[SCM] live-manual branch, upstream, updated. upstream/2.0_a9-1-g8ecd7a9

Sat Nov 13 15:19:37 UTC 2010

The following commit has been merged in the upstream branch:
commit 8ecd7a9aa98b3c310d19dd0e2d1d1158d49f34b8
Author: Daniel Baumann <daniel at debian.org>
Date:   Sat Nov 13 16:19:18 2010 +0100

    Adding upstream version 2.0~a10.

diff --git a/Makefile b/Makefile
index 9fc7b9d..2ca79ca 100644
--- a/Makefile
+++ b/Makefile
@@ -17,6 +17,13 @@ tidy:
 		sed -i -e 's|[ \t]*$$||' $${FILE}; \
 	done
 
+#FIXME: do a proper dependency-based build
+#FORMATS = epub html odf pdf txt
+#...
+#%.pdf: $(sisu_sources)
+#	sisu-pdf -v live-manual.ssm
+#etc.
+
 build:
 	@# FIXME: sisu-concordance sisu-pg sisu-sqlite
 	for LANGUAGE in $(LANGUAGES); \
@@ -35,24 +42,29 @@ autobuild: clean build
 
 	for LANGUAGE in $(LANGUAGES); \
 	do \
-		mkdir -p build/$${LANGUAGE}/epub; \
-		cp manual/$${LANGUAGE}/build/$${LANGUAGE}/epub/live-manual.epub build/$${LANGUAGE}/epub; \
-		mkdir -p build/$${LANGUAGE}/html; \
-		cp manual/$${LANGUAGE}/build/$${LANGUAGE}/live-manual/[0-9]*.html manual/$${LANGUAGE}/build/$${LANGUAGE}/live-manual/index.html build/$${LANGUAGE}/html; \
-		cp manual/$${LANGUAGE}/build/$${LANGUAGE}/live-manual/doc.html build/$${LANGUAGE}/html/live-manual.html; \
-		cp -a manual/$${LANGUAGE}/build/$${LANGUAGE}/_sisu build/$${LANGUAGE}; \
-		mkdir -p build/$${LANGUAGE}/odf; \
-		cp manual/$${LANGUAGE}/build/$${LANGUAGE}/live-manual/opendocument.odt build/$${LANGUAGE}/odf/live-manual.odt; \
-		mkdir -p build/$${LANGUAGE}/pdf; \
-		cp manual/$${LANGUAGE}/build/$${LANGUAGE}/live-manual/landscape.a4.pdf build/$${LANGUAGE}/pdf/live-manual.landscape-a4.pdf; \
-		cp manual/$${LANGUAGE}/build/$${LANGUAGE}/live-manual/portrait.a4.pdf build/$${LANGUAGE}/pdf/live-manual.portrait-a4.pdf; \
-		cp manual/$${LANGUAGE}/build/$${LANGUAGE}/live-manual/landscape.letter.pdf build/$${LANGUAGE}/pdf/live-manual.landscape-letter.pdf; \
-		cp manual/$${LANGUAGE}/build/$${LANGUAGE}/live-manual/portrait.letter.pdf build/$${LANGUAGE}/pdf/live-manual.portrait-letter.pdf; \
-		mkdir -p build/$${LANGUAGE}/txt; \
-		cp manual/$${LANGUAGE}/build/$${LANGUAGE}/live-manual/plain.txt build/$${LANGUAGE}/txt/live-manual.txt; \
+		FROMDIR=$(CURDIR)/manual/$${LANGUAGE}/build/$${LANGUAGE}; \
+		TODIR=$(CURDIR)/build/$${LANGUAGE}; \
+		mkdir -p $${TODIR}; \
+		cd $${TODIR}; \
+		mkdir -p epub; \
+		cp $${FROMDIR}/epub/live-manual.epub epub; \
+		mkdir -p html; \
+		cp $${FROMDIR}/live-manual/*.html html; \
+		mv html/doc.html html/live-manual.html; \
+		cp -a $${FROMDIR}/_sisu .; \
+		rm -f html/toc.html html/sisu_manifest.html html/metadata.html; \
+		mkdir -p odf; \
+		cp $${FROMDIR}/live-manual/opendocument.odt odf/live-manual.odt; \
+		mkdir -p pdf; \
+		cp $${FROMDIR}/live-manual/landscape.a4.pdf pdf/live-manual.landscape-a4.pdf; \
+		cp $${FROMDIR}/live-manual/portrait.a4.pdf pdf/live-manual.portrait-a4.pdf; \
+		cp $${FROMDIR}/live-manual/landscape.letter.pdf pdf/live-manual.landscape-letter.pdf; \
+		cp $${FROMDIR}/live-manual/portrait.letter.pdf pdf/live-manual.portrait-letter.pdf; \
+		mkdir -p txt; \
+		cp $${FROMDIR}/live-manual/plain.txt txt/live-manual.txt; \
 		sed -e "s|@DATE_BUILD@|$(shell LC_ALL=C date -R)|" \
 		    -e "s|@DATE_CHANGE@|$(shell LC_ALL=C git log | grep -m1 Date | awk -FDate: '{ print $2 }' | sed -e 's|  ||g')|" \
-		manual/$${LANGUAGE}/index.html.in > build/$${LANGUAGE}/index.html; \
+		    $${FROMDIR}/../../index.html.in > index.html; \
 	done
 
 commit: tidy test
@@ -75,20 +87,25 @@ install:
 
 	for LANGUAGE in $(LANGUAGES); \
 	do \
-		mkdir -p $(DESTDIR)/usr/share/doc/live-manual/epub; \
-		cp manual/$${LANGUAGE}/build/$${LANGUAGE}/epub/live-manual.epub $(DESTDIR)/usr/share/doc/live-manual/epub/live-manual.$${LANGUAGE}.epub; \
-		mkdir -p $(DESTDIR)/usr/share/doc/live-manual/html/$${LANGUAGE}; \
-		cp manual/$${LANGUAGE}/build/$${LANGUAGE}/live-manual/[0-9]*.html manual/$${LANGUAGE}/build/$${LANGUAGE}/live-manual/index.html $(DESTDIR)/usr/share/doc/live-manual/html/$${LANGUAGE}; \
-		cp manual/$${LANGUAGE}/build/$${LANGUAGE}/live-manual/doc.html $(DESTDIR)/usr/share/doc/live-manual/html/live-manual.$${LANGUAGE}.html; \
-		mkdir -p $(DESTDIR)/usr/share/doc/live-manual/odf; \
-		cp manual/$${LANGUAGE}/build/$${LANGUAGE}/live-manual/opendocument.odt $(DESTDIR)/usr/share/doc/live-manual/odf/live-manual.$${LANGUAGE}.odt; \
-		mkdir -p $(DESTDIR)/usr/share/doc/live-manual/txt; \
-		cp manual/$${LANGUAGE}/build/$${LANGUAGE}/live-manual/plain.txt $(DESTDIR)/usr/share/doc/live-manual/txt/live-manual.$${LANGUAGE}.txt; \
-		mkdir -p $(DESTDIR)/usr/share/doc/live-manual/pdf; \
-		cp manual/$${LANGUAGE}/build/$${LANGUAGE}/live-manual/landscape.a4.pdf $(DESTDIR)/usr/share/doc/live-manual/pdf/live-manual.landscape-a4.$${LANGUAGE}.pdf; \
-		cp manual/$${LANGUAGE}/build/$${LANGUAGE}/live-manual/portrait.a4.pdf $(DESTDIR)/usr/share/doc/live-manual/pdf/live-manual.portrait-a4.$${LANGUAGE}.pdf; \
-		cp manual/$${LANGUAGE}/build/$${LANGUAGE}/live-manual/landscape.letter.pdf $(DESTDIR)/usr/share/doc/live-manual/pdf/live-manual.landscape-letter.$${LANGUAGE}.pdf; \
-		cp manual/$${LANGUAGE}/build/$${LANGUAGE}/live-manual/portrait.letter.pdf $(DESTDIR)/usr/share/doc/live-manual/pdf/live-manual.portrait-letter.$${LANGUAGE}.pdf; \
+		FROMDIR=$(CURDIR)/manual/$${LANGUAGE}/build/$${LANGUAGE}; \
+		TODIR=$(DESTDIR)/usr/share/doc/live-manual; \
+		mkdir -p $${TODIR}; \
+		cd $${TODIR}; \
+		mkdir -p epub; \
+		cp $${FROMDIR}/epub/live-manual.epub epub/live-manual.$${LANGUAGE}.epub; \
+		mkdir -p html/$${LANGUAGE}; \
+		cp $${FROMDIR}/live-manual/*.html html/$${LANGUAGE}; \
+		mv html/$${LANGUAGE}/doc.html html/live-manual.$${LANGUAGE}.html; \
+		rm -f html/$${LANGUAGE}/toc.html html/$${LANGUAGE}/sisu_manifest.html html/$${LANGUAGE}/metadata.html; \
+		mkdir -p odf; \
+		cp $${FROMDIR}/live-manual/opendocument.odt odf/live-manual.$${LANGUAGE}.odt; \
+		mkdir -p txt; \
+		cp $${FROMDIR}/live-manual/plain.txt txt/live-manual.$${LANGUAGE}.txt; \
+		mkdir -p pdf; \
+		cp $${FROMDIR}/live-manual/landscape.a4.pdf pdf/live-manual.landscape-a4.$${LANGUAGE}.pdf; \
+		cp $${FROMDIR}/live-manual/portrait.a4.pdf pdf/live-manual.portrait-a4.$${LANGUAGE}.pdf; \
+		cp $${FROMDIR}/live-manual/landscape.letter.pdf pdf/live-manual.landscape-letter.$${LANGUAGE}.pdf; \
+		cp $${FROMDIR}/live-manual/portrait.letter.pdf pdf/live-manual.portrait-letter.$${LANGUAGE}.pdf; \
 	done
 
 	cp -a manual/en/build/en/_sisu $(DESTDIR)/usr/share/doc/live-manual
diff --git a/VERSION b/VERSION
index 191f5f0..7973afd 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.0~a9
+2.0~a10
diff --git a/manual/de/live-manual.ssm b/manual/de/live-manual.ssm
index ac5702c..53c192c 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-10-25
+ :published: 2010-11-13
 
 @publisher: Debian Live Project <debian-live at lists.debian.org>
 
@@ -51,6 +51,10 @@
 
 << project_bugs.ssi
 
+:B~ Examples ~#
+
+<< user_examples.ssi
+
 :B~ Other ~#
 
 Other material that formerly appeared in this section is out of date and/or
@@ -79,8 +83,6 @@ only after it has been reviewed.
 
 % << other_resources.ssi
 
-% << other_use-cases.ssi
-
 % << other_success-stories.ssi
 
 % << other_troubleshooting.ssi
diff --git a/manual/de/other_live-environment.ssi b/manual/de/other_live-environment.ssi
index 8924b1c..1cc94d2 100644
--- a/manual/de/other_live-environment.ssi
+++ b/manual/de/other_live-environment.ssi
@@ -125,18 +125,18 @@ need to setup also the #{keyb}# variable to the #{klayout}#'s value.
 
 2~ Persistence
 
-A live cd paradigm is a preinstalled 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 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 runtime evolutions of the system
+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 runtime evolution of the system. To
+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
@@ -154,7 +154,7 @@ 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 bootime and the system must be started with the boot
+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.:
 
@@ -206,7 +206,7 @@ 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 runtime could lead to
+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
@@ -230,7 +230,8 @@ parameters of: #{persistent}# #{persistent-subtext=subText}#.
 
 3~ Partial remastering
 
-The runtime 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-initramfs mounts all
-/live filesystem in order or with the module bootparameter.
+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-initramfs mounts all /live filesystem in order or with the module boot
+parameter.
diff --git a/manual/de/other_use-cases.ssi b/manual/de/other_use-cases.ssi
deleted file mode 100644
index 232e3ac..0000000
--- a/manual/de/other_use-cases.ssi
+++ /dev/null
@@ -1,146 +0,0 @@
-B~ Use Cases
-
-1~ Use Cases
-
-This chapter is for users to document their use cases with Debian Live.
-
-2~ VNC Kiosk Client
-
-Create an image with live-helper to boot directly to a VNC server.
-
-_* Make a build directory: #{$ mkdir vncBuild}#
-
-_* Move to the build directory: #{$ cd vncBuild}#
-
-Example to config the build directory to include gdm metacity
-xtightvncviewer: #{$ lh config --packages "gdm metacity xtightvncviewer"}#
-
-Create a folder /etc/skel folder for a custom .xsession for the default
-user: #{$ mkdir -p config/chroot_local-includes/etc/skel}#
-
-Create the .xsession for the default user: #{$ touch
-config/chroot_local-includes/etc/skel/.xsession}#
-
-Edit the .xsession file to launch metacity and start xvncviewer with
-something similar to the below:
-
-code{
-
-#!/bin/sh
-
-/usr/bin/metacity & /usr/bin/vncviewer xxx.xxx.xxx.xxx:PORT
-
-exit
-
-}code
-
-_* Build the image: #{# lh build}#
-
-_* Enjoy.
-
-2~ VMWare-Player Sessions
-
-Create an image with live-helper to boot directly to a specifiv VMWare
-session.
-
-_* Make a build directory: #{$ mkdir VMWare-Player}#
-
-_* Move to the build directory: #{$ cd VMWare-Player}#
-
-_* Example to config the build directory to include gdm metacity
-xtightvncviewer:
-
-code{
-
-$ lh config --apt apt \
-        ---apt-recommends disabled \
-        --archive-areas "main" \
-        --binary-images iso \
-        --binary-indices none \
-        --syslinux-menu vesamenu \
-        ---bootappend-live "persistent quickreboot" \
-        ---bootappend-install "-- plainroot persistent video=vesa:ywrap,mtrr vga=788 quickreboot quiet live-config" \
-        ---debian-installer live \
-        ---distribution lenny \
-        ---hostname vmare-player-firmware \
-        ---includes none \
-        ---linux-flavours 686 \
-        ---packages-lists "gnome-core" \
-        ---packages "gcc gparted linux-headers-2.6-\${LH_LINUX_FLAVOURS} live-config-staging make metacity rsync wireless-tools" \
-        ---repositories live.debian.net \
-        ---win32-loader disabled
-
-}code
-
-_* Create the 01-vmware-player hook: #{$ touch
-config/chroot_local-hooks/01-vmware-player.sh}#
-
-Edit the 01-vmware-player hook to launch the VMWare-Player. The hook should
-look something like the below:
-
-code{
-
-#!/bin/sh
-
-_URL="http://archive.debian-maintainers.org/vmware/other/vmware-player/"
-_VMPLAYER_VERSION="VMware-Player.i386.bundle"
-
-echo "I: Starting script for install of VMWare Player." cd /root
-
-echo "I: Beginning download of ${_VMPLAYER_VERSION} from ${_URL} ." wget
-${_URL}${_VMPLAYER_VERSION}
-
-echo "I: Starting install of VMWare Player." sh /root/${_VMPLAYER_VERSION}
-
-echo "I: Cleaning up the VMWare Player download." rm
-/root/${_VMPLAYER_VERSION}
-
-#echo "I: Starting interactive shell." #bash
-
-}code
-
-_* Build the image (note that during the build the VMWare-Player will prompt
-you to install or cancel): #{#lh build}#
-
-_* 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:
-
-code{
-
-live-config.vmware-player=ACTION:IMAGEPATH:VMXNAME
-
-}code
-
-Notes from the 900-vmware-player file are as follows:
-
-code{
-
-# The script tests for boot parameter of
-# live-config.vmware-player=ACTION:IMAGEPATH:VMXNAME
-#
-# ACTION: The operation to perform on the workstation (none|scratch)
-# IMAGEPATH: The folder path to the VMware image you want to run.
-# VMXNAME: The name of the VMware image you want to run.
-#
-# Notes:To use this file with WMWare images you will need to have a few things
-# setup:
-#
-# 1. The VMware Player needs to be installed in the image.
-# 2. This script uses (s|h)da1 for writing image data, and is used as a scratch
-#    space. This scratch space should be a file system with linux permissions
-#    such as ext2.
-# 3. VMware image(s) should be in a mounted folder and setup as follows:
-#    - Image(s) set to snapshot mode.
-#    - For each image, the image folder needs to have a file called
-#      image-release with a variable CRELEASE. An example: CRELEASE="1.0.0"
-#
-# The image-release file is used by the image maintainer and this script to tell
-# workstation(s) using a given image, to erase locally stored vmware image files
-# and setup with the newly configure image. The operation of erasing locally
-# stored vmare image files, is referred to as a scratch.
-
-}code
-
-_* Enjoy.
diff --git a/manual/de/project_bugs.ssi b/manual/de/project_bugs.ssi
index c82d6cf..8443811 100644
--- a/manual/de/project_bugs.ssi
+++ b/manual/de/project_bugs.ssi
@@ -124,7 +124,7 @@ 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
+3~ At boot time
 
 If your image does not boot, please report it to the mailing list together
 with the information requested in {Collect
@@ -134,7 +134,7 @@ 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
+3~ At run time
 
 If a package was successfully installed, but fails while actually running
 the Live system, this is probably a bug in Debian Live. However,
diff --git a/manual/de/user_basics.ssi b/manual/de/user_basics.ssi
index aef09b7..303cdd7 100644
--- a/manual/de/user_basics.ssi
+++ b/manual/de/user_basics.ssi
@@ -2,56 +2,56 @@
 
 1~ The basics
 
-This chapter contains a brief overview of the build process as well as
-containing instructions on how to boot the various binary image types.
+This chapter contains a brief overview of the build process and instructions
+for booting the various binary image types.
 
 2~ What is a live system?
 
 A live system usually means an operating system booted on a computer from a
-removable medium (such as CD-ROM, USB stick, or network), ready to use
-without any installation on the usual drive(s), with an auto-configuration
-done at runtime (see {Terms}#terms ).
+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).
 
 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 following parts:
+is made from the following parts:
 
-_* Linux kernel
+_* *{Linux kernel image}*, usually named #{vmlinuz*}#
 
-_* The Linux image, usually named #{vmlinuz*}#
-
-_* *{Initial RAM disk image (initrd)}*: RAM disk setup for the Linux boot,
-containing modules possibly needed to mount the filesystem's image and some
+_* *{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 systems filesystem image. The SquashFS
-compressed filesystem is used to minimize the Debian Live image size. Note
-that it's 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 partition(s) are used (see 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).
 
 % FIXME: <xref linkend="persistence"/>
 
-_* *{Bootloader}*: A small piece of code, crafted to boot up from the chosen
+_* *{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 then loads the Linux kernel and its initrd to run
-with an associated filesystem image. Different solutions can be used
-depending on the target media and format of the filesystem containing the
-previous components: Isolinux to boot from a CD or DVD in ISO9660 format,
+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
-partition, etc.
+partitions, etc.
 
-_* live-build will build the system image from your specifications, setup a
-Linux kernel and its initrd, a bootloader to run them, all in one
+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
 
-The following sequence of commands, provided by live-build, will create a
-basic ISO image containing just the Debian standard system without X.org. It
-is suitable for burning to CD or DVD media.
+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).
 
 First, we run the #{lb config}# command which will create a "config/"
 hierarchy in the current directory for use by other commands:
@@ -62,8 +62,8 @@ $ 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 ).
+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:
@@ -75,7 +75,7 @@ code{
 }code
 
 This process can take a while, depending on the speed of your network
-connection (see {The lb build command}#lb-build ).
+connection (see {The lb build command}#lb-build).
 
 3~ Testing an ISO image with Qemu
 
@@ -95,26 +95,23 @@ In order to test the ISO with virtualbox-ose:
 
 code{
 
-# apt-get install virtualbox-ose
+# apt-get install virtualbox-ose virtualbox-ose-dkms
 
-}code
+$ virtualbox
 
-and either install #{virtualbox-ose-source}# or #{virtualbox-ose-dkms}# to
-build the required kernel modules to run virtualbox-ose.
+}code
 
-After successful installation, virtualbox can be e.g. found in the GNOME
-menu under 'Applications/System Tools/VirtualBox OSE'.
+Create a new virtual machine, change the storage settings to use binary.iso
+as the CD/DVD device, and start the machine.
 
-Please consider including of following packages onto the live image to
-achieve higher resolution of the display when booting the live image in
-virutalbox-ose (1280x1024 instead of 800x600 and in particular if the
-default resolution of the virtualbox-ose display shouldn't work with the
-gui-installer).
+Note: For live systems containing X.org that you want to test with
+virtualbox-ose, you may wish to include the VirtualBox X.org driver package,
+virtualbox-ose-guest-x11, in your live-build configuration. Otherwise, the
+resolution is limited to 800x600.
 
 code{
 
-virtualbox-ose-guest-dkms virtualbox-ose-guest-utils
-virtualbox-ose-guest-x11
+# lb config --packages virtualbox-ose-guest-x11
 
 }code
 
@@ -130,16 +127,19 @@ $ wodim binary.iso
 
 }code
 
-2~ Building an USB/HDD image
+2~ Building a USB/HDD image
 
 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.
+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.
 
-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 ):
+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):
 
 code{
 
@@ -164,11 +164,11 @@ code{
 
 }code
 
-3~ Copying USB/HDD image to a USB stick
+3~copying-usb-hdd-image Copying USB/HDD image to a USB stick
 
 The generated binary image contains a VFAT partition and the syslinux
-bootloader, ready to be directly written on an USB stick. Plug in an USB
-stick with a size larger than that of binary.img and type:
+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:
 
 code{
 
@@ -178,7 +178,8 @@ $ dd if=binary.img of=${USBSTICK}
 
 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.
+looking in #{dmesg}#'s output after plugging in the stick, for example, or
+better yet, #{ls -l /dev/disk/by-id}#.
 
 *{This will definitely overwrite any previous contents on your stick!}*
 
@@ -205,8 +206,8 @@ code{
 
 }code
 
-Ater the creation of the partition you have to create a filsystem on it. One
-possible choice would be ext4.
+After the creation of the partition, you have to create a filesystem on
+it. One possible choice would be ext4.
 
 code{
 
@@ -222,7 +223,7 @@ code{
 
 }code
 
-*{Remember: Every time you install a new binary.img on the stick, all your data will be lost because the image includes a complete partition table.}*
+*{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.}*
 
 2~ Building a netboot image
 
@@ -230,7 +231,7 @@ The following sequence of commands will create a basic netboot image
 containing the Debian standard system without X.org. It is suitable for
 booting over the network.
 
-Note if you performed any previous examples, you will need to clean up your
+Note: if you performed any previous examples, you will need to clean up your
 working directory with the #{lb clean}# command:
 
 code{
@@ -249,11 +250,11 @@ $ lb config -b net --net-root-path "/srv/debian-live" --net-root-server
 
 }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
+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.
+located at boot time.
 
 Now build the image with the #{lb build}# command:
 
@@ -263,16 +264,16 @@ code{
 
 }code
 
-In a network boot the client runs a small piece of software, which usually
+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 boot loader via the TFTP protocol. That
-could be PXELINUX, Grub or even boot directly to an operating system like
+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
+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.
@@ -280,7 +281,7 @@ We must now configure three services on the server to enable netboot.
 3~ DHCP server
 
 We must configure our network's DHCP server to be sure to give an IP address
-to the computer netbooting, and to advertise the location of the PXE
+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
@@ -305,9 +306,9 @@ subnet 192.168.1.0 netmask 255.255.255.0 {   # 192.168.1.0/24
 
   # 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
+    # Note: all files for PXE are relatives to the TFTP server's root
 
-    # PXE boot loader (first program to be loaded, by TFTP)
+    # PXE bootloader (first program to be loaded, by TFTP)
     filename "pxelinux.0";
 
   }
@@ -317,7 +318,7 @@ subnet 192.168.1.0 netmask 255.255.255.0 {   # 192.168.1.0/24
 
 3~ TFTP server
 
-This serves the kernel and initial ramdisk to the system at run-time.
+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
@@ -418,6 +419,6 @@ ethernet0.generatedAddress = "00:0c:29:8d:71:3b" uuid.location = "56 4d 83
 _* You can play with this configuration file (i.e. change memory limit to
 256)
 
-_* Double click on this file (or run VMWare player and selecet this file).
+_* Double click on this file (or run VMWare player and select this file).
 
 _* When running just press space if that strange question comes up...
diff --git a/manual/de/user_customization-internationalization.ssi b/manual/de/user_customization-internationalization.ssi
index beb134a..b86f8f8 100644
--- a/manual/de/user_customization-internationalization.ssi
+++ b/manual/de/user_customization-internationalization.ssi
@@ -4,8 +4,8 @@ B~ Customizing locale and language
 
 2~ Default locale and keyboard
 
-The default locale when building a live cd is "locales=en_US.UTF-8", to set
-the locale for e.g. Switzerland, you can use "locales=de_CH.UTF-8".
+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{
 
diff --git a/manual/de/user_customization-overview.ssi b/manual/de/user_customization-overview.ssi
index 517ca3d..44c6731 100644
--- a/manual/de/user_customization-overview.ssi
+++ b/manual/de/user_customization-overview.ssi
@@ -2,12 +2,76 @@ B~ Customizing contents
 
 1~customization-overview Customization overview
 
-% FIXME: just a stub for now.  In conversational style, cover the different
-kinds of customization % and link to each section within the text.
+This chapter gives an overview of the various ways in which you may
+customize a Debian Live system.
 
-This chapter gives an overview of the various ways in which your Debian live
-systems may be customized. See sections {Customizing package
+2~ Build time vs. boot time configuration
+
+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.
+
+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.
+
+2~stages-of-the-build Stages of the build
+
+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.
+
+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.
+
+2~ Supplement lb config with files
+
+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.
+
+2~ Customization tasks
+
+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.
+language}#customizing-locale-and-language cover just a few of the things you
+might want to do.
 
diff --git a/manual/de/user_customization-packages.ssi b/manual/de/user_customization-packages.ssi
index 29fb5eb..1ae1289 100644
--- a/manual/de/user_customization-packages.ssi
+++ b/manual/de/user_customization-packages.ssi
@@ -2,23 +2,44 @@
 
 1~customizing-package-installation Customizing package installation
 
-_* Selecting additional packages to be installed
-
-_* Installing modified packages
+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. We start with customization of the 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.
 
 2~ Package sources
 
 3~ Debian repositories
 
-To set a local mirror (used to 'build' the live system)
+To set a local mirror to be used to at build time:
 
 code{
 
-$ lb config --mirror-bootstrap http://localhost/debian/ --mirror-chroot
-http://localhost/debian/
+$ lb config --mirror-bootstrap http://localhost/debian/
 
 }code
 
+The chroot repository, specified by --mirror-chroot, defaults to the same as
+--mirror-bootstrap.
+
+Each of the --mirror-* options governs which repository 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, when the
+binary image is constructed, the --mirror-binary value is used, superceding
+any earlier repositories.
+
 The generic mirror is added to the live system's /etc/apt/sources.list.
 
 code{
diff --git a/manual/de/user_examples.ssi b/manual/de/user_examples.ssi
new file mode 100644
index 0000000..2567323
--- /dev/null
+++ b/manual/de/user_examples.ssi
@@ -0,0 +1,43 @@
+B~ Examples
+
+1~ Use Case Builds
+
+This chapter covers example builds for specific use cases with Debian Live.
+
+2~ VNC Kiosk Client
+
+Create an image with live-build to boot directly to a VNC server.
+
+_* Make a build directory: #{$ mkdir vncBuild}#
+
+_* Move to the build directory: #{$ cd vncBuild}#
+
+Example to config the build directory to include gdm metacity
+xtightvncviewer: #{$ lb config --packages "gdm3 metacity xtightvncviewer"}#
+
+Create a folder /etc/skel folder for a custom .xsession for the default
+user: #{$ mkdir -p config/chroot_local-includes/etc/skel}#
+
+Create the .xsession for the default user: #{$ touch
+config/chroot_local-includes/etc/skel/.xsession}#
+
+Edit the .xsession file to launch metacity and start xvncviewer with
+something similar to the below:
+
+code{
+
+#!/bin/sh
+
+/usr/bin/metacity & /usr/bin/vncviewer xxx.xxx.xxx.xxx:PORT
+
+exit
+
+}code
+
+_* Build the image: #{# lb build}#
+
+_* Enjoy.
+
+2~ Next Example FIXME
+
+
diff --git a/manual/de/user_managing_a_configuration.ssi b/manual/de/user_managing_a_configuration.ssi
index 3047ef0..bc03008 100644
--- a/manual/de/user_managing_a_configuration.ssi
+++ b/manual/de/user_managing_a_configuration.ssi
@@ -1,6 +1,6 @@
 :B~ Managing a configuration
 
-1~ Managing a configuration
+1~managing-a-configuration Managing a configuration
 
 This chapter explains how to manage a live configuration from initial
 creation, through successive revisions and successive releases of both the
diff --git a/manual/de/user_overview.ssi b/manual/de/user_overview.ssi
index 9c7e8ff..cf9f187 100644
--- a/manual/de/user_overview.ssi
+++ b/manual/de/user_overview.ssi
@@ -32,37 +32,6 @@ 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.
 
-Besides the common config/common, which is used by all live-build commands,
-some additional files can be used to configure the behavior of specific
-helper commands. These files are typically named config/command or
-config/stage (where "stage", of course, is replaced with the name of the
-stage that they belong to, and "command" with the name of the command).
-
-For example, the #{lb_bootstrap_debootstrap}# command uses files named
-config/bootstrap and config/bootstrap_debootstrap to read the options it
-will use. Generally, these files contain variables with values assigned, one
-variable per line. Some commands of live-buil use pairs of values or
-slightly more complicated variable assignments.
-
-live-build respects environment variables which are present in the context
-of the shell it is running. If variables can be read from config files, then
-they override environment variables, and if command line options are used,
-they override values from config files. If no value for a given variable can
-be found (and is thus unset), live-build will automatically set it to a
-default value.
-
-All config files are shell scripts which are sourced by a live-build
-command. That means they have to follow the normal shell syntax. You can
-also put comments in these files; lines beginning with "#" are ignored.
-
-In some rare cases you may want to have different versions of these files
-for different architectures or distributions. If files named
-config/stage.arch or config/stage_command.arch, and config/stage.dist or
-config/stage_command.dist exist (where "arch" is the same as the output of
-dpkg --print-architecture and "dist" is the same as the codename of the
-target distribution), then they will be used in preference to the other,
-more general files.
-
 The remainder of this section discusses the three most important commands:
 
 _* *{lb config}*: Responsible for initializing a Live system configuration
@@ -117,12 +86,12 @@ drwxr-xr-x 2 user user 4096 Sep 7 13:02 templates
 }code
 
 Using #{lb config}# without any arguments would be suitable for users who
-are either happy editing the generated files, or are simply happy with the
-defaults it creates.
+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).
 
-You can ask #{lb config}# to generate a config/ directory "preseeded" with
-various options. This might be suitable if you do not require the default
-settings but do not need to change a large number of options. For example:
+Normally, you will want to specify some options. For example, to include the
+'gnome' package list in your configuration:
 
 code{
 
@@ -130,8 +99,7 @@ $ lb config -p gnome
 
 }code
 
-will build a config/ directory configured to include the 'gnome' package
-list. It is possible to specify many options:
+It is possible to specify many options, such as:
 
 code{
 
@@ -140,8 +108,7 @@ $ lb config --binary-images net --hostname live-machine --username live-user
 
 }code
 
-A full list of options is available in the #{lb_config}# man page. Most
-options have a parallel with an "LB_" prefixed variable.
+A full list of options is available in the #{lb_config}# man page.
 
 3~lb-build The #{lb build}# command
 
@@ -159,7 +126,7 @@ so subsequent builds can start from a clean state.
 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.
+ISOs, netboot tarballs, and USB stick images.
 
 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)
diff --git a/manual/en/live-manual.ssm b/manual/en/live-manual.ssm
index d66ac19..457ffdc 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-10-25
+ :published: 2010-11-13
 
 @publisher: Debian Live Project <debian-live at lists.debian.org>
 
@@ -51,6 +51,10 @@
 
 << project_bugs.ssi
 
+:B~ Examples ~#
+
+<< user_examples.ssi
+
 :B~ Other ~#
 
 Other material that formerly appeared in this section is out of date and/or has
@@ -79,8 +83,6 @@ been reviewed.
 
 % << other_resources.ssi
 
-% << other_use-cases.ssi
-
 % << other_success-stories.ssi
 
 % << other_troubleshooting.ssi
diff --git a/manual/en/other_live-environment.ssi b/manual/en/other_live-environment.ssi
index 57bf84c..7d019c2 100644
--- a/manual/en/other_live-environment.ssi
+++ b/manual/en/other_live-environment.ssi
@@ -99,18 +99,18 @@ Note that on old versions of #{console-setup}# (i.e. Lenny's one), you'll need t
 
 2~ Persistence
 
-A live cd paradigm is a preinstalled 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 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 runtime evolutions of the system are lost at shutdown.
+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 runtime 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.
+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 bootime 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.:
+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{
 
@@ -144,7 +144,7 @@ If during the boot a partition (filesystem) image file or a partition labeled #{
 
 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 runtime 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.
+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.
 
@@ -156,4 +156,4 @@ If a user would need multiple persistent storage of the same type for different
 
 3~ Partial remastering
 
-The runtime 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-initramfs mounts all /live filesystem in order or with the module bootparameter.
+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-initramfs mounts all /live filesystem in order or with the module boot parameter.
diff --git a/manual/en/other_use-cases.ssi b/manual/en/other_use-cases.ssi
deleted file mode 100644
index 6674c9a..0000000
--- a/manual/en/other_use-cases.ssi
+++ /dev/null
@@ -1,138 +0,0 @@
-B~ Use Cases
-
-1~ Use Cases
-
-This chapter is for users to document their use cases with Debian Live.
-
-2~ VNC Kiosk Client
-
-Create an image with live-helper to boot directly to a VNC server.
-
-_* Make a build directory: #{$ mkdir vncBuild}#
-
-_* Move to the build directory: #{$ cd vncBuild}#
-
-Example to config the build directory to include gdm metacity xtightvncviewer: #{$ lh config --packages "gdm metacity xtightvncviewer"}#
-
-Create a folder /etc/skel folder for a custom .xsession for the default user: #{$ mkdir -p config/chroot_local-includes/etc/skel}#
-
-Create the .xsession for the default user: #{$ touch config/chroot_local-includes/etc/skel/.xsession}#
-
-Edit the .xsession file to launch metacity and start xvncviewer with something similar to the below:
-
-code{
-
-#!/bin/sh
-
-/usr/bin/metacity &
-/usr/bin/vncviewer xxx.xxx.xxx.xxx:PORT
-
-exit
-
-}code
-
-_* Build the image: #{# lh build}#
-
-_* Enjoy.
-
-2~ VMWare-Player Sessions
-
-Create an image with live-helper to boot directly to a specifiv VMWare session.
-
-_* Make a build directory: #{$ mkdir VMWare-Player}#
-
-_* Move to the build directory: #{$ cd VMWare-Player}#
-
-_* Example to config the build directory to include gdm metacity xtightvncviewer:
-
-code{
-
-$ lh config --apt apt \
-        ---apt-recommends disabled \
-        --archive-areas "main" \
-        --binary-images iso \
-        --binary-indices none \
-        --syslinux-menu vesamenu \
-        ---bootappend-live "persistent quickreboot" \
-        ---bootappend-install "-- plainroot persistent video=vesa:ywrap,mtrr vga=788 quickreboot quiet live-config" \
-        ---debian-installer live \
-        ---distribution lenny \
-        ---hostname vmare-player-firmware \
-        ---includes none \
-        ---linux-flavours 686 \
-        ---packages-lists "gnome-core" \
-        ---packages "gcc gparted linux-headers-2.6-\${LH_LINUX_FLAVOURS} live-config-staging make metacity rsync wireless-tools" \
-        ---repositories live.debian.net \
-        ---win32-loader disabled
-
-}code
-
-_* Create the 01-vmware-player hook: #{$ touch config/chroot_local-hooks/01-vmware-player.sh}#
-
-Edit the 01-vmware-player hook to launch the VMWare-Player. The hook should look something like the below:
-
-code{
-
-#!/bin/sh
-
-_URL="http://archive.debian-maintainers.org/vmware/other/vmware-player/"
-_VMPLAYER_VERSION="VMware-Player.i386.bundle"
-
-echo "I: Starting script for install of VMWare Player."
-cd /root
-
-echo "I: Beginning download of ${_VMPLAYER_VERSION} from ${_URL} ."
-wget ${_URL}${_VMPLAYER_VERSION}
-
-echo "I: Starting install of VMWare Player."
-sh /root/${_VMPLAYER_VERSION}
-
-echo "I: Cleaning up the VMWare Player download."
-rm /root/${_VMPLAYER_VERSION}
-
-#echo "I: Starting interactive shell."
-#bash
-
-}code
-
-_* Build the image (note that during the build the VMWare-Player will prompt you to install or cancel): #{#lh build}#
-
-_* 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:
-
-code{
-
-live-config.vmware-player=ACTION:IMAGEPATH:VMXNAME
-
-}code
-
-Notes from the 900-vmware-player file are as follows:
-
-code{
-
-# The script tests for boot parameter of
-# live-config.vmware-player=ACTION:IMAGEPATH:VMXNAME
-#
-# ACTION: The operation to perform on the workstation (none|scratch)
-# IMAGEPATH: The folder path to the VMware image you want to run.
-# VMXNAME: The name of the VMware image you want to run.
-#
-# Notes:To use this file with WMWare images you will need to have a few things
-# setup:
-#
-# 1. The VMware Player needs to be installed in the image.
-# 2. This script uses (s|h)da1 for writing image data, and is used as a scratch
-#    space. This scratch space should be a file system with linux permissions
-#    such as ext2.
-# 3. VMware image(s) should be in a mounted folder and setup as follows:
-#    - Image(s) set to snapshot mode.
-#    - For each image, the image folder needs to have a file called
-#      image-release with a variable CRELEASE. An example: CRELEASE="1.0.0"
-#
-# The image-release file is used by the image maintainer and this script to tell
-# workstation(s) using a given image, to erase locally stored vmware image files
-# and setup with the newly configure image. The operation of erasing locally
-# stored vmare image files, is referred to as a scratch.
-
-}code
-
-_* Enjoy.
diff --git a/manual/en/project_bugs.ssi b/manual/en/project_bugs.ssi
index a5ab90c..b19451d 100644
--- a/manual/en/project_bugs.ssi
+++ b/manual/en/project_bugs.ssi
@@ -82,11 +82,11 @@ If this is the case, this is not a bug in Debian Live, but rather in Debian - pl
 
 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
+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.
 
-3~ At run-time
+3~ At run time
 
 If a package was successfully installed, but fails while actually running the Live system, this is probably a bug in Debian Live. However,
 
diff --git a/manual/en/user_basics.ssi b/manual/en/user_basics.ssi
index 4590f82..c707245 100644
--- a/manual/en/user_basics.ssi
+++ b/manual/en/user_basics.ssi
@@ -2,31 +2,29 @@
 
 1~ The basics
 
-This chapter contains a brief overview of the build process as well as containing instructions on how to boot the various binary image types.
+This chapter contains a brief overview of the build process and instructions for booting the various binary image types.
 
 2~ What is a live system?
 
-A live system usually means an operating system booted on a computer from a removable medium (such as CD-ROM, USB stick, or network), ready to use without any installation on the usual drive(s), with an auto-configuration done at runtime (see {Terms}#terms ).
+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).
 
-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 following parts:
+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:
 
-_* Linux kernel
+_* *{Linux kernel image}*, usually named #{vmlinuz*}#
 
-_* The Linux 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.
 
-_* *{Initial RAM disk image (initrd)}*: RAM disk setup for the Linux boot, containing modules possibly needed to mount the filesystem's image and some scripts to do it.
-
-_* *{System image}*: The operating systems filesystem image. The SquashFS compressed filesystem is used to minimize the Debian Live image size. Note that it's 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 partition(s) are used (see 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).
 
 % FIXME: <xref linkend="persistence"/>
 
-_* *{Bootloader}*: A small piece of code, crafted to boot up from the chosen media, possibly presenting a prompt or menu to allow selection of options/configuration. It then loads the Linux kernel and its initrd to run with an associated filesystem image. Different solutions can be used depending on the target media and format of the filesystem containing the previous 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 partition, etc.
+_* *{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.
 
-_* live-build will build the system image from your specifications, setup a Linux kernel and its initrd, 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
 
-The following sequence of commands, provided by live-build, will create a basic ISO image containing just the Debian standard system without X.org. It is suitable for burning to CD or DVD media.
+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).
 
 First, we run the #{lb config}# command which will create a "config/" hierarchy in the current directory for use by other commands:
 
@@ -36,7 +34,7 @@ $ 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 ).
+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:
 
@@ -46,7 +44,7 @@ code{
 
 }code
 
-This process can take a while, depending on the speed of your network connection (see {The lb build command}#lb-build ).
+This process can take a while, depending on the speed of your network connection (see {The lb build command}#lb-build).
 
 3~ Testing an ISO image with Qemu
 
@@ -66,21 +64,19 @@ In order to test the ISO with virtualbox-ose:
 
 code{
 
-# apt-get install virtualbox-ose
+# apt-get install virtualbox-ose virtualbox-ose-dkms
 
-}code
+$ virtualbox
 
-and either install #{virtualbox-ose-source}# or #{virtualbox-ose-dkms}# to build the required kernel modules to run virtualbox-ose.
+}code
 
-After successful installation, virtualbox can be e.g. found in the GNOME menu under 'Applications/System Tools/VirtualBox OSE'.
+Create a new virtual machine, change the storage settings to use binary.iso as the CD/DVD device, and start the machine.
 
-Please consider including of following packages onto the live image to achieve higher resolution of the display when booting the live image in virutalbox-ose (1280x1024 instead of 800x600 and in particular if the default resolution of the virtualbox-ose display shouldn't work with the gui-installer).
+Note: For live systems containing X.org that you want to test with virtualbox-ose, you may wish to include the VirtualBox X.org driver package, virtualbox-ose-guest-x11, in your live-build configuration. Otherwise, the resolution is limited to 800x600.
 
 code{
 
-virtualbox-ose-guest-dkms
-virtualbox-ose-guest-utils
-virtualbox-ose-guest-x11
+# lb config --packages virtualbox-ose-guest-x11
 
 }code
 
@@ -96,11 +92,11 @@ $ wodim binary.iso
 
 }code
 
-2~ Building an USB/HDD image
+2~ Building a USB/HDD image
 
-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.
+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.
 
-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 ):
+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):
 
 code{
 
@@ -124,9 +120,9 @@ code{
 
 }code
 
-3~ Copying USB/HDD image to a USB stick
+3~copying-usb-hdd-image Copying USB/HDD image to a USB stick
 
-The generated binary image contains a VFAT partition and the syslinux bootloader, ready to be directly written on an USB stick. Plug in an USB stick with a size larger than that of binary.img and type:
+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:
 
 code{
 
@@ -134,7 +130,7 @@ $ dd if=binary.img of=${USBSTICK}
 
 }code
 
-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.
+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}#.
 
 *{This will definitely overwrite any previous contents on your stick!}*
 
@@ -158,7 +154,7 @@ code{
 
 }code
 
-Ater the creation of the partition you have to create a filsystem on it. One possible choice would be ext4.
+After the creation of the partition, you have to create a filesystem on it. One possible choice would be ext4.
 
 code{
 
@@ -174,13 +170,13 @@ code{
 
 }code
 
-*{Remember: Every time you install a new binary.img on the stick, all your data will be lost because the image includes a complete partition table.}*
+*{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.}*
 
 2~ Building a netboot image
 
 The following sequence of commands will create a basic netboot image containing the Debian standard system without X.org. It is suitable for booting over the network.
 
-Note if you performed any previous examples, you will need to clean up your working directory with the #{lb clean}# command:
+Note: if you performed any previous examples, you will need to clean up your working directory with the #{lb clean}# command:
 
 code{
 
@@ -196,7 +192,7 @@ $ lb config -b net --net-root-path "/srv/debian-live" --net-root-server "192.168
 
 }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 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.
 
 Now build the image with the #{lb build}# command:
 
@@ -206,15 +202,15 @@ code{
 
 }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 boot loader via the TFTP protocol. That could be PXELINUX, Grub or even boot directly to an operating system like Linux.
+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.
 
 3~ DHCP server
 
-We must configure our network's DHCP server to be sure to give an IP address to the computer netbooting, and to advertise the location of the PXE bootloader.
+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;
 
@@ -237,9 +233,9 @@ subnet 192.168.1.0 netmask 255.255.255.0 {   # 192.168.1.0/24
 
   # 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
+    # Note: all files for PXE are relatives to the TFTP server's root
 
-    # PXE boot loader (first program to be loaded, by TFTP)
+    # PXE bootloader (first program to be loaded, by TFTP)
     filename "pxelinux.0";
 
   }
@@ -249,7 +245,7 @@ subnet 192.168.1.0 netmask 255.255.255.0 {   # 192.168.1.0/24
 
 3~ TFTP server
 
-This serves the kernel and initial ramdisk to the system at run-time.
+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:
 
@@ -351,6 +347,6 @@ ethernet0.generatedAddressOffset = "0"
 
 _* You can play with this configuration file (i.e. change memory limit to 256)
 
-_* Double click on this file (or run VMWare player and selecet this file).
+_* Double click on this file (or run VMWare player and select this file).
 
 _* When running just press space if that strange question comes up...
diff --git a/manual/en/user_customization-internationalization.ssi b/manual/en/user_customization-internationalization.ssi
index 65bd2b1..6298067 100644
--- a/manual/en/user_customization-internationalization.ssi
+++ b/manual/en/user_customization-internationalization.ssi
@@ -4,7 +4,7 @@ B~ Customizing locale and language
 
 2~ Default locale and keyboard
 
-The default locale when building a live cd is "locales=en_US.UTF-8", to set the locale for e.g. Switzerland, you can use "locales=de_CH.UTF-8".
+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{
 
diff --git a/manual/en/user_customization-overview.ssi b/manual/en/user_customization-overview.ssi
index b4df19c..450a64d 100644
--- a/manual/en/user_customization-overview.ssi
+++ b/manual/en/user_customization-overview.ssi
@@ -2,8 +2,25 @@ B~ Customizing contents
 
 1~customization-overview Customization overview
 
-% FIXME: just a stub for now.  In conversational style, cover the different kinds of customization
-% and link to each section within the text.
+This chapter gives an overview of the various ways in which you may customize a Debian Live system.
 
-This chapter gives an overview of the various ways in which your Debian live systems may be customized. See sections {Customizing package installation}#customizing-package-installation, {Customizing contents}#customizing-contents and {Customizing locale and language}#customizing-locale-and-language.
+2~ Build time vs. boot time configuration
+
+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.
+
+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.
+
+2~stages-of-the-build Stages of the build
+
+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.
+
+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.
+
+2~ Supplement lb config with files
+
+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.
+
+2~ Customization tasks
+
+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.
 
diff --git a/manual/en/user_customization-packages.ssi b/manual/en/user_customization-packages.ssi
index 289d6ab..768c8a9 100644
--- a/manual/en/user_customization-packages.ssi
+++ b/manual/en/user_customization-packages.ssi
@@ -2,22 +2,24 @@
 
 1~customizing-package-installation Customizing package installation
 
-_* Selecting additional packages to be installed
-
-_* Installing modified packages
+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. We start with customization of the 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.
 
 2~ Package sources
 
 3~ Debian repositories
 
-To set a local mirror (used to 'build' the live system)
+To set a local mirror to be used to at build time:
 
 code{
 
-$ lb config --mirror-bootstrap http://localhost/debian/ --mirror-chroot http://localhost/debian/
+$ lb config --mirror-bootstrap http://localhost/debian/
 
 }code
 
+The chroot repository, specified by --mirror-chroot, defaults to the same as --mirror-bootstrap.
+
+Each of the --mirror-* options governs which repository 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, when the binary image is constructed, the --mirror-binary value is used, superceding any earlier repositories.
+
 The generic mirror is added to the live system's /etc/apt/sources.list.
 
 code{
diff --git a/manual/en/user_examples.ssi b/manual/en/user_examples.ssi
new file mode 100644
index 0000000..a2ab393
--- /dev/null
+++ b/manual/en/user_examples.ssi
@@ -0,0 +1,40 @@
+B~ Examples
+
+1~ Use Case Builds
+
+This chapter covers example builds for specific use cases with Debian Live.
+
+2~ VNC Kiosk Client
+
+Create an image with live-build to boot directly to a VNC server.
+
+_* Make a build directory: #{$ mkdir vncBuild}#
+
+_* Move to the build directory: #{$ cd vncBuild}#
+
+Example to config the build directory to include gdm metacity xtightvncviewer: #{$ lb config --packages "gdm3 metacity xtightvncviewer"}#
+
+Create a folder /etc/skel folder for a custom .xsession for the default user: #{$ mkdir -p config/chroot_local-includes/etc/skel}#
+
+Create the .xsession for the default user: #{$ touch config/chroot_local-includes/etc/skel/.xsession}#
+
+Edit the .xsession file to launch metacity and start xvncviewer with something similar to the below:
+
+code{
+
+#!/bin/sh
+
+/usr/bin/metacity &
+/usr/bin/vncviewer xxx.xxx.xxx.xxx:PORT
+
+exit
+
+}code
+
+_* Build the image: #{# lb build}#
+
+_* Enjoy.
+
+2~ Next Example FIXME
+
+
diff --git a/manual/en/user_managing_a_configuration.ssi b/manual/en/user_managing_a_configuration.ssi
index 81c5eea..7c68d73 100644
--- a/manual/en/user_managing_a_configuration.ssi
+++ b/manual/en/user_managing_a_configuration.ssi
@@ -1,6 +1,6 @@
 :B~ Managing a configuration
 
-1~ Managing a configuration
+1~managing-a-configuration Managing a configuration
 
 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.
 
diff --git a/manual/en/user_overview.ssi b/manual/en/user_overview.ssi
index 341da61..5767950 100644
--- a/manual/en/user_overview.ssi
+++ b/manual/en/user_overview.ssi
@@ -18,16 +18,6 @@ _* The scripts are independent - that is to say, it is always safe to run each c
 
 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.
 
-Besides the common config/common, which is used by all live-build commands, some additional files can be used to configure the behavior of specific helper commands. These files are typically named config/command or config/stage (where "stage", of course, is replaced with the name of the stage that they belong to, and "command" with the name of the command).
-
-For example, the #{lb_bootstrap_debootstrap}# command uses files named config/bootstrap and config/bootstrap_debootstrap to read the options it will use. Generally, these files contain variables with values assigned, one variable per line. Some commands of live-buil use pairs of values or slightly more complicated variable assignments.
-
-live-build respects environment variables which are present in the context of the shell it is running. If variables can be read from config files, then they override environment variables, and if command line options are used, they override values from config files. If no value for a given variable can be found (and is thus unset), live-build will automatically set it to a default value.
-
-All config files are shell scripts which are sourced by a live-build command. That means they have to follow the normal shell syntax. You can also put comments in these files; lines beginning with "#" are ignored.
-
-In some rare cases you may want to have different versions of these files for different architectures or distributions. If files named config/stage.arch or config/stage_command.arch, and config/stage.dist or config/stage_command.dist exist (where "arch" is the same as the output of dpkg --print-architecture and "dist" is the same as the codename of the target distribution), then they will be used in preference to the other, more general files.
-
 The remainder of this section discusses the three most important commands:
 
 _* *{lb config}*: Responsible for initializing a Live system configuration directory. See {The lb config command}#lb-config for more information.
@@ -82,9 +72,9 @@ drwxr-xr-x 2 user user 4096 Sep  7 13:02 templates
 
 }code
 
-Using #{lb config}# without any arguments would be suitable for users who are either happy editing the generated files, or are simply happy with the defaults it creates.
+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).
 
-You can ask #{lb config}# to generate a config/ directory "preseeded" with various options. This might be suitable if you do not require the default settings but do not need to change a large number of options. For example:
+Normally, you will want to specify some options. For example, to include the 'gnome' package list in your configuration:
 
 code{
 
@@ -92,7 +82,7 @@ $ lb config -p gnome
 
 }code
 
-will build a config/ directory configured to include the 'gnome' package list. It is possible to specify many options:
+It is possible to specify many options, such as:
 
 code{
 
@@ -100,7 +90,7 @@ $ lb config --binary-images net --hostname live-machine --username live-user ...
 
 }code
 
-A full list of options is available in the #{lb_config}# man page. Most options have a parallel with an "LB_" prefixed variable.
+A full list of options is available in the #{lb_config}# man page.
 
 3~lb-build The #{lb build}# command
 
@@ -112,7 +102,7 @@ It is the job of the #{lb clean}# command to remove various parts of a build so
 
 2~live-boot The live-boot package
 
-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.
+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.
 
 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.
 
diff --git a/manual/fr/about_manual.ssi b/manual/fr/about_manual.ssi
index eb719e4..08ab76d 100644
--- a/manual/fr/about_manual.ssi
+++ b/manual/fr/about_manual.ssi
@@ -79,7 +79,7 @@ utilisée par les développeurs et ceux qui aiment le risque.
 Au moment d'écrire ce document, Squeeze est la version Stable et Wheezy est
 la version testing. Sid restera toujours synonyme de version unstable.
 
-2~Auteurs
+2~ Auteurs
 
 La liste des auteurs (dans l'ordre alphabétique):
 
@@ -109,10 +109,10 @@ _* Trent W. Buck
 
 2~ Contribuer à ce 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.
+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
+de soumettre une contribution est de l'envoyer à la liste de diffusion. S'il
+vous plaît voir {Contact}#contact pour plus d'informations.
 
 Lorsque vous soumettez une contribution, veuillez indiquer clairement le
 copyright et inclure la mention légale relative à la licence. Notez que pour
diff --git a/manual/fr/live-manual.ssm b/manual/fr/live-manual.ssm
index 21efbbf..ca909a0 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-10-25
+ :published: 2010-11-13
 
 @publisher: Debian Live Project <debian-live at lists.debian.org>
 
@@ -51,6 +51,10 @@
 
 << project_bugs.ssi
 
+:B~ Examples ~#
+
+<< user_examples.ssi
+
 :B~ Other ~#
 
 Other material that formerly appeared in this section is out of date and/or
@@ -79,8 +83,6 @@ only after it has been reviewed.
 
 % << other_resources.ssi
 
-% << other_use-cases.ssi
-
 % << other_success-stories.ssi
 
 % << other_troubleshooting.ssi
diff --git a/manual/fr/other_live-environment.ssi b/manual/fr/other_live-environment.ssi
index 8924b1c..1cc94d2 100644
--- a/manual/fr/other_live-environment.ssi
+++ b/manual/fr/other_live-environment.ssi
@@ -125,18 +125,18 @@ need to setup also the #{keyb}# variable to the #{klayout}#'s value.
 
 2~ Persistence
 
-A live cd paradigm is a preinstalled 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 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 runtime evolutions of the system
+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 runtime evolution of the system. To
+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
@@ -154,7 +154,7 @@ 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 bootime and the system must be started with the boot
+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.:
 
@@ -206,7 +206,7 @@ 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 runtime could lead to
+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
@@ -230,7 +230,8 @@ parameters of: #{persistent}# #{persistent-subtext=subText}#.
 
 3~ Partial remastering
 
-The runtime 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-initramfs mounts all
-/live filesystem in order or with the module bootparameter.
+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-initramfs mounts all /live filesystem in order or with the module boot
+parameter.
diff --git a/manual/fr/other_use-cases.ssi b/manual/fr/other_use-cases.ssi
deleted file mode 100644
index 232e3ac..0000000
--- a/manual/fr/other_use-cases.ssi
+++ /dev/null
@@ -1,146 +0,0 @@
-B~ Use Cases
-
-1~ Use Cases
-
-This chapter is for users to document their use cases with Debian Live.
-
-2~ VNC Kiosk Client
-
-Create an image with live-helper to boot directly to a VNC server.
-
-_* Make a build directory: #{$ mkdir vncBuild}#
-
-_* Move to the build directory: #{$ cd vncBuild}#
-
-Example to config the build directory to include gdm metacity
-xtightvncviewer: #{$ lh config --packages "gdm metacity xtightvncviewer"}#
-
-Create a folder /etc/skel folder for a custom .xsession for the default
-user: #{$ mkdir -p config/chroot_local-includes/etc/skel}#
-
-Create the .xsession for the default user: #{$ touch
-config/chroot_local-includes/etc/skel/.xsession}#
-
-Edit the .xsession file to launch metacity and start xvncviewer with
-something similar to the below:
-
-code{
-
-#!/bin/sh
-
-/usr/bin/metacity & /usr/bin/vncviewer xxx.xxx.xxx.xxx:PORT
-
-exit
-
-}code
-
-_* Build the image: #{# lh build}#
-
-_* Enjoy.
-
-2~ VMWare-Player Sessions
-
-Create an image with live-helper to boot directly to a specifiv VMWare
-session.
-
-_* Make a build directory: #{$ mkdir VMWare-Player}#
-
-_* Move to the build directory: #{$ cd VMWare-Player}#
-
-_* Example to config the build directory to include gdm metacity
-xtightvncviewer:
-
-code{
-
-$ lh config --apt apt \
-        ---apt-recommends disabled \
-        --archive-areas "main" \
-        --binary-images iso \
-        --binary-indices none \
-        --syslinux-menu vesamenu \
-        ---bootappend-live "persistent quickreboot" \
-        ---bootappend-install "-- plainroot persistent video=vesa:ywrap,mtrr vga=788 quickreboot quiet live-config" \
-        ---debian-installer live \
-        ---distribution lenny \
-        ---hostname vmare-player-firmware \
-        ---includes none \
-        ---linux-flavours 686 \
-        ---packages-lists "gnome-core" \
-        ---packages "gcc gparted linux-headers-2.6-\${LH_LINUX_FLAVOURS} live-config-staging make metacity rsync wireless-tools" \
-        ---repositories live.debian.net \
-        ---win32-loader disabled
-
-}code
-
-_* Create the 01-vmware-player hook: #{$ touch
-config/chroot_local-hooks/01-vmware-player.sh}#
-
-Edit the 01-vmware-player hook to launch the VMWare-Player. The hook should
-look something like the below:
-
-code{
-
-#!/bin/sh
-
-_URL="http://archive.debian-maintainers.org/vmware/other/vmware-player/"
-_VMPLAYER_VERSION="VMware-Player.i386.bundle"
-
-echo "I: Starting script for install of VMWare Player." cd /root
-
-echo "I: Beginning download of ${_VMPLAYER_VERSION} from ${_URL} ." wget
-${_URL}${_VMPLAYER_VERSION}
-
-echo "I: Starting install of VMWare Player." sh /root/${_VMPLAYER_VERSION}
-
-echo "I: Cleaning up the VMWare Player download." rm
-/root/${_VMPLAYER_VERSION}
-
-#echo "I: Starting interactive shell." #bash
-
-}code
-
-_* Build the image (note that during the build the VMWare-Player will prompt
-you to install or cancel): #{#lh build}#
-
-_* 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:
-
-code{
-
-live-config.vmware-player=ACTION:IMAGEPATH:VMXNAME
-
-}code
-
-Notes from the 900-vmware-player file are as follows:
-
-code{
-
-# The script tests for boot parameter of
-# live-config.vmware-player=ACTION:IMAGEPATH:VMXNAME
-#
-# ACTION: The operation to perform on the workstation (none|scratch)
-# IMAGEPATH: The folder path to the VMware image you want to run.
-# VMXNAME: The name of the VMware image you want to run.
-#
-# Notes:To use this file with WMWare images you will need to have a few things
-# setup:
-#
-# 1. The VMware Player needs to be installed in the image.
-# 2. This script uses (s|h)da1 for writing image data, and is used as a scratch
-#    space. This scratch space should be a file system with linux permissions
-#    such as ext2.
-# 3. VMware image(s) should be in a mounted folder and setup as follows:
-#    - Image(s) set to snapshot mode.
-#    - For each image, the image folder needs to have a file called
-#      image-release with a variable CRELEASE. An example: CRELEASE="1.0.0"
-#
-# The image-release file is used by the image maintainer and this script to tell
-# workstation(s) using a given image, to erase locally stored vmware image files
-# and setup with the newly configure image. The operation of erasing locally
-# stored vmare image files, is referred to as a scratch.
-
-}code
-
-_* Enjoy.
diff --git a/manual/fr/project_bugs.ssi b/manual/fr/project_bugs.ssi
index c82d6cf..8443811 100644
--- a/manual/fr/project_bugs.ssi
+++ b/manual/fr/project_bugs.ssi
@@ -124,7 +124,7 @@ 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
+3~ At boot time
 
 If your image does not boot, please report it to the mailing list together
 with the information requested in {Collect
@@ -134,7 +134,7 @@ 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
+3~ At run time
 
 If a package was successfully installed, but fails while actually running
 the Live system, this is probably a bug in Debian Live. However,
diff --git a/manual/fr/user_basics.ssi b/manual/fr/user_basics.ssi
index aef09b7..303cdd7 100644
--- a/manual/fr/user_basics.ssi
+++ b/manual/fr/user_basics.ssi
@@ -2,56 +2,56 @@
 
 1~ The basics
 
-This chapter contains a brief overview of the build process as well as
-containing instructions on how to boot the various binary image types.
+This chapter contains a brief overview of the build process and instructions
+for booting the various binary image types.
 
 2~ What is a live system?
 
 A live system usually means an operating system booted on a computer from a
-removable medium (such as CD-ROM, USB stick, or network), ready to use
-without any installation on the usual drive(s), with an auto-configuration
-done at runtime (see {Terms}#terms ).
+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).
 
 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 following parts:
+is made from the following parts:
 
-_* Linux kernel
+_* *{Linux kernel image}*, usually named #{vmlinuz*}#
 
-_* The Linux image, usually named #{vmlinuz*}#
-
-_* *{Initial RAM disk image (initrd)}*: RAM disk setup for the Linux boot,
-containing modules possibly needed to mount the filesystem's image and some
+_* *{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 systems filesystem image. The SquashFS
-compressed filesystem is used to minimize the Debian Live image size. Note
-that it's 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 partition(s) are used (see 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).
 
 % FIXME: <xref linkend="persistence"/>
 
-_* *{Bootloader}*: A small piece of code, crafted to boot up from the chosen
+_* *{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 then loads the Linux kernel and its initrd to run
-with an associated filesystem image. Different solutions can be used
-depending on the target media and format of the filesystem containing the
-previous components: Isolinux to boot from a CD or DVD in ISO9660 format,
+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
-partition, etc.
+partitions, etc.
 
-_* live-build will build the system image from your specifications, setup a
-Linux kernel and its initrd, a bootloader to run them, all in one
+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
 
-The following sequence of commands, provided by live-build, will create a
-basic ISO image containing just the Debian standard system without X.org. It
-is suitable for burning to CD or DVD media.
+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).
 
 First, we run the #{lb config}# command which will create a "config/"
 hierarchy in the current directory for use by other commands:
@@ -62,8 +62,8 @@ $ 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 ).
+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:
@@ -75,7 +75,7 @@ code{
 }code
 
 This process can take a while, depending on the speed of your network
-connection (see {The lb build command}#lb-build ).
+connection (see {The lb build command}#lb-build).
 
 3~ Testing an ISO image with Qemu
 
@@ -95,26 +95,23 @@ In order to test the ISO with virtualbox-ose:
 
 code{
 
-# apt-get install virtualbox-ose
+# apt-get install virtualbox-ose virtualbox-ose-dkms
 
-}code
+$ virtualbox
 
-and either install #{virtualbox-ose-source}# or #{virtualbox-ose-dkms}# to
-build the required kernel modules to run virtualbox-ose.
+}code
 
-After successful installation, virtualbox can be e.g. found in the GNOME
-menu under 'Applications/System Tools/VirtualBox OSE'.
+Create a new virtual machine, change the storage settings to use binary.iso
+as the CD/DVD device, and start the machine.
 
-Please consider including of following packages onto the live image to
-achieve higher resolution of the display when booting the live image in
-virutalbox-ose (1280x1024 instead of 800x600 and in particular if the
-default resolution of the virtualbox-ose display shouldn't work with the
-gui-installer).
+Note: For live systems containing X.org that you want to test with
+virtualbox-ose, you may wish to include the VirtualBox X.org driver package,
+virtualbox-ose-guest-x11, in your live-build configuration. Otherwise, the
+resolution is limited to 800x600.
 
 code{
 
-virtualbox-ose-guest-dkms virtualbox-ose-guest-utils
-virtualbox-ose-guest-x11
+# lb config --packages virtualbox-ose-guest-x11
 
 }code
 
@@ -130,16 +127,19 @@ $ wodim binary.iso
 
 }code
 
-2~ Building an USB/HDD image
+2~ Building a USB/HDD image
 
 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.
+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.
 
-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 ):
+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):
 
 code{
 
@@ -164,11 +164,11 @@ code{
 
 }code
 
-3~ Copying USB/HDD image to a USB stick
+3~copying-usb-hdd-image Copying USB/HDD image to a USB stick
 
 The generated binary image contains a VFAT partition and the syslinux
-bootloader, ready to be directly written on an USB stick. Plug in an USB
-stick with a size larger than that of binary.img and type:
+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:
 
 code{
 
@@ -178,7 +178,8 @@ $ dd if=binary.img of=${USBSTICK}
 
 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.
+looking in #{dmesg}#'s output after plugging in the stick, for example, or
+better yet, #{ls -l /dev/disk/by-id}#.
 
 *{This will definitely overwrite any previous contents on your stick!}*
 
@@ -205,8 +206,8 @@ code{
 
 }code
 
-Ater the creation of the partition you have to create a filsystem on it. One
-possible choice would be ext4.
+After the creation of the partition, you have to create a filesystem on
+it. One possible choice would be ext4.
 
 code{
 
@@ -222,7 +223,7 @@ code{
 
 }code
 
-*{Remember: Every time you install a new binary.img on the stick, all your data will be lost because the image includes a complete partition table.}*
+*{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.}*
 
 2~ Building a netboot image
 
@@ -230,7 +231,7 @@ The following sequence of commands will create a basic netboot image
 containing the Debian standard system without X.org. It is suitable for
 booting over the network.
 
-Note if you performed any previous examples, you will need to clean up your
+Note: if you performed any previous examples, you will need to clean up your
 working directory with the #{lb clean}# command:
 
 code{
@@ -249,11 +250,11 @@ $ lb config -b net --net-root-path "/srv/debian-live" --net-root-server
 
 }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
+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.
+located at boot time.
 
 Now build the image with the #{lb build}# command:
 
@@ -263,16 +264,16 @@ code{
 
 }code
 
-In a network boot the client runs a small piece of software, which usually
+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 boot loader via the TFTP protocol. That
-could be PXELINUX, Grub or even boot directly to an operating system like
+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
+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.
@@ -280,7 +281,7 @@ We must now configure three services on the server to enable netboot.
 3~ DHCP server
 
 We must configure our network's DHCP server to be sure to give an IP address
-to the computer netbooting, and to advertise the location of the PXE
+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
@@ -305,9 +306,9 @@ subnet 192.168.1.0 netmask 255.255.255.0 {   # 192.168.1.0/24
 
   # 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
+    # Note: all files for PXE are relatives to the TFTP server's root
 
-    # PXE boot loader (first program to be loaded, by TFTP)
+    # PXE bootloader (first program to be loaded, by TFTP)
     filename "pxelinux.0";
 
   }
@@ -317,7 +318,7 @@ subnet 192.168.1.0 netmask 255.255.255.0 {   # 192.168.1.0/24
 
 3~ TFTP server
 
-This serves the kernel and initial ramdisk to the system at run-time.
+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
@@ -418,6 +419,6 @@ ethernet0.generatedAddress = "00:0c:29:8d:71:3b" uuid.location = "56 4d 83
 _* You can play with this configuration file (i.e. change memory limit to
 256)
 
-_* Double click on this file (or run VMWare player and selecet this file).
+_* Double click on this file (or run VMWare player and select this file).
 
 _* When running just press space if that strange question comes up...
diff --git a/manual/fr/user_customization-internationalization.ssi b/manual/fr/user_customization-internationalization.ssi
index beb134a..b86f8f8 100644
--- a/manual/fr/user_customization-internationalization.ssi
+++ b/manual/fr/user_customization-internationalization.ssi
@@ -4,8 +4,8 @@ B~ Customizing locale and language
 
 2~ Default locale and keyboard
 
-The default locale when building a live cd is "locales=en_US.UTF-8", to set
-the locale for e.g. Switzerland, you can use "locales=de_CH.UTF-8".
+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{
 
diff --git a/manual/fr/user_customization-overview.ssi b/manual/fr/user_customization-overview.ssi
index 517ca3d..44c6731 100644
--- a/manual/fr/user_customization-overview.ssi
+++ b/manual/fr/user_customization-overview.ssi
@@ -2,12 +2,76 @@ B~ Customizing contents
 
 1~customization-overview Customization overview
 
-% FIXME: just a stub for now.  In conversational style, cover the different
-kinds of customization % and link to each section within the text.
+This chapter gives an overview of the various ways in which you may
+customize a Debian Live system.
 
-This chapter gives an overview of the various ways in which your Debian live
-systems may be customized. See sections {Customizing package
+2~ Build time vs. boot time configuration
+
+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.
+
+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.
+
+2~stages-of-the-build Stages of the build
+
+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.
+
+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.
+
+2~ Supplement lb config with files
+
+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.
+
+2~ Customization tasks
+
+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.
+language}#customizing-locale-and-language cover just a few of the things you
+might want to do.
 
diff --git a/manual/fr/user_customization-packages.ssi b/manual/fr/user_customization-packages.ssi
index 29fb5eb..1ae1289 100644
--- a/manual/fr/user_customization-packages.ssi
+++ b/manual/fr/user_customization-packages.ssi
@@ -2,23 +2,44 @@
 
 1~customizing-package-installation Customizing package installation
 
-_* Selecting additional packages to be installed
-
-_* Installing modified packages
+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. We start with customization of the 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.
 
 2~ Package sources
 
 3~ Debian repositories
 
-To set a local mirror (used to 'build' the live system)
+To set a local mirror to be used to at build time:
 
 code{
 
-$ lb config --mirror-bootstrap http://localhost/debian/ --mirror-chroot
-http://localhost/debian/
+$ lb config --mirror-bootstrap http://localhost/debian/
 
 }code
 
+The chroot repository, specified by --mirror-chroot, defaults to the same as
+--mirror-bootstrap.
+
+Each of the --mirror-* options governs which repository 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, when the
+binary image is constructed, the --mirror-binary value is used, superceding
+any earlier repositories.
+
 The generic mirror is added to the live system's /etc/apt/sources.list.
 
 code{
diff --git a/manual/fr/user_examples.ssi b/manual/fr/user_examples.ssi
new file mode 100644
index 0000000..2567323
--- /dev/null
+++ b/manual/fr/user_examples.ssi
@@ -0,0 +1,43 @@
+B~ Examples
+
+1~ Use Case Builds
+
+This chapter covers example builds for specific use cases with Debian Live.
+
+2~ VNC Kiosk Client
+
+Create an image with live-build to boot directly to a VNC server.
+
+_* Make a build directory: #{$ mkdir vncBuild}#
+
+_* Move to the build directory: #{$ cd vncBuild}#
+
+Example to config the build directory to include gdm metacity
+xtightvncviewer: #{$ lb config --packages "gdm3 metacity xtightvncviewer"}#
+
+Create a folder /etc/skel folder for a custom .xsession for the default
+user: #{$ mkdir -p config/chroot_local-includes/etc/skel}#
+
+Create the .xsession for the default user: #{$ touch
+config/chroot_local-includes/etc/skel/.xsession}#
+
+Edit the .xsession file to launch metacity and start xvncviewer with
+something similar to the below:
+
+code{
+
+#!/bin/sh
+
+/usr/bin/metacity & /usr/bin/vncviewer xxx.xxx.xxx.xxx:PORT
+
+exit
+
+}code
+
+_* Build the image: #{# lb build}#
+
+_* Enjoy.
+
+2~ Next Example FIXME
+
+
diff --git a/manual/fr/user_managing_a_configuration.ssi b/manual/fr/user_managing_a_configuration.ssi
index 3047ef0..bc03008 100644
--- a/manual/fr/user_managing_a_configuration.ssi
+++ b/manual/fr/user_managing_a_configuration.ssi
@@ -1,6 +1,6 @@
 :B~ Managing a configuration
 
-1~ Managing a configuration
+1~managing-a-configuration Managing a configuration
 
 This chapter explains how to manage a live configuration from initial
 creation, through successive revisions and successive releases of both the
diff --git a/manual/fr/user_overview.ssi b/manual/fr/user_overview.ssi
index 9c7e8ff..cf9f187 100644
--- a/manual/fr/user_overview.ssi
+++ b/manual/fr/user_overview.ssi
@@ -32,37 +32,6 @@ 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.
 
-Besides the common config/common, which is used by all live-build commands,
-some additional files can be used to configure the behavior of specific
-helper commands. These files are typically named config/command or
-config/stage (where "stage", of course, is replaced with the name of the
-stage that they belong to, and "command" with the name of the command).
-
-For example, the #{lb_bootstrap_debootstrap}# command uses files named
-config/bootstrap and config/bootstrap_debootstrap to read the options it
-will use. Generally, these files contain variables with values assigned, one
-variable per line. Some commands of live-buil use pairs of values or
-slightly more complicated variable assignments.
-
-live-build respects environment variables which are present in the context
-of the shell it is running. If variables can be read from config files, then
-they override environment variables, and if command line options are used,
-they override values from config files. If no value for a given variable can
-be found (and is thus unset), live-build will automatically set it to a
-default value.
-
-All config files are shell scripts which are sourced by a live-build
-command. That means they have to follow the normal shell syntax. You can
-also put comments in these files; lines beginning with "#" are ignored.
-
-In some rare cases you may want to have different versions of these files
-for different architectures or distributions. If files named
-config/stage.arch or config/stage_command.arch, and config/stage.dist or
-config/stage_command.dist exist (where "arch" is the same as the output of
-dpkg --print-architecture and "dist" is the same as the codename of the
-target distribution), then they will be used in preference to the other,
-more general files.
-
 The remainder of this section discusses the three most important commands:
 
 _* *{lb config}*: Responsible for initializing a Live system configuration
@@ -117,12 +86,12 @@ drwxr-xr-x 2 user user 4096 Sep 7 13:02 templates
 }code
 
 Using #{lb config}# without any arguments would be suitable for users who
-are either happy editing the generated files, or are simply happy with the
-defaults it creates.
+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).
 
-You can ask #{lb config}# to generate a config/ directory "preseeded" with
-various options. This might be suitable if you do not require the default
-settings but do not need to change a large number of options. For example:
+Normally, you will want to specify some options. For example, to include the
+'gnome' package list in your configuration:
 
 code{
 
@@ -130,8 +99,7 @@ $ lb config -p gnome
 
 }code
 
-will build a config/ directory configured to include the 'gnome' package
-list. It is possible to specify many options:
+It is possible to specify many options, such as:
 
 code{
 
@@ -140,8 +108,7 @@ $ lb config --binary-images net --hostname live-machine --username live-user
 
 }code
 
-A full list of options is available in the #{lb_config}# man page. Most
-options have a parallel with an "LB_" prefixed variable.
+A full list of options is available in the #{lb_config}# man page.
 
 3~lb-build The #{lb build}# command
 
@@ -159,7 +126,7 @@ so subsequent builds can start from a clean state.
 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.
+ISOs, netboot tarballs, and USB stick images.
 
 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)
diff --git a/manual/po/de/live-manual.ssm.po b/manual/po/de/live-manual.ssm.po
index e8d932c..ce2b8fd 100644
--- a/manual/po/de/live-manual.ssm.po
+++ b/manual/po/de/live-manual.ssm.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-25 23:12+0300\n"
+"POT-Creation-Date: 2010-11-13 16:15+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-10-25\n"
+" :published: 2010-11-13\n"
 msgstr ""
 
 #. type: Plain text
@@ -146,11 +146,21 @@ msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:55
+msgid ":B~ Examples ~#"
+msgstr ""
+
+#. type: Plain text
+#: en/live-manual.ssm:57
+msgid "<< user_examples.ssi"
+msgstr ""
+
+#. type: Plain text
+#: en/live-manual.ssm:59
 msgid ":B~ Other ~#"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:61
+#: en/live-manual.ssm:65
 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 "
@@ -160,76 +170,71 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:63
+#: en/live-manual.ssm:67
 msgid "% << other_customization-bootup.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:65
+#: en/live-manual.ssm:69
 msgid "% << other_customization-binary.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:67
+#: en/live-manual.ssm:71
 msgid "% << other_customization-backports.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:69
+#: en/live-manual.ssm:73
 msgid "% << other_common-tasks.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:71
+#: en/live-manual.ssm:75
 msgid "% << other_live-environment.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:73
+#: en/live-manual.ssm:77
 msgid "% << other_faq.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:75
+#: en/live-manual.ssm:79
 msgid "% << other_howtos.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:77
+#: en/live-manual.ssm:81
 msgid "% << other_coding-style.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:79
+#: en/live-manual.ssm:83
 msgid "% << other_procedures.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:81
+#: en/live-manual.ssm:85
 msgid "% << other_resources.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:83
-msgid "% << other_use-cases.ssi"
-msgstr ""
-
-#. type: Plain text
-#: en/live-manual.ssm:85
+#: en/live-manual.ssm:87
 msgid "% << other_success-stories.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:87
+#: en/live-manual.ssm:89
 msgid "% << other_troubleshooting.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:89
+#: en/live-manual.ssm:91
 msgid "% << other_configuration-layout.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:90
+#: en/live-manual.ssm:92
 msgid "% << other_configuration-files.ssi"
 msgstr ""
diff --git a/manual/po/de/other_live-environment.ssi.po b/manual/po/de/other_live-environment.ssi.po
index fea7cfb..1b72423 100644
--- a/manual/po/de/other_live-environment.ssi.po
+++ b/manual/po/de/other_live-environment.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-03 20:30+0300\n"
+"POT-Creation-Date: 2010-10-28 07:47-0200\n"
 "PO-Revision-Date: 2010-10-03 20:30+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,8 +17,8 @@ msgstr ""
 "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: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
@@ -26,56 +26,59 @@ msgstr ""
 #: 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/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/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-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-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: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_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: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
+#: 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:46
+#: en/user_overview.ssi:90 en/user_overview.ssi:98
 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: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
@@ -84,17 +87,12 @@ msgstr ""
 #: 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_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
@@ -104,30 +102,38 @@ msgstr ""
 #: 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/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: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_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: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
+#: 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:84
+#: en/user_overview.ssi:94 en/user_overview.ssi:102
 msgid "}code"
 msgstr ""
 
@@ -349,9 +355,9 @@ msgstr ""
 #. type: Plain text
 #: en/other_live-environment.ssi:103
 msgid ""
-"A live cd paradigm is a preinstalled 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 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
@@ -359,7 +365,7 @@ msgstr ""
 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 runtime evolutions of the system "
+"should be considered read-only and all the run-time evolutions of the system "
 "are lost at shutdown."
 msgstr ""
 
@@ -367,7 +373,7 @@ msgstr ""
 #: en/other_live-environment.ssi:108
 msgid ""
 "Persistence is a common name for different kinds of solutions for saving "
-"across reboots some, or all, of this runtime evolution of the system. To "
+"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 "
@@ -396,7 +402,7 @@ msgid ""
 "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 bootime and the system must be started with the "
+"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 ""
@@ -473,7 +479,7 @@ msgid ""
 "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 runtime could lead to "
+"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 "
@@ -519,8 +525,8 @@ msgstr ""
 #. type: Plain text
 #: en/other_live-environment.ssi:159
 msgid ""
-"The runtime 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-initramfs mounts all /"
-"live filesystem in order or with the module bootparameter."
+"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-initramfs "
+"mounts all /live filesystem in order or with the module boot parameter."
 msgstr ""
diff --git a/manual/po/de/project_bugs.ssi.po b/manual/po/de/project_bugs.ssi.po
index fd45b7a..c5e0191 100644
--- a/manual/po/de/project_bugs.ssi.po
+++ b/manual/po/de/project_bugs.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-25 23:27+0300\n"
+"POT-Creation-Date: 2010-10-27 21:40-0200\n"
 "PO-Revision-Date: 2010-10-25 23:27+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -42,14 +42,14 @@ msgstr ""
 #: 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:34 en/user_basics.ssi:44
-#: en/user_basics.ssi:56 en/user_basics.ssi:68 en/user_basics.ssi:80
-#: en/user_basics.ssi:92 en/user_basics.ssi:106 en/user_basics.ssi:114
-#: en/user_basics.ssi:122 en/user_basics.ssi:132 en/user_basics.ssi:144
-#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
-#: en/user_basics.ssi:186 en/user_basics.ssi:194 en/user_basics.ssi:204
-#: en/user_basics.ssi:224 en/user_basics.ssi:257 en/user_basics.ssi:273
-#: en/user_basics.ssi:281 en/user_basics.ssi:301 en/user_basics.ssi:326
+#: 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/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
@@ -102,15 +102,15 @@ msgstr ""
 #: 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:38
-#: en/user_basics.ssi:48 en/user_basics.ssi:62 en/user_basics.ssi:72
-#: en/user_basics.ssi:86 en/user_basics.ssi:98 en/user_basics.ssi:110
-#: en/user_basics.ssi:118 en/user_basics.ssi:126 en/user_basics.ssi:136
-#: en/user_basics.ssi:150 en/user_basics.ssi:160 en/user_basics.ssi:168
-#: en/user_basics.ssi:176 en/user_basics.ssi:190 en/user_basics.ssi:198
-#: en/user_basics.ssi:208 en/user_basics.ssi:249 en/user_basics.ssi:261
-#: en/user_basics.ssi:277 en/user_basics.ssi:285 en/user_basics.ssi:312
-#: en/user_basics.ssi:351 en/user_customization-contents.ssi:39
+#: 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
@@ -400,7 +400,7 @@ msgstr ""
 
 #. type: Plain text
 #: en/project_bugs.ssi:86
-msgid "3~ At boot-time"
+msgid "3~ At boot time"
 msgstr ""
 
 #. type: Plain text
@@ -416,7 +416,7 @@ msgstr ""
 
 #. type: Plain text
 #: en/project_bugs.ssi:90
-msgid "3~ At run-time"
+msgid "3~ At run time"
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/po/de/user_basics.ssi.po b/manual/po/de/user_basics.ssi.po
index 14ec30b..4bd270e 100644
--- a/manual/po/de/user_basics.ssi.po
+++ b/manual/po/de/user_basics.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-23 16:43+0300\n"
+"POT-Creation-Date: 2010-11-01 06:47-0200\n"
 "PO-Revision-Date: 2010-10-03 20:30+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -41,16 +41,17 @@ msgstr ""
 #: 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:34
-#: en/user_basics.ssi:44 en/user_basics.ssi:56 en/user_basics.ssi:68
-#: en/user_basics.ssi:80 en/user_basics.ssi:92 en/user_basics.ssi:106
-#: en/user_basics.ssi:114 en/user_basics.ssi:122 en/user_basics.ssi:132
-#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
-#: en/user_basics.ssi:172 en/user_basics.ssi:186 en/user_basics.ssi:194
-#: en/user_basics.ssi:204 en/user_basics.ssi:224 en/user_basics.ssi:257
-#: en/user_basics.ssi:273 en/user_basics.ssi:281 en/user_basics.ssi:301
-#: en/user_basics.ssi:326 en/user_customization-contents.ssi:34
-#: en/user_customization-contents.ssi:43 en/user_customization-contents.ssi:66
+#: 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/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
@@ -71,8 +72,8 @@ msgstr ""
 #: 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:46
-#: en/user_overview.ssi:90 en/user_overview.ssi:98
+#: 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 ""
 
@@ -101,16 +102,16 @@ msgstr ""
 #: 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:38 en/user_basics.ssi:48
-#: en/user_basics.ssi:62 en/user_basics.ssi:72 en/user_basics.ssi:86
-#: en/user_basics.ssi:98 en/user_basics.ssi:110 en/user_basics.ssi:118
-#: en/user_basics.ssi:126 en/user_basics.ssi:136 en/user_basics.ssi:150
-#: en/user_basics.ssi:160 en/user_basics.ssi:168 en/user_basics.ssi:176
-#: en/user_basics.ssi:190 en/user_basics.ssi:198 en/user_basics.ssi:208
-#: en/user_basics.ssi:249 en/user_basics.ssi:261 en/user_basics.ssi:277
-#: en/user_basics.ssi:285 en/user_basics.ssi:312 en/user_basics.ssi:351
-#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
-#: en/user_customization-contents.ssi:70
+#: 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
@@ -131,8 +132,8 @@ msgstr ""
 #: 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:84
-#: en/user_overview.ssi:94 en/user_overview.ssi:102
+#: 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 ""
 
@@ -149,8 +150,8 @@ msgstr ""
 #. type: Plain text
 #: en/user_basics.ssi:6
 msgid ""
-"This chapter contains a brief overview of the build process as well as "
-"containing instructions on how to boot the various binary image types."
+"This chapter contains a brief overview of the build process and instructions "
+"for booting the various binary image types."
 msgstr ""
 
 #. type: Plain text
@@ -162,9 +163,9 @@ msgstr ""
 #: en/user_basics.ssi:10
 msgid ""
 "A live system usually means an operating system booted on a computer from a "
-"removable medium (such as CD-ROM, USB stick, or network), ready to use "
-"without any installation on the usual drive(s), with an auto-configuration "
-"done at runtime (see {Terms}#terms )."
+"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 ""
 
 #. type: Plain text
@@ -172,294 +173,291 @@ msgstr ""
 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 following parts:"
+"is made from the following parts:"
 msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:14
-msgid "_* Linux kernel"
+msgid "_* *{Linux kernel image}*, usually named #{vmlinuz*}#"
 msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:16
-msgid "_* The Linux image, usually named #{vmlinuz*}#"
-msgstr ""
-
-#. type: Plain text
-#: en/user_basics.ssi:18
 msgid ""
-"_* *{Initial RAM disk image (initrd)}*: RAM disk setup for the Linux boot, "
-"containing modules possibly needed to mount the filesystem's image and some "
+"_* *{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 ""
 
 #. type: Plain text
-#: en/user_basics.ssi:20
+#: en/user_basics.ssi:18
 msgid ""
-"_* *{System image}*: The operating systems filesystem image. The SquashFS "
-"compressed filesystem is used to minimize the Debian Live image size. Note "
-"that it's 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 partition(s) are used (see 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)."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:22
+#: en/user_basics.ssi:20
 msgid "% FIXME: <xref linkend=\"persistence\"/>"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:24
+#: en/user_basics.ssi:22
 msgid ""
-"_* *{Bootloader}*: A small piece of code, crafted to boot up from the chosen "
+"_* *{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 then loads the Linux kernel and its initrd to run with an "
-"associated filesystem image. Different solutions can be used depending on "
-"the target media and format of the filesystem containing the previous "
-"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 partition, "
-"etc."
+"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 ""
 
 #. type: Plain text
-#: en/user_basics.ssi:26
+#: en/user_basics.ssi:24
 msgid ""
-"_* live-build will build the system image from your specifications, setup a "
-"Linux kernel and its initrd, 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.)"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:28
+#: en/user_basics.ssi:26
 msgid "2~ First steps: building an ISO image"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:30
+#: en/user_basics.ssi:28
 msgid ""
-"The following sequence of commands, provided by live-build, will create a "
-"basic ISO image containing just the Debian standard system without X.org. It "
-"is suitable for burning to CD or DVD media."
+"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 ""
 
 #. type: Plain text
-#: en/user_basics.ssi:32
+#: en/user_basics.ssi:30
 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:36
+#: en/user_basics.ssi:34
 msgid "$ lb config"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:40
+#: en/user_basics.ssi:38
 msgid ""
-"By passing no parameters to #{lb config}# we indicated that we wish to use "
-"the defaults (see {The lb config command}#lb-config )."
+"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:42
+#: en/user_basics.ssi:40
 msgid ""
 "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:46 en/user_basics.ssi:124 en/user_basics.ssi:206
+#: en/user_basics.ssi:44 en/user_basics.ssi:120 en/user_basics.ssi:202
 msgid "# lb build"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:50
+#: en/user_basics.ssi:48
 msgid ""
 "This process can take a while, depending on the speed of your network "
-"connection (see {The lb build command}#lb-build )."
+"connection (see {The lb build command}#lb-build)."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:52
+#: en/user_basics.ssi:50
 msgid "3~ Testing an ISO image with Qemu"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:54
+#: en/user_basics.ssi:52
 msgid "Testing an ISO is simple:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:58 en/user_basics.ssi:146
+#: en/user_basics.ssi:56 en/user_basics.ssi:142
 msgid "# apt-get install qemu"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:60
+#: en/user_basics.ssi:58
 msgid "$ qemu -cdrom binary.iso"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:64
+#: en/user_basics.ssi:62
 msgid "3~ Testing an ISO image with virtualbox-ose"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:66
+#: en/user_basics.ssi:64
 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"
+msgstr ""
+
+#. type: Plain text
 #: en/user_basics.ssi:70
-msgid "# apt-get install virtualbox-ose"
+msgid "$ virtualbox"
 msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:74
 msgid ""
-"and either install #{virtualbox-ose-source}# or #{virtualbox-ose-dkms}# to "
-"build the required kernel modules to run virtualbox-ose."
+"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
 msgid ""
-"After successful installation, virtualbox can be e.g. found in the GNOME "
-"menu under 'Applications/System Tools/VirtualBox OSE'."
+"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 ""
 
 #. type: Plain text
-#: en/user_basics.ssi:78
-msgid ""
-"Please consider including of following packages onto the live image to "
-"achieve higher resolution of the display when booting the live image in "
-"virutalbox-ose (1280x1024 instead of 800x600 and in particular if the "
-"default resolution of the virtualbox-ose display shouldn't work with the gui-"
-"installer)."
+#: en/user_basics.ssi:80
+msgid "# lb config --packages virtualbox-ose-guest-x11"
 msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:84
-msgid ""
-"virtualbox-ose-guest-dkms virtualbox-ose-guest-utils virtualbox-ose-guest-x11"
-msgstr ""
-
-#. type: Plain text
-#: en/user_basics.ssi:88
 msgid "3~ Burning an ISO image to a physical medium"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:90
+#: en/user_basics.ssi:86
 msgid "Burning an ISO image is easy:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:94
+#: en/user_basics.ssi:90
 msgid "# apt-get install wodim"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:96
+#: en/user_basics.ssi:92
 msgid "$ wodim binary.iso"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:100
-msgid "2~ Building an USB/HDD image"
+#: en/user_basics.ssi:96
+msgid "2~ Building a USB/HDD image"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:102
+#: en/user_basics.ssi:98
 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."
+"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 ""
 
 #. type: Plain text
-#: en/user_basics.ssi:104
+#: en/user_basics.ssi:100
 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 ):"
+"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 ""
 
 #. type: Plain text
-#: en/user_basics.ssi:108 en/user_basics.ssi:188
+#: en/user_basics.ssi:104 en/user_basics.ssi:184
 msgid "$ lb clean --binary"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:112
+#: en/user_basics.ssi:108
 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:116
+#: en/user_basics.ssi:112
 msgid "$ lb config -b usb-hdd"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:120
+#: en/user_basics.ssi:116
 msgid "Now build the image with the #{lb build} command:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:128
-msgid "3~ Copying USB/HDD image to a USB stick"
+#: en/user_basics.ssi:124
+msgid "3~copying-usb-hdd-image Copying USB/HDD image to a USB stick"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:130
+#: en/user_basics.ssi:126
 msgid ""
 "The generated binary image contains a VFAT partition and the syslinux "
-"bootloader, ready to be directly written on an USB stick. Plug in an USB "
-"stick with a size larger than that of binary.img and type:"
+"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 ""
 
 #. type: Plain text
-#: en/user_basics.ssi:134
+#: en/user_basics.ssi:130
 msgid "$ dd if=binary.img of=${USBSTICK}"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:138
+#: en/user_basics.ssi:134
 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."
+"looking in #{dmesg}#'s output after plugging in the stick, for example, or "
+"better yet, #{ls -l /dev/disk/by-id}#."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:140
+#: en/user_basics.ssi:136
 #, no-wrap
 msgid "*{This will definitely overwrite any previous contents on your stick!}*\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:142
+#: en/user_basics.ssi:138
 msgid "3~ Testing a USB/HDD image with Qemu"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:148
+#: en/user_basics.ssi:144
 msgid "$ qemu -hda binary.img"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:152
+#: en/user_basics.ssi:148
 msgid "3~ Using the space left on a USB stick"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:154
+#: 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}"
@@ -468,45 +466,45 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:158
+#: en/user_basics.ssi:154
 msgid "# gparted ${USBSTICK}"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:162
+#: en/user_basics.ssi:158
 msgid ""
-"Ater the creation of the partition you have to create a filsystem on it. One "
-"possible choice would be ext4."
+"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:166
+#: en/user_basics.ssi:162
 msgid "# mkfs.ext4 ${USBSTICK}"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:170
+#: 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:174
+#: en/user_basics.ssi:170
 msgid "# mkfs.vfat -F 32"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:178
+#: en/user_basics.ssi:174
 #, no-wrap
-msgid "*{Remember: Every time you install a new binary.img on the stick, all your data will be lost because the image includes a complete partition table.}*\n"
+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:180
+#: en/user_basics.ssi:176
 msgid "2~ Building a netboot image"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:182
+#: 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 "
@@ -514,99 +512,99 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:184
+#: en/user_basics.ssi:180
 msgid ""
-"Note if you performed any previous examples, you will need to clean up your "
+"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:192
+#: en/user_basics.ssi:188
 msgid ""
 "Run the #{lb config}# command with the parameters to configure the \"config/"
 "\" hierarchy to create our netboot image:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:196
+#: en/user_basics.ssi:192
 msgid ""
 "$ lb config -b net --net-root-path \"/srv/debian-live\" --net-root-server "
 "\"192.168.0.1\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:200
+#: 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 "
+"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."
+"located at boot time."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:202
+#: en/user_basics.ssi:198
 msgid "Now build the image with the #{lb build}# command:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:210
+#: en/user_basics.ssi:206
 msgid ""
-"In a network boot the client runs a small piece of software, which usually "
+"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 boot loader via the TFTP protocol. That "
-"could be PXELINUX, Grub or even boot directly to an operating system like "
+"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 ""
 
 #. type: Plain text
-#: en/user_basics.ssi:212
+#: 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 "
+"filesystem.squashfs and the kernel, initrd and pxelinux bootloader in "
 "tftpboot/debian-live/i386."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:214
+#: en/user_basics.ssi:210
 msgid "We must now configure three services on the server to enable netboot."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:216
+#: en/user_basics.ssi:212
 msgid "3~ DHCP server"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:218
+#: en/user_basics.ssi:214
 msgid ""
 "We must configure our network's DHCP server to be sure to give an IP address "
-"to the computer netbooting, and to advertise the location of the PXE "
+"to the netbooting client system, and to advertise the location of the PXE "
 "bootloader."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:220
+#: 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 ""
 
 #. type: Plain text
-#: en/user_basics.ssi:222 en/user_customization-packages.ssi:153
+#: en/user_basics.ssi:218 en/user_customization-packages.ssi:153
 msgid "% FIXME"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:226
+#: en/user_basics.ssi:222
 #, no-wrap
 msgid "subnet 192.168.1.0 netmask 255.255.255.0 {   # 192.168.1.0/24\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:229
+#: en/user_basics.ssi:225
 #, no-wrap
 msgid ""
 "  # IP addresses available for guests\n"
@@ -614,7 +612,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:232
+#: en/user_basics.ssi:228
 #, no-wrap
 msgid ""
 "  # allow booting from the net\n"
@@ -622,7 +620,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:237
+#: en/user_basics.ssi:233
 #, no-wrap
 msgid ""
 "  # for net booting, server where the first file to be loaded (by TFTP\n"
@@ -632,7 +630,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:241
+#: en/user_basics.ssi:237
 #, no-wrap
 msgid ""
 "  # net boot configuration for guests with a PXE client:\n"
@@ -641,15 +639,15 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:244
+#: en/user_basics.ssi:240
 #, no-wrap
 msgid ""
-"    # PXE boot loader (first program to be loaded, by TFTP)\n"
+"    # PXE bootloader (first program to be loaded, by TFTP)\n"
 "    filename \"pxelinux.0\";\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:247
+#: en/user_basics.ssi:243
 #, no-wrap
 msgid ""
 "  }\n"
@@ -657,17 +655,17 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:251
+#: en/user_basics.ssi:247
 msgid "3~ TFTP server"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:253
-msgid "This serves the kernel and initial ramdisk to the system at run-time."
+#: en/user_basics.ssi:249
+msgid "This serves the kernel and initial ramdisk to the system at run time."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:255
+#: en/user_basics.ssi:251
 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 /"
@@ -675,22 +673,22 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:259
+#: en/user_basics.ssi:255
 msgid "dpkg-reconfigure -plow tftpd-hpa"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:263
+#: en/user_basics.ssi:259
 msgid "and fill in the new tftp server directory when being asked about it."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:265
+#: en/user_basics.ssi:261
 msgid "3~ NFS server"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:267
+#: en/user_basics.ssi:263
 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 "
@@ -698,35 +696,35 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:269
+#: en/user_basics.ssi:265
 msgid "You need to install the nfs-kernel-server package."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:271
+#: en/user_basics.ssi:267
 msgid ""
 "Then, make the filesystem image available through NFS by adding a line like "
 "the following to /etc/exports:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:275
+#: en/user_basics.ssi:271
 msgid "/srv/debian-live *(ro,async,no_root_squash,no_subtree_check)"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:279
+#: en/user_basics.ssi:275
 msgid ""
 "and tell the NFS server about this new export with the following command:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:283
+#: en/user_basics.ssi:279
 msgid "# exportfs -rv"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:287
+#: en/user_basics.ssi:283
 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 "
@@ -735,40 +733,40 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:289
+#: en/user_basics.ssi:285
 msgid "3~ Netboot testing HowTo"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:291
+#: en/user_basics.ssi:287
 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:293
+#: en/user_basics.ssi:289
 msgid ""
 "To make our life easier, we can use virtualization. There are two solutions."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:295
+#: en/user_basics.ssi:291
 msgid "3~ Qemu"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:297
+#: en/user_basics.ssi:293
 msgid "_* Install qemu, bridge-utils, sudo."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:299
+#: en/user_basics.ssi:295
 msgid "Edit /etc/qemu-ifup:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:310
+#: en/user_basics.ssi:306
 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...\" "
@@ -777,62 +775,62 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:314
+#: en/user_basics.ssi:310
 msgid "Get, or build a grub-floppy-netboot (in the svn)."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:316
+#: en/user_basics.ssi:312
 msgid "Launch qemu with \"-net nic,vlan=0 -net tap,vlan=0,ifname=tun0\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:318
+#: en/user_basics.ssi:314
 msgid "3~ VMWare Player"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:320
+#: en/user_basics.ssi:316
 msgid "_* Install VMWare Player (\"free as in beer\" edition)"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:322
+#: en/user_basics.ssi:318
 msgid ""
 "_* Create a PXETester directory, and create a text file called pxe.vwx inside"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:324
+#: en/user_basics.ssi:320
 msgid "_* Paste this text inside:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:332
+#: en/user_basics.ssi:328
 msgid ""
 "#!/usr/bin/vmware config.version = \"8\" virtualHW.version = \"4\" memsize = "
 "\"512\" MemAllowAutoScaleDown = \"FALSE\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:338
+#: en/user_basics.ssi:334
 msgid ""
 "ide0:0.present = \"FALSE\" ide1:0.present = \"FALSE\" floppy0.present = "
 "\"FALSE\" sound.present = \"FALSE\" tools.remindInstall = \"FALSE\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:341
+#: en/user_basics.ssi:337
 msgid "ethernet0.present = \"TRUE\" ethernet0.addressType = \"generated\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:344
+#: en/user_basics.ssi:340
 msgid "displayName = \"Test Boot PXE\" guestOS = \"other\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:349
+#: en/user_basics.ssi:345
 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 "
@@ -840,19 +838,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:353
+#: en/user_basics.ssi:349
 msgid ""
 "_* You can play with this configuration file (i.e. change memory limit to "
 "256)"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:355
+#: en/user_basics.ssi:351
 msgid ""
-"_* Double click on this file (or run VMWare player and selecet this file)."
+"_* Double click on this file (or run VMWare player and select this file)."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:356
+#: en/user_basics.ssi:352
 msgid "_* When running just press space if that strange question comes up..."
 msgstr ""
diff --git a/manual/po/de/user_customization-internationalization.ssi.po b/manual/po/de/user_customization-internationalization.ssi.po
index 3f736c9..052e2ca 100644
--- a/manual/po/de/user_customization-internationalization.ssi.po
+++ b/manual/po/de/user_customization-internationalization.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-22 08:57-0200\n"
+"POT-Creation-Date: 2010-10-28 09:15-0200\n"
 "PO-Revision-Date: 2010-10-03 21:43+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -41,16 +41,17 @@ msgstr ""
 #: 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/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/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
@@ -67,8 +68,8 @@ msgstr ""
 #: 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_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:46
@@ -101,16 +102,16 @@ msgstr ""
 #: 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:269 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/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
@@ -127,8 +128,8 @@ msgstr ""
 #: 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_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:84
@@ -154,8 +155,8 @@ msgstr ""
 #. type: Plain text
 #: en/user_customization-internationalization.ssi:8
 msgid ""
-"The default locale when building a live cd is \"locales=en_US.UTF-8\", to "
-"set the locale for e.g. Switzerland, you can use \"locales=de_CH.UTF-8\"."
+"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
diff --git a/manual/po/de/user_customization-overview.ssi.po b/manual/po/de/user_customization-overview.ssi.po
index 7915ea3..f05addd 100644
--- a/manual/po/de/user_customization-overview.ssi.po
+++ b/manual/po/de/user_customization-overview.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-22 08:57-0200\n"
+"POT-Creation-Date: 2010-11-11 11:58-0400\n"
 "PO-Revision-Date: 2010-10-22 07:52-0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -27,18 +27,112 @@ msgid "1~customization-overview Customization overview"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-overview.ssi:7
+#: en/user_customization-overview.ssi:6
 msgid ""
-"% FIXME: just a stub for now.  In conversational style, cover the different "
-"kinds of customization % and link to each section within the text."
+"This chapter gives an overview of the various ways in which you may "
+"customize a Debian Live system."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-overview.ssi:9
+#: en/user_customization-overview.ssi:8
+msgid "2~ Build time vs. boot time configuration"
+msgstr ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. type: Plain text
+#: en/user_customization-overview.ssi:14
+msgid "2~stages-of-the-build Stages of the build"
+msgstr ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. type: Plain text
+#: en/user_customization-overview.ssi:20
+msgid "2~ Supplement lb config with files"
+msgstr ""
+
+#. 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 ""
+
+#. type: Plain text
+#: en/user_customization-overview.ssi:24
+msgid "2~ Customization tasks"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-overview.ssi:26
 msgid ""
-"This chapter gives an overview of the various ways in which your Debian live "
-"systems may be customized. See sections {Customizing package installation}"
-"#customizing-package-installation, {Customizing contents}#customizing-"
-"contents and {Customizing locale and language}#customizing-locale-and-"
-"language."
+"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 ""
diff --git a/manual/po/de/user_customization-packages.ssi.po b/manual/po/de/user_customization-packages.ssi.po
index f303056..8593d82 100644
--- a/manual/po/de/user_customization-packages.ssi.po
+++ b/manual/po/de/user_customization-packages.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-22 08:58-0200\n"
+"POT-Creation-Date: 2010-11-12 16:21-0400\n"
 "PO-Revision-Date: 2010-10-03 20:30+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -39,40 +39,38 @@ msgstr ""
 #: 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/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: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_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_customization-packages.ssi:14 en/user_customization-packages.ssi:26
+#: en/user_customization-packages.ssi:38 en/user_customization-packages.ssi:47
+#: en/user_customization-packages.ssi:61 en/user_customization-packages.ssi:75
+#: en/user_customization-packages.ssi:105
+#: en/user_customization-packages.ssi:113
+#: en/user_customization-packages.ssi:133
+#: en/user_customization-packages.ssi:168
+#: en/user_customization-packages.ssi:178
+#: en/user_customization-packages.ssi:188
+#: en/user_customization-packages.ssi:198 en/user_examples.ssi:24
+#: 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:46
-#: en/user_overview.ssi:90 en/user_overview.ssi:98
+#: 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 ""
 
@@ -99,45 +97,43 @@ msgstr ""
 #: 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:269 en/user_basics.ssi:285
-#: en/user_basics.ssi:293 en/user_basics.ssi:320 en/user_basics.ssi:359
+#: 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/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_customization-packages.ssi:18 en/user_customization-packages.ssi:30
+#: en/user_customization-packages.ssi:43 en/user_customization-packages.ssi:51
+#: en/user_customization-packages.ssi:65 en/user_customization-packages.ssi:79
+#: en/user_customization-packages.ssi:109
+#: en/user_customization-packages.ssi:117
+#: en/user_customization-packages.ssi:137
+#: en/user_customization-packages.ssi:174
+#: en/user_customization-packages.ssi:184
+#: en/user_customization-packages.ssi:194
+#: en/user_customization-packages.ssi:204 en/user_examples.ssi:33
+#: 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:84
-#: en/user_overview.ssi:94 en/user_overview.ssi:102
+#: 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_basics.ssi:230 en/user_customization-packages.ssi:153
+#: en/user_basics.ssi:218 en/user_customization-packages.ssi:155
 msgid "% FIXME"
 msgstr ""
 
@@ -153,85 +149,111 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:6
-msgid "_* Selecting additional packages to be installed"
+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. We start with customization of the 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 ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:8
-msgid "_* Installing modified packages"
+msgid "2~ Package sources"
 msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:10
-msgid "2~ Package sources"
+msgid "3~ Debian repositories"
 msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:12
-msgid "3~ Debian repositories"
+msgid "To set a local mirror to be used to at build time:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:14
-msgid "To set a local mirror (used to 'build' the live system)"
+#: en/user_customization-packages.ssi:16
+msgid "$ lb config --mirror-bootstrap http://localhost/debian/"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:18
+#: en/user_customization-packages.ssi:20
 msgid ""
-"$ lb config --mirror-bootstrap http://localhost/debian/ --mirror-chroot "
-"http://localhost/debian/"
+"The chroot repository, specified by --mirror-chroot, defaults to the same as "
+"--mirror-bootstrap."
 msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:22
+msgid ""
+"Each of the --mirror-* options governs which repository 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, when the "
+"binary image is constructed, the --mirror-binary value is used, superceding "
+"any earlier repositories."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:24
 msgid "The generic mirror is added to the live system's /etc/apt/sources.list."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:26
+#: en/user_customization-packages.ssi:28
 msgid "$ lb config --mirror-binary http://ftp.debian.org/debian/"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:30
+#: en/user_customization-packages.ssi:32
 msgid ""
 "Note: It is not used for building the live system but to install new "
 "software while using the live system."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:32
+#: en/user_customization-packages.ssi:34
 msgid ""
 "It can be disabled by setting the binary mirror to the same value as the "
 "chroot mirror."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:34
+#: en/user_customization-packages.ssi:36
 msgid ""
 "Note: the same applies for mirror chroot security and mirror binary security"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:39
+#: en/user_customization-packages.ssi:41
 msgid ""
 "$ lb config --mirror-chroot-security {URL} $ lb config --mirror-binary-"
 "security {URL}"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:43
+#: en/user_customization-packages.ssi:45
 msgid "If you don't want to include apt indices, you can skip those with:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:47
+#: en/user_customization-packages.ssi:49
 msgid "$ lb config --binary-indices false"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:51
+#: en/user_customization-packages.ssi:53
 msgid ""
 "This will not influence the entries in /etc/apt/sources.list, but only if /"
 "var/lib/apt contains the indices files or not (and by that making the image "
@@ -239,12 +261,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:53
+#: en/user_customization-packages.ssi:55
 msgid "3~ Own repository"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:55
+#: en/user_customization-packages.ssi:57
 msgid ""
 "To add more repositories (e.g. backports, experimental or custom packages, "
 "etc.), create #{config/chroot_sources/your-repository.{chroot,binary}}# "
@@ -252,7 +274,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:57
+#: en/user_customization-packages.ssi:59
 msgid ""
 "e.g. #{config/chroot_sources/live.chroot}# allows you to install packages "
 "from the debian live snapshot repository at live system build time (you have "
@@ -260,31 +282,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:61
+#: en/user_customization-packages.ssi:63
 msgid "deb http://live.debian.net/ sid-snapshots main contrib non-free"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:65
+#: en/user_customization-packages.ssi:67
 msgid ""
 "If you add the line to #{config/chroot_sources/live.binary}# the repository "
 "will be added to your live-system's #{/etc/apt/sources.list}#."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:67
+#: en/user_customization-packages.ssi:69
 msgid "If such files exist, they will be picked up automatically."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:69
+#: en/user_customization-packages.ssi:71
 msgid ""
 "You can also put the gpg-key used to sign the repository into config/"
 "chroot_sources/your-repository.{binary,chroot}.gpg"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:71
+#: en/user_customization-packages.ssi:73
 msgid ""
 "Note: some preconfigured package repositories are available for easy "
 "selection through the --repository switch, e.g. for enabling live snapshots, "
@@ -292,17 +314,17 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:75
+#: en/user_customization-packages.ssi:77
 msgid "$ lb config --repository live.debian.net"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:79
+#: en/user_customization-packages.ssi:81
 msgid "3~ Package installation"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:81
+#: en/user_customization-packages.ssi:83
 msgid ""
 "You can elect to use either #{apt}# or #{aptitude}# when installing "
 "packages. Which utility is used is governed by the #{LB_APT}# variable in #"
@@ -310,7 +332,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:83
+#: en/user_customization-packages.ssi:85
 msgid ""
 "_* #{apt}#: Specifying a missing package causes package installation to "
 "fail, which may not be the desired behaviour. This is the default setting "
@@ -318,7 +340,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:85
+#: en/user_customization-packages.ssi:87
 msgid ""
 "_* #{aptitude}#: Specifying a missing package causes package installation to "
 "succeed, which may not be the desired behaviour. This is the default setting "
@@ -326,66 +348,66 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:87
+#: en/user_customization-packages.ssi:89
 msgid "2~ Installing additional packages"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:89
+#: en/user_customization-packages.ssi:91
 msgid ""
 "live-helper has a number of mechanisms for indicating that additional "
 "packages should be installed, including:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:91
+#: en/user_customization-packages.ssi:93
 msgid "_* The #{LB_PACKAGES}# variable"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:93
+#: en/user_customization-packages.ssi:95
 msgid "_* Package lists"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:95
+#: en/user_customization-packages.ssi:97
 msgid "_* Local packages (#{chroot_local-packages/}#)"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:97
+#: en/user_customization-packages.ssi:99
 msgid "_* Tasks"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:99
+#: en/user_customization-packages.ssi:101
 msgid "3~ The #{LB_PACKAGES}# variable"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:101
+#: en/user_customization-packages.ssi:103
 msgid ""
 "To install additional packages, simply add them to the #{LB_PACKAGES}# "
 "variable in #{config/chroot}#. For example:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:105
+#: en/user_customization-packages.ssi:107
 msgid "LB_PACKAGES=\"package1 package2 package3 ... \""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:109
+#: en/user_customization-packages.ssi:111
 msgid "You can also specify initial values on the command line:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:113
+#: en/user_customization-packages.ssi:115
 msgid "$ lb config --packages \"package1 package2 package3\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:117
+#: en/user_customization-packages.ssi:119
 msgid ""
 "The behaviour of live-build when specifying a package that does not exist is "
 "determined by your choice of APT utility. See package-installation for more "
@@ -393,12 +415,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:119
+#: en/user_customization-packages.ssi:121
 msgid "% FIXME: <xref linkend=\"package-installation\"/>"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:121
+#: en/user_customization-packages.ssi:123
 msgid ""
 "If you need to specify a large number of packages to be installed or you "
 "need flexibility regarding which packages to install, you should probably be "
@@ -406,17 +428,17 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:123
+#: en/user_customization-packages.ssi:125
 msgid "% FIXME: <xref linkend=\"package-lists\"/>"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:125
+#: en/user_customization-packages.ssi:127
 msgid "3~ Package lists"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:129
 msgid ""
 "Package lists are a powerful way of expressing which packages should be "
 "installed. live-build ships with a number of predefined package lists which "
@@ -425,37 +447,37 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:129
+#: en/user_customization-packages.ssi:131
 msgid "To specify one or more package list, you can use:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:133
+#: en/user_customization-packages.ssi:135
 msgid "$ lb config --packages-lists \"list1 list2 list3\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:137
+#: en/user_customization-packages.ssi:139
 msgid ""
 "Note: Package lists that are distributed with live-build reside in the #{/"
 "usr/share/live/build/lists}# directory."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:139
+#: en/user_customization-packages.ssi:141
 #, no-wrap
 msgid "*{Local packages lists}*\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:141
+#: en/user_customization-packages.ssi:143
 msgid ""
 "You may supplement the supplied lists using local package lists stored in #"
 "{config/chroot_local-packageslists}#."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:143
+#: en/user_customization-packages.ssi:145
 msgid ""
 "Package lists that exist in this directory need to have a #{.list}# suffix "
 "in order to be processed. Local packages lists always override package lists "
@@ -464,13 +486,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:145
+#: en/user_customization-packages.ssi:147
 #, no-wrap
 msgid "*{Local binary packages lists}*\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:147
+#: en/user_customization-packages.ssi:149
 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 "
@@ -480,25 +502,25 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:151
 msgid ""
 "Package lists that exist in this directory need to have a .list suffix in "
 "order to be processed."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:151
+#: en/user_customization-packages.ssi:153
 #, no-wrap
 msgid "*{Extending a provided package list using includes}*\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:162
 msgid "% code{ % % #include <gnome> % iceweasel % % }code"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:162
+#: en/user_customization-packages.ssi:164
 msgid ""
 "The package lists that are included with live-build make extensive use of "
 "includes. They are available to view in the #{/usr/share/live/build/lists}# "
@@ -506,75 +528,75 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:164
+#: en/user_customization-packages.ssi:166
 #, no-wrap
 msgid "*{Using conditionals inside packages lists}*\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:172
 msgid "#if ARCHITECTURE amd64 ia32-libs #endif"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:174
+#: en/user_customization-packages.ssi:176
 msgid "or if #{LB_ARCHITECTURE}# is set to #{i386}# or #{amd64}#:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:180
+#: en/user_customization-packages.ssi:182
 msgid "#if ARCHITECTURE i386 amd64 memtest86+ #endif"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:184
+#: en/user_customization-packages.ssi:186
 msgid "or if #{LB_ARCHIVE_AREAS}# contains either #{contrib}# or #{non-free}#:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:190
+#: en/user_customization-packages.ssi:192
 msgid "#if ARCHIVE_AREAS contrib non-free vrms #endif"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:194
+#: en/user_customization-packages.ssi:196
 msgid "A conditional may surround an #{#include}# directive:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:200
+#: en/user_customization-packages.ssi:202
 msgid "#if ARCHITECTURE amd64 #include <gnome-full> #endif"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:204
+#: en/user_customization-packages.ssi:206
 msgid ""
 "Any live-build configuration variable that begins with #{LB_}# can be tested "
 "in this way."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:206
+#: en/user_customization-packages.ssi:208
 msgid "The nesting of conditionals is not supported."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:208
+#: en/user_customization-packages.ssi:210
 msgid "3~ Tasks"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:210
+#: en/user_customization-packages.ssi:212
 msgid "%FIXME"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:212
+#: en/user_customization-packages.ssi:214
 msgid "2~ Installing modified or third-party packages"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:214
+#: en/user_customization-packages.ssi:216
 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 "
@@ -585,7 +607,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:218
 msgid ""
 "This section does not cover advice regarding building or maintaining "
 "modified packages. Joachim Breitner's 'How to fork privately' method from "
@@ -596,22 +618,22 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:218
+#: en/user_customization-packages.ssi:220
 msgid "There are two ways of installing modified custom packages:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:220
+#: en/user_customization-packages.ssi:222
 msgid "_* #{chroot_local-packages}#"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:222
+#: en/user_customization-packages.ssi:224
 msgid "_* Using a custom APT repository"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:224
+#: en/user_customization-packages.ssi:226
 msgid ""
 "The #{chroot_local-packages}# is simpler to achieve and useful for \"one-off"
 "\" customizations but has a number of drawbacks, whilst using a custom APT "
@@ -619,12 +641,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:226
+#: en/user_customization-packages.ssi:228
 msgid "3~ Using #{chroot_local-packages}# to install custom packages"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:228
+#: en/user_customization-packages.ssi:230
 msgid ""
 "To install a custom package, simply copy it to the #{config/chroot_local-"
 "packages}# directory. Packages that are inside this directory will be "
@@ -633,45 +655,45 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:230
+#: en/user_customization-packages.ssi:232
 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:232
+#: en/user_customization-packages.ssi:234
 msgid ""
 "Using #{chroot_local-packages}# for installation of custom packages has "
 "disadvantages:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:234
+#: en/user_customization-packages.ssi:236
 msgid "_* It is not possible to use secure APT"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:236
+#: en/user_customization-packages.ssi:238
 msgid ""
 "_* You must install all appropriate packages in the #{config/chroot_local-"
 "packages}# directory"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:238
+#: en/user_customization-packages.ssi:240
 msgid ""
 "_* It does not lend itself to storing Debian Live configurations in revision "
 "control"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:240
+#: en/user_customization-packages.ssi:242
 msgid "3~ Using an APT repository to install custom packages"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:242
+#: en/user_customization-packages.ssi:244
 msgid ""
 "Unlike using #{chroot_local-packages}#, when using a custom APT repository "
 "you must ensure that you specify the packages elsewhere. See lb-packages for "
@@ -679,12 +701,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:244
+#: en/user_customization-packages.ssi:246
 msgid "% FIXME: <xref linkend=\"lb-packages\"/>"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:246
+#: en/user_customization-packages.ssi:248
 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 "
@@ -692,12 +714,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:248
+#: en/user_customization-packages.ssi:250
 msgid "3~ Custom packages and APT"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:250
+#: en/user_customization-packages.ssi:252
 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 "
@@ -707,7 +729,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:252
+#: en/user_customization-packages.ssi:254
 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 "
@@ -717,17 +739,17 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:254
+#: en/user_customization-packages.ssi:256
 msgid "% FIXME: <xref linkend=\"apt-preferences\"/>"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:256
+#: en/user_customization-packages.ssi:258
 msgid "3~ Altering APT preferences during Live system"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:257
+#: en/user_customization-packages.ssi:259
 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 "
diff --git a/manual/po/de/user_customization-internationalization.ssi.po b/manual/po/de/user_examples.ssi.po
similarity index 57%
copy from manual/po/de/user_customization-internationalization.ssi.po
copy to manual/po/de/user_examples.ssi.po
index 3f736c9..a41671f 100644
--- a/manual/po/de/user_customization-internationalization.ssi.po
+++ b/manual/po/de/user_examples.ssi.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-22 08:57-0200\n"
-"PO-Revision-Date: 2010-10-03 21:43+0300\n"
+"POT-Creation-Date: 2010-11-04 16:34-0400\n"
+"PO-Revision-Date: 2010-11-04 16:34-0400\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "Language: de\n"
@@ -39,17 +39,15 @@ msgstr ""
 #: 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/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: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
@@ -64,15 +62,15 @@ msgstr ""
 #: 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_customization-packages.ssi:196 en/user_examples.ssi:24
+#: 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:46
-#: en/user_overview.ssi:90 en/user_overview.ssi:98
+#: 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 ""
 
@@ -99,16 +97,14 @@ msgstr ""
 #: 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:269 en/user_basics.ssi:285
-#: en/user_basics.ssi:293 en/user_basics.ssi:320 en/user_basics.ssi:359
+#: 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
@@ -124,95 +120,108 @@ msgstr ""
 #: 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_customization-packages.ssi:202 en/user_examples.ssi:33
+#: 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:84
-#: en/user_overview.ssi:94 en/user_overview.ssi:102
+#: 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"
+#: en/other_faq.ssi:85 en/other_faq.ssi:247 en/user_examples.ssi:26
+msgid "#!/bin/sh"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-internationalization.ssi:4
-msgid "1~customizing-locale-and-language Customizing locale and language"
+#: en/user_examples.ssi:2
+msgid "B~ Examples"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-internationalization.ssi:6
-msgid "2~ Default locale and keyboard"
+#: en/user_examples.ssi:4
+msgid "1~ Use Case Builds"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-internationalization.ssi:8
+#: en/user_examples.ssi:6
 msgid ""
-"The default locale when building a live cd is \"locales=en_US.UTF-8\", to "
-"set the locale for e.g. Switzerland, you can use \"locales=de_CH.UTF-8\"."
+"This chapter covers example builds for specific use cases with Debian Live."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-internationalization.ssi:12
-msgid "$ lb config --bootappend-live \"locales=de_CH.UTF-8\""
+#: en/user_examples.ssi:8
+msgid "2~ VNC Kiosk Client"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-internationalization.ssi:16
-msgid "The entry for a Swiss-German keyboard would be:"
+#: en/user_examples.ssi:10
+msgid "Create an image with live-build to boot directly to a VNC server."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-internationalization.ssi:20
-msgid "$ lb config --bootappend-live \"keyboard-layouts=ch\""
+#: en/user_examples.ssi:12
+msgid "_* Make a build directory: #{$ mkdir vncBuild}#"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-internationalization.ssi:24
-msgid "Combined, the keyboard and locale configured for Switzerland would be:"
+#: en/user_examples.ssi:14
+msgid "_* Move to the build directory: #{$ cd vncBuild}#"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-internationalization.ssi:28
+#: en/user_examples.ssi:16
 msgid ""
-"$ lb config --bootappend-live =\"locales=de_CH.UTF-8 keyboard-layouts=ch\""
+"Example to config the build directory to include gdm metacity "
+"xtightvncviewer: #{$ lb config --packages \"gdm3 metacity xtightvncviewer\"}#"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-internationalization.ssi:32
+#: en/user_examples.ssi:18
 msgid ""
-"Note: You can find a list of options in the manpage for live-config. "
-"Currently, only UTF-8 locales are supported."
+"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/user_customization-internationalization.ssi:34
-msgid "2~ l10n Packages"
+#: en/user_examples.ssi:20
+msgid ""
+"Create the .xsession for the default user: #{$ touch config/chroot_local-"
+"includes/etc/skel/.xsession}#"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-internationalization.ssi:36
+#: en/user_examples.ssi:22
 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"
+"Edit the .xsession file to launch metacity and start xvncviewer with "
+"something similar to the below:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-internationalization.ssi:40
-msgid "$ lb config --language \"de\""
+#: en/user_examples.ssi:29
+msgid "/usr/bin/metacity & /usr/bin/vncviewer xxx.xxx.xxx.xxx:PORT"
 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}#."
+#: en/user_examples.ssi:31
+msgid "exit"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:35
+msgid "_* Build the image: #{# lb build}#"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:37
+msgid "_* Enjoy."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:39
+msgid "2~ Next Example FIXME"
 msgstr ""
diff --git a/manual/po/de/user_managing_a_configuration.ssi.po b/manual/po/de/user_managing_a_configuration.ssi.po
index 5b045c7..416e9eb 100644
--- a/manual/po/de/user_managing_a_configuration.ssi.po
+++ b/manual/po/de/user_managing_a_configuration.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-13 17:00+0300\n"
+"POT-Creation-Date: 2010-10-28 16:34-0200\n"
 "PO-Revision-Date: 2010-10-13 17:00+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,8 +17,8 @@ msgstr ""
 "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: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
@@ -41,14 +41,15 @@ msgstr ""
 #: 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/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/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
@@ -67,17 +68,17 @@ msgstr ""
 #: 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:105
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
+#: 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:60
-#: en/user_overview.ssi:104 en/user_overview.ssi:112
+#: 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:86 en/about_manual.ssi:94 en/about_manual.ssi:102
+#: 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
@@ -101,14 +102,15 @@ msgstr ""
 #: 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/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
@@ -126,11 +128,12 @@ msgstr ""
 #: 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:109 en/user_installation.ssi:124
-#: en/user_installation.ssi:139 en/user_managing_a_configuration.ssi:31
+#: 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:98
-#: en/user_overview.ssi:108 en/user_overview.ssi:116
+#: 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 ""
 
@@ -141,7 +144,7 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_managing_a_configuration.ssi:4
-msgid "1~ Managing a configuration"
+msgid "1~managing-a-configuration Managing a configuration"
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/po/de/user_overview.ssi.po b/manual/po/de/user_overview.ssi.po
index e2914a1..93192b9 100644
--- a/manual/po/de/user_overview.ssi.po
+++ b/manual/po/de/user_overview.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-22 07:52-0200\n"
+"POT-Creation-Date: 2010-10-28 16:34-0200\n"
 "PO-Revision-Date: 2010-10-03 20:30+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -41,16 +41,17 @@ msgstr ""
 #: 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/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/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
@@ -67,12 +68,12 @@ msgstr ""
 #: 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_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:46
-#: en/user_overview.ssi:90 en/user_overview.ssi:98
+#: 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 ""
 
@@ -101,16 +102,16 @@ msgstr ""
 #: 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:269 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/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
@@ -127,12 +128,12 @@ msgstr ""
 #: 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_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:84
-#: en/user_overview.ssi:94 en/user_overview.ssi:102
+#: 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 ""
 
@@ -210,88 +211,37 @@ msgstr ""
 #. type: Plain text
 #: en/user_overview.ssi:22
 msgid ""
-"Besides the common config/common, which is used by all live-build commands, "
-"some additional files can be used to configure the behavior of specific "
-"helper commands. These files are typically named config/command or config/"
-"stage (where \"stage\", of course, is replaced with the name of the stage "
-"that they belong to, and \"command\" with the name of the command)."
-msgstr ""
-
-#. type: Plain text
-#: en/user_overview.ssi:24
-msgid ""
-"For example, the #{lb_bootstrap_debootstrap}# command uses files named "
-"config/bootstrap and config/bootstrap_debootstrap to read the options it "
-"will use. Generally, these files contain variables with values assigned, one "
-"variable per line. Some commands of live-buil use pairs of values or "
-"slightly more complicated variable assignments."
-msgstr ""
-
-#. type: Plain text
-#: en/user_overview.ssi:26
-msgid ""
-"live-build respects environment variables which are present in the context "
-"of the shell it is running. If variables can be read from config files, then "
-"they override environment variables, and if command line options are used, "
-"they override values from config files. If no value for a given variable can "
-"be found (and is thus unset), live-build will automatically set it to a "
-"default value."
-msgstr ""
-
-#. type: Plain text
-#: en/user_overview.ssi:28
-msgid ""
-"All config files are shell scripts which are sourced by a live-build "
-"command. That means they have to follow the normal shell syntax. You can "
-"also put comments in these files; lines beginning with \"#\" are ignored."
-msgstr ""
-
-#. type: Plain text
-#: en/user_overview.ssi:30
-msgid ""
-"In some rare cases you may want to have different versions of these files "
-"for different architectures or distributions. If files named config/stage."
-"arch or config/stage_command.arch, and config/stage.dist or config/"
-"stage_command.dist exist (where \"arch\" is the same as the output of dpkg --"
-"print-architecture and \"dist\" is the same as the codename of the target "
-"distribution), then they will be used in preference to the other, more "
-"general files."
-msgstr ""
-
-#. type: Plain text
-#: en/user_overview.ssi:32
-msgid ""
 "The remainder of this section discusses the three most important commands:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:34
+#: 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 ""
 
 #. type: Plain text
-#: en/user_overview.ssi:36
+#: 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 ""
 
 #. type: Plain text
-#: en/user_overview.ssi:38
+#: 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 ""
 
 #. type: Plain text
-#: en/user_overview.ssi:40
+#: en/user_overview.ssi:30
 msgid "3~lb-config The #{lb config}# command"
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:42
+#: 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 "
@@ -301,26 +251,26 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:44
+#: en/user_overview.ssi:34
 msgid ""
 "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:49
+#: en/user_overview.ssi:39
 msgid "$ lb config P: Creating config tree"
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:54
+#: en/user_overview.ssi:44
 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"
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:82
+#: en/user_overview.ssi:72
 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 "
@@ -345,54 +295,50 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:86
+#: en/user_overview.ssi:76
 msgid ""
 "Using #{lb config}# without any arguments would be suitable for users who "
-"are either happy editing the generated files, or are simply happy with the "
-"defaults it creates."
+"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 ""
 
 #. type: Plain text
-#: en/user_overview.ssi:88
+#: en/user_overview.ssi:78
 msgid ""
-"You can ask #{lb config}# to generate a config/ directory \"preseeded\" with "
-"various options. This might be suitable if you do not require the default "
-"settings but do not need to change a large number of options. For example:"
+"Normally, you will want to specify some options. For example, to include the "
+"'gnome' package list in your configuration:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:92
+#: en/user_overview.ssi:82
 msgid "$ lb config -p gnome"
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:96
-msgid ""
-"will build a config/ directory configured to include the 'gnome' package "
-"list. It is possible to specify many options:"
+#: en/user_overview.ssi:86
+msgid "It is possible to specify many options, such as:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:100
+#: en/user_overview.ssi:90
 msgid ""
 "$ lb config --binary-images net --hostname live-machine --username live-"
 "user ..."
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:104
-msgid ""
-"A full list of options is available in the #{lb_config}# man page. Most "
-"options have a parallel with an \"LB_\" prefixed variable."
+#: en/user_overview.ssi:94
+msgid "A full list of options is available in the #{lb_config}# man page."
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:106
+#: en/user_overview.ssi:96
 msgid "3~lb-build The #{lb build}# command"
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:108
+#: 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 "
@@ -400,33 +346,33 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:110
+#: en/user_overview.ssi:100
 msgid "3~lb-clean The #{lb clean}# command"
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:112
+#: 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 ""
 
 #. type: Plain text
-#: en/user_overview.ssi:114
+#: en/user_overview.ssi:104
 msgid "2~live-boot The live-boot package"
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:116
+#: 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."
+"as those created by live-build. This includes the Debian Live ISOs, netboot "
+"tarballs, and USB stick images."
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:118
+#: 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 "
@@ -435,7 +381,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:120
+#: 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 "
@@ -443,12 +389,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:122
+#: en/user_overview.ssi:112
 msgid "2~live-config The live-config package"
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:124
+#: 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 "
diff --git a/manual/po/fr/about_manual.ssi.po b/manual/po/fr/about_manual.ssi.po
index ebdc63f..7829de8 100644
--- a/manual/po/fr/about_manual.ssi.po
+++ b/manual/po/fr/about_manual.ssi.po
@@ -1,14 +1,15 @@
 # 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.
+# Creak <romain.failliot at foolstep.com>, 2010.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual 2.0~a8\n"
 "POT-Creation-Date: 2010-10-23 16:43+0300\n"
-"PO-Revision-Date: 2010-10-21 19:15+0100\n"
-"Last-Translator: Christophe Siraut <chris at tobald.eu.org>\n"
-"Language-Team: none\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"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -231,7 +232,7 @@ msgstr ""
 #. type: Plain text
 #: en/about_manual.ssi:44
 msgid "2~ Authors"
-msgstr "2~Auteurs"
+msgstr "2~ Auteurs"
 
 #. type: Plain text
 #: en/about_manual.ssi:46
@@ -311,6 +312,10 @@ msgid ""
 "submit a contribution is to send it to the mailing list. Please see {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 "
+"de soumettre une contribution est de l'envoyer à la liste de diffusion. S'il "
+"vous plaît voir {Contact}#contact pour plus d'informations."
 
 #. type: Plain text
 #: en/about_manual.ssi:76
diff --git a/manual/po/fr/live-manual.ssm.po b/manual/po/fr/live-manual.ssm.po
index 10ba733..f228ca9 100644
--- a/manual/po/fr/live-manual.ssm.po
+++ b/manual/po/fr/live-manual.ssm.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-25 23:12+0300\n"
+"POT-Creation-Date: 2010-11-13 16:15+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-10-25\n"
+" :published: 2010-11-13\n"
 msgstr ""
 
 #. type: Plain text
@@ -146,11 +146,21 @@ msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:55
+msgid ":B~ Examples ~#"
+msgstr ""
+
+#. type: Plain text
+#: en/live-manual.ssm:57
+msgid "<< user_examples.ssi"
+msgstr ""
+
+#. type: Plain text
+#: en/live-manual.ssm:59
 msgid ":B~ Other ~#"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:61
+#: en/live-manual.ssm:65
 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 "
@@ -160,76 +170,71 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:63
+#: en/live-manual.ssm:67
 msgid "% << other_customization-bootup.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:65
+#: en/live-manual.ssm:69
 msgid "% << other_customization-binary.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:67
+#: en/live-manual.ssm:71
 msgid "% << other_customization-backports.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:69
+#: en/live-manual.ssm:73
 msgid "% << other_common-tasks.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:71
+#: en/live-manual.ssm:75
 msgid "% << other_live-environment.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:73
+#: en/live-manual.ssm:77
 msgid "% << other_faq.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:75
+#: en/live-manual.ssm:79
 msgid "% << other_howtos.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:77
+#: en/live-manual.ssm:81
 msgid "% << other_coding-style.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:79
+#: en/live-manual.ssm:83
 msgid "% << other_procedures.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:81
+#: en/live-manual.ssm:85
 msgid "% << other_resources.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:83
-msgid "% << other_use-cases.ssi"
-msgstr ""
-
-#. type: Plain text
-#: en/live-manual.ssm:85
+#: en/live-manual.ssm:87
 msgid "% << other_success-stories.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:87
+#: en/live-manual.ssm:89
 msgid "% << other_troubleshooting.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:89
+#: en/live-manual.ssm:91
 msgid "% << other_configuration-layout.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:90
+#: en/live-manual.ssm:92
 msgid "% << other_configuration-files.ssi"
 msgstr ""
diff --git a/manual/po/fr/other_live-environment.ssi.po b/manual/po/fr/other_live-environment.ssi.po
index d33472d..c1ec7c8 100644
--- a/manual/po/fr/other_live-environment.ssi.po
+++ b/manual/po/fr/other_live-environment.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-03 20:30+0300\n"
+"POT-Creation-Date: 2010-10-28 07:47-0200\n"
 "PO-Revision-Date: 2010-10-03 20:30+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,8 +17,8 @@ msgstr ""
 "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: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
@@ -26,56 +26,59 @@ msgstr ""
 #: 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/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/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-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-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: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_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: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
+#: 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:46
+#: en/user_overview.ssi:90 en/user_overview.ssi:98
 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: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
@@ -84,17 +87,12 @@ msgstr "code{"
 #: 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_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
@@ -104,30 +102,38 @@ msgstr "code{"
 #: 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/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: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_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: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
+#: 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:84
+#: en/user_overview.ssi:94 en/user_overview.ssi:102
 msgid "}code"
 msgstr "}code"
 
@@ -349,9 +355,9 @@ msgstr ""
 #. type: Plain text
 #: en/other_live-environment.ssi:103
 msgid ""
-"A live cd paradigm is a preinstalled 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 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
@@ -359,7 +365,7 @@ msgstr ""
 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 runtime evolutions of the system "
+"should be considered read-only and all the run-time evolutions of the system "
 "are lost at shutdown."
 msgstr ""
 
@@ -367,7 +373,7 @@ msgstr ""
 #: en/other_live-environment.ssi:108
 msgid ""
 "Persistence is a common name for different kinds of solutions for saving "
-"across reboots some, or all, of this runtime evolution of the system. To "
+"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 "
@@ -396,7 +402,7 @@ msgid ""
 "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 bootime and the system must be started with the "
+"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 ""
@@ -473,7 +479,7 @@ msgid ""
 "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 runtime could lead to "
+"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 "
@@ -519,8 +525,8 @@ msgstr ""
 #. type: Plain text
 #: en/other_live-environment.ssi:159
 msgid ""
-"The runtime 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-initramfs mounts all /"
-"live filesystem in order or with the module bootparameter."
+"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-initramfs "
+"mounts all /live filesystem in order or with the module boot parameter."
 msgstr ""
diff --git a/manual/po/fr/project_bugs.ssi.po b/manual/po/fr/project_bugs.ssi.po
index 6e963eb..17e6d7d 100644
--- a/manual/po/fr/project_bugs.ssi.po
+++ b/manual/po/fr/project_bugs.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-25 23:27+0300\n"
+"POT-Creation-Date: 2010-10-27 21:40-0200\n"
 "PO-Revision-Date: 2010-10-25 23:27+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -42,14 +42,14 @@ msgstr ""
 #: 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:34 en/user_basics.ssi:44
-#: en/user_basics.ssi:56 en/user_basics.ssi:68 en/user_basics.ssi:80
-#: en/user_basics.ssi:92 en/user_basics.ssi:106 en/user_basics.ssi:114
-#: en/user_basics.ssi:122 en/user_basics.ssi:132 en/user_basics.ssi:144
-#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
-#: en/user_basics.ssi:186 en/user_basics.ssi:194 en/user_basics.ssi:204
-#: en/user_basics.ssi:224 en/user_basics.ssi:257 en/user_basics.ssi:273
-#: en/user_basics.ssi:281 en/user_basics.ssi:301 en/user_basics.ssi:326
+#: 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/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
@@ -102,15 +102,15 @@ msgstr "code{"
 #: 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:38
-#: en/user_basics.ssi:48 en/user_basics.ssi:62 en/user_basics.ssi:72
-#: en/user_basics.ssi:86 en/user_basics.ssi:98 en/user_basics.ssi:110
-#: en/user_basics.ssi:118 en/user_basics.ssi:126 en/user_basics.ssi:136
-#: en/user_basics.ssi:150 en/user_basics.ssi:160 en/user_basics.ssi:168
-#: en/user_basics.ssi:176 en/user_basics.ssi:190 en/user_basics.ssi:198
-#: en/user_basics.ssi:208 en/user_basics.ssi:249 en/user_basics.ssi:261
-#: en/user_basics.ssi:277 en/user_basics.ssi:285 en/user_basics.ssi:312
-#: en/user_basics.ssi:351 en/user_customization-contents.ssi:39
+#: 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
@@ -400,7 +400,7 @@ msgstr ""
 
 #. type: Plain text
 #: en/project_bugs.ssi:86
-msgid "3~ At boot-time"
+msgid "3~ At boot time"
 msgstr ""
 
 #. type: Plain text
@@ -416,7 +416,7 @@ msgstr ""
 
 #. type: Plain text
 #: en/project_bugs.ssi:90
-msgid "3~ At run-time"
+msgid "3~ At run time"
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/po/fr/user_basics.ssi.po b/manual/po/fr/user_basics.ssi.po
index eed62b0..bdde68f 100644
--- a/manual/po/fr/user_basics.ssi.po
+++ b/manual/po/fr/user_basics.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-23 16:43+0300\n"
+"POT-Creation-Date: 2010-11-01 06:47-0200\n"
 "PO-Revision-Date: 2010-10-20 06:53-0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -41,16 +41,17 @@ msgstr ""
 #: 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:34
-#: en/user_basics.ssi:44 en/user_basics.ssi:56 en/user_basics.ssi:68
-#: en/user_basics.ssi:80 en/user_basics.ssi:92 en/user_basics.ssi:106
-#: en/user_basics.ssi:114 en/user_basics.ssi:122 en/user_basics.ssi:132
-#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
-#: en/user_basics.ssi:172 en/user_basics.ssi:186 en/user_basics.ssi:194
-#: en/user_basics.ssi:204 en/user_basics.ssi:224 en/user_basics.ssi:257
-#: en/user_basics.ssi:273 en/user_basics.ssi:281 en/user_basics.ssi:301
-#: en/user_basics.ssi:326 en/user_customization-contents.ssi:34
-#: en/user_customization-contents.ssi:43 en/user_customization-contents.ssi:66
+#: 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/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
@@ -71,8 +72,8 @@ msgstr ""
 #: 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:46
-#: en/user_overview.ssi:90 en/user_overview.ssi:98
+#: 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{"
 
@@ -101,16 +102,16 @@ msgstr "code{"
 #: 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:38 en/user_basics.ssi:48
-#: en/user_basics.ssi:62 en/user_basics.ssi:72 en/user_basics.ssi:86
-#: en/user_basics.ssi:98 en/user_basics.ssi:110 en/user_basics.ssi:118
-#: en/user_basics.ssi:126 en/user_basics.ssi:136 en/user_basics.ssi:150
-#: en/user_basics.ssi:160 en/user_basics.ssi:168 en/user_basics.ssi:176
-#: en/user_basics.ssi:190 en/user_basics.ssi:198 en/user_basics.ssi:208
-#: en/user_basics.ssi:249 en/user_basics.ssi:261 en/user_basics.ssi:277
-#: en/user_basics.ssi:285 en/user_basics.ssi:312 en/user_basics.ssi:351
-#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
-#: en/user_customization-contents.ssi:70
+#: 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
@@ -131,8 +132,8 @@ msgstr "code{"
 #: 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:84
-#: en/user_overview.ssi:94 en/user_overview.ssi:102
+#: 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"
 
@@ -149,8 +150,8 @@ msgstr ""
 #. type: Plain text
 #: en/user_basics.ssi:6
 msgid ""
-"This chapter contains a brief overview of the build process as well as "
-"containing instructions on how to boot the various binary image types."
+"This chapter contains a brief overview of the build process and instructions "
+"for booting the various binary image types."
 msgstr ""
 
 #. type: Plain text
@@ -162,9 +163,9 @@ msgstr ""
 #: en/user_basics.ssi:10
 msgid ""
 "A live system usually means an operating system booted on a computer from a "
-"removable medium (such as CD-ROM, USB stick, or network), ready to use "
-"without any installation on the usual drive(s), with an auto-configuration "
-"done at runtime (see {Terms}#terms )."
+"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 ""
 
 #. type: Plain text
@@ -172,294 +173,291 @@ msgstr ""
 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 following parts:"
+"is made from the following parts:"
 msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:14
-msgid "_* Linux kernel"
+msgid "_* *{Linux kernel image}*, usually named #{vmlinuz*}#"
 msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:16
-msgid "_* The Linux image, usually named #{vmlinuz*}#"
-msgstr ""
-
-#. type: Plain text
-#: en/user_basics.ssi:18
 msgid ""
-"_* *{Initial RAM disk image (initrd)}*: RAM disk setup for the Linux boot, "
-"containing modules possibly needed to mount the filesystem's image and some "
+"_* *{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 ""
 
 #. type: Plain text
-#: en/user_basics.ssi:20
+#: en/user_basics.ssi:18
 msgid ""
-"_* *{System image}*: The operating systems filesystem image. The SquashFS "
-"compressed filesystem is used to minimize the Debian Live image size. Note "
-"that it's 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 partition(s) are used (see 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)."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:22
+#: en/user_basics.ssi:20
 msgid "% FIXME: <xref linkend=\"persistence\"/>"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:24
+#: en/user_basics.ssi:22
 msgid ""
-"_* *{Bootloader}*: A small piece of code, crafted to boot up from the chosen "
+"_* *{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 then loads the Linux kernel and its initrd to run with an "
-"associated filesystem image. Different solutions can be used depending on "
-"the target media and format of the filesystem containing the previous "
-"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 partition, "
-"etc."
+"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 ""
 
 #. type: Plain text
-#: en/user_basics.ssi:26
+#: en/user_basics.ssi:24
 msgid ""
-"_* live-build will build the system image from your specifications, setup a "
-"Linux kernel and its initrd, 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.)"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:28
+#: en/user_basics.ssi:26
 msgid "2~ First steps: building an ISO image"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:30
+#: en/user_basics.ssi:28
 msgid ""
-"The following sequence of commands, provided by live-build, will create a "
-"basic ISO image containing just the Debian standard system without X.org. It "
-"is suitable for burning to CD or DVD media."
+"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 ""
 
 #. type: Plain text
-#: en/user_basics.ssi:32
+#: en/user_basics.ssi:30
 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:36
+#: en/user_basics.ssi:34
 msgid "$ lb config"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:40
+#: en/user_basics.ssi:38
 msgid ""
-"By passing no parameters to #{lb config}# we indicated that we wish to use "
-"the defaults (see {The lb config command}#lb-config )."
+"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:42
+#: en/user_basics.ssi:40
 msgid ""
 "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:46 en/user_basics.ssi:124 en/user_basics.ssi:206
+#: en/user_basics.ssi:44 en/user_basics.ssi:120 en/user_basics.ssi:202
 msgid "# lb build"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:50
+#: en/user_basics.ssi:48
 msgid ""
 "This process can take a while, depending on the speed of your network "
-"connection (see {The lb build command}#lb-build )."
+"connection (see {The lb build command}#lb-build)."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:52
+#: en/user_basics.ssi:50
 msgid "3~ Testing an ISO image with Qemu"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:54
+#: en/user_basics.ssi:52
 msgid "Testing an ISO is simple:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:58 en/user_basics.ssi:146
+#: en/user_basics.ssi:56 en/user_basics.ssi:142
 msgid "# apt-get install qemu"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:60
+#: en/user_basics.ssi:58
 msgid "$ qemu -cdrom binary.iso"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:64
+#: en/user_basics.ssi:62
 msgid "3~ Testing an ISO image with virtualbox-ose"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:66
+#: en/user_basics.ssi:64
 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"
+msgstr ""
+
+#. type: Plain text
 #: en/user_basics.ssi:70
-msgid "# apt-get install virtualbox-ose"
+msgid "$ virtualbox"
 msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:74
 msgid ""
-"and either install #{virtualbox-ose-source}# or #{virtualbox-ose-dkms}# to "
-"build the required kernel modules to run virtualbox-ose."
+"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
 msgid ""
-"After successful installation, virtualbox can be e.g. found in the GNOME "
-"menu under 'Applications/System Tools/VirtualBox OSE'."
+"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 ""
 
 #. type: Plain text
-#: en/user_basics.ssi:78
-msgid ""
-"Please consider including of following packages onto the live image to "
-"achieve higher resolution of the display when booting the live image in "
-"virutalbox-ose (1280x1024 instead of 800x600 and in particular if the "
-"default resolution of the virtualbox-ose display shouldn't work with the gui-"
-"installer)."
+#: en/user_basics.ssi:80
+msgid "# lb config --packages virtualbox-ose-guest-x11"
 msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:84
-msgid ""
-"virtualbox-ose-guest-dkms virtualbox-ose-guest-utils virtualbox-ose-guest-x11"
-msgstr ""
-
-#. type: Plain text
-#: en/user_basics.ssi:88
 msgid "3~ Burning an ISO image to a physical medium"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:90
+#: en/user_basics.ssi:86
 msgid "Burning an ISO image is easy:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:94
+#: en/user_basics.ssi:90
 msgid "# apt-get install wodim"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:96
+#: en/user_basics.ssi:92
 msgid "$ wodim binary.iso"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:100
-msgid "2~ Building an USB/HDD image"
+#: en/user_basics.ssi:96
+msgid "2~ Building a USB/HDD image"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:102
+#: en/user_basics.ssi:98
 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."
+"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 ""
 
 #. type: Plain text
-#: en/user_basics.ssi:104
+#: en/user_basics.ssi:100
 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 ):"
+"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 ""
 
 #. type: Plain text
-#: en/user_basics.ssi:108 en/user_basics.ssi:188
+#: en/user_basics.ssi:104 en/user_basics.ssi:184
 msgid "$ lb clean --binary"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:112
+#: en/user_basics.ssi:108
 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:116
+#: en/user_basics.ssi:112
 msgid "$ lb config -b usb-hdd"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:120
+#: en/user_basics.ssi:116
 msgid "Now build the image with the #{lb build} command:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:128
-msgid "3~ Copying USB/HDD image to a USB stick"
+#: en/user_basics.ssi:124
+msgid "3~copying-usb-hdd-image Copying USB/HDD image to a USB stick"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:130
+#: en/user_basics.ssi:126
 msgid ""
 "The generated binary image contains a VFAT partition and the syslinux "
-"bootloader, ready to be directly written on an USB stick. Plug in an USB "
-"stick with a size larger than that of binary.img and type:"
+"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 ""
 
 #. type: Plain text
-#: en/user_basics.ssi:134
+#: en/user_basics.ssi:130
 msgid "$ dd if=binary.img of=${USBSTICK}"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:138
+#: en/user_basics.ssi:134
 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."
+"looking in #{dmesg}#'s output after plugging in the stick, for example, or "
+"better yet, #{ls -l /dev/disk/by-id}#."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:140
+#: en/user_basics.ssi:136
 #, no-wrap
 msgid "*{This will definitely overwrite any previous contents on your stick!}*\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:142
+#: en/user_basics.ssi:138
 msgid "3~ Testing a USB/HDD image with Qemu"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:148
+#: en/user_basics.ssi:144
 msgid "$ qemu -hda binary.img"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:152
+#: en/user_basics.ssi:148
 msgid "3~ Using the space left on a USB stick"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:154
+#: 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}"
@@ -468,45 +466,45 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:158
+#: en/user_basics.ssi:154
 msgid "# gparted ${USBSTICK}"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:162
+#: en/user_basics.ssi:158
 msgid ""
-"Ater the creation of the partition you have to create a filsystem on it. One "
-"possible choice would be ext4."
+"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:166
+#: en/user_basics.ssi:162
 msgid "# mkfs.ext4 ${USBSTICK}"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:170
+#: 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:174
+#: en/user_basics.ssi:170
 msgid "# mkfs.vfat -F 32"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:178
+#: en/user_basics.ssi:174
 #, no-wrap
-msgid "*{Remember: Every time you install a new binary.img on the stick, all your data will be lost because the image includes a complete partition table.}*\n"
+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:180
+#: en/user_basics.ssi:176
 msgid "2~ Building a netboot image"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:182
+#: 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 "
@@ -514,99 +512,99 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:184
+#: en/user_basics.ssi:180
 msgid ""
-"Note if you performed any previous examples, you will need to clean up your "
+"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:192
+#: en/user_basics.ssi:188
 msgid ""
 "Run the #{lb config}# command with the parameters to configure the \"config/"
 "\" hierarchy to create our netboot image:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:196
+#: en/user_basics.ssi:192
 msgid ""
 "$ lb config -b net --net-root-path \"/srv/debian-live\" --net-root-server "
 "\"192.168.0.1\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:200
+#: 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 "
+"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."
+"located at boot time."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:202
+#: en/user_basics.ssi:198
 msgid "Now build the image with the #{lb build}# command:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:210
+#: en/user_basics.ssi:206
 msgid ""
-"In a network boot the client runs a small piece of software, which usually "
+"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 boot loader via the TFTP protocol. That "
-"could be PXELINUX, Grub or even boot directly to an operating system like "
+"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 ""
 
 #. type: Plain text
-#: en/user_basics.ssi:212
+#: 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 "
+"filesystem.squashfs and the kernel, initrd and pxelinux bootloader in "
 "tftpboot/debian-live/i386."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:214
+#: en/user_basics.ssi:210
 msgid "We must now configure three services on the server to enable netboot."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:216
+#: en/user_basics.ssi:212
 msgid "3~ DHCP server"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:218
+#: en/user_basics.ssi:214
 msgid ""
 "We must configure our network's DHCP server to be sure to give an IP address "
-"to the computer netbooting, and to advertise the location of the PXE "
+"to the netbooting client system, and to advertise the location of the PXE "
 "bootloader."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:220
+#: 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 ""
 
 #. type: Plain text
-#: en/user_basics.ssi:222 en/user_customization-packages.ssi:153
+#: en/user_basics.ssi:218 en/user_customization-packages.ssi:153
 msgid "% FIXME"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:226
+#: en/user_basics.ssi:222
 #, no-wrap
 msgid "subnet 192.168.1.0 netmask 255.255.255.0 {   # 192.168.1.0/24\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:229
+#: en/user_basics.ssi:225
 #, no-wrap
 msgid ""
 "  # IP addresses available for guests\n"
@@ -614,7 +612,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:232
+#: en/user_basics.ssi:228
 #, no-wrap
 msgid ""
 "  # allow booting from the net\n"
@@ -622,7 +620,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:237
+#: en/user_basics.ssi:233
 #, no-wrap
 msgid ""
 "  # for net booting, server where the first file to be loaded (by TFTP\n"
@@ -632,7 +630,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:241
+#: en/user_basics.ssi:237
 #, no-wrap
 msgid ""
 "  # net boot configuration for guests with a PXE client:\n"
@@ -641,15 +639,15 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:244
+#: en/user_basics.ssi:240
 #, no-wrap
 msgid ""
-"    # PXE boot loader (first program to be loaded, by TFTP)\n"
+"    # PXE bootloader (first program to be loaded, by TFTP)\n"
 "    filename \"pxelinux.0\";\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:247
+#: en/user_basics.ssi:243
 #, no-wrap
 msgid ""
 "  }\n"
@@ -657,17 +655,17 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:251
+#: en/user_basics.ssi:247
 msgid "3~ TFTP server"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:253
-msgid "This serves the kernel and initial ramdisk to the system at run-time."
+#: en/user_basics.ssi:249
+msgid "This serves the kernel and initial ramdisk to the system at run time."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:255
+#: en/user_basics.ssi:251
 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 /"
@@ -675,22 +673,22 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:259
+#: en/user_basics.ssi:255
 msgid "dpkg-reconfigure -plow tftpd-hpa"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:263
+#: en/user_basics.ssi:259
 msgid "and fill in the new tftp server directory when being asked about it."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:265
+#: en/user_basics.ssi:261
 msgid "3~ NFS server"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:267
+#: en/user_basics.ssi:263
 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 "
@@ -698,35 +696,35 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:269
+#: en/user_basics.ssi:265
 msgid "You need to install the nfs-kernel-server package."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:271
+#: en/user_basics.ssi:267
 msgid ""
 "Then, make the filesystem image available through NFS by adding a line like "
 "the following to /etc/exports:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:275
+#: en/user_basics.ssi:271
 msgid "/srv/debian-live *(ro,async,no_root_squash,no_subtree_check)"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:279
+#: en/user_basics.ssi:275
 msgid ""
 "and tell the NFS server about this new export with the following command:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:283
+#: en/user_basics.ssi:279
 msgid "# exportfs -rv"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:287
+#: en/user_basics.ssi:283
 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 "
@@ -735,40 +733,40 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:289
+#: en/user_basics.ssi:285
 msgid "3~ Netboot testing HowTo"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:291
+#: en/user_basics.ssi:287
 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:293
+#: en/user_basics.ssi:289
 msgid ""
 "To make our life easier, we can use virtualization. There are two solutions."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:295
+#: en/user_basics.ssi:291
 msgid "3~ Qemu"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:297
+#: en/user_basics.ssi:293
 msgid "_* Install qemu, bridge-utils, sudo."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:299
+#: en/user_basics.ssi:295
 msgid "Edit /etc/qemu-ifup:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:310
+#: en/user_basics.ssi:306
 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...\" "
@@ -777,62 +775,62 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:314
+#: en/user_basics.ssi:310
 msgid "Get, or build a grub-floppy-netboot (in the svn)."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:316
+#: en/user_basics.ssi:312
 msgid "Launch qemu with \"-net nic,vlan=0 -net tap,vlan=0,ifname=tun0\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:318
+#: en/user_basics.ssi:314
 msgid "3~ VMWare Player"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:320
+#: en/user_basics.ssi:316
 msgid "_* Install VMWare Player (\"free as in beer\" edition)"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:322
+#: en/user_basics.ssi:318
 msgid ""
 "_* Create a PXETester directory, and create a text file called pxe.vwx inside"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:324
+#: en/user_basics.ssi:320
 msgid "_* Paste this text inside:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:332
+#: en/user_basics.ssi:328
 msgid ""
 "#!/usr/bin/vmware config.version = \"8\" virtualHW.version = \"4\" memsize = "
 "\"512\" MemAllowAutoScaleDown = \"FALSE\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:338
+#: en/user_basics.ssi:334
 msgid ""
 "ide0:0.present = \"FALSE\" ide1:0.present = \"FALSE\" floppy0.present = "
 "\"FALSE\" sound.present = \"FALSE\" tools.remindInstall = \"FALSE\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:341
+#: en/user_basics.ssi:337
 msgid "ethernet0.present = \"TRUE\" ethernet0.addressType = \"generated\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:344
+#: en/user_basics.ssi:340
 msgid "displayName = \"Test Boot PXE\" guestOS = \"other\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:349
+#: en/user_basics.ssi:345
 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 "
@@ -840,19 +838,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:353
+#: en/user_basics.ssi:349
 msgid ""
 "_* You can play with this configuration file (i.e. change memory limit to "
 "256)"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:355
+#: en/user_basics.ssi:351
 msgid ""
-"_* Double click on this file (or run VMWare player and selecet this file)."
+"_* Double click on this file (or run VMWare player and select this file)."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:356
+#: en/user_basics.ssi:352
 msgid "_* When running just press space if that strange question comes up..."
 msgstr ""
diff --git a/manual/po/fr/user_customization-internationalization.ssi.po b/manual/po/fr/user_customization-internationalization.ssi.po
index dc1d045..fc5dced 100644
--- a/manual/po/fr/user_customization-internationalization.ssi.po
+++ b/manual/po/fr/user_customization-internationalization.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-22 08:57-0200\n"
+"POT-Creation-Date: 2010-10-28 09:15-0200\n"
 "PO-Revision-Date: 2010-10-16 15:48-0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -41,16 +41,17 @@ msgstr ""
 #: 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/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/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
@@ -67,8 +68,8 @@ msgstr ""
 #: 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_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:46
@@ -101,16 +102,16 @@ msgstr "code{"
 #: 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:269 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/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
@@ -127,8 +128,8 @@ msgstr "code{"
 #: 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_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:84
@@ -154,8 +155,8 @@ msgstr ""
 #. type: Plain text
 #: en/user_customization-internationalization.ssi:8
 msgid ""
-"The default locale when building a live cd is \"locales=en_US.UTF-8\", to "
-"set the locale for e.g. Switzerland, you can use \"locales=de_CH.UTF-8\"."
+"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
diff --git a/manual/po/fr/user_customization-overview.ssi.po b/manual/po/fr/user_customization-overview.ssi.po
index 69bad9a..58afc9c 100644
--- a/manual/po/fr/user_customization-overview.ssi.po
+++ b/manual/po/fr/user_customization-overview.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-22 08:57-0200\n"
+"POT-Creation-Date: 2010-11-11 11:58-0400\n"
 "PO-Revision-Date: 2010-10-22 07:52-0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -27,18 +27,112 @@ msgid "1~customization-overview Customization overview"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-overview.ssi:7
+#: en/user_customization-overview.ssi:6
 msgid ""
-"% FIXME: just a stub for now.  In conversational style, cover the different "
-"kinds of customization % and link to each section within the text."
+"This chapter gives an overview of the various ways in which you may "
+"customize a Debian Live system."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-overview.ssi:9
+#: en/user_customization-overview.ssi:8
+msgid "2~ Build time vs. boot time configuration"
+msgstr ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. type: Plain text
+#: en/user_customization-overview.ssi:14
+msgid "2~stages-of-the-build Stages of the build"
+msgstr ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. type: Plain text
+#: en/user_customization-overview.ssi:20
+msgid "2~ Supplement lb config with files"
+msgstr ""
+
+#. 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 ""
+
+#. type: Plain text
+#: en/user_customization-overview.ssi:24
+msgid "2~ Customization tasks"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-overview.ssi:26
 msgid ""
-"This chapter gives an overview of the various ways in which your Debian live "
-"systems may be customized. See sections {Customizing package installation}"
-"#customizing-package-installation, {Customizing contents}#customizing-"
-"contents and {Customizing locale and language}#customizing-locale-and-"
-"language."
+"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 ""
diff --git a/manual/po/fr/user_customization-packages.ssi.po b/manual/po/fr/user_customization-packages.ssi.po
index c79afc7..e9e129d 100644
--- a/manual/po/fr/user_customization-packages.ssi.po
+++ b/manual/po/fr/user_customization-packages.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-22 08:58-0200\n"
+"POT-Creation-Date: 2010-11-12 16:21-0400\n"
 "PO-Revision-Date: 2010-10-16 14:45-0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -39,40 +39,38 @@ msgstr ""
 #: 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/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: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_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_customization-packages.ssi:14 en/user_customization-packages.ssi:26
+#: en/user_customization-packages.ssi:38 en/user_customization-packages.ssi:47
+#: en/user_customization-packages.ssi:61 en/user_customization-packages.ssi:75
+#: en/user_customization-packages.ssi:105
+#: en/user_customization-packages.ssi:113
+#: en/user_customization-packages.ssi:133
+#: en/user_customization-packages.ssi:168
+#: en/user_customization-packages.ssi:178
+#: en/user_customization-packages.ssi:188
+#: en/user_customization-packages.ssi:198 en/user_examples.ssi:24
+#: 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:46
-#: en/user_overview.ssi:90 en/user_overview.ssi:98
+#: 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{"
 
@@ -99,45 +97,43 @@ msgstr "code{"
 #: 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:269 en/user_basics.ssi:285
-#: en/user_basics.ssi:293 en/user_basics.ssi:320 en/user_basics.ssi:359
+#: 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/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_customization-packages.ssi:18 en/user_customization-packages.ssi:30
+#: en/user_customization-packages.ssi:43 en/user_customization-packages.ssi:51
+#: en/user_customization-packages.ssi:65 en/user_customization-packages.ssi:79
+#: en/user_customization-packages.ssi:109
+#: en/user_customization-packages.ssi:117
+#: en/user_customization-packages.ssi:137
+#: en/user_customization-packages.ssi:174
+#: en/user_customization-packages.ssi:184
+#: en/user_customization-packages.ssi:194
+#: en/user_customization-packages.ssi:204 en/user_examples.ssi:33
+#: 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:84
-#: en/user_overview.ssi:94 en/user_overview.ssi:102
+#: 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_basics.ssi:230 en/user_customization-packages.ssi:153
+#: en/user_basics.ssi:218 en/user_customization-packages.ssi:155
 msgid "% FIXME"
 msgstr ""
 
@@ -153,85 +149,111 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:6
-msgid "_* Selecting additional packages to be installed"
+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. We start with customization of the 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 ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:8
-msgid "_* Installing modified packages"
+msgid "2~ Package sources"
 msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:10
-msgid "2~ Package sources"
+msgid "3~ Debian repositories"
 msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:12
-msgid "3~ Debian repositories"
+msgid "To set a local mirror to be used to at build time:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:14
-msgid "To set a local mirror (used to 'build' the live system)"
+#: en/user_customization-packages.ssi:16
+msgid "$ lb config --mirror-bootstrap http://localhost/debian/"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:18
+#: en/user_customization-packages.ssi:20
 msgid ""
-"$ lb config --mirror-bootstrap http://localhost/debian/ --mirror-chroot "
-"http://localhost/debian/"
+"The chroot repository, specified by --mirror-chroot, defaults to the same as "
+"--mirror-bootstrap."
 msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:22
+msgid ""
+"Each of the --mirror-* options governs which repository 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, when the "
+"binary image is constructed, the --mirror-binary value is used, superceding "
+"any earlier repositories."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:24
 msgid "The generic mirror is added to the live system's /etc/apt/sources.list."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:26
+#: en/user_customization-packages.ssi:28
 msgid "$ lb config --mirror-binary http://ftp.debian.org/debian/"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:30
+#: en/user_customization-packages.ssi:32
 msgid ""
 "Note: It is not used for building the live system but to install new "
 "software while using the live system."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:32
+#: en/user_customization-packages.ssi:34
 msgid ""
 "It can be disabled by setting the binary mirror to the same value as the "
 "chroot mirror."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:34
+#: en/user_customization-packages.ssi:36
 msgid ""
 "Note: the same applies for mirror chroot security and mirror binary security"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:39
+#: en/user_customization-packages.ssi:41
 msgid ""
 "$ lb config --mirror-chroot-security {URL} $ lb config --mirror-binary-"
 "security {URL}"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:43
+#: en/user_customization-packages.ssi:45
 msgid "If you don't want to include apt indices, you can skip those with:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:47
+#: en/user_customization-packages.ssi:49
 msgid "$ lb config --binary-indices false"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:51
+#: en/user_customization-packages.ssi:53
 msgid ""
 "This will not influence the entries in /etc/apt/sources.list, but only if /"
 "var/lib/apt contains the indices files or not (and by that making the image "
@@ -239,12 +261,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:53
+#: en/user_customization-packages.ssi:55
 msgid "3~ Own repository"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:55
+#: en/user_customization-packages.ssi:57
 msgid ""
 "To add more repositories (e.g. backports, experimental or custom packages, "
 "etc.), create #{config/chroot_sources/your-repository.{chroot,binary}}# "
@@ -252,7 +274,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:57
+#: en/user_customization-packages.ssi:59
 msgid ""
 "e.g. #{config/chroot_sources/live.chroot}# allows you to install packages "
 "from the debian live snapshot repository at live system build time (you have "
@@ -260,31 +282,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:61
+#: en/user_customization-packages.ssi:63
 msgid "deb http://live.debian.net/ sid-snapshots main contrib non-free"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:65
+#: en/user_customization-packages.ssi:67
 msgid ""
 "If you add the line to #{config/chroot_sources/live.binary}# the repository "
 "will be added to your live-system's #{/etc/apt/sources.list}#."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:67
+#: en/user_customization-packages.ssi:69
 msgid "If such files exist, they will be picked up automatically."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:69
+#: en/user_customization-packages.ssi:71
 msgid ""
 "You can also put the gpg-key used to sign the repository into config/"
 "chroot_sources/your-repository.{binary,chroot}.gpg"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:71
+#: en/user_customization-packages.ssi:73
 msgid ""
 "Note: some preconfigured package repositories are available for easy "
 "selection through the --repository switch, e.g. for enabling live snapshots, "
@@ -292,17 +314,17 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:75
+#: en/user_customization-packages.ssi:77
 msgid "$ lb config --repository live.debian.net"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:79
+#: en/user_customization-packages.ssi:81
 msgid "3~ Package installation"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:81
+#: en/user_customization-packages.ssi:83
 msgid ""
 "You can elect to use either #{apt}# or #{aptitude}# when installing "
 "packages. Which utility is used is governed by the #{LB_APT}# variable in #"
@@ -310,7 +332,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:83
+#: en/user_customization-packages.ssi:85
 msgid ""
 "_* #{apt}#: Specifying a missing package causes package installation to "
 "fail, which may not be the desired behaviour. This is the default setting "
@@ -318,7 +340,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:85
+#: en/user_customization-packages.ssi:87
 msgid ""
 "_* #{aptitude}#: Specifying a missing package causes package installation to "
 "succeed, which may not be the desired behaviour. This is the default setting "
@@ -326,66 +348,66 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:87
+#: en/user_customization-packages.ssi:89
 msgid "2~ Installing additional packages"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:89
+#: en/user_customization-packages.ssi:91
 msgid ""
 "live-helper has a number of mechanisms for indicating that additional "
 "packages should be installed, including:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:91
+#: en/user_customization-packages.ssi:93
 msgid "_* The #{LB_PACKAGES}# variable"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:93
+#: en/user_customization-packages.ssi:95
 msgid "_* Package lists"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:95
+#: en/user_customization-packages.ssi:97
 msgid "_* Local packages (#{chroot_local-packages/}#)"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:97
+#: en/user_customization-packages.ssi:99
 msgid "_* Tasks"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:99
+#: en/user_customization-packages.ssi:101
 msgid "3~ The #{LB_PACKAGES}# variable"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:101
+#: en/user_customization-packages.ssi:103
 msgid ""
 "To install additional packages, simply add them to the #{LB_PACKAGES}# "
 "variable in #{config/chroot}#. For example:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:105
+#: en/user_customization-packages.ssi:107
 msgid "LB_PACKAGES=\"package1 package2 package3 ... \""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:109
+#: en/user_customization-packages.ssi:111
 msgid "You can also specify initial values on the command line:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:113
+#: en/user_customization-packages.ssi:115
 msgid "$ lb config --packages \"package1 package2 package3\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:117
+#: en/user_customization-packages.ssi:119
 msgid ""
 "The behaviour of live-build when specifying a package that does not exist is "
 "determined by your choice of APT utility. See package-installation for more "
@@ -393,12 +415,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:119
+#: en/user_customization-packages.ssi:121
 msgid "% FIXME: <xref linkend=\"package-installation\"/>"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:121
+#: en/user_customization-packages.ssi:123
 msgid ""
 "If you need to specify a large number of packages to be installed or you "
 "need flexibility regarding which packages to install, you should probably be "
@@ -406,17 +428,17 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:123
+#: en/user_customization-packages.ssi:125
 msgid "% FIXME: <xref linkend=\"package-lists\"/>"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:125
+#: en/user_customization-packages.ssi:127
 msgid "3~ Package lists"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:129
 msgid ""
 "Package lists are a powerful way of expressing which packages should be "
 "installed. live-build ships with a number of predefined package lists which "
@@ -425,37 +447,37 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:129
+#: en/user_customization-packages.ssi:131
 msgid "To specify one or more package list, you can use:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:133
+#: en/user_customization-packages.ssi:135
 msgid "$ lb config --packages-lists \"list1 list2 list3\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:137
+#: en/user_customization-packages.ssi:139
 msgid ""
 "Note: Package lists that are distributed with live-build reside in the #{/"
 "usr/share/live/build/lists}# directory."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:139
+#: en/user_customization-packages.ssi:141
 #, no-wrap
 msgid "*{Local packages lists}*\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:141
+#: en/user_customization-packages.ssi:143
 msgid ""
 "You may supplement the supplied lists using local package lists stored in #"
 "{config/chroot_local-packageslists}#."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:143
+#: en/user_customization-packages.ssi:145
 msgid ""
 "Package lists that exist in this directory need to have a #{.list}# suffix "
 "in order to be processed. Local packages lists always override package lists "
@@ -464,13 +486,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:145
+#: en/user_customization-packages.ssi:147
 #, no-wrap
 msgid "*{Local binary packages lists}*\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:147
+#: en/user_customization-packages.ssi:149
 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 "
@@ -480,25 +502,25 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:151
 msgid ""
 "Package lists that exist in this directory need to have a .list suffix in "
 "order to be processed."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:151
+#: en/user_customization-packages.ssi:153
 #, no-wrap
 msgid "*{Extending a provided package list using includes}*\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:162
 msgid "% code{ % % #include <gnome> % iceweasel % % }code"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:162
+#: en/user_customization-packages.ssi:164
 msgid ""
 "The package lists that are included with live-build make extensive use of "
 "includes. They are available to view in the #{/usr/share/live/build/lists}# "
@@ -506,75 +528,75 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:164
+#: en/user_customization-packages.ssi:166
 #, no-wrap
 msgid "*{Using conditionals inside packages lists}*\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:172
 msgid "#if ARCHITECTURE amd64 ia32-libs #endif"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:174
+#: en/user_customization-packages.ssi:176
 msgid "or if #{LB_ARCHITECTURE}# is set to #{i386}# or #{amd64}#:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:180
+#: en/user_customization-packages.ssi:182
 msgid "#if ARCHITECTURE i386 amd64 memtest86+ #endif"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:184
+#: en/user_customization-packages.ssi:186
 msgid "or if #{LB_ARCHIVE_AREAS}# contains either #{contrib}# or #{non-free}#:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:190
+#: en/user_customization-packages.ssi:192
 msgid "#if ARCHIVE_AREAS contrib non-free vrms #endif"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:194
+#: en/user_customization-packages.ssi:196
 msgid "A conditional may surround an #{#include}# directive:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:200
+#: en/user_customization-packages.ssi:202
 msgid "#if ARCHITECTURE amd64 #include <gnome-full> #endif"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:204
+#: en/user_customization-packages.ssi:206
 msgid ""
 "Any live-build configuration variable that begins with #{LB_}# can be tested "
 "in this way."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:206
+#: en/user_customization-packages.ssi:208
 msgid "The nesting of conditionals is not supported."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:208
+#: en/user_customization-packages.ssi:210
 msgid "3~ Tasks"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:210
+#: en/user_customization-packages.ssi:212
 msgid "%FIXME"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:212
+#: en/user_customization-packages.ssi:214
 msgid "2~ Installing modified or third-party packages"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:214
+#: en/user_customization-packages.ssi:216
 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 "
@@ -585,7 +607,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:218
 msgid ""
 "This section does not cover advice regarding building or maintaining "
 "modified packages. Joachim Breitner's 'How to fork privately' method from "
@@ -596,22 +618,22 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:218
+#: en/user_customization-packages.ssi:220
 msgid "There are two ways of installing modified custom packages:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:220
+#: en/user_customization-packages.ssi:222
 msgid "_* #{chroot_local-packages}#"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:222
+#: en/user_customization-packages.ssi:224
 msgid "_* Using a custom APT repository"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:224
+#: en/user_customization-packages.ssi:226
 msgid ""
 "The #{chroot_local-packages}# is simpler to achieve and useful for \"one-off"
 "\" customizations but has a number of drawbacks, whilst using a custom APT "
@@ -619,12 +641,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:226
+#: en/user_customization-packages.ssi:228
 msgid "3~ Using #{chroot_local-packages}# to install custom packages"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:228
+#: en/user_customization-packages.ssi:230
 msgid ""
 "To install a custom package, simply copy it to the #{config/chroot_local-"
 "packages}# directory. Packages that are inside this directory will be "
@@ -633,45 +655,45 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:230
+#: en/user_customization-packages.ssi:232
 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:232
+#: en/user_customization-packages.ssi:234
 msgid ""
 "Using #{chroot_local-packages}# for installation of custom packages has "
 "disadvantages:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:234
+#: en/user_customization-packages.ssi:236
 msgid "_* It is not possible to use secure APT"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:236
+#: en/user_customization-packages.ssi:238
 msgid ""
 "_* You must install all appropriate packages in the #{config/chroot_local-"
 "packages}# directory"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:238
+#: en/user_customization-packages.ssi:240
 msgid ""
 "_* It does not lend itself to storing Debian Live configurations in revision "
 "control"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:240
+#: en/user_customization-packages.ssi:242
 msgid "3~ Using an APT repository to install custom packages"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:242
+#: en/user_customization-packages.ssi:244
 msgid ""
 "Unlike using #{chroot_local-packages}#, when using a custom APT repository "
 "you must ensure that you specify the packages elsewhere. See lb-packages for "
@@ -679,12 +701,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:244
+#: en/user_customization-packages.ssi:246
 msgid "% FIXME: <xref linkend=\"lb-packages\"/>"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:246
+#: en/user_customization-packages.ssi:248
 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 "
@@ -692,12 +714,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:248
+#: en/user_customization-packages.ssi:250
 msgid "3~ Custom packages and APT"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:250
+#: en/user_customization-packages.ssi:252
 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 "
@@ -707,7 +729,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:252
+#: en/user_customization-packages.ssi:254
 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 "
@@ -717,17 +739,17 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:254
+#: en/user_customization-packages.ssi:256
 msgid "% FIXME: <xref linkend=\"apt-preferences\"/>"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:256
+#: en/user_customization-packages.ssi:258
 msgid "3~ Altering APT preferences during Live system"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:257
+#: en/user_customization-packages.ssi:259
 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 "
diff --git a/manual/po/fr/user_customization-internationalization.ssi.po b/manual/po/fr/user_examples.ssi.po
similarity index 57%
copy from manual/po/fr/user_customization-internationalization.ssi.po
copy to manual/po/fr/user_examples.ssi.po
index dc1d045..8e8b835 100644
--- a/manual/po/fr/user_customization-internationalization.ssi.po
+++ b/manual/po/fr/user_examples.ssi.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-22 08:57-0200\n"
-"PO-Revision-Date: 2010-10-16 15:48-0200\n"
+"POT-Creation-Date: 2010-11-04 16:34-0400\n"
+"PO-Revision-Date: 2010-11-04 16:34-0400\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "Language: fr\n"
@@ -39,17 +39,15 @@ msgstr ""
 #: 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/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: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
@@ -64,15 +62,15 @@ msgstr ""
 #: 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_customization-packages.ssi:196 en/user_examples.ssi:24
+#: 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:46
-#: en/user_overview.ssi:90 en/user_overview.ssi:98
+#: 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{"
 
@@ -99,16 +97,14 @@ msgstr "code{"
 #: 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:269 en/user_basics.ssi:285
-#: en/user_basics.ssi:293 en/user_basics.ssi:320 en/user_basics.ssi:359
+#: 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
@@ -124,95 +120,108 @@ msgstr "code{"
 #: 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_customization-packages.ssi:202 en/user_examples.ssi:33
+#: 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:84
-#: en/user_overview.ssi:94 en/user_overview.ssi:102
+#: 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"
+#: en/other_faq.ssi:85 en/other_faq.ssi:247 en/user_examples.ssi:26
+msgid "#!/bin/sh"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-internationalization.ssi:4
-msgid "1~customizing-locale-and-language Customizing locale and language"
+#: en/user_examples.ssi:2
+msgid "B~ Examples"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-internationalization.ssi:6
-msgid "2~ Default locale and keyboard"
+#: en/user_examples.ssi:4
+msgid "1~ Use Case Builds"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-internationalization.ssi:8
+#: en/user_examples.ssi:6
 msgid ""
-"The default locale when building a live cd is \"locales=en_US.UTF-8\", to "
-"set the locale for e.g. Switzerland, you can use \"locales=de_CH.UTF-8\"."
+"This chapter covers example builds for specific use cases with Debian Live."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-internationalization.ssi:12
-msgid "$ lb config --bootappend-live \"locales=de_CH.UTF-8\""
+#: en/user_examples.ssi:8
+msgid "2~ VNC Kiosk Client"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-internationalization.ssi:16
-msgid "The entry for a Swiss-German keyboard would be:"
+#: en/user_examples.ssi:10
+msgid "Create an image with live-build to boot directly to a VNC server."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-internationalization.ssi:20
-msgid "$ lb config --bootappend-live \"keyboard-layouts=ch\""
+#: en/user_examples.ssi:12
+msgid "_* Make a build directory: #{$ mkdir vncBuild}#"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-internationalization.ssi:24
-msgid "Combined, the keyboard and locale configured for Switzerland would be:"
+#: en/user_examples.ssi:14
+msgid "_* Move to the build directory: #{$ cd vncBuild}#"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-internationalization.ssi:28
+#: en/user_examples.ssi:16
 msgid ""
-"$ lb config --bootappend-live =\"locales=de_CH.UTF-8 keyboard-layouts=ch\""
+"Example to config the build directory to include gdm metacity "
+"xtightvncviewer: #{$ lb config --packages \"gdm3 metacity xtightvncviewer\"}#"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-internationalization.ssi:32
+#: en/user_examples.ssi:18
 msgid ""
-"Note: You can find a list of options in the manpage for live-config. "
-"Currently, only UTF-8 locales are supported."
+"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/user_customization-internationalization.ssi:34
-msgid "2~ l10n Packages"
+#: en/user_examples.ssi:20
+msgid ""
+"Create the .xsession for the default user: #{$ touch config/chroot_local-"
+"includes/etc/skel/.xsession}#"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-internationalization.ssi:36
+#: en/user_examples.ssi:22
 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"
+"Edit the .xsession file to launch metacity and start xvncviewer with "
+"something similar to the below:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-internationalization.ssi:40
-msgid "$ lb config --language \"de\""
+#: en/user_examples.ssi:29
+msgid "/usr/bin/metacity & /usr/bin/vncviewer xxx.xxx.xxx.xxx:PORT"
 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}#."
+#: en/user_examples.ssi:31
+msgid "exit"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:35
+msgid "_* Build the image: #{# lb build}#"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:37
+msgid "_* Enjoy."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:39
+msgid "2~ Next Example FIXME"
 msgstr ""
diff --git a/manual/po/fr/user_managing_a_configuration.ssi.po b/manual/po/fr/user_managing_a_configuration.ssi.po
index cd76359..a2ca66a 100644
--- a/manual/po/fr/user_managing_a_configuration.ssi.po
+++ b/manual/po/fr/user_managing_a_configuration.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-13 17:00+0300\n"
+"POT-Creation-Date: 2010-10-28 16:34-0200\n"
 "PO-Revision-Date: 2010-10-13 17:00+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,8 +17,8 @@ msgstr ""
 "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: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
@@ -41,14 +41,15 @@ msgstr ""
 #: 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/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/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
@@ -67,17 +68,17 @@ msgstr ""
 #: 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:105
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
+#: 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:60
-#: en/user_overview.ssi:104 en/user_overview.ssi:112
+#: 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:86 en/about_manual.ssi:94 en/about_manual.ssi:102
+#: 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
@@ -101,14 +102,15 @@ msgstr "code{"
 #: 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/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
@@ -126,11 +128,12 @@ msgstr "code{"
 #: 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:109 en/user_installation.ssi:124
-#: en/user_installation.ssi:139 en/user_managing_a_configuration.ssi:31
+#: 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:98
-#: en/user_overview.ssi:108 en/user_overview.ssi:116
+#: 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"
 
@@ -141,7 +144,7 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_managing_a_configuration.ssi:4
-msgid "1~ Managing a configuration"
+msgid "1~managing-a-configuration Managing a configuration"
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/po/fr/user_overview.ssi.po b/manual/po/fr/user_overview.ssi.po
index 14fffdc..9c055a4 100644
--- a/manual/po/fr/user_overview.ssi.po
+++ b/manual/po/fr/user_overview.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-22 07:52-0200\n"
+"POT-Creation-Date: 2010-10-28 16:34-0200\n"
 "PO-Revision-Date: 2010-10-21 07:06-0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -41,16 +41,17 @@ msgstr ""
 #: 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/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/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
@@ -67,12 +68,12 @@ msgstr ""
 #: 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_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:46
-#: en/user_overview.ssi:90 en/user_overview.ssi:98
+#: 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{"
 
@@ -101,16 +102,16 @@ msgstr "code{"
 #: 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:269 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/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
@@ -127,12 +128,12 @@ msgstr "code{"
 #: 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_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:84
-#: en/user_overview.ssi:94 en/user_overview.ssi:102
+#: 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"
 
@@ -210,88 +211,37 @@ msgstr ""
 #. type: Plain text
 #: en/user_overview.ssi:22
 msgid ""
-"Besides the common config/common, which is used by all live-build commands, "
-"some additional files can be used to configure the behavior of specific "
-"helper commands. These files are typically named config/command or config/"
-"stage (where \"stage\", of course, is replaced with the name of the stage "
-"that they belong to, and \"command\" with the name of the command)."
-msgstr ""
-
-#. type: Plain text
-#: en/user_overview.ssi:24
-msgid ""
-"For example, the #{lb_bootstrap_debootstrap}# command uses files named "
-"config/bootstrap and config/bootstrap_debootstrap to read the options it "
-"will use. Generally, these files contain variables with values assigned, one "
-"variable per line. Some commands of live-buil use pairs of values or "
-"slightly more complicated variable assignments."
-msgstr ""
-
-#. type: Plain text
-#: en/user_overview.ssi:26
-msgid ""
-"live-build respects environment variables which are present in the context "
-"of the shell it is running. If variables can be read from config files, then "
-"they override environment variables, and if command line options are used, "
-"they override values from config files. If no value for a given variable can "
-"be found (and is thus unset), live-build will automatically set it to a "
-"default value."
-msgstr ""
-
-#. type: Plain text
-#: en/user_overview.ssi:28
-msgid ""
-"All config files are shell scripts which are sourced by a live-build "
-"command. That means they have to follow the normal shell syntax. You can "
-"also put comments in these files; lines beginning with \"#\" are ignored."
-msgstr ""
-
-#. type: Plain text
-#: en/user_overview.ssi:30
-msgid ""
-"In some rare cases you may want to have different versions of these files "
-"for different architectures or distributions. If files named config/stage."
-"arch or config/stage_command.arch, and config/stage.dist or config/"
-"stage_command.dist exist (where \"arch\" is the same as the output of dpkg --"
-"print-architecture and \"dist\" is the same as the codename of the target "
-"distribution), then they will be used in preference to the other, more "
-"general files."
-msgstr ""
-
-#. type: Plain text
-#: en/user_overview.ssi:32
-msgid ""
 "The remainder of this section discusses the three most important commands:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:34
+#: 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 ""
 
 #. type: Plain text
-#: en/user_overview.ssi:36
+#: 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 ""
 
 #. type: Plain text
-#: en/user_overview.ssi:38
+#: 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 ""
 
 #. type: Plain text
-#: en/user_overview.ssi:40
+#: en/user_overview.ssi:30
 msgid "3~lb-config The #{lb config}# command"
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:42
+#: 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 "
@@ -301,26 +251,26 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:44
+#: en/user_overview.ssi:34
 msgid ""
 "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:49
+#: en/user_overview.ssi:39
 msgid "$ lb config P: Creating config tree"
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:54
+#: en/user_overview.ssi:44
 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"
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:82
+#: en/user_overview.ssi:72
 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 "
@@ -345,54 +295,50 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:86
+#: en/user_overview.ssi:76
 msgid ""
 "Using #{lb config}# without any arguments would be suitable for users who "
-"are either happy editing the generated files, or are simply happy with the "
-"defaults it creates."
+"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 ""
 
 #. type: Plain text
-#: en/user_overview.ssi:88
+#: en/user_overview.ssi:78
 msgid ""
-"You can ask #{lb config}# to generate a config/ directory \"preseeded\" with "
-"various options. This might be suitable if you do not require the default "
-"settings but do not need to change a large number of options. For example:"
+"Normally, you will want to specify some options. For example, to include the "
+"'gnome' package list in your configuration:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:92
+#: en/user_overview.ssi:82
 msgid "$ lb config -p gnome"
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:96
-msgid ""
-"will build a config/ directory configured to include the 'gnome' package "
-"list. It is possible to specify many options:"
+#: en/user_overview.ssi:86
+msgid "It is possible to specify many options, such as:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:100
+#: en/user_overview.ssi:90
 msgid ""
 "$ lb config --binary-images net --hostname live-machine --username live-"
 "user ..."
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:104
-msgid ""
-"A full list of options is available in the #{lb_config}# man page. Most "
-"options have a parallel with an \"LB_\" prefixed variable."
+#: en/user_overview.ssi:94
+msgid "A full list of options is available in the #{lb_config}# man page."
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:106
+#: en/user_overview.ssi:96
 msgid "3~lb-build The #{lb build}# command"
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:108
+#: 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 "
@@ -400,33 +346,33 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:110
+#: en/user_overview.ssi:100
 msgid "3~lb-clean The #{lb clean}# command"
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:112
+#: 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 ""
 
 #. type: Plain text
-#: en/user_overview.ssi:114
+#: en/user_overview.ssi:104
 msgid "2~live-boot The live-boot package"
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:116
+#: 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."
+"as those created by live-build. This includes the Debian Live ISOs, netboot "
+"tarballs, and USB stick images."
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:118
+#: 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 "
@@ -435,7 +381,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:120
+#: 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 "
@@ -443,12 +389,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:122
+#: en/user_overview.ssi:112
 msgid "2~live-config The live-config package"
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:124
+#: 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 "
diff --git a/manual/po/pt_BR/live-manual.ssm.po b/manual/po/pt_BR/live-manual.ssm.po
index 22c7880..d234391 100644
--- a/manual/po/pt_BR/live-manual.ssm.po
+++ b/manual/po/pt_BR/live-manual.ssm.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-25 23:12+0300\n"
+"POT-Creation-Date: 2010-11-13 16:15+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-10-25\n"
+" :published: 2010-11-13\n"
 msgstr ""
 
 #. type: Plain text
@@ -146,11 +146,21 @@ msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:55
+msgid ":B~ Examples ~#"
+msgstr ""
+
+#. type: Plain text
+#: en/live-manual.ssm:57
+msgid "<< user_examples.ssi"
+msgstr ""
+
+#. type: Plain text
+#: en/live-manual.ssm:59
 msgid ":B~ Other ~#"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:61
+#: en/live-manual.ssm:65
 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 "
@@ -160,76 +170,71 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:63
+#: en/live-manual.ssm:67
 msgid "% << other_customization-bootup.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:65
+#: en/live-manual.ssm:69
 msgid "% << other_customization-binary.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:67
+#: en/live-manual.ssm:71
 msgid "% << other_customization-backports.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:69
+#: en/live-manual.ssm:73
 msgid "% << other_common-tasks.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:71
+#: en/live-manual.ssm:75
 msgid "% << other_live-environment.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:73
+#: en/live-manual.ssm:77
 msgid "% << other_faq.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:75
+#: en/live-manual.ssm:79
 msgid "% << other_howtos.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:77
+#: en/live-manual.ssm:81
 msgid "% << other_coding-style.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:79
+#: en/live-manual.ssm:83
 msgid "% << other_procedures.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:81
+#: en/live-manual.ssm:85
 msgid "% << other_resources.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:83
-msgid "% << other_use-cases.ssi"
-msgstr ""
-
-#. type: Plain text
-#: en/live-manual.ssm:85
+#: en/live-manual.ssm:87
 msgid "% << other_success-stories.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:87
+#: en/live-manual.ssm:89
 msgid "% << other_troubleshooting.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:89
+#: en/live-manual.ssm:91
 msgid "% << other_configuration-layout.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:90
+#: en/live-manual.ssm:92
 msgid "% << other_configuration-files.ssi"
 msgstr ""
diff --git a/manual/po/pt_BR/other_live-environment.ssi.po b/manual/po/pt_BR/other_live-environment.ssi.po
index b45dbfa..f4e852e 100644
--- a/manual/po/pt_BR/other_live-environment.ssi.po
+++ b/manual/po/pt_BR/other_live-environment.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-03 20:30+0300\n"
+"POT-Creation-Date: 2010-10-28 07:47-0200\n"
 "PO-Revision-Date: 2010-10-03 20:30+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,8 +17,8 @@ msgstr ""
 "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: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
@@ -26,56 +26,59 @@ msgstr ""
 #: 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/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/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-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-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: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_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: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
+#: 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:46
+#: en/user_overview.ssi:90 en/user_overview.ssi:98
 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: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
@@ -84,17 +87,12 @@ msgstr "code{"
 #: 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_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
@@ -104,30 +102,38 @@ msgstr "code{"
 #: 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/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: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_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: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
+#: 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:84
+#: en/user_overview.ssi:94 en/user_overview.ssi:102
 msgid "}code"
 msgstr "}code"
 
@@ -349,9 +355,9 @@ msgstr ""
 #. type: Plain text
 #: en/other_live-environment.ssi:103
 msgid ""
-"A live cd paradigm is a preinstalled 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 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
@@ -359,7 +365,7 @@ msgstr ""
 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 runtime evolutions of the system "
+"should be considered read-only and all the run-time evolutions of the system "
 "are lost at shutdown."
 msgstr ""
 
@@ -367,7 +373,7 @@ msgstr ""
 #: en/other_live-environment.ssi:108
 msgid ""
 "Persistence is a common name for different kinds of solutions for saving "
-"across reboots some, or all, of this runtime evolution of the system. To "
+"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 "
@@ -396,7 +402,7 @@ msgid ""
 "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 bootime and the system must be started with the "
+"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 ""
@@ -473,7 +479,7 @@ msgid ""
 "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 runtime could lead to "
+"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 "
@@ -519,8 +525,8 @@ msgstr ""
 #. type: Plain text
 #: en/other_live-environment.ssi:159
 msgid ""
-"The runtime 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-initramfs mounts all /"
-"live filesystem in order or with the module bootparameter."
+"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-initramfs "
+"mounts all /live filesystem in order or with the module boot parameter."
 msgstr ""
diff --git a/manual/po/pt_BR/project_bugs.ssi.po b/manual/po/pt_BR/project_bugs.ssi.po
index a69dabe..553bccf 100644
--- a/manual/po/pt_BR/project_bugs.ssi.po
+++ b/manual/po/pt_BR/project_bugs.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-25 23:27+0300\n"
+"POT-Creation-Date: 2010-10-27 21:40-0200\n"
 "PO-Revision-Date: 2010-10-25 23:27+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -42,14 +42,14 @@ msgstr ""
 #: 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:34 en/user_basics.ssi:44
-#: en/user_basics.ssi:56 en/user_basics.ssi:68 en/user_basics.ssi:80
-#: en/user_basics.ssi:92 en/user_basics.ssi:106 en/user_basics.ssi:114
-#: en/user_basics.ssi:122 en/user_basics.ssi:132 en/user_basics.ssi:144
-#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
-#: en/user_basics.ssi:186 en/user_basics.ssi:194 en/user_basics.ssi:204
-#: en/user_basics.ssi:224 en/user_basics.ssi:257 en/user_basics.ssi:273
-#: en/user_basics.ssi:281 en/user_basics.ssi:301 en/user_basics.ssi:326
+#: 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/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
@@ -102,15 +102,15 @@ msgstr "code{"
 #: 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:38
-#: en/user_basics.ssi:48 en/user_basics.ssi:62 en/user_basics.ssi:72
-#: en/user_basics.ssi:86 en/user_basics.ssi:98 en/user_basics.ssi:110
-#: en/user_basics.ssi:118 en/user_basics.ssi:126 en/user_basics.ssi:136
-#: en/user_basics.ssi:150 en/user_basics.ssi:160 en/user_basics.ssi:168
-#: en/user_basics.ssi:176 en/user_basics.ssi:190 en/user_basics.ssi:198
-#: en/user_basics.ssi:208 en/user_basics.ssi:249 en/user_basics.ssi:261
-#: en/user_basics.ssi:277 en/user_basics.ssi:285 en/user_basics.ssi:312
-#: en/user_basics.ssi:351 en/user_customization-contents.ssi:39
+#: 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
@@ -400,7 +400,7 @@ msgstr ""
 
 #. type: Plain text
 #: en/project_bugs.ssi:86
-msgid "3~ At boot-time"
+msgid "3~ At boot time"
 msgstr ""
 
 #. type: Plain text
@@ -416,7 +416,7 @@ msgstr ""
 
 #. type: Plain text
 #: en/project_bugs.ssi:90
-msgid "3~ At run-time"
+msgid "3~ At run time"
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/po/pt_BR/user_basics.ssi.po b/manual/po/pt_BR/user_basics.ssi.po
index 6c3300c..0ab51a8 100644
--- a/manual/po/pt_BR/user_basics.ssi.po
+++ b/manual/po/pt_BR/user_basics.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-23 16:43+0300\n"
+"POT-Creation-Date: 2010-11-01 06:47-0200\n"
 "PO-Revision-Date: 2010-10-20 06:53-0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -41,16 +41,17 @@ msgstr ""
 #: 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:34
-#: en/user_basics.ssi:44 en/user_basics.ssi:56 en/user_basics.ssi:68
-#: en/user_basics.ssi:80 en/user_basics.ssi:92 en/user_basics.ssi:106
-#: en/user_basics.ssi:114 en/user_basics.ssi:122 en/user_basics.ssi:132
-#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
-#: en/user_basics.ssi:172 en/user_basics.ssi:186 en/user_basics.ssi:194
-#: en/user_basics.ssi:204 en/user_basics.ssi:224 en/user_basics.ssi:257
-#: en/user_basics.ssi:273 en/user_basics.ssi:281 en/user_basics.ssi:301
-#: en/user_basics.ssi:326 en/user_customization-contents.ssi:34
-#: en/user_customization-contents.ssi:43 en/user_customization-contents.ssi:66
+#: 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/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
@@ -71,8 +72,8 @@ msgstr ""
 #: 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:46
-#: en/user_overview.ssi:90 en/user_overview.ssi:98
+#: 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{"
 
@@ -101,16 +102,16 @@ msgstr "code{"
 #: 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:38 en/user_basics.ssi:48
-#: en/user_basics.ssi:62 en/user_basics.ssi:72 en/user_basics.ssi:86
-#: en/user_basics.ssi:98 en/user_basics.ssi:110 en/user_basics.ssi:118
-#: en/user_basics.ssi:126 en/user_basics.ssi:136 en/user_basics.ssi:150
-#: en/user_basics.ssi:160 en/user_basics.ssi:168 en/user_basics.ssi:176
-#: en/user_basics.ssi:190 en/user_basics.ssi:198 en/user_basics.ssi:208
-#: en/user_basics.ssi:249 en/user_basics.ssi:261 en/user_basics.ssi:277
-#: en/user_basics.ssi:285 en/user_basics.ssi:312 en/user_basics.ssi:351
-#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
-#: en/user_customization-contents.ssi:70
+#: 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
@@ -131,8 +132,8 @@ msgstr "code{"
 #: 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:84
-#: en/user_overview.ssi:94 en/user_overview.ssi:102
+#: 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"
 
@@ -149,8 +150,8 @@ msgstr ""
 #. type: Plain text
 #: en/user_basics.ssi:6
 msgid ""
-"This chapter contains a brief overview of the build process as well as "
-"containing instructions on how to boot the various binary image types."
+"This chapter contains a brief overview of the build process and instructions "
+"for booting the various binary image types."
 msgstr ""
 
 #. type: Plain text
@@ -162,9 +163,9 @@ msgstr ""
 #: en/user_basics.ssi:10
 msgid ""
 "A live system usually means an operating system booted on a computer from a "
-"removable medium (such as CD-ROM, USB stick, or network), ready to use "
-"without any installation on the usual drive(s), with an auto-configuration "
-"done at runtime (see {Terms}#terms )."
+"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 ""
 
 #. type: Plain text
@@ -172,294 +173,291 @@ msgstr ""
 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 following parts:"
+"is made from the following parts:"
 msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:14
-msgid "_* Linux kernel"
+msgid "_* *{Linux kernel image}*, usually named #{vmlinuz*}#"
 msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:16
-msgid "_* The Linux image, usually named #{vmlinuz*}#"
-msgstr ""
-
-#. type: Plain text
-#: en/user_basics.ssi:18
 msgid ""
-"_* *{Initial RAM disk image (initrd)}*: RAM disk setup for the Linux boot, "
-"containing modules possibly needed to mount the filesystem's image and some "
+"_* *{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 ""
 
 #. type: Plain text
-#: en/user_basics.ssi:20
+#: en/user_basics.ssi:18
 msgid ""
-"_* *{System image}*: The operating systems filesystem image. The SquashFS "
-"compressed filesystem is used to minimize the Debian Live image size. Note "
-"that it's 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 partition(s) are used (see 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)."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:22
+#: en/user_basics.ssi:20
 msgid "% FIXME: <xref linkend=\"persistence\"/>"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:24
+#: en/user_basics.ssi:22
 msgid ""
-"_* *{Bootloader}*: A small piece of code, crafted to boot up from the chosen "
+"_* *{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 then loads the Linux kernel and its initrd to run with an "
-"associated filesystem image. Different solutions can be used depending on "
-"the target media and format of the filesystem containing the previous "
-"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 partition, "
-"etc."
+"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 ""
 
 #. type: Plain text
-#: en/user_basics.ssi:26
+#: en/user_basics.ssi:24
 msgid ""
-"_* live-build will build the system image from your specifications, setup a "
-"Linux kernel and its initrd, 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.)"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:28
+#: en/user_basics.ssi:26
 msgid "2~ First steps: building an ISO image"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:30
+#: en/user_basics.ssi:28
 msgid ""
-"The following sequence of commands, provided by live-build, will create a "
-"basic ISO image containing just the Debian standard system without X.org. It "
-"is suitable for burning to CD or DVD media."
+"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 ""
 
 #. type: Plain text
-#: en/user_basics.ssi:32
+#: en/user_basics.ssi:30
 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:36
+#: en/user_basics.ssi:34
 msgid "$ lb config"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:40
+#: en/user_basics.ssi:38
 msgid ""
-"By passing no parameters to #{lb config}# we indicated that we wish to use "
-"the defaults (see {The lb config command}#lb-config )."
+"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:42
+#: en/user_basics.ssi:40
 msgid ""
 "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:46 en/user_basics.ssi:124 en/user_basics.ssi:206
+#: en/user_basics.ssi:44 en/user_basics.ssi:120 en/user_basics.ssi:202
 msgid "# lb build"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:50
+#: en/user_basics.ssi:48
 msgid ""
 "This process can take a while, depending on the speed of your network "
-"connection (see {The lb build command}#lb-build )."
+"connection (see {The lb build command}#lb-build)."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:52
+#: en/user_basics.ssi:50
 msgid "3~ Testing an ISO image with Qemu"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:54
+#: en/user_basics.ssi:52
 msgid "Testing an ISO is simple:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:58 en/user_basics.ssi:146
+#: en/user_basics.ssi:56 en/user_basics.ssi:142
 msgid "# apt-get install qemu"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:60
+#: en/user_basics.ssi:58
 msgid "$ qemu -cdrom binary.iso"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:64
+#: en/user_basics.ssi:62
 msgid "3~ Testing an ISO image with virtualbox-ose"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:66
+#: en/user_basics.ssi:64
 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"
+msgstr ""
+
+#. type: Plain text
 #: en/user_basics.ssi:70
-msgid "# apt-get install virtualbox-ose"
+msgid "$ virtualbox"
 msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:74
 msgid ""
-"and either install #{virtualbox-ose-source}# or #{virtualbox-ose-dkms}# to "
-"build the required kernel modules to run virtualbox-ose."
+"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
 msgid ""
-"After successful installation, virtualbox can be e.g. found in the GNOME "
-"menu under 'Applications/System Tools/VirtualBox OSE'."
+"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 ""
 
 #. type: Plain text
-#: en/user_basics.ssi:78
-msgid ""
-"Please consider including of following packages onto the live image to "
-"achieve higher resolution of the display when booting the live image in "
-"virutalbox-ose (1280x1024 instead of 800x600 and in particular if the "
-"default resolution of the virtualbox-ose display shouldn't work with the gui-"
-"installer)."
+#: en/user_basics.ssi:80
+msgid "# lb config --packages virtualbox-ose-guest-x11"
 msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:84
-msgid ""
-"virtualbox-ose-guest-dkms virtualbox-ose-guest-utils virtualbox-ose-guest-x11"
-msgstr ""
-
-#. type: Plain text
-#: en/user_basics.ssi:88
 msgid "3~ Burning an ISO image to a physical medium"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:90
+#: en/user_basics.ssi:86
 msgid "Burning an ISO image is easy:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:94
+#: en/user_basics.ssi:90
 msgid "# apt-get install wodim"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:96
+#: en/user_basics.ssi:92
 msgid "$ wodim binary.iso"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:100
-msgid "2~ Building an USB/HDD image"
+#: en/user_basics.ssi:96
+msgid "2~ Building a USB/HDD image"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:102
+#: en/user_basics.ssi:98
 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."
+"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 ""
 
 #. type: Plain text
-#: en/user_basics.ssi:104
+#: en/user_basics.ssi:100
 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 ):"
+"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 ""
 
 #. type: Plain text
-#: en/user_basics.ssi:108 en/user_basics.ssi:188
+#: en/user_basics.ssi:104 en/user_basics.ssi:184
 msgid "$ lb clean --binary"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:112
+#: en/user_basics.ssi:108
 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:116
+#: en/user_basics.ssi:112
 msgid "$ lb config -b usb-hdd"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:120
+#: en/user_basics.ssi:116
 msgid "Now build the image with the #{lb build} command:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:128
-msgid "3~ Copying USB/HDD image to a USB stick"
+#: en/user_basics.ssi:124
+msgid "3~copying-usb-hdd-image Copying USB/HDD image to a USB stick"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:130
+#: en/user_basics.ssi:126
 msgid ""
 "The generated binary image contains a VFAT partition and the syslinux "
-"bootloader, ready to be directly written on an USB stick. Plug in an USB "
-"stick with a size larger than that of binary.img and type:"
+"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 ""
 
 #. type: Plain text
-#: en/user_basics.ssi:134
+#: en/user_basics.ssi:130
 msgid "$ dd if=binary.img of=${USBSTICK}"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:138
+#: en/user_basics.ssi:134
 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."
+"looking in #{dmesg}#'s output after plugging in the stick, for example, or "
+"better yet, #{ls -l /dev/disk/by-id}#."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:140
+#: en/user_basics.ssi:136
 #, no-wrap
 msgid "*{This will definitely overwrite any previous contents on your stick!}*\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:142
+#: en/user_basics.ssi:138
 msgid "3~ Testing a USB/HDD image with Qemu"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:148
+#: en/user_basics.ssi:144
 msgid "$ qemu -hda binary.img"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:152
+#: en/user_basics.ssi:148
 msgid "3~ Using the space left on a USB stick"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:154
+#: 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}"
@@ -468,45 +466,45 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:158
+#: en/user_basics.ssi:154
 msgid "# gparted ${USBSTICK}"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:162
+#: en/user_basics.ssi:158
 msgid ""
-"Ater the creation of the partition you have to create a filsystem on it. One "
-"possible choice would be ext4."
+"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:166
+#: en/user_basics.ssi:162
 msgid "# mkfs.ext4 ${USBSTICK}"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:170
+#: 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:174
+#: en/user_basics.ssi:170
 msgid "# mkfs.vfat -F 32"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:178
+#: en/user_basics.ssi:174
 #, no-wrap
-msgid "*{Remember: Every time you install a new binary.img on the stick, all your data will be lost because the image includes a complete partition table.}*\n"
+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:180
+#: en/user_basics.ssi:176
 msgid "2~ Building a netboot image"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:182
+#: 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 "
@@ -514,99 +512,99 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:184
+#: en/user_basics.ssi:180
 msgid ""
-"Note if you performed any previous examples, you will need to clean up your "
+"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:192
+#: en/user_basics.ssi:188
 msgid ""
 "Run the #{lb config}# command with the parameters to configure the \"config/"
 "\" hierarchy to create our netboot image:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:196
+#: en/user_basics.ssi:192
 msgid ""
 "$ lb config -b net --net-root-path \"/srv/debian-live\" --net-root-server "
 "\"192.168.0.1\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:200
+#: 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 "
+"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."
+"located at boot time."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:202
+#: en/user_basics.ssi:198
 msgid "Now build the image with the #{lb build}# command:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:210
+#: en/user_basics.ssi:206
 msgid ""
-"In a network boot the client runs a small piece of software, which usually "
+"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 boot loader via the TFTP protocol. That "
-"could be PXELINUX, Grub or even boot directly to an operating system like "
+"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 ""
 
 #. type: Plain text
-#: en/user_basics.ssi:212
+#: 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 "
+"filesystem.squashfs and the kernel, initrd and pxelinux bootloader in "
 "tftpboot/debian-live/i386."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:214
+#: en/user_basics.ssi:210
 msgid "We must now configure three services on the server to enable netboot."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:216
+#: en/user_basics.ssi:212
 msgid "3~ DHCP server"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:218
+#: en/user_basics.ssi:214
 msgid ""
 "We must configure our network's DHCP server to be sure to give an IP address "
-"to the computer netbooting, and to advertise the location of the PXE "
+"to the netbooting client system, and to advertise the location of the PXE "
 "bootloader."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:220
+#: 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 ""
 
 #. type: Plain text
-#: en/user_basics.ssi:222 en/user_customization-packages.ssi:153
+#: en/user_basics.ssi:218 en/user_customization-packages.ssi:153
 msgid "% FIXME"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:226
+#: en/user_basics.ssi:222
 #, no-wrap
 msgid "subnet 192.168.1.0 netmask 255.255.255.0 {   # 192.168.1.0/24\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:229
+#: en/user_basics.ssi:225
 #, no-wrap
 msgid ""
 "  # IP addresses available for guests\n"
@@ -614,7 +612,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:232
+#: en/user_basics.ssi:228
 #, no-wrap
 msgid ""
 "  # allow booting from the net\n"
@@ -622,7 +620,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:237
+#: en/user_basics.ssi:233
 #, no-wrap
 msgid ""
 "  # for net booting, server where the first file to be loaded (by TFTP\n"
@@ -632,7 +630,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:241
+#: en/user_basics.ssi:237
 #, no-wrap
 msgid ""
 "  # net boot configuration for guests with a PXE client:\n"
@@ -641,15 +639,15 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:244
+#: en/user_basics.ssi:240
 #, no-wrap
 msgid ""
-"    # PXE boot loader (first program to be loaded, by TFTP)\n"
+"    # PXE bootloader (first program to be loaded, by TFTP)\n"
 "    filename \"pxelinux.0\";\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:247
+#: en/user_basics.ssi:243
 #, no-wrap
 msgid ""
 "  }\n"
@@ -657,17 +655,17 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:251
+#: en/user_basics.ssi:247
 msgid "3~ TFTP server"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:253
-msgid "This serves the kernel and initial ramdisk to the system at run-time."
+#: en/user_basics.ssi:249
+msgid "This serves the kernel and initial ramdisk to the system at run time."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:255
+#: en/user_basics.ssi:251
 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 /"
@@ -675,22 +673,22 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:259
+#: en/user_basics.ssi:255
 msgid "dpkg-reconfigure -plow tftpd-hpa"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:263
+#: en/user_basics.ssi:259
 msgid "and fill in the new tftp server directory when being asked about it."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:265
+#: en/user_basics.ssi:261
 msgid "3~ NFS server"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:267
+#: en/user_basics.ssi:263
 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 "
@@ -698,35 +696,35 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:269
+#: en/user_basics.ssi:265
 msgid "You need to install the nfs-kernel-server package."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:271
+#: en/user_basics.ssi:267
 msgid ""
 "Then, make the filesystem image available through NFS by adding a line like "
 "the following to /etc/exports:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:275
+#: en/user_basics.ssi:271
 msgid "/srv/debian-live *(ro,async,no_root_squash,no_subtree_check)"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:279
+#: en/user_basics.ssi:275
 msgid ""
 "and tell the NFS server about this new export with the following command:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:283
+#: en/user_basics.ssi:279
 msgid "# exportfs -rv"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:287
+#: en/user_basics.ssi:283
 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 "
@@ -735,40 +733,40 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:289
+#: en/user_basics.ssi:285
 msgid "3~ Netboot testing HowTo"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:291
+#: en/user_basics.ssi:287
 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:293
+#: en/user_basics.ssi:289
 msgid ""
 "To make our life easier, we can use virtualization. There are two solutions."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:295
+#: en/user_basics.ssi:291
 msgid "3~ Qemu"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:297
+#: en/user_basics.ssi:293
 msgid "_* Install qemu, bridge-utils, sudo."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:299
+#: en/user_basics.ssi:295
 msgid "Edit /etc/qemu-ifup:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:310
+#: en/user_basics.ssi:306
 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...\" "
@@ -777,62 +775,62 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:314
+#: en/user_basics.ssi:310
 msgid "Get, or build a grub-floppy-netboot (in the svn)."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:316
+#: en/user_basics.ssi:312
 msgid "Launch qemu with \"-net nic,vlan=0 -net tap,vlan=0,ifname=tun0\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:318
+#: en/user_basics.ssi:314
 msgid "3~ VMWare Player"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:320
+#: en/user_basics.ssi:316
 msgid "_* Install VMWare Player (\"free as in beer\" edition)"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:322
+#: en/user_basics.ssi:318
 msgid ""
 "_* Create a PXETester directory, and create a text file called pxe.vwx inside"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:324
+#: en/user_basics.ssi:320
 msgid "_* Paste this text inside:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:332
+#: en/user_basics.ssi:328
 msgid ""
 "#!/usr/bin/vmware config.version = \"8\" virtualHW.version = \"4\" memsize = "
 "\"512\" MemAllowAutoScaleDown = \"FALSE\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:338
+#: en/user_basics.ssi:334
 msgid ""
 "ide0:0.present = \"FALSE\" ide1:0.present = \"FALSE\" floppy0.present = "
 "\"FALSE\" sound.present = \"FALSE\" tools.remindInstall = \"FALSE\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:341
+#: en/user_basics.ssi:337
 msgid "ethernet0.present = \"TRUE\" ethernet0.addressType = \"generated\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:344
+#: en/user_basics.ssi:340
 msgid "displayName = \"Test Boot PXE\" guestOS = \"other\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:349
+#: en/user_basics.ssi:345
 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 "
@@ -840,19 +838,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:353
+#: en/user_basics.ssi:349
 msgid ""
 "_* You can play with this configuration file (i.e. change memory limit to "
 "256)"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:355
+#: en/user_basics.ssi:351
 msgid ""
-"_* Double click on this file (or run VMWare player and selecet this file)."
+"_* Double click on this file (or run VMWare player and select this file)."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:356
+#: en/user_basics.ssi:352
 msgid "_* When running just press space if that strange question comes up..."
 msgstr ""
diff --git a/manual/po/pt_BR/user_customization-internationalization.ssi.po b/manual/po/pt_BR/user_customization-internationalization.ssi.po
index b6d9fb5..1b95502 100644
--- a/manual/po/pt_BR/user_customization-internationalization.ssi.po
+++ b/manual/po/pt_BR/user_customization-internationalization.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-22 08:57-0200\n"
+"POT-Creation-Date: 2010-10-28 09:15-0200\n"
 "PO-Revision-Date: 2010-10-22 08:57-0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -41,16 +41,17 @@ msgstr ""
 #: 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/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/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
@@ -67,8 +68,8 @@ msgstr ""
 #: 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_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:46
@@ -101,16 +102,16 @@ msgstr "code{"
 #: 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:269 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/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
@@ -127,8 +128,8 @@ msgstr "code{"
 #: 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_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:84
@@ -154,8 +155,8 @@ msgstr ""
 #. type: Plain text
 #: en/user_customization-internationalization.ssi:8
 msgid ""
-"The default locale when building a live cd is \"locales=en_US.UTF-8\", to "
-"set the locale for e.g. Switzerland, you can use \"locales=de_CH.UTF-8\"."
+"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
diff --git a/manual/po/pt_BR/user_customization-overview.ssi.po b/manual/po/pt_BR/user_customization-overview.ssi.po
index fa980d5..96e386a 100644
--- a/manual/po/pt_BR/user_customization-overview.ssi.po
+++ b/manual/po/pt_BR/user_customization-overview.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-22 08:57-0200\n"
+"POT-Creation-Date: 2010-11-11 11:58-0400\n"
 "PO-Revision-Date: 2010-10-22 08:57-0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -27,18 +27,112 @@ msgid "1~customization-overview Customization overview"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-overview.ssi:7
+#: en/user_customization-overview.ssi:6
 msgid ""
-"% FIXME: just a stub for now.  In conversational style, cover the different "
-"kinds of customization % and link to each section within the text."
+"This chapter gives an overview of the various ways in which you may "
+"customize a Debian Live system."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-overview.ssi:9
+#: en/user_customization-overview.ssi:8
+msgid "2~ Build time vs. boot time configuration"
+msgstr ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. type: Plain text
+#: en/user_customization-overview.ssi:14
+msgid "2~stages-of-the-build Stages of the build"
+msgstr ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. type: Plain text
+#: en/user_customization-overview.ssi:20
+msgid "2~ Supplement lb config with files"
+msgstr ""
+
+#. 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 ""
+
+#. type: Plain text
+#: en/user_customization-overview.ssi:24
+msgid "2~ Customization tasks"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-overview.ssi:26
 msgid ""
-"This chapter gives an overview of the various ways in which your Debian live "
-"systems may be customized. See sections {Customizing package installation}"
-"#customizing-package-installation, {Customizing contents}#customizing-"
-"contents and {Customizing locale and language}#customizing-locale-and-"
-"language."
+"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 ""
diff --git a/manual/po/pt_BR/user_customization-packages.ssi.po b/manual/po/pt_BR/user_customization-packages.ssi.po
index 143ae89..241b965 100644
--- a/manual/po/pt_BR/user_customization-packages.ssi.po
+++ b/manual/po/pt_BR/user_customization-packages.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-22 08:58-0200\n"
+"POT-Creation-Date: 2010-11-12 16:21-0400\n"
 "PO-Revision-Date: 2010-10-22 08:58-0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -39,40 +39,38 @@ msgstr ""
 #: 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/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: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_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_customization-packages.ssi:14 en/user_customization-packages.ssi:26
+#: en/user_customization-packages.ssi:38 en/user_customization-packages.ssi:47
+#: en/user_customization-packages.ssi:61 en/user_customization-packages.ssi:75
+#: en/user_customization-packages.ssi:105
+#: en/user_customization-packages.ssi:113
+#: en/user_customization-packages.ssi:133
+#: en/user_customization-packages.ssi:168
+#: en/user_customization-packages.ssi:178
+#: en/user_customization-packages.ssi:188
+#: en/user_customization-packages.ssi:198 en/user_examples.ssi:24
+#: 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:46
-#: en/user_overview.ssi:90 en/user_overview.ssi:98
+#: 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{"
 
@@ -99,45 +97,43 @@ msgstr "code{"
 #: 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:269 en/user_basics.ssi:285
-#: en/user_basics.ssi:293 en/user_basics.ssi:320 en/user_basics.ssi:359
+#: 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/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_customization-packages.ssi:18 en/user_customization-packages.ssi:30
+#: en/user_customization-packages.ssi:43 en/user_customization-packages.ssi:51
+#: en/user_customization-packages.ssi:65 en/user_customization-packages.ssi:79
+#: en/user_customization-packages.ssi:109
+#: en/user_customization-packages.ssi:117
+#: en/user_customization-packages.ssi:137
+#: en/user_customization-packages.ssi:174
+#: en/user_customization-packages.ssi:184
+#: en/user_customization-packages.ssi:194
+#: en/user_customization-packages.ssi:204 en/user_examples.ssi:33
+#: 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:84
-#: en/user_overview.ssi:94 en/user_overview.ssi:102
+#: 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_basics.ssi:230 en/user_customization-packages.ssi:153
+#: en/user_basics.ssi:218 en/user_customization-packages.ssi:155
 msgid "% FIXME"
 msgstr ""
 
@@ -153,85 +149,111 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:6
-msgid "_* Selecting additional packages to be installed"
+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. We start with customization of the 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 ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:8
-msgid "_* Installing modified packages"
+msgid "2~ Package sources"
 msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:10
-msgid "2~ Package sources"
+msgid "3~ Debian repositories"
 msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:12
-msgid "3~ Debian repositories"
+msgid "To set a local mirror to be used to at build time:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:14
-msgid "To set a local mirror (used to 'build' the live system)"
+#: en/user_customization-packages.ssi:16
+msgid "$ lb config --mirror-bootstrap http://localhost/debian/"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:18
+#: en/user_customization-packages.ssi:20
 msgid ""
-"$ lb config --mirror-bootstrap http://localhost/debian/ --mirror-chroot "
-"http://localhost/debian/"
+"The chroot repository, specified by --mirror-chroot, defaults to the same as "
+"--mirror-bootstrap."
 msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:22
+msgid ""
+"Each of the --mirror-* options governs which repository 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, when the "
+"binary image is constructed, the --mirror-binary value is used, superceding "
+"any earlier repositories."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:24
 msgid "The generic mirror is added to the live system's /etc/apt/sources.list."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:26
+#: en/user_customization-packages.ssi:28
 msgid "$ lb config --mirror-binary http://ftp.debian.org/debian/"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:30
+#: en/user_customization-packages.ssi:32
 msgid ""
 "Note: It is not used for building the live system but to install new "
 "software while using the live system."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:32
+#: en/user_customization-packages.ssi:34
 msgid ""
 "It can be disabled by setting the binary mirror to the same value as the "
 "chroot mirror."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:34
+#: en/user_customization-packages.ssi:36
 msgid ""
 "Note: the same applies for mirror chroot security and mirror binary security"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:39
+#: en/user_customization-packages.ssi:41
 msgid ""
 "$ lb config --mirror-chroot-security {URL} $ lb config --mirror-binary-"
 "security {URL}"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:43
+#: en/user_customization-packages.ssi:45
 msgid "If you don't want to include apt indices, you can skip those with:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:47
+#: en/user_customization-packages.ssi:49
 msgid "$ lb config --binary-indices false"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:51
+#: en/user_customization-packages.ssi:53
 msgid ""
 "This will not influence the entries in /etc/apt/sources.list, but only if /"
 "var/lib/apt contains the indices files or not (and by that making the image "
@@ -239,12 +261,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:53
+#: en/user_customization-packages.ssi:55
 msgid "3~ Own repository"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:55
+#: en/user_customization-packages.ssi:57
 msgid ""
 "To add more repositories (e.g. backports, experimental or custom packages, "
 "etc.), create #{config/chroot_sources/your-repository.{chroot,binary}}# "
@@ -252,7 +274,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:57
+#: en/user_customization-packages.ssi:59
 msgid ""
 "e.g. #{config/chroot_sources/live.chroot}# allows you to install packages "
 "from the debian live snapshot repository at live system build time (you have "
@@ -260,31 +282,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:61
+#: en/user_customization-packages.ssi:63
 msgid "deb http://live.debian.net/ sid-snapshots main contrib non-free"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:65
+#: en/user_customization-packages.ssi:67
 msgid ""
 "If you add the line to #{config/chroot_sources/live.binary}# the repository "
 "will be added to your live-system's #{/etc/apt/sources.list}#."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:67
+#: en/user_customization-packages.ssi:69
 msgid "If such files exist, they will be picked up automatically."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:69
+#: en/user_customization-packages.ssi:71
 msgid ""
 "You can also put the gpg-key used to sign the repository into config/"
 "chroot_sources/your-repository.{binary,chroot}.gpg"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:71
+#: en/user_customization-packages.ssi:73
 msgid ""
 "Note: some preconfigured package repositories are available for easy "
 "selection through the --repository switch, e.g. for enabling live snapshots, "
@@ -292,17 +314,17 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:75
+#: en/user_customization-packages.ssi:77
 msgid "$ lb config --repository live.debian.net"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:79
+#: en/user_customization-packages.ssi:81
 msgid "3~ Package installation"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:81
+#: en/user_customization-packages.ssi:83
 msgid ""
 "You can elect to use either #{apt}# or #{aptitude}# when installing "
 "packages. Which utility is used is governed by the #{LB_APT}# variable in #"
@@ -310,7 +332,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:83
+#: en/user_customization-packages.ssi:85
 msgid ""
 "_* #{apt}#: Specifying a missing package causes package installation to "
 "fail, which may not be the desired behaviour. This is the default setting "
@@ -318,7 +340,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:85
+#: en/user_customization-packages.ssi:87
 msgid ""
 "_* #{aptitude}#: Specifying a missing package causes package installation to "
 "succeed, which may not be the desired behaviour. This is the default setting "
@@ -326,66 +348,66 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:87
+#: en/user_customization-packages.ssi:89
 msgid "2~ Installing additional packages"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:89
+#: en/user_customization-packages.ssi:91
 msgid ""
 "live-helper has a number of mechanisms for indicating that additional "
 "packages should be installed, including:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:91
+#: en/user_customization-packages.ssi:93
 msgid "_* The #{LB_PACKAGES}# variable"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:93
+#: en/user_customization-packages.ssi:95
 msgid "_* Package lists"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:95
+#: en/user_customization-packages.ssi:97
 msgid "_* Local packages (#{chroot_local-packages/}#)"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:97
+#: en/user_customization-packages.ssi:99
 msgid "_* Tasks"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:99
+#: en/user_customization-packages.ssi:101
 msgid "3~ The #{LB_PACKAGES}# variable"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:101
+#: en/user_customization-packages.ssi:103
 msgid ""
 "To install additional packages, simply add them to the #{LB_PACKAGES}# "
 "variable in #{config/chroot}#. For example:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:105
+#: en/user_customization-packages.ssi:107
 msgid "LB_PACKAGES=\"package1 package2 package3 ... \""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:109
+#: en/user_customization-packages.ssi:111
 msgid "You can also specify initial values on the command line:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:113
+#: en/user_customization-packages.ssi:115
 msgid "$ lb config --packages \"package1 package2 package3\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:117
+#: en/user_customization-packages.ssi:119
 msgid ""
 "The behaviour of live-build when specifying a package that does not exist is "
 "determined by your choice of APT utility. See package-installation for more "
@@ -393,12 +415,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:119
+#: en/user_customization-packages.ssi:121
 msgid "% FIXME: <xref linkend=\"package-installation\"/>"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:121
+#: en/user_customization-packages.ssi:123
 msgid ""
 "If you need to specify a large number of packages to be installed or you "
 "need flexibility regarding which packages to install, you should probably be "
@@ -406,17 +428,17 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:123
+#: en/user_customization-packages.ssi:125
 msgid "% FIXME: <xref linkend=\"package-lists\"/>"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:125
+#: en/user_customization-packages.ssi:127
 msgid "3~ Package lists"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:129
 msgid ""
 "Package lists are a powerful way of expressing which packages should be "
 "installed. live-build ships with a number of predefined package lists which "
@@ -425,37 +447,37 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:129
+#: en/user_customization-packages.ssi:131
 msgid "To specify one or more package list, you can use:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:133
+#: en/user_customization-packages.ssi:135
 msgid "$ lb config --packages-lists \"list1 list2 list3\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:137
+#: en/user_customization-packages.ssi:139
 msgid ""
 "Note: Package lists that are distributed with live-build reside in the #{/"
 "usr/share/live/build/lists}# directory."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:139
+#: en/user_customization-packages.ssi:141
 #, no-wrap
 msgid "*{Local packages lists}*\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:141
+#: en/user_customization-packages.ssi:143
 msgid ""
 "You may supplement the supplied lists using local package lists stored in #"
 "{config/chroot_local-packageslists}#."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:143
+#: en/user_customization-packages.ssi:145
 msgid ""
 "Package lists that exist in this directory need to have a #{.list}# suffix "
 "in order to be processed. Local packages lists always override package lists "
@@ -464,13 +486,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:145
+#: en/user_customization-packages.ssi:147
 #, no-wrap
 msgid "*{Local binary packages lists}*\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:147
+#: en/user_customization-packages.ssi:149
 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 "
@@ -480,25 +502,25 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:151
 msgid ""
 "Package lists that exist in this directory need to have a .list suffix in "
 "order to be processed."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:151
+#: en/user_customization-packages.ssi:153
 #, no-wrap
 msgid "*{Extending a provided package list using includes}*\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:162
 msgid "% code{ % % #include <gnome> % iceweasel % % }code"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:162
+#: en/user_customization-packages.ssi:164
 msgid ""
 "The package lists that are included with live-build make extensive use of "
 "includes. They are available to view in the #{/usr/share/live/build/lists}# "
@@ -506,75 +528,75 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:164
+#: en/user_customization-packages.ssi:166
 #, no-wrap
 msgid "*{Using conditionals inside packages lists}*\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:172
 msgid "#if ARCHITECTURE amd64 ia32-libs #endif"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:174
+#: en/user_customization-packages.ssi:176
 msgid "or if #{LB_ARCHITECTURE}# is set to #{i386}# or #{amd64}#:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:180
+#: en/user_customization-packages.ssi:182
 msgid "#if ARCHITECTURE i386 amd64 memtest86+ #endif"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:184
+#: en/user_customization-packages.ssi:186
 msgid "or if #{LB_ARCHIVE_AREAS}# contains either #{contrib}# or #{non-free}#:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:190
+#: en/user_customization-packages.ssi:192
 msgid "#if ARCHIVE_AREAS contrib non-free vrms #endif"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:194
+#: en/user_customization-packages.ssi:196
 msgid "A conditional may surround an #{#include}# directive:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:200
+#: en/user_customization-packages.ssi:202
 msgid "#if ARCHITECTURE amd64 #include <gnome-full> #endif"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:204
+#: en/user_customization-packages.ssi:206
 msgid ""
 "Any live-build configuration variable that begins with #{LB_}# can be tested "
 "in this way."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:206
+#: en/user_customization-packages.ssi:208
 msgid "The nesting of conditionals is not supported."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:208
+#: en/user_customization-packages.ssi:210
 msgid "3~ Tasks"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:210
+#: en/user_customization-packages.ssi:212
 msgid "%FIXME"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:212
+#: en/user_customization-packages.ssi:214
 msgid "2~ Installing modified or third-party packages"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:214
+#: en/user_customization-packages.ssi:216
 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 "
@@ -585,7 +607,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:218
 msgid ""
 "This section does not cover advice regarding building or maintaining "
 "modified packages. Joachim Breitner's 'How to fork privately' method from "
@@ -596,22 +618,22 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:218
+#: en/user_customization-packages.ssi:220
 msgid "There are two ways of installing modified custom packages:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:220
+#: en/user_customization-packages.ssi:222
 msgid "_* #{chroot_local-packages}#"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:222
+#: en/user_customization-packages.ssi:224
 msgid "_* Using a custom APT repository"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:224
+#: en/user_customization-packages.ssi:226
 msgid ""
 "The #{chroot_local-packages}# is simpler to achieve and useful for \"one-off"
 "\" customizations but has a number of drawbacks, whilst using a custom APT "
@@ -619,12 +641,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:226
+#: en/user_customization-packages.ssi:228
 msgid "3~ Using #{chroot_local-packages}# to install custom packages"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:228
+#: en/user_customization-packages.ssi:230
 msgid ""
 "To install a custom package, simply copy it to the #{config/chroot_local-"
 "packages}# directory. Packages that are inside this directory will be "
@@ -633,45 +655,45 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:230
+#: en/user_customization-packages.ssi:232
 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:232
+#: en/user_customization-packages.ssi:234
 msgid ""
 "Using #{chroot_local-packages}# for installation of custom packages has "
 "disadvantages:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:234
+#: en/user_customization-packages.ssi:236
 msgid "_* It is not possible to use secure APT"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:236
+#: en/user_customization-packages.ssi:238
 msgid ""
 "_* You must install all appropriate packages in the #{config/chroot_local-"
 "packages}# directory"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:238
+#: en/user_customization-packages.ssi:240
 msgid ""
 "_* It does not lend itself to storing Debian Live configurations in revision "
 "control"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:240
+#: en/user_customization-packages.ssi:242
 msgid "3~ Using an APT repository to install custom packages"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:242
+#: en/user_customization-packages.ssi:244
 msgid ""
 "Unlike using #{chroot_local-packages}#, when using a custom APT repository "
 "you must ensure that you specify the packages elsewhere. See lb-packages for "
@@ -679,12 +701,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:244
+#: en/user_customization-packages.ssi:246
 msgid "% FIXME: <xref linkend=\"lb-packages\"/>"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:246
+#: en/user_customization-packages.ssi:248
 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 "
@@ -692,12 +714,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:248
+#: en/user_customization-packages.ssi:250
 msgid "3~ Custom packages and APT"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:250
+#: en/user_customization-packages.ssi:252
 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 "
@@ -707,7 +729,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:252
+#: en/user_customization-packages.ssi:254
 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 "
@@ -717,17 +739,17 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:254
+#: en/user_customization-packages.ssi:256
 msgid "% FIXME: <xref linkend=\"apt-preferences\"/>"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:256
+#: en/user_customization-packages.ssi:258
 msgid "3~ Altering APT preferences during Live system"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:257
+#: en/user_customization-packages.ssi:259
 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 "
diff --git a/manual/po/pt_BR/user_customization-internationalization.ssi.po b/manual/po/pt_BR/user_examples.ssi.po
similarity index 57%
copy from manual/po/pt_BR/user_customization-internationalization.ssi.po
copy to manual/po/pt_BR/user_examples.ssi.po
index b6d9fb5..2f6115a 100644
--- a/manual/po/pt_BR/user_customization-internationalization.ssi.po
+++ b/manual/po/pt_BR/user_examples.ssi.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-22 08:57-0200\n"
-"PO-Revision-Date: 2010-10-22 08:57-0200\n"
+"POT-Creation-Date: 2010-11-04 16:34-0400\n"
+"PO-Revision-Date: 2010-11-04 16:34-0400\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "Language: pt_BR\n"
@@ -39,17 +39,15 @@ msgstr ""
 #: 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/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: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
@@ -64,15 +62,15 @@ msgstr ""
 #: 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_customization-packages.ssi:196 en/user_examples.ssi:24
+#: 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:46
-#: en/user_overview.ssi:90 en/user_overview.ssi:98
+#: 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{"
 
@@ -99,16 +97,14 @@ msgstr "code{"
 #: 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:269 en/user_basics.ssi:285
-#: en/user_basics.ssi:293 en/user_basics.ssi:320 en/user_basics.ssi:359
+#: 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
@@ -124,95 +120,108 @@ msgstr "code{"
 #: 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_customization-packages.ssi:202 en/user_examples.ssi:33
+#: 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:84
-#: en/user_overview.ssi:94 en/user_overview.ssi:102
+#: 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"
+#: en/other_faq.ssi:85 en/other_faq.ssi:247 en/user_examples.ssi:26
+msgid "#!/bin/sh"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-internationalization.ssi:4
-msgid "1~customizing-locale-and-language Customizing locale and language"
+#: en/user_examples.ssi:2
+msgid "B~ Examples"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-internationalization.ssi:6
-msgid "2~ Default locale and keyboard"
+#: en/user_examples.ssi:4
+msgid "1~ Use Case Builds"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-internationalization.ssi:8
+#: en/user_examples.ssi:6
 msgid ""
-"The default locale when building a live cd is \"locales=en_US.UTF-8\", to "
-"set the locale for e.g. Switzerland, you can use \"locales=de_CH.UTF-8\"."
+"This chapter covers example builds for specific use cases with Debian Live."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-internationalization.ssi:12
-msgid "$ lb config --bootappend-live \"locales=de_CH.UTF-8\""
+#: en/user_examples.ssi:8
+msgid "2~ VNC Kiosk Client"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-internationalization.ssi:16
-msgid "The entry for a Swiss-German keyboard would be:"
+#: en/user_examples.ssi:10
+msgid "Create an image with live-build to boot directly to a VNC server."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-internationalization.ssi:20
-msgid "$ lb config --bootappend-live \"keyboard-layouts=ch\""
+#: en/user_examples.ssi:12
+msgid "_* Make a build directory: #{$ mkdir vncBuild}#"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-internationalization.ssi:24
-msgid "Combined, the keyboard and locale configured for Switzerland would be:"
+#: en/user_examples.ssi:14
+msgid "_* Move to the build directory: #{$ cd vncBuild}#"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-internationalization.ssi:28
+#: en/user_examples.ssi:16
 msgid ""
-"$ lb config --bootappend-live =\"locales=de_CH.UTF-8 keyboard-layouts=ch\""
+"Example to config the build directory to include gdm metacity "
+"xtightvncviewer: #{$ lb config --packages \"gdm3 metacity xtightvncviewer\"}#"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-internationalization.ssi:32
+#: en/user_examples.ssi:18
 msgid ""
-"Note: You can find a list of options in the manpage for live-config. "
-"Currently, only UTF-8 locales are supported."
+"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/user_customization-internationalization.ssi:34
-msgid "2~ l10n Packages"
+#: en/user_examples.ssi:20
+msgid ""
+"Create the .xsession for the default user: #{$ touch config/chroot_local-"
+"includes/etc/skel/.xsession}#"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-internationalization.ssi:36
+#: en/user_examples.ssi:22
 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"
+"Edit the .xsession file to launch metacity and start xvncviewer with "
+"something similar to the below:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-internationalization.ssi:40
-msgid "$ lb config --language \"de\""
+#: en/user_examples.ssi:29
+msgid "/usr/bin/metacity & /usr/bin/vncviewer xxx.xxx.xxx.xxx:PORT"
 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}#."
+#: en/user_examples.ssi:31
+msgid "exit"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:35
+msgid "_* Build the image: #{# lb build}#"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:37
+msgid "_* Enjoy."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:39
+msgid "2~ Next Example FIXME"
 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 010cb70..dc370cb 100644
--- a/manual/po/pt_BR/user_managing_a_configuration.ssi.po
+++ b/manual/po/pt_BR/user_managing_a_configuration.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-13 17:00+0300\n"
+"POT-Creation-Date: 2010-10-28 16:34-0200\n"
 "PO-Revision-Date: 2010-10-13 17:00+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,8 +17,8 @@ msgstr ""
 "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: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
@@ -41,14 +41,15 @@ msgstr ""
 #: 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/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/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
@@ -67,17 +68,17 @@ msgstr ""
 #: 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:105
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
+#: 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:60
-#: en/user_overview.ssi:104 en/user_overview.ssi:112
+#: 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:86 en/about_manual.ssi:94 en/about_manual.ssi:102
+#: 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
@@ -101,14 +102,15 @@ msgstr "code{"
 #: 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/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
@@ -126,11 +128,12 @@ msgstr "code{"
 #: 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:109 en/user_installation.ssi:124
-#: en/user_installation.ssi:139 en/user_managing_a_configuration.ssi:31
+#: 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:98
-#: en/user_overview.ssi:108 en/user_overview.ssi:116
+#: 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"
 
@@ -141,7 +144,7 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_managing_a_configuration.ssi:4
-msgid "1~ Managing a configuration"
+msgid "1~managing-a-configuration Managing a configuration"
 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 2a3459d..0e0a6f2 100644
--- a/manual/po/pt_BR/user_overview.ssi.po
+++ b/manual/po/pt_BR/user_overview.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-22 07:52-0200\n"
+"POT-Creation-Date: 2010-10-28 16:34-0200\n"
 "PO-Revision-Date: 2010-10-22 07:52-0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -41,16 +41,17 @@ msgstr ""
 #: 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/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/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
@@ -67,12 +68,12 @@ msgstr ""
 #: 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_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:46
-#: en/user_overview.ssi:90 en/user_overview.ssi:98
+#: 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{"
 
@@ -101,16 +102,16 @@ msgstr "code{"
 #: 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:269 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/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
@@ -127,12 +128,12 @@ msgstr "code{"
 #: 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_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:84
-#: en/user_overview.ssi:94 en/user_overview.ssi:102
+#: 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"
 
@@ -210,88 +211,37 @@ msgstr ""
 #. type: Plain text
 #: en/user_overview.ssi:22
 msgid ""
-"Besides the common config/common, which is used by all live-build commands, "
-"some additional files can be used to configure the behavior of specific "
-"helper commands. These files are typically named config/command or config/"
-"stage (where \"stage\", of course, is replaced with the name of the stage "
-"that they belong to, and \"command\" with the name of the command)."
-msgstr ""
-
-#. type: Plain text
-#: en/user_overview.ssi:24
-msgid ""
-"For example, the #{lb_bootstrap_debootstrap}# command uses files named "
-"config/bootstrap and config/bootstrap_debootstrap to read the options it "
-"will use. Generally, these files contain variables with values assigned, one "
-"variable per line. Some commands of live-buil use pairs of values or "
-"slightly more complicated variable assignments."
-msgstr ""
-
-#. type: Plain text
-#: en/user_overview.ssi:26
-msgid ""
-"live-build respects environment variables which are present in the context "
-"of the shell it is running. If variables can be read from config files, then "
-"they override environment variables, and if command line options are used, "
-"they override values from config files. If no value for a given variable can "
-"be found (and is thus unset), live-build will automatically set it to a "
-"default value."
-msgstr ""
-
-#. type: Plain text
-#: en/user_overview.ssi:28
-msgid ""
-"All config files are shell scripts which are sourced by a live-build "
-"command. That means they have to follow the normal shell syntax. You can "
-"also put comments in these files; lines beginning with \"#\" are ignored."
-msgstr ""
-
-#. type: Plain text
-#: en/user_overview.ssi:30
-msgid ""
-"In some rare cases you may want to have different versions of these files "
-"for different architectures or distributions. If files named config/stage."
-"arch or config/stage_command.arch, and config/stage.dist or config/"
-"stage_command.dist exist (where \"arch\" is the same as the output of dpkg --"
-"print-architecture and \"dist\" is the same as the codename of the target "
-"distribution), then they will be used in preference to the other, more "
-"general files."
-msgstr ""
-
-#. type: Plain text
-#: en/user_overview.ssi:32
-msgid ""
 "The remainder of this section discusses the three most important commands:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:34
+#: 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 ""
 
 #. type: Plain text
-#: en/user_overview.ssi:36
+#: 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 ""
 
 #. type: Plain text
-#: en/user_overview.ssi:38
+#: 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 ""
 
 #. type: Plain text
-#: en/user_overview.ssi:40
+#: en/user_overview.ssi:30
 msgid "3~lb-config The #{lb config}# command"
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:42
+#: 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 "
@@ -301,26 +251,26 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:44
+#: en/user_overview.ssi:34
 msgid ""
 "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:49
+#: en/user_overview.ssi:39
 msgid "$ lb config P: Creating config tree"
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:54
+#: en/user_overview.ssi:44
 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"
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:82
+#: en/user_overview.ssi:72
 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 "
@@ -345,54 +295,50 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:86
+#: en/user_overview.ssi:76
 msgid ""
 "Using #{lb config}# without any arguments would be suitable for users who "
-"are either happy editing the generated files, or are simply happy with the "
-"defaults it creates."
+"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 ""
 
 #. type: Plain text
-#: en/user_overview.ssi:88
+#: en/user_overview.ssi:78
 msgid ""
-"You can ask #{lb config}# to generate a config/ directory \"preseeded\" with "
-"various options. This might be suitable if you do not require the default "
-"settings but do not need to change a large number of options. For example:"
+"Normally, you will want to specify some options. For example, to include the "
+"'gnome' package list in your configuration:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:92
+#: en/user_overview.ssi:82
 msgid "$ lb config -p gnome"
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:96
-msgid ""
-"will build a config/ directory configured to include the 'gnome' package "
-"list. It is possible to specify many options:"
+#: en/user_overview.ssi:86
+msgid "It is possible to specify many options, such as:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:100
+#: en/user_overview.ssi:90
 msgid ""
 "$ lb config --binary-images net --hostname live-machine --username live-"
 "user ..."
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:104
-msgid ""
-"A full list of options is available in the #{lb_config}# man page. Most "
-"options have a parallel with an \"LB_\" prefixed variable."
+#: en/user_overview.ssi:94
+msgid "A full list of options is available in the #{lb_config}# man page."
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:106
+#: en/user_overview.ssi:96
 msgid "3~lb-build The #{lb build}# command"
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:108
+#: 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 "
@@ -400,33 +346,33 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:110
+#: en/user_overview.ssi:100
 msgid "3~lb-clean The #{lb clean}# command"
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:112
+#: 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 ""
 
 #. type: Plain text
-#: en/user_overview.ssi:114
+#: en/user_overview.ssi:104
 msgid "2~live-boot The live-boot package"
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:116
+#: 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."
+"as those created by live-build. This includes the Debian Live ISOs, netboot "
+"tarballs, and USB stick images."
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:118
+#: 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 "
@@ -435,7 +381,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:120
+#: 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 "
@@ -443,12 +389,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:122
+#: en/user_overview.ssi:112
 msgid "2~live-config The live-config package"
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:124
+#: 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 "
diff --git a/manual/po/ro/live-manual.ssm.po b/manual/po/ro/live-manual.ssm.po
index 4d0a6a0..b02b796 100644
--- a/manual/po/ro/live-manual.ssm.po
+++ b/manual/po/ro/live-manual.ssm.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-25 23:12+0300\n"
+"POT-Creation-Date: 2010-11-13 16:15+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-10-25\n"
+" :published: 2010-11-13\n"
 msgstr ""
 
 #. type: Plain text
@@ -147,11 +147,21 @@ msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:55
+msgid ":B~ Examples ~#"
+msgstr ""
+
+#. type: Plain text
+#: en/live-manual.ssm:57
+msgid "<< user_examples.ssi"
+msgstr ""
+
+#. type: Plain text
+#: en/live-manual.ssm:59
 msgid ":B~ Other ~#"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:61
+#: en/live-manual.ssm:65
 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 "
@@ -161,76 +171,71 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:63
+#: en/live-manual.ssm:67
 msgid "% << other_customization-bootup.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:65
+#: en/live-manual.ssm:69
 msgid "% << other_customization-binary.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:67
+#: en/live-manual.ssm:71
 msgid "% << other_customization-backports.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:69
+#: en/live-manual.ssm:73
 msgid "% << other_common-tasks.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:71
+#: en/live-manual.ssm:75
 msgid "% << other_live-environment.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:73
+#: en/live-manual.ssm:77
 msgid "% << other_faq.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:75
+#: en/live-manual.ssm:79
 msgid "% << other_howtos.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:77
+#: en/live-manual.ssm:81
 msgid "% << other_coding-style.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:79
+#: en/live-manual.ssm:83
 msgid "% << other_procedures.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:81
+#: en/live-manual.ssm:85
 msgid "% << other_resources.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:83
-msgid "% << other_use-cases.ssi"
-msgstr ""
-
-#. type: Plain text
-#: en/live-manual.ssm:85
+#: en/live-manual.ssm:87
 msgid "% << other_success-stories.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:87
+#: en/live-manual.ssm:89
 msgid "% << other_troubleshooting.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:89
+#: en/live-manual.ssm:91
 msgid "% << other_configuration-layout.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:90
+#: en/live-manual.ssm:92
 msgid "% << other_configuration-files.ssi"
 msgstr ""
diff --git a/manual/po/ro/other_live-environment.ssi.po b/manual/po/ro/other_live-environment.ssi.po
index f0ee2ef..a9154dc 100644
--- a/manual/po/ro/other_live-environment.ssi.po
+++ b/manual/po/ro/other_live-environment.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-03 20:30+0300\n"
+"POT-Creation-Date: 2010-10-28 07:47-0200\n"
 "PO-Revision-Date: 2010-10-03 20:30+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -18,8 +18,8 @@ msgstr ""
 "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: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
@@ -27,56 +27,59 @@ msgstr ""
 #: 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/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/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-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-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: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_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: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
+#: 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:46
+#: en/user_overview.ssi:90 en/user_overview.ssi:98
 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: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
@@ -85,17 +88,12 @@ msgstr "code{"
 #: 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_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
@@ -105,30 +103,38 @@ msgstr "code{"
 #: 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/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: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_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: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
+#: 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:84
+#: en/user_overview.ssi:94 en/user_overview.ssi:102
 msgid "}code"
 msgstr "}code"
 
@@ -350,9 +356,9 @@ msgstr ""
 #. type: Plain text
 #: en/other_live-environment.ssi:103
 msgid ""
-"A live cd paradigm is a preinstalled 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 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
@@ -360,7 +366,7 @@ msgstr ""
 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 runtime evolutions of the system "
+"should be considered read-only and all the run-time evolutions of the system "
 "are lost at shutdown."
 msgstr ""
 
@@ -368,7 +374,7 @@ msgstr ""
 #: en/other_live-environment.ssi:108
 msgid ""
 "Persistence is a common name for different kinds of solutions for saving "
-"across reboots some, or all, of this runtime evolution of the system. To "
+"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 "
@@ -397,7 +403,7 @@ msgid ""
 "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 bootime and the system must be started with the "
+"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 ""
@@ -474,7 +480,7 @@ msgid ""
 "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 runtime could lead to "
+"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 "
@@ -520,8 +526,8 @@ msgstr ""
 #. type: Plain text
 #: en/other_live-environment.ssi:159
 msgid ""
-"The runtime 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-initramfs mounts all /"
-"live filesystem in order or with the module bootparameter."
+"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-initramfs "
+"mounts all /live filesystem in order or with the module boot parameter."
 msgstr ""
diff --git a/manual/po/ro/project_bugs.ssi.po b/manual/po/ro/project_bugs.ssi.po
index 5d2193a..011847e 100644
--- a/manual/po/ro/project_bugs.ssi.po
+++ b/manual/po/ro/project_bugs.ssi.po
@@ -2,20 +2,20 @@
 # Copyright (C) 2010 Free Software Foundation, Inc.
 # This file is distributed under the same license as the live-manual package.
 # Automatically generated, 2010.
+# Creak <romain.failliot at foolstep.com>, 2010.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-25 23:27+0300\n"
-"PO-Revision-Date: 2010-10-25 23:27+0300\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
+"POT-Creation-Date: 2010-10-27 21:40-0200\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"
 "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"
+"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
@@ -43,14 +43,14 @@ msgstr ""
 #: 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:34 en/user_basics.ssi:44
-#: en/user_basics.ssi:56 en/user_basics.ssi:68 en/user_basics.ssi:80
-#: en/user_basics.ssi:92 en/user_basics.ssi:106 en/user_basics.ssi:114
-#: en/user_basics.ssi:122 en/user_basics.ssi:132 en/user_basics.ssi:144
-#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
-#: en/user_basics.ssi:186 en/user_basics.ssi:194 en/user_basics.ssi:204
-#: en/user_basics.ssi:224 en/user_basics.ssi:257 en/user_basics.ssi:273
-#: en/user_basics.ssi:281 en/user_basics.ssi:301 en/user_basics.ssi:326
+#: 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/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
@@ -103,15 +103,15 @@ msgstr "code{"
 #: 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:38
-#: en/user_basics.ssi:48 en/user_basics.ssi:62 en/user_basics.ssi:72
-#: en/user_basics.ssi:86 en/user_basics.ssi:98 en/user_basics.ssi:110
-#: en/user_basics.ssi:118 en/user_basics.ssi:126 en/user_basics.ssi:136
-#: en/user_basics.ssi:150 en/user_basics.ssi:160 en/user_basics.ssi:168
-#: en/user_basics.ssi:176 en/user_basics.ssi:190 en/user_basics.ssi:198
-#: en/user_basics.ssi:208 en/user_basics.ssi:249 en/user_basics.ssi:261
-#: en/user_basics.ssi:277 en/user_basics.ssi:285 en/user_basics.ssi:312
-#: en/user_basics.ssi:351 en/user_customization-contents.ssi:39
+#: 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
@@ -285,10 +285,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/project_bugs.ssi:46
-#, fuzzy
-#| msgid "3~ No package configuration of the live system"
 msgid "_* Version of live-config on the live system"
-msgstr "3~ Nu vor fi programe de configurare pentru sistemul live."
+msgstr ""
 
 #. type: Plain text
 #: en/project_bugs.ssi:48
@@ -297,17 +295,13 @@ msgstr ""
 
 #. type: Plain text
 #: en/project_bugs.ssi:50
-#, fuzzy
-#| msgid "3~ No package configuration of the live system"
 msgid "_* Architecture of the live system"
-msgstr "3~ Nu vor fi programe de configurare pentru sistemul live."
+msgstr ""
 
 #. type: Plain text
 #: en/project_bugs.ssi:52
-#, fuzzy
-#| msgid "3~ No package configuration of the live system"
 msgid "_* Distribution of the live system"
-msgstr "3~ Nu vor fi programe de configurare pentru sistemul live."
+msgstr ""
 
 #. type: Plain text
 #: en/project_bugs.ssi:54
@@ -407,7 +401,7 @@ msgstr ""
 
 #. type: Plain text
 #: en/project_bugs.ssi:86
-msgid "3~ At boot-time"
+msgid "3~ At boot time"
 msgstr ""
 
 #. type: Plain text
@@ -423,7 +417,7 @@ msgstr ""
 
 #. type: Plain text
 #: en/project_bugs.ssi:90
-msgid "3~ At run-time"
+msgid "3~ At run time"
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/po/ro/user_basics.ssi.po b/manual/po/ro/user_basics.ssi.po
index 2f177d7..e038be8 100644
--- a/manual/po/ro/user_basics.ssi.po
+++ b/manual/po/ro/user_basics.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-23 16:43+0300\n"
+"POT-Creation-Date: 2010-11-01 06:47-0200\n"
 "PO-Revision-Date: 2010-10-23 16:43+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -42,16 +42,17 @@ msgstr ""
 #: 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:34
-#: en/user_basics.ssi:44 en/user_basics.ssi:56 en/user_basics.ssi:68
-#: en/user_basics.ssi:80 en/user_basics.ssi:92 en/user_basics.ssi:106
-#: en/user_basics.ssi:114 en/user_basics.ssi:122 en/user_basics.ssi:132
-#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
-#: en/user_basics.ssi:172 en/user_basics.ssi:186 en/user_basics.ssi:194
-#: en/user_basics.ssi:204 en/user_basics.ssi:224 en/user_basics.ssi:257
-#: en/user_basics.ssi:273 en/user_basics.ssi:281 en/user_basics.ssi:301
-#: en/user_basics.ssi:326 en/user_customization-contents.ssi:34
-#: en/user_customization-contents.ssi:43 en/user_customization-contents.ssi:66
+#: 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/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
@@ -72,8 +73,8 @@ msgstr ""
 #: 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:46
-#: en/user_overview.ssi:90 en/user_overview.ssi:98
+#: 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{"
 
@@ -102,16 +103,16 @@ msgstr "code{"
 #: 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:38 en/user_basics.ssi:48
-#: en/user_basics.ssi:62 en/user_basics.ssi:72 en/user_basics.ssi:86
-#: en/user_basics.ssi:98 en/user_basics.ssi:110 en/user_basics.ssi:118
-#: en/user_basics.ssi:126 en/user_basics.ssi:136 en/user_basics.ssi:150
-#: en/user_basics.ssi:160 en/user_basics.ssi:168 en/user_basics.ssi:176
-#: en/user_basics.ssi:190 en/user_basics.ssi:198 en/user_basics.ssi:208
-#: en/user_basics.ssi:249 en/user_basics.ssi:261 en/user_basics.ssi:277
-#: en/user_basics.ssi:285 en/user_basics.ssi:312 en/user_basics.ssi:351
-#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
-#: en/user_customization-contents.ssi:70
+#: 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
@@ -132,8 +133,8 @@ msgstr "code{"
 #: 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:84
-#: en/user_overview.ssi:94 en/user_overview.ssi:102
+#: 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"
 
@@ -150,8 +151,8 @@ msgstr ""
 #. type: Plain text
 #: en/user_basics.ssi:6
 msgid ""
-"This chapter contains a brief overview of the build process as well as "
-"containing instructions on how to boot the various binary image types."
+"This chapter contains a brief overview of the build process and instructions "
+"for booting the various binary image types."
 msgstr ""
 
 #. type: Plain text
@@ -163,9 +164,9 @@ msgstr ""
 #: en/user_basics.ssi:10
 msgid ""
 "A live system usually means an operating system booted on a computer from a "
-"removable medium (such as CD-ROM, USB stick, or network), ready to use "
-"without any installation on the usual drive(s), with an auto-configuration "
-"done at runtime (see {Terms}#terms )."
+"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 ""
 
 #. type: Plain text
@@ -173,294 +174,291 @@ msgstr ""
 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 following parts:"
+"is made from the following parts:"
 msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:14
-msgid "_* Linux kernel"
+msgid "_* *{Linux kernel image}*, usually named #{vmlinuz*}#"
 msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:16
-msgid "_* The Linux image, usually named #{vmlinuz*}#"
-msgstr ""
-
-#. type: Plain text
-#: en/user_basics.ssi:18
 msgid ""
-"_* *{Initial RAM disk image (initrd)}*: RAM disk setup for the Linux boot, "
-"containing modules possibly needed to mount the filesystem's image and some "
+"_* *{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 ""
 
 #. type: Plain text
-#: en/user_basics.ssi:20
+#: en/user_basics.ssi:18
 msgid ""
-"_* *{System image}*: The operating systems filesystem image. The SquashFS "
-"compressed filesystem is used to minimize the Debian Live image size. Note "
-"that it's 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 partition(s) are used (see 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)."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:22
+#: en/user_basics.ssi:20
 msgid "% FIXME: <xref linkend=\"persistence\"/>"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:24
+#: en/user_basics.ssi:22
 msgid ""
-"_* *{Bootloader}*: A small piece of code, crafted to boot up from the chosen "
+"_* *{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 then loads the Linux kernel and its initrd to run with an "
-"associated filesystem image. Different solutions can be used depending on "
-"the target media and format of the filesystem containing the previous "
-"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 partition, "
-"etc."
+"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 ""
 
 #. type: Plain text
-#: en/user_basics.ssi:26
+#: en/user_basics.ssi:24
 msgid ""
-"_* live-build will build the system image from your specifications, setup a "
-"Linux kernel and its initrd, 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.)"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:28
+#: en/user_basics.ssi:26
 msgid "2~ First steps: building an ISO image"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:30
+#: en/user_basics.ssi:28
 msgid ""
-"The following sequence of commands, provided by live-build, will create a "
-"basic ISO image containing just the Debian standard system without X.org. It "
-"is suitable for burning to CD or DVD media."
+"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 ""
 
 #. type: Plain text
-#: en/user_basics.ssi:32
+#: en/user_basics.ssi:30
 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:36
+#: en/user_basics.ssi:34
 msgid "$ lb config"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:40
+#: en/user_basics.ssi:38
 msgid ""
-"By passing no parameters to #{lb config}# we indicated that we wish to use "
-"the defaults (see {The lb config command}#lb-config )."
+"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:42
+#: en/user_basics.ssi:40
 msgid ""
 "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:46 en/user_basics.ssi:124 en/user_basics.ssi:206
+#: en/user_basics.ssi:44 en/user_basics.ssi:120 en/user_basics.ssi:202
 msgid "# lb build"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:50
+#: en/user_basics.ssi:48
 msgid ""
 "This process can take a while, depending on the speed of your network "
-"connection (see {The lb build command}#lb-build )."
+"connection (see {The lb build command}#lb-build)."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:52
+#: en/user_basics.ssi:50
 msgid "3~ Testing an ISO image with Qemu"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:54
+#: en/user_basics.ssi:52
 msgid "Testing an ISO is simple:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:58 en/user_basics.ssi:146
+#: en/user_basics.ssi:56 en/user_basics.ssi:142
 msgid "# apt-get install qemu"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:60
+#: en/user_basics.ssi:58
 msgid "$ qemu -cdrom binary.iso"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:64
+#: en/user_basics.ssi:62
 msgid "3~ Testing an ISO image with virtualbox-ose"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:66
+#: en/user_basics.ssi:64
 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"
+msgstr ""
+
+#. type: Plain text
 #: en/user_basics.ssi:70
-msgid "# apt-get install virtualbox-ose"
+msgid "$ virtualbox"
 msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:74
 msgid ""
-"and either install #{virtualbox-ose-source}# or #{virtualbox-ose-dkms}# to "
-"build the required kernel modules to run virtualbox-ose."
+"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
 msgid ""
-"After successful installation, virtualbox can be e.g. found in the GNOME "
-"menu under 'Applications/System Tools/VirtualBox OSE'."
+"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 ""
 
 #. type: Plain text
-#: en/user_basics.ssi:78
-msgid ""
-"Please consider including of following packages onto the live image to "
-"achieve higher resolution of the display when booting the live image in "
-"virutalbox-ose (1280x1024 instead of 800x600 and in particular if the "
-"default resolution of the virtualbox-ose display shouldn't work with the gui-"
-"installer)."
+#: en/user_basics.ssi:80
+msgid "# lb config --packages virtualbox-ose-guest-x11"
 msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:84
-msgid ""
-"virtualbox-ose-guest-dkms virtualbox-ose-guest-utils virtualbox-ose-guest-x11"
-msgstr ""
-
-#. type: Plain text
-#: en/user_basics.ssi:88
 msgid "3~ Burning an ISO image to a physical medium"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:90
+#: en/user_basics.ssi:86
 msgid "Burning an ISO image is easy:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:94
+#: en/user_basics.ssi:90
 msgid "# apt-get install wodim"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:96
+#: en/user_basics.ssi:92
 msgid "$ wodim binary.iso"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:100
-msgid "2~ Building an USB/HDD image"
+#: en/user_basics.ssi:96
+msgid "2~ Building a USB/HDD image"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:102
+#: en/user_basics.ssi:98
 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."
+"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 ""
 
 #. type: Plain text
-#: en/user_basics.ssi:104
+#: en/user_basics.ssi:100
 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 ):"
+"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 ""
 
 #. type: Plain text
-#: en/user_basics.ssi:108 en/user_basics.ssi:188
+#: en/user_basics.ssi:104 en/user_basics.ssi:184
 msgid "$ lb clean --binary"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:112
+#: en/user_basics.ssi:108
 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:116
+#: en/user_basics.ssi:112
 msgid "$ lb config -b usb-hdd"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:120
+#: en/user_basics.ssi:116
 msgid "Now build the image with the #{lb build} command:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:128
-msgid "3~ Copying USB/HDD image to a USB stick"
+#: en/user_basics.ssi:124
+msgid "3~copying-usb-hdd-image Copying USB/HDD image to a USB stick"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:130
+#: en/user_basics.ssi:126
 msgid ""
 "The generated binary image contains a VFAT partition and the syslinux "
-"bootloader, ready to be directly written on an USB stick. Plug in an USB "
-"stick with a size larger than that of binary.img and type:"
+"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 ""
 
 #. type: Plain text
-#: en/user_basics.ssi:134
+#: en/user_basics.ssi:130
 msgid "$ dd if=binary.img of=${USBSTICK}"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:138
+#: en/user_basics.ssi:134
 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."
+"looking in #{dmesg}#'s output after plugging in the stick, for example, or "
+"better yet, #{ls -l /dev/disk/by-id}#."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:140
+#: en/user_basics.ssi:136
 #, no-wrap
 msgid "*{This will definitely overwrite any previous contents on your stick!}*\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:142
+#: en/user_basics.ssi:138
 msgid "3~ Testing a USB/HDD image with Qemu"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:148
+#: en/user_basics.ssi:144
 msgid "$ qemu -hda binary.img"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:152
+#: en/user_basics.ssi:148
 msgid "3~ Using the space left on a USB stick"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:154
+#: 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}"
@@ -469,45 +467,45 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:158
+#: en/user_basics.ssi:154
 msgid "# gparted ${USBSTICK}"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:162
+#: en/user_basics.ssi:158
 msgid ""
-"Ater the creation of the partition you have to create a filsystem on it. One "
-"possible choice would be ext4."
+"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:166
+#: en/user_basics.ssi:162
 msgid "# mkfs.ext4 ${USBSTICK}"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:170
+#: 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:174
+#: en/user_basics.ssi:170
 msgid "# mkfs.vfat -F 32"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:178
+#: en/user_basics.ssi:174
 #, no-wrap
-msgid "*{Remember: Every time you install a new binary.img on the stick, all your data will be lost because the image includes a complete partition table.}*\n"
+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:180
+#: en/user_basics.ssi:176
 msgid "2~ Building a netboot image"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:182
+#: 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 "
@@ -515,99 +513,99 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:184
+#: en/user_basics.ssi:180
 msgid ""
-"Note if you performed any previous examples, you will need to clean up your "
+"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:192
+#: en/user_basics.ssi:188
 msgid ""
 "Run the #{lb config}# command with the parameters to configure the \"config/"
 "\" hierarchy to create our netboot image:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:196
+#: en/user_basics.ssi:192
 msgid ""
 "$ lb config -b net --net-root-path \"/srv/debian-live\" --net-root-server "
 "\"192.168.0.1\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:200
+#: 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 "
+"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."
+"located at boot time."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:202
+#: en/user_basics.ssi:198
 msgid "Now build the image with the #{lb build}# command:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:210
+#: en/user_basics.ssi:206
 msgid ""
-"In a network boot the client runs a small piece of software, which usually "
+"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 boot loader via the TFTP protocol. That "
-"could be PXELINUX, Grub or even boot directly to an operating system like "
+"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 ""
 
 #. type: Plain text
-#: en/user_basics.ssi:212
+#: 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 "
+"filesystem.squashfs and the kernel, initrd and pxelinux bootloader in "
 "tftpboot/debian-live/i386."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:214
+#: en/user_basics.ssi:210
 msgid "We must now configure three services on the server to enable netboot."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:216
+#: en/user_basics.ssi:212
 msgid "3~ DHCP server"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:218
+#: en/user_basics.ssi:214
 msgid ""
 "We must configure our network's DHCP server to be sure to give an IP address "
-"to the computer netbooting, and to advertise the location of the PXE "
+"to the netbooting client system, and to advertise the location of the PXE "
 "bootloader."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:220
+#: 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 ""
 
 #. type: Plain text
-#: en/user_basics.ssi:222 en/user_customization-packages.ssi:153
+#: en/user_basics.ssi:218 en/user_customization-packages.ssi:153
 msgid "% FIXME"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:226
+#: en/user_basics.ssi:222
 #, no-wrap
 msgid "subnet 192.168.1.0 netmask 255.255.255.0 {   # 192.168.1.0/24\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:229
+#: en/user_basics.ssi:225
 #, no-wrap
 msgid ""
 "  # IP addresses available for guests\n"
@@ -615,7 +613,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:232
+#: en/user_basics.ssi:228
 #, no-wrap
 msgid ""
 "  # allow booting from the net\n"
@@ -623,7 +621,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:237
+#: en/user_basics.ssi:233
 #, no-wrap
 msgid ""
 "  # for net booting, server where the first file to be loaded (by TFTP\n"
@@ -633,7 +631,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:241
+#: en/user_basics.ssi:237
 #, no-wrap
 msgid ""
 "  # net boot configuration for guests with a PXE client:\n"
@@ -642,15 +640,15 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:244
+#: en/user_basics.ssi:240
 #, no-wrap
 msgid ""
-"    # PXE boot loader (first program to be loaded, by TFTP)\n"
+"    # PXE bootloader (first program to be loaded, by TFTP)\n"
 "    filename \"pxelinux.0\";\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:247
+#: en/user_basics.ssi:243
 #, no-wrap
 msgid ""
 "  }\n"
@@ -658,17 +656,17 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:251
+#: en/user_basics.ssi:247
 msgid "3~ TFTP server"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:253
-msgid "This serves the kernel and initial ramdisk to the system at run-time."
+#: en/user_basics.ssi:249
+msgid "This serves the kernel and initial ramdisk to the system at run time."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:255
+#: en/user_basics.ssi:251
 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 /"
@@ -676,22 +674,22 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:259
+#: en/user_basics.ssi:255
 msgid "dpkg-reconfigure -plow tftpd-hpa"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:263
+#: en/user_basics.ssi:259
 msgid "and fill in the new tftp server directory when being asked about it."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:265
+#: en/user_basics.ssi:261
 msgid "3~ NFS server"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:267
+#: en/user_basics.ssi:263
 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 "
@@ -699,35 +697,35 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:269
+#: en/user_basics.ssi:265
 msgid "You need to install the nfs-kernel-server package."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:271
+#: en/user_basics.ssi:267
 msgid ""
 "Then, make the filesystem image available through NFS by adding a line like "
 "the following to /etc/exports:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:275
+#: en/user_basics.ssi:271
 msgid "/srv/debian-live *(ro,async,no_root_squash,no_subtree_check)"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:279
+#: en/user_basics.ssi:275
 msgid ""
 "and tell the NFS server about this new export with the following command:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:283
+#: en/user_basics.ssi:279
 msgid "# exportfs -rv"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:287
+#: en/user_basics.ssi:283
 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 "
@@ -736,40 +734,40 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:289
+#: en/user_basics.ssi:285
 msgid "3~ Netboot testing HowTo"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:291
+#: en/user_basics.ssi:287
 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:293
+#: en/user_basics.ssi:289
 msgid ""
 "To make our life easier, we can use virtualization. There are two solutions."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:295
+#: en/user_basics.ssi:291
 msgid "3~ Qemu"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:297
+#: en/user_basics.ssi:293
 msgid "_* Install qemu, bridge-utils, sudo."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:299
+#: en/user_basics.ssi:295
 msgid "Edit /etc/qemu-ifup:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:310
+#: en/user_basics.ssi:306
 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...\" "
@@ -778,62 +776,62 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:314
+#: en/user_basics.ssi:310
 msgid "Get, or build a grub-floppy-netboot (in the svn)."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:316
+#: en/user_basics.ssi:312
 msgid "Launch qemu with \"-net nic,vlan=0 -net tap,vlan=0,ifname=tun0\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:318
+#: en/user_basics.ssi:314
 msgid "3~ VMWare Player"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:320
+#: en/user_basics.ssi:316
 msgid "_* Install VMWare Player (\"free as in beer\" edition)"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:322
+#: en/user_basics.ssi:318
 msgid ""
 "_* Create a PXETester directory, and create a text file called pxe.vwx inside"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:324
+#: en/user_basics.ssi:320
 msgid "_* Paste this text inside:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:332
+#: en/user_basics.ssi:328
 msgid ""
 "#!/usr/bin/vmware config.version = \"8\" virtualHW.version = \"4\" memsize = "
 "\"512\" MemAllowAutoScaleDown = \"FALSE\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:338
+#: en/user_basics.ssi:334
 msgid ""
 "ide0:0.present = \"FALSE\" ide1:0.present = \"FALSE\" floppy0.present = "
 "\"FALSE\" sound.present = \"FALSE\" tools.remindInstall = \"FALSE\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:341
+#: en/user_basics.ssi:337
 msgid "ethernet0.present = \"TRUE\" ethernet0.addressType = \"generated\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:344
+#: en/user_basics.ssi:340
 msgid "displayName = \"Test Boot PXE\" guestOS = \"other\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:349
+#: en/user_basics.ssi:345
 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 "
@@ -841,19 +839,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:353
+#: en/user_basics.ssi:349
 msgid ""
 "_* You can play with this configuration file (i.e. change memory limit to "
 "256)"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:355
+#: en/user_basics.ssi:351
 msgid ""
-"_* Double click on this file (or run VMWare player and selecet this file)."
+"_* Double click on this file (or run VMWare player and select this file)."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:356
+#: en/user_basics.ssi:352
 msgid "_* When running just press space if that strange question comes up..."
 msgstr ""
diff --git a/manual/po/ro/user_customization-internationalization.ssi.po b/manual/po/ro/user_customization-internationalization.ssi.po
index 5f8e2c7..148d727 100644
--- a/manual/po/ro/user_customization-internationalization.ssi.po
+++ b/manual/po/ro/user_customization-internationalization.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-22 08:57-0200\n"
+"POT-Creation-Date: 2010-10-28 09:15-0200\n"
 "PO-Revision-Date: 2010-10-22 08:57-0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -42,16 +42,17 @@ msgstr ""
 #: 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/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/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
@@ -68,8 +69,8 @@ msgstr ""
 #: 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_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:46
@@ -102,16 +103,16 @@ msgstr "code{"
 #: 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:269 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/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
@@ -128,8 +129,8 @@ msgstr "code{"
 #: 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_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:84
@@ -155,8 +156,8 @@ msgstr ""
 #. type: Plain text
 #: en/user_customization-internationalization.ssi:8
 msgid ""
-"The default locale when building a live cd is \"locales=en_US.UTF-8\", to "
-"set the locale for e.g. Switzerland, you can use \"locales=de_CH.UTF-8\"."
+"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
diff --git a/manual/po/ro/user_customization-overview.ssi.po b/manual/po/ro/user_customization-overview.ssi.po
index 291851a..83669bd 100644
--- a/manual/po/ro/user_customization-overview.ssi.po
+++ b/manual/po/ro/user_customization-overview.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-22 08:57-0200\n"
+"POT-Creation-Date: 2010-11-11 11:58-0400\n"
 "PO-Revision-Date: 2010-10-22 08:57-0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -28,18 +28,112 @@ msgid "1~customization-overview Customization overview"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-overview.ssi:7
+#: en/user_customization-overview.ssi:6
 msgid ""
-"% FIXME: just a stub for now.  In conversational style, cover the different "
-"kinds of customization % and link to each section within the text."
+"This chapter gives an overview of the various ways in which you may "
+"customize a Debian Live system."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-overview.ssi:9
+#: en/user_customization-overview.ssi:8
+msgid "2~ Build time vs. boot time configuration"
+msgstr ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. type: Plain text
+#: en/user_customization-overview.ssi:14
+msgid "2~stages-of-the-build Stages of the build"
+msgstr ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. type: Plain text
+#: en/user_customization-overview.ssi:20
+msgid "2~ Supplement lb config with files"
+msgstr ""
+
+#. 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 ""
+
+#. type: Plain text
+#: en/user_customization-overview.ssi:24
+msgid "2~ Customization tasks"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-overview.ssi:26
 msgid ""
-"This chapter gives an overview of the various ways in which your Debian live "
-"systems may be customized. See sections {Customizing package installation}"
-"#customizing-package-installation, {Customizing contents}#customizing-"
-"contents and {Customizing locale and language}#customizing-locale-and-"
-"language."
+"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 ""
diff --git a/manual/po/ro/user_customization-packages.ssi.po b/manual/po/ro/user_customization-packages.ssi.po
index 939dfaf..6d90465 100644
--- a/manual/po/ro/user_customization-packages.ssi.po
+++ b/manual/po/ro/user_customization-packages.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-22 08:58-0200\n"
+"POT-Creation-Date: 2010-11-12 16:21-0400\n"
 "PO-Revision-Date: 2010-10-22 08:58-0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -40,40 +40,38 @@ msgstr ""
 #: 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/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: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_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_customization-packages.ssi:14 en/user_customization-packages.ssi:26
+#: en/user_customization-packages.ssi:38 en/user_customization-packages.ssi:47
+#: en/user_customization-packages.ssi:61 en/user_customization-packages.ssi:75
+#: en/user_customization-packages.ssi:105
+#: en/user_customization-packages.ssi:113
+#: en/user_customization-packages.ssi:133
+#: en/user_customization-packages.ssi:168
+#: en/user_customization-packages.ssi:178
+#: en/user_customization-packages.ssi:188
+#: en/user_customization-packages.ssi:198 en/user_examples.ssi:24
+#: 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:46
-#: en/user_overview.ssi:90 en/user_overview.ssi:98
+#: 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{"
 
@@ -100,45 +98,43 @@ msgstr "code{"
 #: 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:269 en/user_basics.ssi:285
-#: en/user_basics.ssi:293 en/user_basics.ssi:320 en/user_basics.ssi:359
+#: 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/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_customization-packages.ssi:18 en/user_customization-packages.ssi:30
+#: en/user_customization-packages.ssi:43 en/user_customization-packages.ssi:51
+#: en/user_customization-packages.ssi:65 en/user_customization-packages.ssi:79
+#: en/user_customization-packages.ssi:109
+#: en/user_customization-packages.ssi:117
+#: en/user_customization-packages.ssi:137
+#: en/user_customization-packages.ssi:174
+#: en/user_customization-packages.ssi:184
+#: en/user_customization-packages.ssi:194
+#: en/user_customization-packages.ssi:204 en/user_examples.ssi:33
+#: 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:84
-#: en/user_overview.ssi:94 en/user_overview.ssi:102
+#: 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_basics.ssi:230 en/user_customization-packages.ssi:153
+#: en/user_basics.ssi:218 en/user_customization-packages.ssi:155
 msgid "% FIXME"
 msgstr ""
 
@@ -154,85 +150,111 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:6
-msgid "_* Selecting additional packages to be installed"
+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. We start with customization of the 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 ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:8
-msgid "_* Installing modified packages"
+msgid "2~ Package sources"
 msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:10
-msgid "2~ Package sources"
+msgid "3~ Debian repositories"
 msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:12
-msgid "3~ Debian repositories"
+msgid "To set a local mirror to be used to at build time:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:14
-msgid "To set a local mirror (used to 'build' the live system)"
+#: en/user_customization-packages.ssi:16
+msgid "$ lb config --mirror-bootstrap http://localhost/debian/"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:18
+#: en/user_customization-packages.ssi:20
 msgid ""
-"$ lb config --mirror-bootstrap http://localhost/debian/ --mirror-chroot "
-"http://localhost/debian/"
+"The chroot repository, specified by --mirror-chroot, defaults to the same as "
+"--mirror-bootstrap."
 msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:22
+msgid ""
+"Each of the --mirror-* options governs which repository 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, when the "
+"binary image is constructed, the --mirror-binary value is used, superceding "
+"any earlier repositories."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:24
 msgid "The generic mirror is added to the live system's /etc/apt/sources.list."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:26
+#: en/user_customization-packages.ssi:28
 msgid "$ lb config --mirror-binary http://ftp.debian.org/debian/"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:30
+#: en/user_customization-packages.ssi:32
 msgid ""
 "Note: It is not used for building the live system but to install new "
 "software while using the live system."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:32
+#: en/user_customization-packages.ssi:34
 msgid ""
 "It can be disabled by setting the binary mirror to the same value as the "
 "chroot mirror."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:34
+#: en/user_customization-packages.ssi:36
 msgid ""
 "Note: the same applies for mirror chroot security and mirror binary security"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:39
+#: en/user_customization-packages.ssi:41
 msgid ""
 "$ lb config --mirror-chroot-security {URL} $ lb config --mirror-binary-"
 "security {URL}"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:43
+#: en/user_customization-packages.ssi:45
 msgid "If you don't want to include apt indices, you can skip those with:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:47
+#: en/user_customization-packages.ssi:49
 msgid "$ lb config --binary-indices false"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:51
+#: en/user_customization-packages.ssi:53
 msgid ""
 "This will not influence the entries in /etc/apt/sources.list, but only if /"
 "var/lib/apt contains the indices files or not (and by that making the image "
@@ -240,12 +262,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:53
+#: en/user_customization-packages.ssi:55
 msgid "3~ Own repository"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:55
+#: en/user_customization-packages.ssi:57
 msgid ""
 "To add more repositories (e.g. backports, experimental or custom packages, "
 "etc.), create #{config/chroot_sources/your-repository.{chroot,binary}}# "
@@ -253,7 +275,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:57
+#: en/user_customization-packages.ssi:59
 msgid ""
 "e.g. #{config/chroot_sources/live.chroot}# allows you to install packages "
 "from the debian live snapshot repository at live system build time (you have "
@@ -261,31 +283,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:61
+#: en/user_customization-packages.ssi:63
 msgid "deb http://live.debian.net/ sid-snapshots main contrib non-free"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:65
+#: en/user_customization-packages.ssi:67
 msgid ""
 "If you add the line to #{config/chroot_sources/live.binary}# the repository "
 "will be added to your live-system's #{/etc/apt/sources.list}#."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:67
+#: en/user_customization-packages.ssi:69
 msgid "If such files exist, they will be picked up automatically."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:69
+#: en/user_customization-packages.ssi:71
 msgid ""
 "You can also put the gpg-key used to sign the repository into config/"
 "chroot_sources/your-repository.{binary,chroot}.gpg"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:71
+#: en/user_customization-packages.ssi:73
 msgid ""
 "Note: some preconfigured package repositories are available for easy "
 "selection through the --repository switch, e.g. for enabling live snapshots, "
@@ -293,17 +315,17 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:75
+#: en/user_customization-packages.ssi:77
 msgid "$ lb config --repository live.debian.net"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:79
+#: en/user_customization-packages.ssi:81
 msgid "3~ Package installation"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:81
+#: en/user_customization-packages.ssi:83
 msgid ""
 "You can elect to use either #{apt}# or #{aptitude}# when installing "
 "packages. Which utility is used is governed by the #{LB_APT}# variable in #"
@@ -311,7 +333,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:83
+#: en/user_customization-packages.ssi:85
 msgid ""
 "_* #{apt}#: Specifying a missing package causes package installation to "
 "fail, which may not be the desired behaviour. This is the default setting "
@@ -319,7 +341,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:85
+#: en/user_customization-packages.ssi:87
 msgid ""
 "_* #{aptitude}#: Specifying a missing package causes package installation to "
 "succeed, which may not be the desired behaviour. This is the default setting "
@@ -327,66 +349,66 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:87
+#: en/user_customization-packages.ssi:89
 msgid "2~ Installing additional packages"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:89
+#: en/user_customization-packages.ssi:91
 msgid ""
 "live-helper has a number of mechanisms for indicating that additional "
 "packages should be installed, including:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:91
+#: en/user_customization-packages.ssi:93
 msgid "_* The #{LB_PACKAGES}# variable"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:93
+#: en/user_customization-packages.ssi:95
 msgid "_* Package lists"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:95
+#: en/user_customization-packages.ssi:97
 msgid "_* Local packages (#{chroot_local-packages/}#)"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:97
+#: en/user_customization-packages.ssi:99
 msgid "_* Tasks"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:99
+#: en/user_customization-packages.ssi:101
 msgid "3~ The #{LB_PACKAGES}# variable"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:101
+#: en/user_customization-packages.ssi:103
 msgid ""
 "To install additional packages, simply add them to the #{LB_PACKAGES}# "
 "variable in #{config/chroot}#. For example:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:105
+#: en/user_customization-packages.ssi:107
 msgid "LB_PACKAGES=\"package1 package2 package3 ... \""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:109
+#: en/user_customization-packages.ssi:111
 msgid "You can also specify initial values on the command line:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:113
+#: en/user_customization-packages.ssi:115
 msgid "$ lb config --packages \"package1 package2 package3\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:117
+#: en/user_customization-packages.ssi:119
 msgid ""
 "The behaviour of live-build when specifying a package that does not exist is "
 "determined by your choice of APT utility. See package-installation for more "
@@ -394,12 +416,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:119
+#: en/user_customization-packages.ssi:121
 msgid "% FIXME: <xref linkend=\"package-installation\"/>"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:121
+#: en/user_customization-packages.ssi:123
 msgid ""
 "If you need to specify a large number of packages to be installed or you "
 "need flexibility regarding which packages to install, you should probably be "
@@ -407,17 +429,17 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:123
+#: en/user_customization-packages.ssi:125
 msgid "% FIXME: <xref linkend=\"package-lists\"/>"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:125
+#: en/user_customization-packages.ssi:127
 msgid "3~ Package lists"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:129
 msgid ""
 "Package lists are a powerful way of expressing which packages should be "
 "installed. live-build ships with a number of predefined package lists which "
@@ -426,37 +448,37 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:129
+#: en/user_customization-packages.ssi:131
 msgid "To specify one or more package list, you can use:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:133
+#: en/user_customization-packages.ssi:135
 msgid "$ lb config --packages-lists \"list1 list2 list3\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:137
+#: en/user_customization-packages.ssi:139
 msgid ""
 "Note: Package lists that are distributed with live-build reside in the #{/"
 "usr/share/live/build/lists}# directory."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:139
+#: en/user_customization-packages.ssi:141
 #, no-wrap
 msgid "*{Local packages lists}*\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:141
+#: en/user_customization-packages.ssi:143
 msgid ""
 "You may supplement the supplied lists using local package lists stored in #"
 "{config/chroot_local-packageslists}#."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:143
+#: en/user_customization-packages.ssi:145
 msgid ""
 "Package lists that exist in this directory need to have a #{.list}# suffix "
 "in order to be processed. Local packages lists always override package lists "
@@ -465,13 +487,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:145
+#: en/user_customization-packages.ssi:147
 #, no-wrap
 msgid "*{Local binary packages lists}*\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:147
+#: en/user_customization-packages.ssi:149
 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 "
@@ -481,25 +503,25 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:151
 msgid ""
 "Package lists that exist in this directory need to have a .list suffix in "
 "order to be processed."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:151
+#: en/user_customization-packages.ssi:153
 #, no-wrap
 msgid "*{Extending a provided package list using includes}*\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:162
 msgid "% code{ % % #include <gnome> % iceweasel % % }code"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:162
+#: en/user_customization-packages.ssi:164
 msgid ""
 "The package lists that are included with live-build make extensive use of "
 "includes. They are available to view in the #{/usr/share/live/build/lists}# "
@@ -507,75 +529,75 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:164
+#: en/user_customization-packages.ssi:166
 #, no-wrap
 msgid "*{Using conditionals inside packages lists}*\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:172
 msgid "#if ARCHITECTURE amd64 ia32-libs #endif"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:174
+#: en/user_customization-packages.ssi:176
 msgid "or if #{LB_ARCHITECTURE}# is set to #{i386}# or #{amd64}#:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:180
+#: en/user_customization-packages.ssi:182
 msgid "#if ARCHITECTURE i386 amd64 memtest86+ #endif"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:184
+#: en/user_customization-packages.ssi:186
 msgid "or if #{LB_ARCHIVE_AREAS}# contains either #{contrib}# or #{non-free}#:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:190
+#: en/user_customization-packages.ssi:192
 msgid "#if ARCHIVE_AREAS contrib non-free vrms #endif"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:194
+#: en/user_customization-packages.ssi:196
 msgid "A conditional may surround an #{#include}# directive:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:200
+#: en/user_customization-packages.ssi:202
 msgid "#if ARCHITECTURE amd64 #include <gnome-full> #endif"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:204
+#: en/user_customization-packages.ssi:206
 msgid ""
 "Any live-build configuration variable that begins with #{LB_}# can be tested "
 "in this way."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:206
+#: en/user_customization-packages.ssi:208
 msgid "The nesting of conditionals is not supported."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:208
+#: en/user_customization-packages.ssi:210
 msgid "3~ Tasks"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:210
+#: en/user_customization-packages.ssi:212
 msgid "%FIXME"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:212
+#: en/user_customization-packages.ssi:214
 msgid "2~ Installing modified or third-party packages"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:214
+#: en/user_customization-packages.ssi:216
 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 "
@@ -586,7 +608,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:218
 msgid ""
 "This section does not cover advice regarding building or maintaining "
 "modified packages. Joachim Breitner's 'How to fork privately' method from "
@@ -597,22 +619,22 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:218
+#: en/user_customization-packages.ssi:220
 msgid "There are two ways of installing modified custom packages:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:220
+#: en/user_customization-packages.ssi:222
 msgid "_* #{chroot_local-packages}#"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:222
+#: en/user_customization-packages.ssi:224
 msgid "_* Using a custom APT repository"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:224
+#: en/user_customization-packages.ssi:226
 msgid ""
 "The #{chroot_local-packages}# is simpler to achieve and useful for \"one-off"
 "\" customizations but has a number of drawbacks, whilst using a custom APT "
@@ -620,12 +642,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:226
+#: en/user_customization-packages.ssi:228
 msgid "3~ Using #{chroot_local-packages}# to install custom packages"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:228
+#: en/user_customization-packages.ssi:230
 msgid ""
 "To install a custom package, simply copy it to the #{config/chroot_local-"
 "packages}# directory. Packages that are inside this directory will be "
@@ -634,45 +656,45 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:230
+#: en/user_customization-packages.ssi:232
 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:232
+#: en/user_customization-packages.ssi:234
 msgid ""
 "Using #{chroot_local-packages}# for installation of custom packages has "
 "disadvantages:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:234
+#: en/user_customization-packages.ssi:236
 msgid "_* It is not possible to use secure APT"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:236
+#: en/user_customization-packages.ssi:238
 msgid ""
 "_* You must install all appropriate packages in the #{config/chroot_local-"
 "packages}# directory"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:238
+#: en/user_customization-packages.ssi:240
 msgid ""
 "_* It does not lend itself to storing Debian Live configurations in revision "
 "control"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:240
+#: en/user_customization-packages.ssi:242
 msgid "3~ Using an APT repository to install custom packages"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:242
+#: en/user_customization-packages.ssi:244
 msgid ""
 "Unlike using #{chroot_local-packages}#, when using a custom APT repository "
 "you must ensure that you specify the packages elsewhere. See lb-packages for "
@@ -680,12 +702,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:244
+#: en/user_customization-packages.ssi:246
 msgid "% FIXME: <xref linkend=\"lb-packages\"/>"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:246
+#: en/user_customization-packages.ssi:248
 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 "
@@ -693,12 +715,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:248
+#: en/user_customization-packages.ssi:250
 msgid "3~ Custom packages and APT"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:250
+#: en/user_customization-packages.ssi:252
 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 "
@@ -708,7 +730,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:252
+#: en/user_customization-packages.ssi:254
 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 "
@@ -718,17 +740,17 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:254
+#: en/user_customization-packages.ssi:256
 msgid "% FIXME: <xref linkend=\"apt-preferences\"/>"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:256
+#: en/user_customization-packages.ssi:258
 msgid "3~ Altering APT preferences during Live system"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:257
+#: en/user_customization-packages.ssi:259
 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 "
diff --git a/manual/po/ro/user_customization-internationalization.ssi.po b/manual/po/ro/user_examples.ssi.po
similarity index 58%
copy from manual/po/ro/user_customization-internationalization.ssi.po
copy to manual/po/ro/user_examples.ssi.po
index 5f8e2c7..f9c2bc0 100644
--- a/manual/po/ro/user_customization-internationalization.ssi.po
+++ b/manual/po/ro/user_examples.ssi.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-22 08:57-0200\n"
-"PO-Revision-Date: 2010-10-22 08:57-0200\n"
+"POT-Creation-Date: 2010-11-04 16:34-0400\n"
+"PO-Revision-Date: 2010-11-04 16:34-0400\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "Language: ro\n"
@@ -40,17 +40,15 @@ msgstr ""
 #: 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/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: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
@@ -65,15 +63,15 @@ msgstr ""
 #: 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_customization-packages.ssi:196 en/user_examples.ssi:24
+#: 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:46
-#: en/user_overview.ssi:90 en/user_overview.ssi:98
+#: 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{"
 
@@ -100,16 +98,14 @@ msgstr "code{"
 #: 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:269 en/user_basics.ssi:285
-#: en/user_basics.ssi:293 en/user_basics.ssi:320 en/user_basics.ssi:359
+#: 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
@@ -125,95 +121,108 @@ msgstr "code{"
 #: 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_customization-packages.ssi:202 en/user_examples.ssi:33
+#: 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:84
-#: en/user_overview.ssi:94 en/user_overview.ssi:102
+#: 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"
+#: en/other_faq.ssi:85 en/other_faq.ssi:247 en/user_examples.ssi:26
+msgid "#!/bin/sh"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-internationalization.ssi:4
-msgid "1~customizing-locale-and-language Customizing locale and language"
+#: en/user_examples.ssi:2
+msgid "B~ Examples"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-internationalization.ssi:6
-msgid "2~ Default locale and keyboard"
+#: en/user_examples.ssi:4
+msgid "1~ Use Case Builds"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-internationalization.ssi:8
+#: en/user_examples.ssi:6
 msgid ""
-"The default locale when building a live cd is \"locales=en_US.UTF-8\", to "
-"set the locale for e.g. Switzerland, you can use \"locales=de_CH.UTF-8\"."
+"This chapter covers example builds for specific use cases with Debian Live."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-internationalization.ssi:12
-msgid "$ lb config --bootappend-live \"locales=de_CH.UTF-8\""
+#: en/user_examples.ssi:8
+msgid "2~ VNC Kiosk Client"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-internationalization.ssi:16
-msgid "The entry for a Swiss-German keyboard would be:"
+#: en/user_examples.ssi:10
+msgid "Create an image with live-build to boot directly to a VNC server."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-internationalization.ssi:20
-msgid "$ lb config --bootappend-live \"keyboard-layouts=ch\""
+#: en/user_examples.ssi:12
+msgid "_* Make a build directory: #{$ mkdir vncBuild}#"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-internationalization.ssi:24
-msgid "Combined, the keyboard and locale configured for Switzerland would be:"
+#: en/user_examples.ssi:14
+msgid "_* Move to the build directory: #{$ cd vncBuild}#"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-internationalization.ssi:28
+#: en/user_examples.ssi:16
 msgid ""
-"$ lb config --bootappend-live =\"locales=de_CH.UTF-8 keyboard-layouts=ch\""
+"Example to config the build directory to include gdm metacity "
+"xtightvncviewer: #{$ lb config --packages \"gdm3 metacity xtightvncviewer\"}#"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-internationalization.ssi:32
+#: en/user_examples.ssi:18
 msgid ""
-"Note: You can find a list of options in the manpage for live-config. "
-"Currently, only UTF-8 locales are supported."
+"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/user_customization-internationalization.ssi:34
-msgid "2~ l10n Packages"
+#: en/user_examples.ssi:20
+msgid ""
+"Create the .xsession for the default user: #{$ touch config/chroot_local-"
+"includes/etc/skel/.xsession}#"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-internationalization.ssi:36
+#: en/user_examples.ssi:22
 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"
+"Edit the .xsession file to launch metacity and start xvncviewer with "
+"something similar to the below:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-internationalization.ssi:40
-msgid "$ lb config --language \"de\""
+#: en/user_examples.ssi:29
+msgid "/usr/bin/metacity & /usr/bin/vncviewer xxx.xxx.xxx.xxx:PORT"
 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}#."
+#: en/user_examples.ssi:31
+msgid "exit"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:35
+msgid "_* Build the image: #{# lb build}#"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:37
+msgid "_* Enjoy."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:39
+msgid "2~ Next Example FIXME"
 msgstr ""
diff --git a/manual/po/ro/user_managing_a_configuration.ssi.po b/manual/po/ro/user_managing_a_configuration.ssi.po
index bbe1905..6c3247f 100644
--- a/manual/po/ro/user_managing_a_configuration.ssi.po
+++ b/manual/po/ro/user_managing_a_configuration.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-13 17:00+0300\n"
+"POT-Creation-Date: 2010-10-28 16:34-0200\n"
 "PO-Revision-Date: 2010-10-13 17:00+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -18,8 +18,8 @@ msgstr ""
 "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: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
@@ -42,14 +42,15 @@ msgstr ""
 #: 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/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/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
@@ -68,17 +69,17 @@ msgstr ""
 #: 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:105
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
+#: 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:60
-#: en/user_overview.ssi:104 en/user_overview.ssi:112
+#: 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:86 en/about_manual.ssi:94 en/about_manual.ssi:102
+#: 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
@@ -102,14 +103,15 @@ msgstr "code{"
 #: 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/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
@@ -127,11 +129,12 @@ msgstr "code{"
 #: 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:109 en/user_installation.ssi:124
-#: en/user_installation.ssi:139 en/user_managing_a_configuration.ssi:31
+#: 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:98
-#: en/user_overview.ssi:108 en/user_overview.ssi:116
+#: 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"
 
@@ -142,7 +145,7 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_managing_a_configuration.ssi:4
-msgid "1~ Managing a configuration"
+msgid "1~managing-a-configuration Managing a configuration"
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/po/ro/user_overview.ssi.po b/manual/po/ro/user_overview.ssi.po
index 22efbcb..c39a513 100644
--- a/manual/po/ro/user_overview.ssi.po
+++ b/manual/po/ro/user_overview.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-22 07:52-0200\n"
+"POT-Creation-Date: 2010-10-28 16:34-0200\n"
 "PO-Revision-Date: 2010-10-22 07:52-0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -42,16 +42,17 @@ msgstr ""
 #: 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/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/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
@@ -68,12 +69,12 @@ msgstr ""
 #: 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_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:46
-#: en/user_overview.ssi:90 en/user_overview.ssi:98
+#: 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{"
 
@@ -102,16 +103,16 @@ msgstr "code{"
 #: 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:269 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/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
@@ -128,12 +129,12 @@ msgstr "code{"
 #: 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_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:84
-#: en/user_overview.ssi:94 en/user_overview.ssi:102
+#: 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"
 
@@ -211,88 +212,37 @@ msgstr ""
 #. type: Plain text
 #: en/user_overview.ssi:22
 msgid ""
-"Besides the common config/common, which is used by all live-build commands, "
-"some additional files can be used to configure the behavior of specific "
-"helper commands. These files are typically named config/command or config/"
-"stage (where \"stage\", of course, is replaced with the name of the stage "
-"that they belong to, and \"command\" with the name of the command)."
-msgstr ""
-
-#. type: Plain text
-#: en/user_overview.ssi:24
-msgid ""
-"For example, the #{lb_bootstrap_debootstrap}# command uses files named "
-"config/bootstrap and config/bootstrap_debootstrap to read the options it "
-"will use. Generally, these files contain variables with values assigned, one "
-"variable per line. Some commands of live-buil use pairs of values or "
-"slightly more complicated variable assignments."
-msgstr ""
-
-#. type: Plain text
-#: en/user_overview.ssi:26
-msgid ""
-"live-build respects environment variables which are present in the context "
-"of the shell it is running. If variables can be read from config files, then "
-"they override environment variables, and if command line options are used, "
-"they override values from config files. If no value for a given variable can "
-"be found (and is thus unset), live-build will automatically set it to a "
-"default value."
-msgstr ""
-
-#. type: Plain text
-#: en/user_overview.ssi:28
-msgid ""
-"All config files are shell scripts which are sourced by a live-build "
-"command. That means they have to follow the normal shell syntax. You can "
-"also put comments in these files; lines beginning with \"#\" are ignored."
-msgstr ""
-
-#. type: Plain text
-#: en/user_overview.ssi:30
-msgid ""
-"In some rare cases you may want to have different versions of these files "
-"for different architectures or distributions. If files named config/stage."
-"arch or config/stage_command.arch, and config/stage.dist or config/"
-"stage_command.dist exist (where \"arch\" is the same as the output of dpkg --"
-"print-architecture and \"dist\" is the same as the codename of the target "
-"distribution), then they will be used in preference to the other, more "
-"general files."
-msgstr ""
-
-#. type: Plain text
-#: en/user_overview.ssi:32
-msgid ""
 "The remainder of this section discusses the three most important commands:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:34
+#: 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 ""
 
 #. type: Plain text
-#: en/user_overview.ssi:36
+#: 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 ""
 
 #. type: Plain text
-#: en/user_overview.ssi:38
+#: 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 ""
 
 #. type: Plain text
-#: en/user_overview.ssi:40
+#: en/user_overview.ssi:30
 msgid "3~lb-config The #{lb config}# command"
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:42
+#: 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 "
@@ -302,26 +252,26 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:44
+#: en/user_overview.ssi:34
 msgid ""
 "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:49
+#: en/user_overview.ssi:39
 msgid "$ lb config P: Creating config tree"
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:54
+#: en/user_overview.ssi:44
 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"
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:82
+#: en/user_overview.ssi:72
 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 "
@@ -346,54 +296,50 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:86
+#: en/user_overview.ssi:76
 msgid ""
 "Using #{lb config}# without any arguments would be suitable for users who "
-"are either happy editing the generated files, or are simply happy with the "
-"defaults it creates."
+"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 ""
 
 #. type: Plain text
-#: en/user_overview.ssi:88
+#: en/user_overview.ssi:78
 msgid ""
-"You can ask #{lb config}# to generate a config/ directory \"preseeded\" with "
-"various options. This might be suitable if you do not require the default "
-"settings but do not need to change a large number of options. For example:"
+"Normally, you will want to specify some options. For example, to include the "
+"'gnome' package list in your configuration:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:92
+#: en/user_overview.ssi:82
 msgid "$ lb config -p gnome"
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:96
-msgid ""
-"will build a config/ directory configured to include the 'gnome' package "
-"list. It is possible to specify many options:"
+#: en/user_overview.ssi:86
+msgid "It is possible to specify many options, such as:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:100
+#: en/user_overview.ssi:90
 msgid ""
 "$ lb config --binary-images net --hostname live-machine --username live-"
 "user ..."
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:104
-msgid ""
-"A full list of options is available in the #{lb_config}# man page. Most "
-"options have a parallel with an \"LB_\" prefixed variable."
+#: en/user_overview.ssi:94
+msgid "A full list of options is available in the #{lb_config}# man page."
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:106
+#: en/user_overview.ssi:96
 msgid "3~lb-build The #{lb build}# command"
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:108
+#: 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 "
@@ -401,33 +347,33 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:110
+#: en/user_overview.ssi:100
 msgid "3~lb-clean The #{lb clean}# command"
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:112
+#: 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 ""
 
 #. type: Plain text
-#: en/user_overview.ssi:114
+#: en/user_overview.ssi:104
 msgid "2~live-boot The live-boot package"
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:116
+#: 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."
+"as those created by live-build. This includes the Debian Live ISOs, netboot "
+"tarballs, and USB stick images."
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:118
+#: 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 "
@@ -436,7 +382,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:120
+#: 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 "
@@ -444,12 +390,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:122
+#: en/user_overview.ssi:112
 msgid "2~live-config The live-config package"
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:124
+#: 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 "
diff --git a/manual/po4a.cfg b/manual/po4a.cfg
index 8b43a9c..2ac4a63 100644
--- a/manual/po4a.cfg
+++ b/manual/po4a.cfg
@@ -17,13 +17,13 @@
 [type: text] en/other_resources.ssi $lang:$lang/other_resources.ssi
 [type: text] en/other_success-stories.ssi $lang:$lang/other_success-stories.ssi
 [type: text] en/other_troubleshooting.ssi $lang:$lang/other_troubleshooting.ssi
-[type: text] en/other_use-cases.ssi $lang:$lang/other_use-cases.ssi
 [type: text] en/project_bugs.ssi $lang:$lang/project_bugs.ssi
 [type: text] en/user_basics.ssi $lang:$lang/user_basics.ssi
 [type: text] en/user_customization-contents.ssi $lang:$lang/user_customization-contents.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_examples.ssi $lang:$lang/user_examples.ssi
 [type: text] en/user_installation.ssi $lang:$lang/user_installation.ssi
 [type: text] en/user_managing_a_configuration.ssi $lang:$lang/user_managing_a_configuration.ssi
 [type: text] en/user_overview.ssi $lang:$lang/user_overview.ssi
diff --git a/manual/pot/live-manual.ssm.pot b/manual/pot/live-manual.ssm.pot
index e7a1a29..e72bac7 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-10-25 23:12+0300\n"
+"POT-Creation-Date: 2010-11-13 16:15+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-10-25\n"
+" :published: 2010-11-13\n"
 msgstr ""
 
 #. type: Plain text
@@ -146,11 +146,21 @@ msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:55
+msgid ":B~ Examples ~#"
+msgstr ""
+
+#. type: Plain text
+#: en/live-manual.ssm:57
+msgid "<< user_examples.ssi"
+msgstr ""
+
+#. type: Plain text
+#: en/live-manual.ssm:59
 msgid ":B~ Other ~#"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:61
+#: en/live-manual.ssm:65
 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 "
@@ -160,76 +170,71 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:63
+#: en/live-manual.ssm:67
 msgid "% << other_customization-bootup.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:65
+#: en/live-manual.ssm:69
 msgid "% << other_customization-binary.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:67
+#: en/live-manual.ssm:71
 msgid "% << other_customization-backports.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:69
+#: en/live-manual.ssm:73
 msgid "% << other_common-tasks.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:71
+#: en/live-manual.ssm:75
 msgid "% << other_live-environment.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:73
+#: en/live-manual.ssm:77
 msgid "% << other_faq.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:75
+#: en/live-manual.ssm:79
 msgid "% << other_howtos.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:77
+#: en/live-manual.ssm:81
 msgid "% << other_coding-style.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:79
+#: en/live-manual.ssm:83
 msgid "% << other_procedures.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:81
+#: en/live-manual.ssm:85
 msgid "% << other_resources.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:83
-msgid "% << other_use-cases.ssi"
-msgstr ""
-
-#. type: Plain text
-#: en/live-manual.ssm:85
+#: en/live-manual.ssm:87
 msgid "% << other_success-stories.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:87
+#: en/live-manual.ssm:89
 msgid "% << other_troubleshooting.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:89
+#: en/live-manual.ssm:91
 msgid "% << other_configuration-layout.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:90
+#: en/live-manual.ssm:92
 msgid "% << other_configuration-files.ssi"
 msgstr ""
diff --git a/manual/pot/other_live-environment.ssi.pot b/manual/pot/other_live-environment.ssi.pot
index 80cc2fa..e3b5a5e 100644
--- a/manual/pot/other_live-environment.ssi.pot
+++ b/manual/pot/other_live-environment.ssi.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-03 20:30+0300\n"
+"POT-Creation-Date: 2010-10-28 07:47-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"
@@ -17,8 +17,8 @@ msgstr ""
 "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: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
@@ -26,56 +26,59 @@ msgstr ""
 #: 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/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/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-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-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: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_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: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
+#: 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:46
+#: en/user_overview.ssi:90 en/user_overview.ssi:98
 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: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
@@ -84,17 +87,12 @@ msgstr ""
 #: 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_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
@@ -104,30 +102,38 @@ msgstr ""
 #: 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/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: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_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: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
+#: 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:84
+#: en/user_overview.ssi:94 en/user_overview.ssi:102
 msgid "}code"
 msgstr ""
 
@@ -349,9 +355,9 @@ msgstr ""
 #. type: Plain text
 #: en/other_live-environment.ssi:103
 msgid ""
-"A live cd paradigm is a preinstalled 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 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
@@ -359,7 +365,7 @@ msgstr ""
 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 runtime evolutions of the system "
+"should be considered read-only and all the run-time evolutions of the system "
 "are lost at shutdown."
 msgstr ""
 
@@ -367,7 +373,7 @@ msgstr ""
 #: en/other_live-environment.ssi:108
 msgid ""
 "Persistence is a common name for different kinds of solutions for saving "
-"across reboots some, or all, of this runtime evolution of the system. To "
+"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 "
@@ -396,7 +402,7 @@ msgid ""
 "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 bootime and the system must be started with the "
+"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 ""
@@ -473,7 +479,7 @@ msgid ""
 "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 runtime could lead to "
+"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 "
@@ -519,8 +525,8 @@ msgstr ""
 #. type: Plain text
 #: en/other_live-environment.ssi:159
 msgid ""
-"The runtime 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-initramfs mounts all /"
-"live filesystem in order or with the module bootparameter."
+"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-initramfs "
+"mounts all /live filesystem in order or with the module boot parameter."
 msgstr ""
diff --git a/manual/pot/project_bugs.ssi.pot b/manual/pot/project_bugs.ssi.pot
index db499d7..dc6fde9 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-10-25 23:27+0300\n"
+"POT-Creation-Date: 2010-10-27 21:40-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"
@@ -42,14 +42,14 @@ msgstr ""
 #: 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:34 en/user_basics.ssi:44
-#: en/user_basics.ssi:56 en/user_basics.ssi:68 en/user_basics.ssi:80
-#: en/user_basics.ssi:92 en/user_basics.ssi:106 en/user_basics.ssi:114
-#: en/user_basics.ssi:122 en/user_basics.ssi:132 en/user_basics.ssi:144
-#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
-#: en/user_basics.ssi:186 en/user_basics.ssi:194 en/user_basics.ssi:204
-#: en/user_basics.ssi:224 en/user_basics.ssi:257 en/user_basics.ssi:273
-#: en/user_basics.ssi:281 en/user_basics.ssi:301 en/user_basics.ssi:326
+#: 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/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
@@ -102,15 +102,15 @@ msgstr ""
 #: 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:38
-#: en/user_basics.ssi:48 en/user_basics.ssi:62 en/user_basics.ssi:72
-#: en/user_basics.ssi:86 en/user_basics.ssi:98 en/user_basics.ssi:110
-#: en/user_basics.ssi:118 en/user_basics.ssi:126 en/user_basics.ssi:136
-#: en/user_basics.ssi:150 en/user_basics.ssi:160 en/user_basics.ssi:168
-#: en/user_basics.ssi:176 en/user_basics.ssi:190 en/user_basics.ssi:198
-#: en/user_basics.ssi:208 en/user_basics.ssi:249 en/user_basics.ssi:261
-#: en/user_basics.ssi:277 en/user_basics.ssi:285 en/user_basics.ssi:312
-#: en/user_basics.ssi:351 en/user_customization-contents.ssi:39
+#: 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
@@ -400,7 +400,7 @@ msgstr ""
 
 #. type: Plain text
 #: en/project_bugs.ssi:86
-msgid "3~ At boot-time"
+msgid "3~ At boot time"
 msgstr ""
 
 #. type: Plain text
@@ -416,7 +416,7 @@ msgstr ""
 
 #. type: Plain text
 #: en/project_bugs.ssi:90
-msgid "3~ At run-time"
+msgid "3~ At run time"
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/pot/user_basics.ssi.pot b/manual/pot/user_basics.ssi.pot
index 580b48f..26451b3 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-10-23 16:43+0300\n"
+"POT-Creation-Date: 2010-11-01 06:47-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"
@@ -41,16 +41,17 @@ msgstr ""
 #: 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:34
-#: en/user_basics.ssi:44 en/user_basics.ssi:56 en/user_basics.ssi:68
-#: en/user_basics.ssi:80 en/user_basics.ssi:92 en/user_basics.ssi:106
-#: en/user_basics.ssi:114 en/user_basics.ssi:122 en/user_basics.ssi:132
-#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
-#: en/user_basics.ssi:172 en/user_basics.ssi:186 en/user_basics.ssi:194
-#: en/user_basics.ssi:204 en/user_basics.ssi:224 en/user_basics.ssi:257
-#: en/user_basics.ssi:273 en/user_basics.ssi:281 en/user_basics.ssi:301
-#: en/user_basics.ssi:326 en/user_customization-contents.ssi:34
-#: en/user_customization-contents.ssi:43 en/user_customization-contents.ssi:66
+#: 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/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
@@ -71,8 +72,8 @@ msgstr ""
 #: 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:46
-#: en/user_overview.ssi:90 en/user_overview.ssi:98
+#: 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 ""
 
@@ -101,16 +102,16 @@ msgstr ""
 #: 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:38 en/user_basics.ssi:48
-#: en/user_basics.ssi:62 en/user_basics.ssi:72 en/user_basics.ssi:86
-#: en/user_basics.ssi:98 en/user_basics.ssi:110 en/user_basics.ssi:118
-#: en/user_basics.ssi:126 en/user_basics.ssi:136 en/user_basics.ssi:150
-#: en/user_basics.ssi:160 en/user_basics.ssi:168 en/user_basics.ssi:176
-#: en/user_basics.ssi:190 en/user_basics.ssi:198 en/user_basics.ssi:208
-#: en/user_basics.ssi:249 en/user_basics.ssi:261 en/user_basics.ssi:277
-#: en/user_basics.ssi:285 en/user_basics.ssi:312 en/user_basics.ssi:351
-#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
-#: en/user_customization-contents.ssi:70
+#: 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
@@ -131,8 +132,8 @@ msgstr ""
 #: 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:84
-#: en/user_overview.ssi:94 en/user_overview.ssi:102
+#: 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 ""
 
@@ -149,8 +150,8 @@ msgstr ""
 #. type: Plain text
 #: en/user_basics.ssi:6
 msgid ""
-"This chapter contains a brief overview of the build process as well as "
-"containing instructions on how to boot the various binary image types."
+"This chapter contains a brief overview of the build process and instructions "
+"for booting the various binary image types."
 msgstr ""
 
 #. type: Plain text
@@ -162,9 +163,9 @@ msgstr ""
 #: en/user_basics.ssi:10
 msgid ""
 "A live system usually means an operating system booted on a computer from a "
-"removable medium (such as CD-ROM, USB stick, or network), ready to use "
-"without any installation on the usual drive(s), with an auto-configuration "
-"done at runtime (see {Terms}#terms )."
+"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 ""
 
 #. type: Plain text
@@ -172,294 +173,291 @@ msgstr ""
 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 following parts:"
+"is made from the following parts:"
 msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:14
-msgid "_* Linux kernel"
+msgid "_* *{Linux kernel image}*, usually named #{vmlinuz*}#"
 msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:16
-msgid "_* The Linux image, usually named #{vmlinuz*}#"
-msgstr ""
-
-#. type: Plain text
-#: en/user_basics.ssi:18
 msgid ""
-"_* *{Initial RAM disk image (initrd)}*: RAM disk setup for the Linux boot, "
-"containing modules possibly needed to mount the filesystem's image and some "
+"_* *{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 ""
 
 #. type: Plain text
-#: en/user_basics.ssi:20
+#: en/user_basics.ssi:18
 msgid ""
-"_* *{System image}*: The operating systems filesystem image. The SquashFS "
-"compressed filesystem is used to minimize the Debian Live image size. Note "
-"that it's 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 partition(s) are used (see 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)."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:22
+#: en/user_basics.ssi:20
 msgid "% FIXME: <xref linkend=\"persistence\"/>"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:24
+#: en/user_basics.ssi:22
 msgid ""
-"_* *{Bootloader}*: A small piece of code, crafted to boot up from the chosen "
+"_* *{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 then loads the Linux kernel and its initrd to run with an "
-"associated filesystem image. Different solutions can be used depending on "
-"the target media and format of the filesystem containing the previous "
-"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 partition, "
-"etc."
+"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 ""
 
 #. type: Plain text
-#: en/user_basics.ssi:26
+#: en/user_basics.ssi:24
 msgid ""
-"_* live-build will build the system image from your specifications, setup a "
-"Linux kernel and its initrd, 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.)"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:28
+#: en/user_basics.ssi:26
 msgid "2~ First steps: building an ISO image"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:30
+#: en/user_basics.ssi:28
 msgid ""
-"The following sequence of commands, provided by live-build, will create a "
-"basic ISO image containing just the Debian standard system without X.org. It "
-"is suitable for burning to CD or DVD media."
+"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 ""
 
 #. type: Plain text
-#: en/user_basics.ssi:32
+#: en/user_basics.ssi:30
 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:36
+#: en/user_basics.ssi:34
 msgid "$ lb config"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:40
+#: en/user_basics.ssi:38
 msgid ""
-"By passing no parameters to #{lb config}# we indicated that we wish to use "
-"the defaults (see {The lb config command}#lb-config )."
+"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:42
+#: en/user_basics.ssi:40
 msgid ""
 "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:46 en/user_basics.ssi:124 en/user_basics.ssi:206
+#: en/user_basics.ssi:44 en/user_basics.ssi:120 en/user_basics.ssi:202
 msgid "# lb build"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:50
+#: en/user_basics.ssi:48
 msgid ""
 "This process can take a while, depending on the speed of your network "
-"connection (see {The lb build command}#lb-build )."
+"connection (see {The lb build command}#lb-build)."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:52
+#: en/user_basics.ssi:50
 msgid "3~ Testing an ISO image with Qemu"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:54
+#: en/user_basics.ssi:52
 msgid "Testing an ISO is simple:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:58 en/user_basics.ssi:146
+#: en/user_basics.ssi:56 en/user_basics.ssi:142
 msgid "# apt-get install qemu"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:60
+#: en/user_basics.ssi:58
 msgid "$ qemu -cdrom binary.iso"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:64
+#: en/user_basics.ssi:62
 msgid "3~ Testing an ISO image with virtualbox-ose"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:66
+#: en/user_basics.ssi:64
 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"
+msgstr ""
+
+#. type: Plain text
 #: en/user_basics.ssi:70
-msgid "# apt-get install virtualbox-ose"
+msgid "$ virtualbox"
 msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:74
 msgid ""
-"and either install #{virtualbox-ose-source}# or #{virtualbox-ose-dkms}# to "
-"build the required kernel modules to run virtualbox-ose."
+"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
 msgid ""
-"After successful installation, virtualbox can be e.g. found in the GNOME "
-"menu under 'Applications/System Tools/VirtualBox OSE'."
+"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 ""
 
 #. type: Plain text
-#: en/user_basics.ssi:78
-msgid ""
-"Please consider including of following packages onto the live image to "
-"achieve higher resolution of the display when booting the live image in "
-"virutalbox-ose (1280x1024 instead of 800x600 and in particular if the "
-"default resolution of the virtualbox-ose display shouldn't work with the gui-"
-"installer)."
+#: en/user_basics.ssi:80
+msgid "# lb config --packages virtualbox-ose-guest-x11"
 msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:84
-msgid ""
-"virtualbox-ose-guest-dkms virtualbox-ose-guest-utils virtualbox-ose-guest-x11"
-msgstr ""
-
-#. type: Plain text
-#: en/user_basics.ssi:88
 msgid "3~ Burning an ISO image to a physical medium"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:90
+#: en/user_basics.ssi:86
 msgid "Burning an ISO image is easy:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:94
+#: en/user_basics.ssi:90
 msgid "# apt-get install wodim"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:96
+#: en/user_basics.ssi:92
 msgid "$ wodim binary.iso"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:100
-msgid "2~ Building an USB/HDD image"
+#: en/user_basics.ssi:96
+msgid "2~ Building a USB/HDD image"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:102
+#: en/user_basics.ssi:98
 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."
+"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 ""
 
 #. type: Plain text
-#: en/user_basics.ssi:104
+#: en/user_basics.ssi:100
 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 ):"
+"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 ""
 
 #. type: Plain text
-#: en/user_basics.ssi:108 en/user_basics.ssi:188
+#: en/user_basics.ssi:104 en/user_basics.ssi:184
 msgid "$ lb clean --binary"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:112
+#: en/user_basics.ssi:108
 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:116
+#: en/user_basics.ssi:112
 msgid "$ lb config -b usb-hdd"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:120
+#: en/user_basics.ssi:116
 msgid "Now build the image with the #{lb build} command:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:128
-msgid "3~ Copying USB/HDD image to a USB stick"
+#: en/user_basics.ssi:124
+msgid "3~copying-usb-hdd-image Copying USB/HDD image to a USB stick"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:130
+#: en/user_basics.ssi:126
 msgid ""
 "The generated binary image contains a VFAT partition and the syslinux "
-"bootloader, ready to be directly written on an USB stick. Plug in an USB "
-"stick with a size larger than that of binary.img and type:"
+"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 ""
 
 #. type: Plain text
-#: en/user_basics.ssi:134
+#: en/user_basics.ssi:130
 msgid "$ dd if=binary.img of=${USBSTICK}"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:138
+#: en/user_basics.ssi:134
 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."
+"looking in #{dmesg}#'s output after plugging in the stick, for example, or "
+"better yet, #{ls -l /dev/disk/by-id}#."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:140
+#: en/user_basics.ssi:136
 #, no-wrap
 msgid "*{This will definitely overwrite any previous contents on your stick!}*\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:142
+#: en/user_basics.ssi:138
 msgid "3~ Testing a USB/HDD image with Qemu"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:148
+#: en/user_basics.ssi:144
 msgid "$ qemu -hda binary.img"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:152
+#: en/user_basics.ssi:148
 msgid "3~ Using the space left on a USB stick"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:154
+#: 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}"
@@ -468,45 +466,45 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:158
+#: en/user_basics.ssi:154
 msgid "# gparted ${USBSTICK}"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:162
+#: en/user_basics.ssi:158
 msgid ""
-"Ater the creation of the partition you have to create a filsystem on it. One "
-"possible choice would be ext4."
+"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:166
+#: en/user_basics.ssi:162
 msgid "# mkfs.ext4 ${USBSTICK}"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:170
+#: 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:174
+#: en/user_basics.ssi:170
 msgid "# mkfs.vfat -F 32"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:178
+#: en/user_basics.ssi:174
 #, no-wrap
-msgid "*{Remember: Every time you install a new binary.img on the stick, all your data will be lost because the image includes a complete partition table.}*\n"
+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:180
+#: en/user_basics.ssi:176
 msgid "2~ Building a netboot image"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:182
+#: 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 "
@@ -514,99 +512,99 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:184
+#: en/user_basics.ssi:180
 msgid ""
-"Note if you performed any previous examples, you will need to clean up your "
+"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:192
+#: en/user_basics.ssi:188
 msgid ""
 "Run the #{lb config}# command with the parameters to configure the \"config/"
 "\" hierarchy to create our netboot image:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:196
+#: en/user_basics.ssi:192
 msgid ""
 "$ lb config -b net --net-root-path \"/srv/debian-live\" --net-root-server "
 "\"192.168.0.1\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:200
+#: 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 "
+"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."
+"located at boot time."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:202
+#: en/user_basics.ssi:198
 msgid "Now build the image with the #{lb build}# command:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:210
+#: en/user_basics.ssi:206
 msgid ""
-"In a network boot the client runs a small piece of software, which usually "
+"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 boot loader via the TFTP protocol. That "
-"could be PXELINUX, Grub or even boot directly to an operating system like "
+"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 ""
 
 #. type: Plain text
-#: en/user_basics.ssi:212
+#: 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 "
+"filesystem.squashfs and the kernel, initrd and pxelinux bootloader in "
 "tftpboot/debian-live/i386."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:214
+#: en/user_basics.ssi:210
 msgid "We must now configure three services on the server to enable netboot."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:216
+#: en/user_basics.ssi:212
 msgid "3~ DHCP server"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:218
+#: en/user_basics.ssi:214
 msgid ""
 "We must configure our network's DHCP server to be sure to give an IP address "
-"to the computer netbooting, and to advertise the location of the PXE "
+"to the netbooting client system, and to advertise the location of the PXE "
 "bootloader."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:220
+#: 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 ""
 
 #. type: Plain text
-#: en/user_basics.ssi:222 en/user_customization-packages.ssi:153
+#: en/user_basics.ssi:218 en/user_customization-packages.ssi:153
 msgid "% FIXME"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:226
+#: en/user_basics.ssi:222
 #, no-wrap
 msgid "subnet 192.168.1.0 netmask 255.255.255.0 {   # 192.168.1.0/24\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:229
+#: en/user_basics.ssi:225
 #, no-wrap
 msgid ""
 "  # IP addresses available for guests\n"
@@ -614,7 +612,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:232
+#: en/user_basics.ssi:228
 #, no-wrap
 msgid ""
 "  # allow booting from the net\n"
@@ -622,7 +620,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:237
+#: en/user_basics.ssi:233
 #, no-wrap
 msgid ""
 "  # for net booting, server where the first file to be loaded (by TFTP\n"
@@ -632,7 +630,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:241
+#: en/user_basics.ssi:237
 #, no-wrap
 msgid ""
 "  # net boot configuration for guests with a PXE client:\n"
@@ -641,15 +639,15 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:244
+#: en/user_basics.ssi:240
 #, no-wrap
 msgid ""
-"    # PXE boot loader (first program to be loaded, by TFTP)\n"
+"    # PXE bootloader (first program to be loaded, by TFTP)\n"
 "    filename \"pxelinux.0\";\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:247
+#: en/user_basics.ssi:243
 #, no-wrap
 msgid ""
 "  }\n"
@@ -657,17 +655,17 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:251
+#: en/user_basics.ssi:247
 msgid "3~ TFTP server"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:253
-msgid "This serves the kernel and initial ramdisk to the system at run-time."
+#: en/user_basics.ssi:249
+msgid "This serves the kernel and initial ramdisk to the system at run time."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:255
+#: en/user_basics.ssi:251
 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 /"
@@ -675,22 +673,22 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:259
+#: en/user_basics.ssi:255
 msgid "dpkg-reconfigure -plow tftpd-hpa"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:263
+#: en/user_basics.ssi:259
 msgid "and fill in the new tftp server directory when being asked about it."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:265
+#: en/user_basics.ssi:261
 msgid "3~ NFS server"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:267
+#: en/user_basics.ssi:263
 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 "
@@ -698,35 +696,35 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:269
+#: en/user_basics.ssi:265
 msgid "You need to install the nfs-kernel-server package."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:271
+#: en/user_basics.ssi:267
 msgid ""
 "Then, make the filesystem image available through NFS by adding a line like "
 "the following to /etc/exports:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:275
+#: en/user_basics.ssi:271
 msgid "/srv/debian-live *(ro,async,no_root_squash,no_subtree_check)"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:279
+#: en/user_basics.ssi:275
 msgid ""
 "and tell the NFS server about this new export with the following command:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:283
+#: en/user_basics.ssi:279
 msgid "# exportfs -rv"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:287
+#: en/user_basics.ssi:283
 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 "
@@ -735,40 +733,40 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:289
+#: en/user_basics.ssi:285
 msgid "3~ Netboot testing HowTo"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:291
+#: en/user_basics.ssi:287
 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:293
+#: en/user_basics.ssi:289
 msgid ""
 "To make our life easier, we can use virtualization. There are two solutions."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:295
+#: en/user_basics.ssi:291
 msgid "3~ Qemu"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:297
+#: en/user_basics.ssi:293
 msgid "_* Install qemu, bridge-utils, sudo."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:299
+#: en/user_basics.ssi:295
 msgid "Edit /etc/qemu-ifup:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:310
+#: en/user_basics.ssi:306
 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...\" "
@@ -777,62 +775,62 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:314
+#: en/user_basics.ssi:310
 msgid "Get, or build a grub-floppy-netboot (in the svn)."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:316
+#: en/user_basics.ssi:312
 msgid "Launch qemu with \"-net nic,vlan=0 -net tap,vlan=0,ifname=tun0\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:318
+#: en/user_basics.ssi:314
 msgid "3~ VMWare Player"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:320
+#: en/user_basics.ssi:316
 msgid "_* Install VMWare Player (\"free as in beer\" edition)"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:322
+#: en/user_basics.ssi:318
 msgid ""
 "_* Create a PXETester directory, and create a text file called pxe.vwx inside"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:324
+#: en/user_basics.ssi:320
 msgid "_* Paste this text inside:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:332
+#: en/user_basics.ssi:328
 msgid ""
 "#!/usr/bin/vmware config.version = \"8\" virtualHW.version = \"4\" memsize = "
 "\"512\" MemAllowAutoScaleDown = \"FALSE\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:338
+#: en/user_basics.ssi:334
 msgid ""
 "ide0:0.present = \"FALSE\" ide1:0.present = \"FALSE\" floppy0.present = "
 "\"FALSE\" sound.present = \"FALSE\" tools.remindInstall = \"FALSE\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:341
+#: en/user_basics.ssi:337
 msgid "ethernet0.present = \"TRUE\" ethernet0.addressType = \"generated\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:344
+#: en/user_basics.ssi:340
 msgid "displayName = \"Test Boot PXE\" guestOS = \"other\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:349
+#: en/user_basics.ssi:345
 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 "
@@ -840,19 +838,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:353
+#: en/user_basics.ssi:349
 msgid ""
 "_* You can play with this configuration file (i.e. change memory limit to "
 "256)"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:355
+#: en/user_basics.ssi:351
 msgid ""
-"_* Double click on this file (or run VMWare player and selecet this file)."
+"_* Double click on this file (or run VMWare player and select this file)."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:356
+#: en/user_basics.ssi:352
 msgid "_* When running just press space if that strange question comes up..."
 msgstr ""
diff --git a/manual/pot/user_customization-internationalization.ssi.pot b/manual/pot/user_customization-internationalization.ssi.pot
index 4f993b4..7d6accb 100644
--- a/manual/pot/user_customization-internationalization.ssi.pot
+++ b/manual/pot/user_customization-internationalization.ssi.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-22 08:57-0200\n"
+"POT-Creation-Date: 2010-10-28 09:15-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"
@@ -41,16 +41,17 @@ msgstr ""
 #: 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/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/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
@@ -67,8 +68,8 @@ msgstr ""
 #: 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_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:46
@@ -101,16 +102,16 @@ msgstr ""
 #: 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:269 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/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
@@ -127,8 +128,8 @@ msgstr ""
 #: 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_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:84
@@ -154,8 +155,8 @@ msgstr ""
 #. type: Plain text
 #: en/user_customization-internationalization.ssi:8
 msgid ""
-"The default locale when building a live cd is \"locales=en_US.UTF-8\", to "
-"set the locale for e.g. Switzerland, you can use \"locales=de_CH.UTF-8\"."
+"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
diff --git a/manual/pot/user_customization-overview.ssi.pot b/manual/pot/user_customization-overview.ssi.pot
index c8f4007..afae677 100644
--- a/manual/pot/user_customization-overview.ssi.pot
+++ b/manual/pot/user_customization-overview.ssi.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-22 08:57-0200\n"
+"POT-Creation-Date: 2010-11-11 11: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"
@@ -27,18 +27,112 @@ msgid "1~customization-overview Customization overview"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-overview.ssi:7
+#: en/user_customization-overview.ssi:6
 msgid ""
-"% FIXME: just a stub for now.  In conversational style, cover the different "
-"kinds of customization % and link to each section within the text."
+"This chapter gives an overview of the various ways in which you may "
+"customize a Debian Live system."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-overview.ssi:9
+#: en/user_customization-overview.ssi:8
+msgid "2~ Build time vs. boot time configuration"
+msgstr ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. type: Plain text
+#: en/user_customization-overview.ssi:14
+msgid "2~stages-of-the-build Stages of the build"
+msgstr ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. type: Plain text
+#: en/user_customization-overview.ssi:20
+msgid "2~ Supplement lb config with files"
+msgstr ""
+
+#. 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 ""
+
+#. type: Plain text
+#: en/user_customization-overview.ssi:24
+msgid "2~ Customization tasks"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-overview.ssi:26
 msgid ""
-"This chapter gives an overview of the various ways in which your Debian live "
-"systems may be customized. See sections {Customizing package installation}"
-"#customizing-package-installation, {Customizing contents}#customizing-"
-"contents and {Customizing locale and language}#customizing-locale-and-"
-"language."
+"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 ""
diff --git a/manual/pot/user_customization-packages.ssi.pot b/manual/pot/user_customization-packages.ssi.pot
index 57cdfdb..037382e 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-10-22 08:58-0200\n"
+"POT-Creation-Date: 2010-11-12 16:21-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"
@@ -39,40 +39,38 @@ msgstr ""
 #: 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/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: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_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_customization-packages.ssi:14 en/user_customization-packages.ssi:26
+#: en/user_customization-packages.ssi:38 en/user_customization-packages.ssi:47
+#: en/user_customization-packages.ssi:61 en/user_customization-packages.ssi:75
+#: en/user_customization-packages.ssi:105
+#: en/user_customization-packages.ssi:113
+#: en/user_customization-packages.ssi:133
+#: en/user_customization-packages.ssi:168
+#: en/user_customization-packages.ssi:178
+#: en/user_customization-packages.ssi:188
+#: en/user_customization-packages.ssi:198 en/user_examples.ssi:24
+#: 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:46
-#: en/user_overview.ssi:90 en/user_overview.ssi:98
+#: 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 ""
 
@@ -99,45 +97,43 @@ msgstr ""
 #: 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:269 en/user_basics.ssi:285
-#: en/user_basics.ssi:293 en/user_basics.ssi:320 en/user_basics.ssi:359
+#: 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/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_customization-packages.ssi:18 en/user_customization-packages.ssi:30
+#: en/user_customization-packages.ssi:43 en/user_customization-packages.ssi:51
+#: en/user_customization-packages.ssi:65 en/user_customization-packages.ssi:79
+#: en/user_customization-packages.ssi:109
+#: en/user_customization-packages.ssi:117
+#: en/user_customization-packages.ssi:137
+#: en/user_customization-packages.ssi:174
+#: en/user_customization-packages.ssi:184
+#: en/user_customization-packages.ssi:194
+#: en/user_customization-packages.ssi:204 en/user_examples.ssi:33
+#: 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:84
-#: en/user_overview.ssi:94 en/user_overview.ssi:102
+#: 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_basics.ssi:230 en/user_customization-packages.ssi:153
+#: en/user_basics.ssi:218 en/user_customization-packages.ssi:155
 msgid "% FIXME"
 msgstr ""
 
@@ -153,85 +149,111 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:6
-msgid "_* Selecting additional packages to be installed"
+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. We start with customization of the 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 ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:8
-msgid "_* Installing modified packages"
+msgid "2~ Package sources"
 msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:10
-msgid "2~ Package sources"
+msgid "3~ Debian repositories"
 msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:12
-msgid "3~ Debian repositories"
+msgid "To set a local mirror to be used to at build time:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:14
-msgid "To set a local mirror (used to 'build' the live system)"
+#: en/user_customization-packages.ssi:16
+msgid "$ lb config --mirror-bootstrap http://localhost/debian/"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:18
+#: en/user_customization-packages.ssi:20
 msgid ""
-"$ lb config --mirror-bootstrap http://localhost/debian/ --mirror-chroot "
-"http://localhost/debian/"
+"The chroot repository, specified by --mirror-chroot, defaults to the same as "
+"--mirror-bootstrap."
 msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:22
+msgid ""
+"Each of the --mirror-* options governs which repository 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, when the "
+"binary image is constructed, the --mirror-binary value is used, superceding "
+"any earlier repositories."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:24
 msgid "The generic mirror is added to the live system's /etc/apt/sources.list."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:26
+#: en/user_customization-packages.ssi:28
 msgid "$ lb config --mirror-binary http://ftp.debian.org/debian/"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:30
+#: en/user_customization-packages.ssi:32
 msgid ""
 "Note: It is not used for building the live system but to install new "
 "software while using the live system."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:32
+#: en/user_customization-packages.ssi:34
 msgid ""
 "It can be disabled by setting the binary mirror to the same value as the "
 "chroot mirror."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:34
+#: en/user_customization-packages.ssi:36
 msgid ""
 "Note: the same applies for mirror chroot security and mirror binary security"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:39
+#: en/user_customization-packages.ssi:41
 msgid ""
 "$ lb config --mirror-chroot-security {URL} $ lb config --mirror-binary-"
 "security {URL}"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:43
+#: en/user_customization-packages.ssi:45
 msgid "If you don't want to include apt indices, you can skip those with:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:47
+#: en/user_customization-packages.ssi:49
 msgid "$ lb config --binary-indices false"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:51
+#: en/user_customization-packages.ssi:53
 msgid ""
 "This will not influence the entries in /etc/apt/sources.list, but only if /"
 "var/lib/apt contains the indices files or not (and by that making the image "
@@ -239,12 +261,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:53
+#: en/user_customization-packages.ssi:55
 msgid "3~ Own repository"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:55
+#: en/user_customization-packages.ssi:57
 msgid ""
 "To add more repositories (e.g. backports, experimental or custom packages, "
 "etc.), create #{config/chroot_sources/your-repository.{chroot,binary}}# "
@@ -252,7 +274,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:57
+#: en/user_customization-packages.ssi:59
 msgid ""
 "e.g. #{config/chroot_sources/live.chroot}# allows you to install packages "
 "from the debian live snapshot repository at live system build time (you have "
@@ -260,31 +282,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:61
+#: en/user_customization-packages.ssi:63
 msgid "deb http://live.debian.net/ sid-snapshots main contrib non-free"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:65
+#: en/user_customization-packages.ssi:67
 msgid ""
 "If you add the line to #{config/chroot_sources/live.binary}# the repository "
 "will be added to your live-system's #{/etc/apt/sources.list}#."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:67
+#: en/user_customization-packages.ssi:69
 msgid "If such files exist, they will be picked up automatically."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:69
+#: en/user_customization-packages.ssi:71
 msgid ""
 "You can also put the gpg-key used to sign the repository into config/"
 "chroot_sources/your-repository.{binary,chroot}.gpg"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:71
+#: en/user_customization-packages.ssi:73
 msgid ""
 "Note: some preconfigured package repositories are available for easy "
 "selection through the --repository switch, e.g. for enabling live snapshots, "
@@ -292,17 +314,17 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:75
+#: en/user_customization-packages.ssi:77
 msgid "$ lb config --repository live.debian.net"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:79
+#: en/user_customization-packages.ssi:81
 msgid "3~ Package installation"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:81
+#: en/user_customization-packages.ssi:83
 msgid ""
 "You can elect to use either #{apt}# or #{aptitude}# when installing "
 "packages. Which utility is used is governed by the #{LB_APT}# variable in #"
@@ -310,7 +332,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:83
+#: en/user_customization-packages.ssi:85
 msgid ""
 "_* #{apt}#: Specifying a missing package causes package installation to "
 "fail, which may not be the desired behaviour. This is the default setting "
@@ -318,7 +340,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:85
+#: en/user_customization-packages.ssi:87
 msgid ""
 "_* #{aptitude}#: Specifying a missing package causes package installation to "
 "succeed, which may not be the desired behaviour. This is the default setting "
@@ -326,66 +348,66 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:87
+#: en/user_customization-packages.ssi:89
 msgid "2~ Installing additional packages"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:89
+#: en/user_customization-packages.ssi:91
 msgid ""
 "live-helper has a number of mechanisms for indicating that additional "
 "packages should be installed, including:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:91
+#: en/user_customization-packages.ssi:93
 msgid "_* The #{LB_PACKAGES}# variable"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:93
+#: en/user_customization-packages.ssi:95
 msgid "_* Package lists"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:95
+#: en/user_customization-packages.ssi:97
 msgid "_* Local packages (#{chroot_local-packages/}#)"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:97
+#: en/user_customization-packages.ssi:99
 msgid "_* Tasks"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:99
+#: en/user_customization-packages.ssi:101
 msgid "3~ The #{LB_PACKAGES}# variable"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:101
+#: en/user_customization-packages.ssi:103
 msgid ""
 "To install additional packages, simply add them to the #{LB_PACKAGES}# "
 "variable in #{config/chroot}#. For example:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:105
+#: en/user_customization-packages.ssi:107
 msgid "LB_PACKAGES=\"package1 package2 package3 ... \""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:109
+#: en/user_customization-packages.ssi:111
 msgid "You can also specify initial values on the command line:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:113
+#: en/user_customization-packages.ssi:115
 msgid "$ lb config --packages \"package1 package2 package3\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:117
+#: en/user_customization-packages.ssi:119
 msgid ""
 "The behaviour of live-build when specifying a package that does not exist is "
 "determined by your choice of APT utility. See package-installation for more "
@@ -393,12 +415,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:119
+#: en/user_customization-packages.ssi:121
 msgid "% FIXME: <xref linkend=\"package-installation\"/>"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:121
+#: en/user_customization-packages.ssi:123
 msgid ""
 "If you need to specify a large number of packages to be installed or you "
 "need flexibility regarding which packages to install, you should probably be "
@@ -406,17 +428,17 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:123
+#: en/user_customization-packages.ssi:125
 msgid "% FIXME: <xref linkend=\"package-lists\"/>"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:125
+#: en/user_customization-packages.ssi:127
 msgid "3~ Package lists"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:129
 msgid ""
 "Package lists are a powerful way of expressing which packages should be "
 "installed. live-build ships with a number of predefined package lists which "
@@ -425,37 +447,37 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:129
+#: en/user_customization-packages.ssi:131
 msgid "To specify one or more package list, you can use:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:133
+#: en/user_customization-packages.ssi:135
 msgid "$ lb config --packages-lists \"list1 list2 list3\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:137
+#: en/user_customization-packages.ssi:139
 msgid ""
 "Note: Package lists that are distributed with live-build reside in the #{/"
 "usr/share/live/build/lists}# directory."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:139
+#: en/user_customization-packages.ssi:141
 #, no-wrap
 msgid "*{Local packages lists}*\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:141
+#: en/user_customization-packages.ssi:143
 msgid ""
 "You may supplement the supplied lists using local package lists stored in #"
 "{config/chroot_local-packageslists}#."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:143
+#: en/user_customization-packages.ssi:145
 msgid ""
 "Package lists that exist in this directory need to have a #{.list}# suffix "
 "in order to be processed. Local packages lists always override package lists "
@@ -464,13 +486,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:145
+#: en/user_customization-packages.ssi:147
 #, no-wrap
 msgid "*{Local binary packages lists}*\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:147
+#: en/user_customization-packages.ssi:149
 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 "
@@ -480,25 +502,25 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:151
 msgid ""
 "Package lists that exist in this directory need to have a .list suffix in "
 "order to be processed."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:151
+#: en/user_customization-packages.ssi:153
 #, no-wrap
 msgid "*{Extending a provided package list using includes}*\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:162
 msgid "% code{ % % #include <gnome> % iceweasel % % }code"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:162
+#: en/user_customization-packages.ssi:164
 msgid ""
 "The package lists that are included with live-build make extensive use of "
 "includes. They are available to view in the #{/usr/share/live/build/lists}# "
@@ -506,75 +528,75 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:164
+#: en/user_customization-packages.ssi:166
 #, no-wrap
 msgid "*{Using conditionals inside packages lists}*\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:172
 msgid "#if ARCHITECTURE amd64 ia32-libs #endif"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:174
+#: en/user_customization-packages.ssi:176
 msgid "or if #{LB_ARCHITECTURE}# is set to #{i386}# or #{amd64}#:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:180
+#: en/user_customization-packages.ssi:182
 msgid "#if ARCHITECTURE i386 amd64 memtest86+ #endif"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:184
+#: en/user_customization-packages.ssi:186
 msgid "or if #{LB_ARCHIVE_AREAS}# contains either #{contrib}# or #{non-free}#:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:190
+#: en/user_customization-packages.ssi:192
 msgid "#if ARCHIVE_AREAS contrib non-free vrms #endif"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:194
+#: en/user_customization-packages.ssi:196
 msgid "A conditional may surround an #{#include}# directive:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:200
+#: en/user_customization-packages.ssi:202
 msgid "#if ARCHITECTURE amd64 #include <gnome-full> #endif"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:204
+#: en/user_customization-packages.ssi:206
 msgid ""
 "Any live-build configuration variable that begins with #{LB_}# can be tested "
 "in this way."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:206
+#: en/user_customization-packages.ssi:208
 msgid "The nesting of conditionals is not supported."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:208
+#: en/user_customization-packages.ssi:210
 msgid "3~ Tasks"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:210
+#: en/user_customization-packages.ssi:212
 msgid "%FIXME"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:212
+#: en/user_customization-packages.ssi:214
 msgid "2~ Installing modified or third-party packages"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:214
+#: en/user_customization-packages.ssi:216
 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 "
@@ -585,7 +607,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:218
 msgid ""
 "This section does not cover advice regarding building or maintaining "
 "modified packages. Joachim Breitner's 'How to fork privately' method from "
@@ -596,22 +618,22 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:218
+#: en/user_customization-packages.ssi:220
 msgid "There are two ways of installing modified custom packages:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:220
+#: en/user_customization-packages.ssi:222
 msgid "_* #{chroot_local-packages}#"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:222
+#: en/user_customization-packages.ssi:224
 msgid "_* Using a custom APT repository"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:224
+#: en/user_customization-packages.ssi:226
 msgid ""
 "The #{chroot_local-packages}# is simpler to achieve and useful for \"one-off"
 "\" customizations but has a number of drawbacks, whilst using a custom APT "
@@ -619,12 +641,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:226
+#: en/user_customization-packages.ssi:228
 msgid "3~ Using #{chroot_local-packages}# to install custom packages"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:228
+#: en/user_customization-packages.ssi:230
 msgid ""
 "To install a custom package, simply copy it to the #{config/chroot_local-"
 "packages}# directory. Packages that are inside this directory will be "
@@ -633,45 +655,45 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:230
+#: en/user_customization-packages.ssi:232
 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:232
+#: en/user_customization-packages.ssi:234
 msgid ""
 "Using #{chroot_local-packages}# for installation of custom packages has "
 "disadvantages:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:234
+#: en/user_customization-packages.ssi:236
 msgid "_* It is not possible to use secure APT"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:236
+#: en/user_customization-packages.ssi:238
 msgid ""
 "_* You must install all appropriate packages in the #{config/chroot_local-"
 "packages}# directory"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:238
+#: en/user_customization-packages.ssi:240
 msgid ""
 "_* It does not lend itself to storing Debian Live configurations in revision "
 "control"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:240
+#: en/user_customization-packages.ssi:242
 msgid "3~ Using an APT repository to install custom packages"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:242
+#: en/user_customization-packages.ssi:244
 msgid ""
 "Unlike using #{chroot_local-packages}#, when using a custom APT repository "
 "you must ensure that you specify the packages elsewhere. See lb-packages for "
@@ -679,12 +701,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:244
+#: en/user_customization-packages.ssi:246
 msgid "% FIXME: <xref linkend=\"lb-packages\"/>"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:246
+#: en/user_customization-packages.ssi:248
 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 "
@@ -692,12 +714,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:248
+#: en/user_customization-packages.ssi:250
 msgid "3~ Custom packages and APT"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:250
+#: en/user_customization-packages.ssi:252
 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 "
@@ -707,7 +729,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:252
+#: en/user_customization-packages.ssi:254
 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 "
@@ -717,17 +739,17 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:254
+#: en/user_customization-packages.ssi:256
 msgid "% FIXME: <xref linkend=\"apt-preferences\"/>"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:256
+#: en/user_customization-packages.ssi:258
 msgid "3~ Altering APT preferences during Live system"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:257
+#: en/user_customization-packages.ssi:259
 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 "
diff --git a/manual/pot/user_customization-internationalization.ssi.pot b/manual/pot/user_examples.ssi.pot
similarity index 58%
copy from manual/pot/user_customization-internationalization.ssi.pot
copy to manual/pot/user_examples.ssi.pot
index 4f993b4..7494c39 100644
--- a/manual/pot/user_customization-internationalization.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-10-22 08:57-0200\n"
+"POT-Creation-Date: 2010-11-04 16:34-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"
@@ -39,17 +39,15 @@ msgstr ""
 #: 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/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: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
@@ -64,15 +62,15 @@ msgstr ""
 #: 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_customization-packages.ssi:196 en/user_examples.ssi:24
+#: 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:46
-#: en/user_overview.ssi:90 en/user_overview.ssi:98
+#: 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 ""
 
@@ -99,16 +97,14 @@ msgstr ""
 #: 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:269 en/user_basics.ssi:285
-#: en/user_basics.ssi:293 en/user_basics.ssi:320 en/user_basics.ssi:359
+#: 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
@@ -124,95 +120,108 @@ msgstr ""
 #: 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_customization-packages.ssi:202 en/user_examples.ssi:33
+#: 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:84
-#: en/user_overview.ssi:94 en/user_overview.ssi:102
+#: 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"
+#: en/other_faq.ssi:85 en/other_faq.ssi:247 en/user_examples.ssi:26
+msgid "#!/bin/sh"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-internationalization.ssi:4
-msgid "1~customizing-locale-and-language Customizing locale and language"
+#: en/user_examples.ssi:2
+msgid "B~ Examples"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-internationalization.ssi:6
-msgid "2~ Default locale and keyboard"
+#: en/user_examples.ssi:4
+msgid "1~ Use Case Builds"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-internationalization.ssi:8
+#: en/user_examples.ssi:6
 msgid ""
-"The default locale when building a live cd is \"locales=en_US.UTF-8\", to "
-"set the locale for e.g. Switzerland, you can use \"locales=de_CH.UTF-8\"."
+"This chapter covers example builds for specific use cases with Debian Live."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-internationalization.ssi:12
-msgid "$ lb config --bootappend-live \"locales=de_CH.UTF-8\""
+#: en/user_examples.ssi:8
+msgid "2~ VNC Kiosk Client"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-internationalization.ssi:16
-msgid "The entry for a Swiss-German keyboard would be:"
+#: en/user_examples.ssi:10
+msgid "Create an image with live-build to boot directly to a VNC server."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-internationalization.ssi:20
-msgid "$ lb config --bootappend-live \"keyboard-layouts=ch\""
+#: en/user_examples.ssi:12
+msgid "_* Make a build directory: #{$ mkdir vncBuild}#"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-internationalization.ssi:24
-msgid "Combined, the keyboard and locale configured for Switzerland would be:"
+#: en/user_examples.ssi:14
+msgid "_* Move to the build directory: #{$ cd vncBuild}#"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-internationalization.ssi:28
+#: en/user_examples.ssi:16
 msgid ""
-"$ lb config --bootappend-live =\"locales=de_CH.UTF-8 keyboard-layouts=ch\""
+"Example to config the build directory to include gdm metacity "
+"xtightvncviewer: #{$ lb config --packages \"gdm3 metacity xtightvncviewer\"}#"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-internationalization.ssi:32
+#: en/user_examples.ssi:18
 msgid ""
-"Note: You can find a list of options in the manpage for live-config. "
-"Currently, only UTF-8 locales are supported."
+"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/user_customization-internationalization.ssi:34
-msgid "2~ l10n Packages"
+#: en/user_examples.ssi:20
+msgid ""
+"Create the .xsession for the default user: #{$ touch config/chroot_local-"
+"includes/etc/skel/.xsession}#"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-internationalization.ssi:36
+#: en/user_examples.ssi:22
 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"
+"Edit the .xsession file to launch metacity and start xvncviewer with "
+"something similar to the below:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-internationalization.ssi:40
-msgid "$ lb config --language \"de\""
+#: en/user_examples.ssi:29
+msgid "/usr/bin/metacity & /usr/bin/vncviewer xxx.xxx.xxx.xxx:PORT"
 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}#."
+#: en/user_examples.ssi:31
+msgid "exit"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:35
+msgid "_* Build the image: #{# lb build}#"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:37
+msgid "_* Enjoy."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:39
+msgid "2~ Next Example FIXME"
 msgstr ""
diff --git a/manual/pot/user_managing_a_configuration.ssi.pot b/manual/pot/user_managing_a_configuration.ssi.pot
index 228a192..1872562 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-10-13 17:00+0300\n"
+"POT-Creation-Date: 2010-10-28 16:34-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"
@@ -17,8 +17,8 @@ msgstr ""
 "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: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
@@ -41,14 +41,15 @@ msgstr ""
 #: 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/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/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
@@ -67,17 +68,17 @@ msgstr ""
 #: 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:105
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
+#: 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:60
-#: en/user_overview.ssi:104 en/user_overview.ssi:112
+#: 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:86 en/about_manual.ssi:94 en/about_manual.ssi:102
+#: 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
@@ -101,14 +102,15 @@ msgstr ""
 #: 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/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
@@ -126,11 +128,12 @@ msgstr ""
 #: 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:109 en/user_installation.ssi:124
-#: en/user_installation.ssi:139 en/user_managing_a_configuration.ssi:31
+#: 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:98
-#: en/user_overview.ssi:108 en/user_overview.ssi:116
+#: 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 ""
 
@@ -141,7 +144,7 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_managing_a_configuration.ssi:4
-msgid "1~ Managing a configuration"
+msgid "1~managing-a-configuration Managing a configuration"
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/pot/user_overview.ssi.pot b/manual/pot/user_overview.ssi.pot
index cffecd5..2a2bb48 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-22 07:52-0200\n"
+"POT-Creation-Date: 2010-10-28 16:34-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"
@@ -41,16 +41,17 @@ msgstr ""
 #: 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/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/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
@@ -67,12 +68,12 @@ msgstr ""
 #: 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_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:46
-#: en/user_overview.ssi:90 en/user_overview.ssi:98
+#: 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 ""
 
@@ -101,16 +102,16 @@ msgstr ""
 #: 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:269 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/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
@@ -127,12 +128,12 @@ msgstr ""
 #: 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_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:84
-#: en/user_overview.ssi:94 en/user_overview.ssi:102
+#: 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 ""
 
@@ -210,88 +211,37 @@ msgstr ""
 #. type: Plain text
 #: en/user_overview.ssi:22
 msgid ""
-"Besides the common config/common, which is used by all live-build commands, "
-"some additional files can be used to configure the behavior of specific "
-"helper commands. These files are typically named config/command or config/"
-"stage (where \"stage\", of course, is replaced with the name of the stage "
-"that they belong to, and \"command\" with the name of the command)."
-msgstr ""
-
-#. type: Plain text
-#: en/user_overview.ssi:24
-msgid ""
-"For example, the #{lb_bootstrap_debootstrap}# command uses files named "
-"config/bootstrap and config/bootstrap_debootstrap to read the options it "
-"will use. Generally, these files contain variables with values assigned, one "
-"variable per line. Some commands of live-buil use pairs of values or "
-"slightly more complicated variable assignments."
-msgstr ""
-
-#. type: Plain text
-#: en/user_overview.ssi:26
-msgid ""
-"live-build respects environment variables which are present in the context "
-"of the shell it is running. If variables can be read from config files, then "
-"they override environment variables, and if command line options are used, "
-"they override values from config files. If no value for a given variable can "
-"be found (and is thus unset), live-build will automatically set it to a "
-"default value."
-msgstr ""
-
-#. type: Plain text
-#: en/user_overview.ssi:28
-msgid ""
-"All config files are shell scripts which are sourced by a live-build "
-"command. That means they have to follow the normal shell syntax. You can "
-"also put comments in these files; lines beginning with \"#\" are ignored."
-msgstr ""
-
-#. type: Plain text
-#: en/user_overview.ssi:30
-msgid ""
-"In some rare cases you may want to have different versions of these files "
-"for different architectures or distributions. If files named config/stage."
-"arch or config/stage_command.arch, and config/stage.dist or config/"
-"stage_command.dist exist (where \"arch\" is the same as the output of dpkg --"
-"print-architecture and \"dist\" is the same as the codename of the target "
-"distribution), then they will be used in preference to the other, more "
-"general files."
-msgstr ""
-
-#. type: Plain text
-#: en/user_overview.ssi:32
-msgid ""
 "The remainder of this section discusses the three most important commands:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:34
+#: 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 ""
 
 #. type: Plain text
-#: en/user_overview.ssi:36
+#: 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 ""
 
 #. type: Plain text
-#: en/user_overview.ssi:38
+#: 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 ""
 
 #. type: Plain text
-#: en/user_overview.ssi:40
+#: en/user_overview.ssi:30
 msgid "3~lb-config The #{lb config}# command"
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:42
+#: 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 "
@@ -301,26 +251,26 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:44
+#: en/user_overview.ssi:34
 msgid ""
 "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:49
+#: en/user_overview.ssi:39
 msgid "$ lb config P: Creating config tree"
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:54
+#: en/user_overview.ssi:44
 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"
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:82
+#: en/user_overview.ssi:72
 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 "
@@ -345,54 +295,50 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:86
+#: en/user_overview.ssi:76
 msgid ""
 "Using #{lb config}# without any arguments would be suitable for users who "
-"are either happy editing the generated files, or are simply happy with the "
-"defaults it creates."
+"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 ""
 
 #. type: Plain text
-#: en/user_overview.ssi:88
+#: en/user_overview.ssi:78
 msgid ""
-"You can ask #{lb config}# to generate a config/ directory \"preseeded\" with "
-"various options. This might be suitable if you do not require the default "
-"settings but do not need to change a large number of options. For example:"
+"Normally, you will want to specify some options. For example, to include the "
+"'gnome' package list in your configuration:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:92
+#: en/user_overview.ssi:82
 msgid "$ lb config -p gnome"
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:96
-msgid ""
-"will build a config/ directory configured to include the 'gnome' package "
-"list. It is possible to specify many options:"
+#: en/user_overview.ssi:86
+msgid "It is possible to specify many options, such as:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:100
+#: en/user_overview.ssi:90
 msgid ""
 "$ lb config --binary-images net --hostname live-machine --username live-"
 "user ..."
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:104
-msgid ""
-"A full list of options is available in the #{lb_config}# man page. Most "
-"options have a parallel with an \"LB_\" prefixed variable."
+#: en/user_overview.ssi:94
+msgid "A full list of options is available in the #{lb_config}# man page."
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:106
+#: en/user_overview.ssi:96
 msgid "3~lb-build The #{lb build}# command"
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:108
+#: 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 "
@@ -400,33 +346,33 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:110
+#: en/user_overview.ssi:100
 msgid "3~lb-clean The #{lb clean}# command"
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:112
+#: 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 ""
 
 #. type: Plain text
-#: en/user_overview.ssi:114
+#: en/user_overview.ssi:104
 msgid "2~live-boot The live-boot package"
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:116
+#: 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."
+"as those created by live-build. This includes the Debian Live ISOs, netboot "
+"tarballs, and USB stick images."
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:118
+#: 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 "
@@ -435,7 +381,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:120
+#: 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 "
@@ -443,12 +389,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:122
+#: en/user_overview.ssi:112
 msgid "2~live-config The live-config package"
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:124
+#: 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 "
diff --git a/manual/pt_BR/live-manual.ssm b/manual/pt_BR/live-manual.ssm
index 21efbbf..ca909a0 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-10-25
+ :published: 2010-11-13
 
 @publisher: Debian Live Project <debian-live at lists.debian.org>
 
@@ -51,6 +51,10 @@
 
 << project_bugs.ssi
 
+:B~ Examples ~#
+
+<< user_examples.ssi
+
 :B~ Other ~#
 
 Other material that formerly appeared in this section is out of date and/or
@@ -79,8 +83,6 @@ only after it has been reviewed.
 
 % << other_resources.ssi
 
-% << other_use-cases.ssi
-
 % << other_success-stories.ssi
 
 % << other_troubleshooting.ssi
diff --git a/manual/pt_BR/other_live-environment.ssi b/manual/pt_BR/other_live-environment.ssi
index 8924b1c..1cc94d2 100644
--- a/manual/pt_BR/other_live-environment.ssi
+++ b/manual/pt_BR/other_live-environment.ssi
@@ -125,18 +125,18 @@ need to setup also the #{keyb}# variable to the #{klayout}#'s value.
 
 2~ Persistence
 
-A live cd paradigm is a preinstalled 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 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 runtime evolutions of the system
+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 runtime evolution of the system. To
+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
@@ -154,7 +154,7 @@ 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 bootime and the system must be started with the boot
+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.:
 
@@ -206,7 +206,7 @@ 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 runtime could lead to
+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
@@ -230,7 +230,8 @@ parameters of: #{persistent}# #{persistent-subtext=subText}#.
 
 3~ Partial remastering
 
-The runtime 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-initramfs mounts all
-/live filesystem in order or with the module bootparameter.
+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-initramfs mounts all /live filesystem in order or with the module boot
+parameter.
diff --git a/manual/pt_BR/other_use-cases.ssi b/manual/pt_BR/other_use-cases.ssi
deleted file mode 100644
index 232e3ac..0000000
--- a/manual/pt_BR/other_use-cases.ssi
+++ /dev/null
@@ -1,146 +0,0 @@
-B~ Use Cases
-
-1~ Use Cases
-
-This chapter is for users to document their use cases with Debian Live.
-
-2~ VNC Kiosk Client
-
-Create an image with live-helper to boot directly to a VNC server.
-
-_* Make a build directory: #{$ mkdir vncBuild}#
-
-_* Move to the build directory: #{$ cd vncBuild}#
-
-Example to config the build directory to include gdm metacity
-xtightvncviewer: #{$ lh config --packages "gdm metacity xtightvncviewer"}#
-
-Create a folder /etc/skel folder for a custom .xsession for the default
-user: #{$ mkdir -p config/chroot_local-includes/etc/skel}#
-
-Create the .xsession for the default user: #{$ touch
-config/chroot_local-includes/etc/skel/.xsession}#
-
-Edit the .xsession file to launch metacity and start xvncviewer with
-something similar to the below:
-
-code{
-
-#!/bin/sh
-
-/usr/bin/metacity & /usr/bin/vncviewer xxx.xxx.xxx.xxx:PORT
-
-exit
-
-}code
-
-_* Build the image: #{# lh build}#
-
-_* Enjoy.
-
-2~ VMWare-Player Sessions
-
-Create an image with live-helper to boot directly to a specifiv VMWare
-session.
-
-_* Make a build directory: #{$ mkdir VMWare-Player}#
-
-_* Move to the build directory: #{$ cd VMWare-Player}#
-
-_* Example to config the build directory to include gdm metacity
-xtightvncviewer:
-
-code{
-
-$ lh config --apt apt \
-        ---apt-recommends disabled \
-        --archive-areas "main" \
-        --binary-images iso \
-        --binary-indices none \
-        --syslinux-menu vesamenu \
-        ---bootappend-live "persistent quickreboot" \
-        ---bootappend-install "-- plainroot persistent video=vesa:ywrap,mtrr vga=788 quickreboot quiet live-config" \
-        ---debian-installer live \
-        ---distribution lenny \
-        ---hostname vmare-player-firmware \
-        ---includes none \
-        ---linux-flavours 686 \
-        ---packages-lists "gnome-core" \
-        ---packages "gcc gparted linux-headers-2.6-\${LH_LINUX_FLAVOURS} live-config-staging make metacity rsync wireless-tools" \
-        ---repositories live.debian.net \
-        ---win32-loader disabled
-
-}code
-
-_* Create the 01-vmware-player hook: #{$ touch
-config/chroot_local-hooks/01-vmware-player.sh}#
-
-Edit the 01-vmware-player hook to launch the VMWare-Player. The hook should
-look something like the below:
-
-code{
-
-#!/bin/sh
-
-_URL="http://archive.debian-maintainers.org/vmware/other/vmware-player/"
-_VMPLAYER_VERSION="VMware-Player.i386.bundle"
-
-echo "I: Starting script for install of VMWare Player." cd /root
-
-echo "I: Beginning download of ${_VMPLAYER_VERSION} from ${_URL} ." wget
-${_URL}${_VMPLAYER_VERSION}
-
-echo "I: Starting install of VMWare Player." sh /root/${_VMPLAYER_VERSION}
-
-echo "I: Cleaning up the VMWare Player download." rm
-/root/${_VMPLAYER_VERSION}
-
-#echo "I: Starting interactive shell." #bash
-
-}code
-
-_* Build the image (note that during the build the VMWare-Player will prompt
-you to install or cancel): #{#lh build}#
-
-_* 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:
-
-code{
-
-live-config.vmware-player=ACTION:IMAGEPATH:VMXNAME
-
-}code
-
-Notes from the 900-vmware-player file are as follows:
-
-code{
-
-# The script tests for boot parameter of
-# live-config.vmware-player=ACTION:IMAGEPATH:VMXNAME
-#
-# ACTION: The operation to perform on the workstation (none|scratch)
-# IMAGEPATH: The folder path to the VMware image you want to run.
-# VMXNAME: The name of the VMware image you want to run.
-#
-# Notes:To use this file with WMWare images you will need to have a few things
-# setup:
-#
-# 1. The VMware Player needs to be installed in the image.
-# 2. This script uses (s|h)da1 for writing image data, and is used as a scratch
-#    space. This scratch space should be a file system with linux permissions
-#    such as ext2.
-# 3. VMware image(s) should be in a mounted folder and setup as follows:
-#    - Image(s) set to snapshot mode.
-#    - For each image, the image folder needs to have a file called
-#      image-release with a variable CRELEASE. An example: CRELEASE="1.0.0"
-#
-# The image-release file is used by the image maintainer and this script to tell
-# workstation(s) using a given image, to erase locally stored vmware image files
-# and setup with the newly configure image. The operation of erasing locally
-# stored vmare image files, is referred to as a scratch.
-
-}code
-
-_* Enjoy.
diff --git a/manual/pt_BR/project_bugs.ssi b/manual/pt_BR/project_bugs.ssi
index c82d6cf..8443811 100644
--- a/manual/pt_BR/project_bugs.ssi
+++ b/manual/pt_BR/project_bugs.ssi
@@ -124,7 +124,7 @@ 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
+3~ At boot time
 
 If your image does not boot, please report it to the mailing list together
 with the information requested in {Collect
@@ -134,7 +134,7 @@ 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
+3~ At run time
 
 If a package was successfully installed, but fails while actually running
 the Live system, this is probably a bug in Debian Live. However,
diff --git a/manual/pt_BR/user_basics.ssi b/manual/pt_BR/user_basics.ssi
index aef09b7..303cdd7 100644
--- a/manual/pt_BR/user_basics.ssi
+++ b/manual/pt_BR/user_basics.ssi
@@ -2,56 +2,56 @@
 
 1~ The basics
 
-This chapter contains a brief overview of the build process as well as
-containing instructions on how to boot the various binary image types.
+This chapter contains a brief overview of the build process and instructions
+for booting the various binary image types.
 
 2~ What is a live system?
 
 A live system usually means an operating system booted on a computer from a
-removable medium (such as CD-ROM, USB stick, or network), ready to use
-without any installation on the usual drive(s), with an auto-configuration
-done at runtime (see {Terms}#terms ).
+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).
 
 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 following parts:
+is made from the following parts:
 
-_* Linux kernel
+_* *{Linux kernel image}*, usually named #{vmlinuz*}#
 
-_* The Linux image, usually named #{vmlinuz*}#
-
-_* *{Initial RAM disk image (initrd)}*: RAM disk setup for the Linux boot,
-containing modules possibly needed to mount the filesystem's image and some
+_* *{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 systems filesystem image. The SquashFS
-compressed filesystem is used to minimize the Debian Live image size. Note
-that it's 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 partition(s) are used (see 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).
 
 % FIXME: <xref linkend="persistence"/>
 
-_* *{Bootloader}*: A small piece of code, crafted to boot up from the chosen
+_* *{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 then loads the Linux kernel and its initrd to run
-with an associated filesystem image. Different solutions can be used
-depending on the target media and format of the filesystem containing the
-previous components: Isolinux to boot from a CD or DVD in ISO9660 format,
+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
-partition, etc.
+partitions, etc.
 
-_* live-build will build the system image from your specifications, setup a
-Linux kernel and its initrd, a bootloader to run them, all in one
+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
 
-The following sequence of commands, provided by live-build, will create a
-basic ISO image containing just the Debian standard system without X.org. It
-is suitable for burning to CD or DVD media.
+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).
 
 First, we run the #{lb config}# command which will create a "config/"
 hierarchy in the current directory for use by other commands:
@@ -62,8 +62,8 @@ $ 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 ).
+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:
@@ -75,7 +75,7 @@ code{
 }code
 
 This process can take a while, depending on the speed of your network
-connection (see {The lb build command}#lb-build ).
+connection (see {The lb build command}#lb-build).
 
 3~ Testing an ISO image with Qemu
 
@@ -95,26 +95,23 @@ In order to test the ISO with virtualbox-ose:
 
 code{
 
-# apt-get install virtualbox-ose
+# apt-get install virtualbox-ose virtualbox-ose-dkms
 
-}code
+$ virtualbox
 
-and either install #{virtualbox-ose-source}# or #{virtualbox-ose-dkms}# to
-build the required kernel modules to run virtualbox-ose.
+}code
 
-After successful installation, virtualbox can be e.g. found in the GNOME
-menu under 'Applications/System Tools/VirtualBox OSE'.
+Create a new virtual machine, change the storage settings to use binary.iso
+as the CD/DVD device, and start the machine.
 
-Please consider including of following packages onto the live image to
-achieve higher resolution of the display when booting the live image in
-virutalbox-ose (1280x1024 instead of 800x600 and in particular if the
-default resolution of the virtualbox-ose display shouldn't work with the
-gui-installer).
+Note: For live systems containing X.org that you want to test with
+virtualbox-ose, you may wish to include the VirtualBox X.org driver package,
+virtualbox-ose-guest-x11, in your live-build configuration. Otherwise, the
+resolution is limited to 800x600.
 
 code{
 
-virtualbox-ose-guest-dkms virtualbox-ose-guest-utils
-virtualbox-ose-guest-x11
+# lb config --packages virtualbox-ose-guest-x11
 
 }code
 
@@ -130,16 +127,19 @@ $ wodim binary.iso
 
 }code
 
-2~ Building an USB/HDD image
+2~ Building a USB/HDD image
 
 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.
+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.
 
-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 ):
+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):
 
 code{
 
@@ -164,11 +164,11 @@ code{
 
 }code
 
-3~ Copying USB/HDD image to a USB stick
+3~copying-usb-hdd-image Copying USB/HDD image to a USB stick
 
 The generated binary image contains a VFAT partition and the syslinux
-bootloader, ready to be directly written on an USB stick. Plug in an USB
-stick with a size larger than that of binary.img and type:
+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:
 
 code{
 
@@ -178,7 +178,8 @@ $ dd if=binary.img of=${USBSTICK}
 
 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.
+looking in #{dmesg}#'s output after plugging in the stick, for example, or
+better yet, #{ls -l /dev/disk/by-id}#.
 
 *{This will definitely overwrite any previous contents on your stick!}*
 
@@ -205,8 +206,8 @@ code{
 
 }code
 
-Ater the creation of the partition you have to create a filsystem on it. One
-possible choice would be ext4.
+After the creation of the partition, you have to create a filesystem on
+it. One possible choice would be ext4.
 
 code{
 
@@ -222,7 +223,7 @@ code{
 
 }code
 
-*{Remember: Every time you install a new binary.img on the stick, all your data will be lost because the image includes a complete partition table.}*
+*{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.}*
 
 2~ Building a netboot image
 
@@ -230,7 +231,7 @@ The following sequence of commands will create a basic netboot image
 containing the Debian standard system without X.org. It is suitable for
 booting over the network.
 
-Note if you performed any previous examples, you will need to clean up your
+Note: if you performed any previous examples, you will need to clean up your
 working directory with the #{lb clean}# command:
 
 code{
@@ -249,11 +250,11 @@ $ lb config -b net --net-root-path "/srv/debian-live" --net-root-server
 
 }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
+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.
+located at boot time.
 
 Now build the image with the #{lb build}# command:
 
@@ -263,16 +264,16 @@ code{
 
 }code
 
-In a network boot the client runs a small piece of software, which usually
+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 boot loader via the TFTP protocol. That
-could be PXELINUX, Grub or even boot directly to an operating system like
+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
+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.
@@ -280,7 +281,7 @@ We must now configure three services on the server to enable netboot.
 3~ DHCP server
 
 We must configure our network's DHCP server to be sure to give an IP address
-to the computer netbooting, and to advertise the location of the PXE
+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
@@ -305,9 +306,9 @@ subnet 192.168.1.0 netmask 255.255.255.0 {   # 192.168.1.0/24
 
   # 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
+    # Note: all files for PXE are relatives to the TFTP server's root
 
-    # PXE boot loader (first program to be loaded, by TFTP)
+    # PXE bootloader (first program to be loaded, by TFTP)
     filename "pxelinux.0";
 
   }
@@ -317,7 +318,7 @@ subnet 192.168.1.0 netmask 255.255.255.0 {   # 192.168.1.0/24
 
 3~ TFTP server
 
-This serves the kernel and initial ramdisk to the system at run-time.
+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
@@ -418,6 +419,6 @@ ethernet0.generatedAddress = "00:0c:29:8d:71:3b" uuid.location = "56 4d 83
 _* You can play with this configuration file (i.e. change memory limit to
 256)
 
-_* Double click on this file (or run VMWare player and selecet this file).
+_* Double click on this file (or run VMWare player and select this file).
 
 _* When running just press space if that strange question comes up...
diff --git a/manual/pt_BR/user_customization-internationalization.ssi b/manual/pt_BR/user_customization-internationalization.ssi
index beb134a..b86f8f8 100644
--- a/manual/pt_BR/user_customization-internationalization.ssi
+++ b/manual/pt_BR/user_customization-internationalization.ssi
@@ -4,8 +4,8 @@ B~ Customizing locale and language
 
 2~ Default locale and keyboard
 
-The default locale when building a live cd is "locales=en_US.UTF-8", to set
-the locale for e.g. Switzerland, you can use "locales=de_CH.UTF-8".
+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{
 
diff --git a/manual/pt_BR/user_customization-overview.ssi b/manual/pt_BR/user_customization-overview.ssi
index 517ca3d..44c6731 100644
--- a/manual/pt_BR/user_customization-overview.ssi
+++ b/manual/pt_BR/user_customization-overview.ssi
@@ -2,12 +2,76 @@ B~ Customizing contents
 
 1~customization-overview Customization overview
 
-% FIXME: just a stub for now.  In conversational style, cover the different
-kinds of customization % and link to each section within the text.
+This chapter gives an overview of the various ways in which you may
+customize a Debian Live system.
 
-This chapter gives an overview of the various ways in which your Debian live
-systems may be customized. See sections {Customizing package
+2~ Build time vs. boot time configuration
+
+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.
+
+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.
+
+2~stages-of-the-build Stages of the build
+
+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.
+
+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.
+
+2~ Supplement lb config with files
+
+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.
+
+2~ Customization tasks
+
+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.
+language}#customizing-locale-and-language cover just a few of the things you
+might want to do.
 
diff --git a/manual/pt_BR/user_customization-packages.ssi b/manual/pt_BR/user_customization-packages.ssi
index 29fb5eb..1ae1289 100644
--- a/manual/pt_BR/user_customization-packages.ssi
+++ b/manual/pt_BR/user_customization-packages.ssi
@@ -2,23 +2,44 @@
 
 1~customizing-package-installation Customizing package installation
 
-_* Selecting additional packages to be installed
-
-_* Installing modified packages
+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. We start with customization of the 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.
 
 2~ Package sources
 
 3~ Debian repositories
 
-To set a local mirror (used to 'build' the live system)
+To set a local mirror to be used to at build time:
 
 code{
 
-$ lb config --mirror-bootstrap http://localhost/debian/ --mirror-chroot
-http://localhost/debian/
+$ lb config --mirror-bootstrap http://localhost/debian/
 
 }code
 
+The chroot repository, specified by --mirror-chroot, defaults to the same as
+--mirror-bootstrap.
+
+Each of the --mirror-* options governs which repository 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, when the
+binary image is constructed, the --mirror-binary value is used, superceding
+any earlier repositories.
+
 The generic mirror is added to the live system's /etc/apt/sources.list.
 
 code{
diff --git a/manual/pt_BR/user_examples.ssi b/manual/pt_BR/user_examples.ssi
new file mode 100644
index 0000000..2567323
--- /dev/null
+++ b/manual/pt_BR/user_examples.ssi
@@ -0,0 +1,43 @@
+B~ Examples
+
+1~ Use Case Builds
+
+This chapter covers example builds for specific use cases with Debian Live.
+
+2~ VNC Kiosk Client
+
+Create an image with live-build to boot directly to a VNC server.
+
+_* Make a build directory: #{$ mkdir vncBuild}#
+
+_* Move to the build directory: #{$ cd vncBuild}#
+
+Example to config the build directory to include gdm metacity
+xtightvncviewer: #{$ lb config --packages "gdm3 metacity xtightvncviewer"}#
+
+Create a folder /etc/skel folder for a custom .xsession for the default
+user: #{$ mkdir -p config/chroot_local-includes/etc/skel}#
+
+Create the .xsession for the default user: #{$ touch
+config/chroot_local-includes/etc/skel/.xsession}#
+
+Edit the .xsession file to launch metacity and start xvncviewer with
+something similar to the below:
+
+code{
+
+#!/bin/sh
+
+/usr/bin/metacity & /usr/bin/vncviewer xxx.xxx.xxx.xxx:PORT
+
+exit
+
+}code
+
+_* Build the image: #{# lb build}#
+
+_* Enjoy.
+
+2~ Next Example FIXME
+
+
diff --git a/manual/pt_BR/user_managing_a_configuration.ssi b/manual/pt_BR/user_managing_a_configuration.ssi
index 3047ef0..bc03008 100644
--- a/manual/pt_BR/user_managing_a_configuration.ssi
+++ b/manual/pt_BR/user_managing_a_configuration.ssi
@@ -1,6 +1,6 @@
 :B~ Managing a configuration
 
-1~ Managing a configuration
+1~managing-a-configuration Managing a configuration
 
 This chapter explains how to manage a live configuration from initial
 creation, through successive revisions and successive releases of both the
diff --git a/manual/pt_BR/user_overview.ssi b/manual/pt_BR/user_overview.ssi
index 9c7e8ff..cf9f187 100644
--- a/manual/pt_BR/user_overview.ssi
+++ b/manual/pt_BR/user_overview.ssi
@@ -32,37 +32,6 @@ 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.
 
-Besides the common config/common, which is used by all live-build commands,
-some additional files can be used to configure the behavior of specific
-helper commands. These files are typically named config/command or
-config/stage (where "stage", of course, is replaced with the name of the
-stage that they belong to, and "command" with the name of the command).
-
-For example, the #{lb_bootstrap_debootstrap}# command uses files named
-config/bootstrap and config/bootstrap_debootstrap to read the options it
-will use. Generally, these files contain variables with values assigned, one
-variable per line. Some commands of live-buil use pairs of values or
-slightly more complicated variable assignments.
-
-live-build respects environment variables which are present in the context
-of the shell it is running. If variables can be read from config files, then
-they override environment variables, and if command line options are used,
-they override values from config files. If no value for a given variable can
-be found (and is thus unset), live-build will automatically set it to a
-default value.
-
-All config files are shell scripts which are sourced by a live-build
-command. That means they have to follow the normal shell syntax. You can
-also put comments in these files; lines beginning with "#" are ignored.
-
-In some rare cases you may want to have different versions of these files
-for different architectures or distributions. If files named
-config/stage.arch or config/stage_command.arch, and config/stage.dist or
-config/stage_command.dist exist (where "arch" is the same as the output of
-dpkg --print-architecture and "dist" is the same as the codename of the
-target distribution), then they will be used in preference to the other,
-more general files.
-
 The remainder of this section discusses the three most important commands:
 
 _* *{lb config}*: Responsible for initializing a Live system configuration
@@ -117,12 +86,12 @@ drwxr-xr-x 2 user user 4096 Sep 7 13:02 templates
 }code
 
 Using #{lb config}# without any arguments would be suitable for users who
-are either happy editing the generated files, or are simply happy with the
-defaults it creates.
+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).
 
-You can ask #{lb config}# to generate a config/ directory "preseeded" with
-various options. This might be suitable if you do not require the default
-settings but do not need to change a large number of options. For example:
+Normally, you will want to specify some options. For example, to include the
+'gnome' package list in your configuration:
 
 code{
 
@@ -130,8 +99,7 @@ $ lb config -p gnome
 
 }code
 
-will build a config/ directory configured to include the 'gnome' package
-list. It is possible to specify many options:
+It is possible to specify many options, such as:
 
 code{
 
@@ -140,8 +108,7 @@ $ lb config --binary-images net --hostname live-machine --username live-user
 
 }code
 
-A full list of options is available in the #{lb_config}# man page. Most
-options have a parallel with an "LB_" prefixed variable.
+A full list of options is available in the #{lb_config}# man page.
 
 3~lb-build The #{lb build}# command
 
@@ -159,7 +126,7 @@ so subsequent builds can start from a clean state.
 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.
+ISOs, netboot tarballs, and USB stick images.
 
 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)
diff --git a/manual/ro/live-manual.ssm b/manual/ro/live-manual.ssm
index 21efbbf..ca909a0 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-10-25
+ :published: 2010-11-13
 
 @publisher: Debian Live Project <debian-live at lists.debian.org>
 
@@ -51,6 +51,10 @@
 
 << project_bugs.ssi
 
+:B~ Examples ~#
+
+<< user_examples.ssi
+
 :B~ Other ~#
 
 Other material that formerly appeared in this section is out of date and/or
@@ -79,8 +83,6 @@ only after it has been reviewed.
 
 % << other_resources.ssi
 
-% << other_use-cases.ssi
-
 % << other_success-stories.ssi
 
 % << other_troubleshooting.ssi
diff --git a/manual/ro/other_live-environment.ssi b/manual/ro/other_live-environment.ssi
index 8924b1c..1cc94d2 100644
--- a/manual/ro/other_live-environment.ssi
+++ b/manual/ro/other_live-environment.ssi
@@ -125,18 +125,18 @@ need to setup also the #{keyb}# variable to the #{klayout}#'s value.
 
 2~ Persistence
 
-A live cd paradigm is a preinstalled 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 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 runtime evolutions of the system
+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 runtime evolution of the system. To
+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
@@ -154,7 +154,7 @@ 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 bootime and the system must be started with the boot
+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.:
 
@@ -206,7 +206,7 @@ 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 runtime could lead to
+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
@@ -230,7 +230,8 @@ parameters of: #{persistent}# #{persistent-subtext=subText}#.
 
 3~ Partial remastering
 
-The runtime 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-initramfs mounts all
-/live filesystem in order or with the module bootparameter.
+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-initramfs mounts all /live filesystem in order or with the module boot
+parameter.
diff --git a/manual/ro/other_use-cases.ssi b/manual/ro/other_use-cases.ssi
deleted file mode 100644
index 232e3ac..0000000
--- a/manual/ro/other_use-cases.ssi
+++ /dev/null
@@ -1,146 +0,0 @@
-B~ Use Cases
-
-1~ Use Cases
-
-This chapter is for users to document their use cases with Debian Live.
-
-2~ VNC Kiosk Client
-
-Create an image with live-helper to boot directly to a VNC server.
-
-_* Make a build directory: #{$ mkdir vncBuild}#
-
-_* Move to the build directory: #{$ cd vncBuild}#
-
-Example to config the build directory to include gdm metacity
-xtightvncviewer: #{$ lh config --packages "gdm metacity xtightvncviewer"}#
-
-Create a folder /etc/skel folder for a custom .xsession for the default
-user: #{$ mkdir -p config/chroot_local-includes/etc/skel}#
-
-Create the .xsession for the default user: #{$ touch
-config/chroot_local-includes/etc/skel/.xsession}#
-
-Edit the .xsession file to launch metacity and start xvncviewer with
-something similar to the below:
-
-code{
-
-#!/bin/sh
-
-/usr/bin/metacity & /usr/bin/vncviewer xxx.xxx.xxx.xxx:PORT
-
-exit
-
-}code
-
-_* Build the image: #{# lh build}#
-
-_* Enjoy.
-
-2~ VMWare-Player Sessions
-
-Create an image with live-helper to boot directly to a specifiv VMWare
-session.
-
-_* Make a build directory: #{$ mkdir VMWare-Player}#
-
-_* Move to the build directory: #{$ cd VMWare-Player}#
-
-_* Example to config the build directory to include gdm metacity
-xtightvncviewer:
-
-code{
-
-$ lh config --apt apt \
-        ---apt-recommends disabled \
-        --archive-areas "main" \
-        --binary-images iso \
-        --binary-indices none \
-        --syslinux-menu vesamenu \
-        ---bootappend-live "persistent quickreboot" \
-        ---bootappend-install "-- plainroot persistent video=vesa:ywrap,mtrr vga=788 quickreboot quiet live-config" \
-        ---debian-installer live \
-        ---distribution lenny \
-        ---hostname vmare-player-firmware \
-        ---includes none \
-        ---linux-flavours 686 \
-        ---packages-lists "gnome-core" \
-        ---packages "gcc gparted linux-headers-2.6-\${LH_LINUX_FLAVOURS} live-config-staging make metacity rsync wireless-tools" \
-        ---repositories live.debian.net \
-        ---win32-loader disabled
-
-}code
-
-_* Create the 01-vmware-player hook: #{$ touch
-config/chroot_local-hooks/01-vmware-player.sh}#
-
-Edit the 01-vmware-player hook to launch the VMWare-Player. The hook should
-look something like the below:
-
-code{
-
-#!/bin/sh
-
-_URL="http://archive.debian-maintainers.org/vmware/other/vmware-player/"
-_VMPLAYER_VERSION="VMware-Player.i386.bundle"
-
-echo "I: Starting script for install of VMWare Player." cd /root
-
-echo "I: Beginning download of ${_VMPLAYER_VERSION} from ${_URL} ." wget
-${_URL}${_VMPLAYER_VERSION}
-
-echo "I: Starting install of VMWare Player." sh /root/${_VMPLAYER_VERSION}
-
-echo "I: Cleaning up the VMWare Player download." rm
-/root/${_VMPLAYER_VERSION}
-
-#echo "I: Starting interactive shell." #bash
-
-}code
-
-_* Build the image (note that during the build the VMWare-Player will prompt
-you to install or cancel): #{#lh build}#
-
-_* 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:
-
-code{
-
-live-config.vmware-player=ACTION:IMAGEPATH:VMXNAME
-
-}code
-
-Notes from the 900-vmware-player file are as follows:
-
-code{
-
-# The script tests for boot parameter of
-# live-config.vmware-player=ACTION:IMAGEPATH:VMXNAME
-#
-# ACTION: The operation to perform on the workstation (none|scratch)
-# IMAGEPATH: The folder path to the VMware image you want to run.
-# VMXNAME: The name of the VMware image you want to run.
-#
-# Notes:To use this file with WMWare images you will need to have a few things
-# setup:
-#
-# 1. The VMware Player needs to be installed in the image.
-# 2. This script uses (s|h)da1 for writing image data, and is used as a scratch
-#    space. This scratch space should be a file system with linux permissions
-#    such as ext2.
-# 3. VMware image(s) should be in a mounted folder and setup as follows:
-#    - Image(s) set to snapshot mode.
-#    - For each image, the image folder needs to have a file called
-#      image-release with a variable CRELEASE. An example: CRELEASE="1.0.0"
-#
-# The image-release file is used by the image maintainer and this script to tell
-# workstation(s) using a given image, to erase locally stored vmware image files
-# and setup with the newly configure image. The operation of erasing locally
-# stored vmare image files, is referred to as a scratch.
-
-}code
-
-_* Enjoy.
diff --git a/manual/ro/project_bugs.ssi b/manual/ro/project_bugs.ssi
index c82d6cf..8443811 100644
--- a/manual/ro/project_bugs.ssi
+++ b/manual/ro/project_bugs.ssi
@@ -124,7 +124,7 @@ 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
+3~ At boot time
 
 If your image does not boot, please report it to the mailing list together
 with the information requested in {Collect
@@ -134,7 +134,7 @@ 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
+3~ At run time
 
 If a package was successfully installed, but fails while actually running
 the Live system, this is probably a bug in Debian Live. However,
diff --git a/manual/ro/user_basics.ssi b/manual/ro/user_basics.ssi
index aef09b7..303cdd7 100644
--- a/manual/ro/user_basics.ssi
+++ b/manual/ro/user_basics.ssi
@@ -2,56 +2,56 @@
 
 1~ The basics
 
-This chapter contains a brief overview of the build process as well as
-containing instructions on how to boot the various binary image types.
+This chapter contains a brief overview of the build process and instructions
+for booting the various binary image types.
 
 2~ What is a live system?
 
 A live system usually means an operating system booted on a computer from a
-removable medium (such as CD-ROM, USB stick, or network), ready to use
-without any installation on the usual drive(s), with an auto-configuration
-done at runtime (see {Terms}#terms ).
+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).
 
 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 following parts:
+is made from the following parts:
 
-_* Linux kernel
+_* *{Linux kernel image}*, usually named #{vmlinuz*}#
 
-_* The Linux image, usually named #{vmlinuz*}#
-
-_* *{Initial RAM disk image (initrd)}*: RAM disk setup for the Linux boot,
-containing modules possibly needed to mount the filesystem's image and some
+_* *{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 systems filesystem image. The SquashFS
-compressed filesystem is used to minimize the Debian Live image size. Note
-that it's 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 partition(s) are used (see 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).
 
 % FIXME: <xref linkend="persistence"/>
 
-_* *{Bootloader}*: A small piece of code, crafted to boot up from the chosen
+_* *{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 then loads the Linux kernel and its initrd to run
-with an associated filesystem image. Different solutions can be used
-depending on the target media and format of the filesystem containing the
-previous components: Isolinux to boot from a CD or DVD in ISO9660 format,
+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
-partition, etc.
+partitions, etc.
 
-_* live-build will build the system image from your specifications, setup a
-Linux kernel and its initrd, a bootloader to run them, all in one
+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
 
-The following sequence of commands, provided by live-build, will create a
-basic ISO image containing just the Debian standard system without X.org. It
-is suitable for burning to CD or DVD media.
+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).
 
 First, we run the #{lb config}# command which will create a "config/"
 hierarchy in the current directory for use by other commands:
@@ -62,8 +62,8 @@ $ 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 ).
+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:
@@ -75,7 +75,7 @@ code{
 }code
 
 This process can take a while, depending on the speed of your network
-connection (see {The lb build command}#lb-build ).
+connection (see {The lb build command}#lb-build).
 
 3~ Testing an ISO image with Qemu
 
@@ -95,26 +95,23 @@ In order to test the ISO with virtualbox-ose:
 
 code{
 
-# apt-get install virtualbox-ose
+# apt-get install virtualbox-ose virtualbox-ose-dkms
 
-}code
+$ virtualbox
 
-and either install #{virtualbox-ose-source}# or #{virtualbox-ose-dkms}# to
-build the required kernel modules to run virtualbox-ose.
+}code
 
-After successful installation, virtualbox can be e.g. found in the GNOME
-menu under 'Applications/System Tools/VirtualBox OSE'.
+Create a new virtual machine, change the storage settings to use binary.iso
+as the CD/DVD device, and start the machine.
 
-Please consider including of following packages onto the live image to
-achieve higher resolution of the display when booting the live image in
-virutalbox-ose (1280x1024 instead of 800x600 and in particular if the
-default resolution of the virtualbox-ose display shouldn't work with the
-gui-installer).
+Note: For live systems containing X.org that you want to test with
+virtualbox-ose, you may wish to include the VirtualBox X.org driver package,
+virtualbox-ose-guest-x11, in your live-build configuration. Otherwise, the
+resolution is limited to 800x600.
 
 code{
 
-virtualbox-ose-guest-dkms virtualbox-ose-guest-utils
-virtualbox-ose-guest-x11
+# lb config --packages virtualbox-ose-guest-x11
 
 }code
 
@@ -130,16 +127,19 @@ $ wodim binary.iso
 
 }code
 
-2~ Building an USB/HDD image
+2~ Building a USB/HDD image
 
 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.
+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.
 
-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 ):
+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):
 
 code{
 
@@ -164,11 +164,11 @@ code{
 
 }code
 
-3~ Copying USB/HDD image to a USB stick
+3~copying-usb-hdd-image Copying USB/HDD image to a USB stick
 
 The generated binary image contains a VFAT partition and the syslinux
-bootloader, ready to be directly written on an USB stick. Plug in an USB
-stick with a size larger than that of binary.img and type:
+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:
 
 code{
 
@@ -178,7 +178,8 @@ $ dd if=binary.img of=${USBSTICK}
 
 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.
+looking in #{dmesg}#'s output after plugging in the stick, for example, or
+better yet, #{ls -l /dev/disk/by-id}#.
 
 *{This will definitely overwrite any previous contents on your stick!}*
 
@@ -205,8 +206,8 @@ code{
 
 }code
 
-Ater the creation of the partition you have to create a filsystem on it. One
-possible choice would be ext4.
+After the creation of the partition, you have to create a filesystem on
+it. One possible choice would be ext4.
 
 code{
 
@@ -222,7 +223,7 @@ code{
 
 }code
 
-*{Remember: Every time you install a new binary.img on the stick, all your data will be lost because the image includes a complete partition table.}*
+*{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.}*
 
 2~ Building a netboot image
 
@@ -230,7 +231,7 @@ The following sequence of commands will create a basic netboot image
 containing the Debian standard system without X.org. It is suitable for
 booting over the network.
 
-Note if you performed any previous examples, you will need to clean up your
+Note: if you performed any previous examples, you will need to clean up your
 working directory with the #{lb clean}# command:
 
 code{
@@ -249,11 +250,11 @@ $ lb config -b net --net-root-path "/srv/debian-live" --net-root-server
 
 }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
+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.
+located at boot time.
 
 Now build the image with the #{lb build}# command:
 
@@ -263,16 +264,16 @@ code{
 
 }code
 
-In a network boot the client runs a small piece of software, which usually
+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 boot loader via the TFTP protocol. That
-could be PXELINUX, Grub or even boot directly to an operating system like
+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
+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.
@@ -280,7 +281,7 @@ We must now configure three services on the server to enable netboot.
 3~ DHCP server
 
 We must configure our network's DHCP server to be sure to give an IP address
-to the computer netbooting, and to advertise the location of the PXE
+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
@@ -305,9 +306,9 @@ subnet 192.168.1.0 netmask 255.255.255.0 {   # 192.168.1.0/24
 
   # 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
+    # Note: all files for PXE are relatives to the TFTP server's root
 
-    # PXE boot loader (first program to be loaded, by TFTP)
+    # PXE bootloader (first program to be loaded, by TFTP)
     filename "pxelinux.0";
 
   }
@@ -317,7 +318,7 @@ subnet 192.168.1.0 netmask 255.255.255.0 {   # 192.168.1.0/24
 
 3~ TFTP server
 
-This serves the kernel and initial ramdisk to the system at run-time.
+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
@@ -418,6 +419,6 @@ ethernet0.generatedAddress = "00:0c:29:8d:71:3b" uuid.location = "56 4d 83
 _* You can play with this configuration file (i.e. change memory limit to
 256)
 
-_* Double click on this file (or run VMWare player and selecet this file).
+_* Double click on this file (or run VMWare player and select this file).
 
 _* When running just press space if that strange question comes up...
diff --git a/manual/ro/user_customization-internationalization.ssi b/manual/ro/user_customization-internationalization.ssi
index beb134a..b86f8f8 100644
--- a/manual/ro/user_customization-internationalization.ssi
+++ b/manual/ro/user_customization-internationalization.ssi
@@ -4,8 +4,8 @@ B~ Customizing locale and language
 
 2~ Default locale and keyboard
 
-The default locale when building a live cd is "locales=en_US.UTF-8", to set
-the locale for e.g. Switzerland, you can use "locales=de_CH.UTF-8".
+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{
 
diff --git a/manual/ro/user_customization-overview.ssi b/manual/ro/user_customization-overview.ssi
index 517ca3d..44c6731 100644
--- a/manual/ro/user_customization-overview.ssi
+++ b/manual/ro/user_customization-overview.ssi
@@ -2,12 +2,76 @@ B~ Customizing contents
 
 1~customization-overview Customization overview
 
-% FIXME: just a stub for now.  In conversational style, cover the different
-kinds of customization % and link to each section within the text.
+This chapter gives an overview of the various ways in which you may
+customize a Debian Live system.
 
-This chapter gives an overview of the various ways in which your Debian live
-systems may be customized. See sections {Customizing package
+2~ Build time vs. boot time configuration
+
+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.
+
+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.
+
+2~stages-of-the-build Stages of the build
+
+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.
+
+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.
+
+2~ Supplement lb config with files
+
+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.
+
+2~ Customization tasks
+
+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.
+language}#customizing-locale-and-language cover just a few of the things you
+might want to do.
 
diff --git a/manual/ro/user_customization-packages.ssi b/manual/ro/user_customization-packages.ssi
index 29fb5eb..1ae1289 100644
--- a/manual/ro/user_customization-packages.ssi
+++ b/manual/ro/user_customization-packages.ssi
@@ -2,23 +2,44 @@
 
 1~customizing-package-installation Customizing package installation
 
-_* Selecting additional packages to be installed
-
-_* Installing modified packages
+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. We start with customization of the 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.
 
 2~ Package sources
 
 3~ Debian repositories
 
-To set a local mirror (used to 'build' the live system)
+To set a local mirror to be used to at build time:
 
 code{
 
-$ lb config --mirror-bootstrap http://localhost/debian/ --mirror-chroot
-http://localhost/debian/
+$ lb config --mirror-bootstrap http://localhost/debian/
 
 }code
 
+The chroot repository, specified by --mirror-chroot, defaults to the same as
+--mirror-bootstrap.
+
+Each of the --mirror-* options governs which repository 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, when the
+binary image is constructed, the --mirror-binary value is used, superceding
+any earlier repositories.
+
 The generic mirror is added to the live system's /etc/apt/sources.list.
 
 code{
diff --git a/manual/ro/user_examples.ssi b/manual/ro/user_examples.ssi
new file mode 100644
index 0000000..2567323
--- /dev/null
+++ b/manual/ro/user_examples.ssi
@@ -0,0 +1,43 @@
+B~ Examples
+
+1~ Use Case Builds
+
+This chapter covers example builds for specific use cases with Debian Live.
+
+2~ VNC Kiosk Client
+
+Create an image with live-build to boot directly to a VNC server.
+
+_* Make a build directory: #{$ mkdir vncBuild}#
+
+_* Move to the build directory: #{$ cd vncBuild}#
+
+Example to config the build directory to include gdm metacity
+xtightvncviewer: #{$ lb config --packages "gdm3 metacity xtightvncviewer"}#
+
+Create a folder /etc/skel folder for a custom .xsession for the default
+user: #{$ mkdir -p config/chroot_local-includes/etc/skel}#
+
+Create the .xsession for the default user: #{$ touch
+config/chroot_local-includes/etc/skel/.xsession}#
+
+Edit the .xsession file to launch metacity and start xvncviewer with
+something similar to the below:
+
+code{
+
+#!/bin/sh
+
+/usr/bin/metacity & /usr/bin/vncviewer xxx.xxx.xxx.xxx:PORT
+
+exit
+
+}code
+
+_* Build the image: #{# lb build}#
+
+_* Enjoy.
+
+2~ Next Example FIXME
+
+
diff --git a/manual/ro/user_managing_a_configuration.ssi b/manual/ro/user_managing_a_configuration.ssi
index 3047ef0..bc03008 100644
--- a/manual/ro/user_managing_a_configuration.ssi
+++ b/manual/ro/user_managing_a_configuration.ssi
@@ -1,6 +1,6 @@
 :B~ Managing a configuration
 
-1~ Managing a configuration
+1~managing-a-configuration Managing a configuration
 
 This chapter explains how to manage a live configuration from initial
 creation, through successive revisions and successive releases of both the
diff --git a/manual/ro/user_overview.ssi b/manual/ro/user_overview.ssi
index 9c7e8ff..cf9f187 100644
--- a/manual/ro/user_overview.ssi
+++ b/manual/ro/user_overview.ssi
@@ -32,37 +32,6 @@ 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.
 
-Besides the common config/common, which is used by all live-build commands,
-some additional files can be used to configure the behavior of specific
-helper commands. These files are typically named config/command or
-config/stage (where "stage", of course, is replaced with the name of the
-stage that they belong to, and "command" with the name of the command).
-
-For example, the #{lb_bootstrap_debootstrap}# command uses files named
-config/bootstrap and config/bootstrap_debootstrap to read the options it
-will use. Generally, these files contain variables with values assigned, one
-variable per line. Some commands of live-buil use pairs of values or
-slightly more complicated variable assignments.
-
-live-build respects environment variables which are present in the context
-of the shell it is running. If variables can be read from config files, then
-they override environment variables, and if command line options are used,
-they override values from config files. If no value for a given variable can
-be found (and is thus unset), live-build will automatically set it to a
-default value.
-
-All config files are shell scripts which are sourced by a live-build
-command. That means they have to follow the normal shell syntax. You can
-also put comments in these files; lines beginning with "#" are ignored.
-
-In some rare cases you may want to have different versions of these files
-for different architectures or distributions. If files named
-config/stage.arch or config/stage_command.arch, and config/stage.dist or
-config/stage_command.dist exist (where "arch" is the same as the output of
-dpkg --print-architecture and "dist" is the same as the codename of the
-target distribution), then they will be used in preference to the other,
-more general files.
-
 The remainder of this section discusses the three most important commands:
 
 _* *{lb config}*: Responsible for initializing a Live system configuration
@@ -117,12 +86,12 @@ drwxr-xr-x 2 user user 4096 Sep 7 13:02 templates
 }code
 
 Using #{lb config}# without any arguments would be suitable for users who
-are either happy editing the generated files, or are simply happy with the
-defaults it creates.
+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).
 
-You can ask #{lb config}# to generate a config/ directory "preseeded" with
-various options. This might be suitable if you do not require the default
-settings but do not need to change a large number of options. For example:
+Normally, you will want to specify some options. For example, to include the
+'gnome' package list in your configuration:
 
 code{
 
@@ -130,8 +99,7 @@ $ lb config -p gnome
 
 }code
 
-will build a config/ directory configured to include the 'gnome' package
-list. It is possible to specify many options:
+It is possible to specify many options, such as:
 
 code{
 
@@ -140,8 +108,7 @@ $ lb config --binary-images net --hostname live-machine --username live-user
 
 }code
 
-A full list of options is available in the #{lb_config}# man page. Most
-options have a parallel with an "LB_" prefixed variable.
+A full list of options is available in the #{lb_config}# man page.
 
 3~lb-build The #{lb build}# command
 
@@ -159,7 +126,7 @@ so subsequent builds can start from a clean state.
 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.
+ISOs, netboot tarballs, and USB stick images.
 
 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)

-- 
live-manual

