[SCM] live-manual branch, upstream, updated. upstream/2.0_a7-1-gcf150c2

Daniel Baumann daniel at debian.org
Sun Oct 3 19:01:59 UTC 2010


The following commit has been merged in the upstream branch:
commit cf150c29ff355035c19a11dbbeab9c048d236765
Author: Daniel Baumann <daniel at debian.org>
Date:   Sun Oct 3 21:01:44 2010 +0200

    Adding upstream version 2.0~a8.

diff --git a/Makefile b/Makefile
index 0b60c26..9fc7b9d 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
 
 SHELL := sh -e
 
-LANGUAGES = en
+LANGUAGES = en $(shell cd manual/po && ls)
 
 all: test build
 
@@ -22,11 +22,11 @@ build:
 	for LANGUAGE in $(LANGUAGES); \
 	do \
 		cd $(CURDIR)/manual/$${LANGUAGE}; \
-		sisu-epub live-manual.ssm; \
-		sisu-html live-manual.ssm; \
-		sisu-odf live-manual.ssm; \
-		sisu-pdf live-manual.ssm; \
-		sisu-txt live-manual.ssm; \
+		sisu-epub -v live-manual.ssm; \
+		sisu-html -v live-manual.ssm; \
+		sisu-odf -v live-manual.ssm; \
+		sisu-pdf -v live-manual.ssm; \
+		sisu-txt -v live-manual.ssm; \
 	done
 
 autobuild: clean build
@@ -38,24 +38,23 @@ autobuild: clean build
 		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}/index.html build/$${LANGUAGE}/html; \
-		mkdir -p build/$${LANGUAGE}/html-single; \
-		cp manual/$${LANGUAGE}/build/$${LANGUAGE}/live-manual/doc.html build/$${LANGUAGE}/html-single/live-manual.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; \
 		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')|" \
+		    -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; \
 	done
 
-#		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; \
-
 commit: tidy test
 	$(MAKE) -C manual rebuild
 
@@ -79,7 +78,7 @@ install:
 		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}/index.html $(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; \
@@ -92,6 +91,8 @@ install:
 		cp manual/$${LANGUAGE}/build/$${LANGUAGE}/live-manual/portrait.letter.pdf $(DESTDIR)/usr/share/doc/live-manual/pdf/live-manual.portrait-letter.$${LANGUAGE}.pdf; \
 	done
 
+	cp -a manual/en/build/en/_sisu $(DESTDIR)/usr/share/doc/live-manual
+
 uninstall:
 	rm -rf $(DESTDIR)/usr/share/doc/live-manual
 
diff --git a/VERSION b/VERSION
index 288a58c..9eaada7 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.0~a7
+2.0~a8
diff --git a/html/index.html b/html/index.html
new file mode 100644
index 0000000..be3395b
--- /dev/null
+++ b/html/index.html
@@ -0,0 +1,20 @@
+<html>
+
+<head>
+	<title>Debian Live Project</title>
+</head>
+
+<body>
+	<h2>Debian Live Manual</h2>
+
+	<ul>
+		<li><a href="en"><b>English</b></a></li>
+		<li><a href="de">Deutsch (German)</a></li>
+	</ul>
+
+	<p>
+		<a href="http://live.debian.net/">Debian Live</a> &lt;<a href="mailto:debian-live at lists.debian.org">debian-live at lists.debian.org</a>&gt; - <a href="http://live.debian.net/legal.html">Legal Notice</a>
+	</p>
+</body>
+
+</html>
diff --git a/manual/Makefile b/manual/Makefile
index 2ee8ab3..ff0d6cf 100644
--- a/manual/Makefile
+++ b/manual/Makefile
@@ -15,6 +15,8 @@ po4a.cfg:
 		echo "[type: text] $${FILE} \$$lang:\$$lang/$$(basename $${FILE})" >> po4a.cfg; \
 	done
 
+	echo "[type: xhtml] en/index.html.in \$$lang:\$$lang/index.html.in" >> po4a.cfg
+
 update:
 	@./bin/update-version.sh
 
diff --git a/manual/de/about_manual.ssi b/manual/de/about_manual.ssi
index 001ca6f..8506689 100644
--- a/manual/de/about_manual.ssi
+++ b/manual/de/about_manual.ssi
@@ -108,7 +108,9 @@ _* Trent W. Buck
 This manual is intended as a community project and all proposals for
 improvements and contributions are extremely welcome. The preferred way to
 submit a contribution is to send it to the mailing list. Please see contact
-for more information.  % FIXME: <xref linkend="contact"/>
+for more information.
+
+% FIXME: <xref linkend="contact"/>
 
 When submitting a contribution please clearly identify its copyright holder
 and include the licensing statement. Note that to be accepted the
diff --git a/manual/de/about_project.ssi b/manual/de/about_project.ssi
index 557f567..993ea07 100644
--- a/manual/de/about_project.ssi
+++ b/manual/de/about_project.ssi
@@ -1,6 +1,6 @@
-:B~ About the Debian Live Project
+:B~ Über das Debian Live Projekt
 
-1~ About the Debian Live Project
+1~ Über das Debian Live Projekt
 
 2~ Motivation
 
@@ -77,7 +77,9 @@ A system for configuring packages is provided using debconf in #{lh config}#
 (use --preseed FILE) allowing custom configured packages to be installed in
 your custom produced Debian Live images, but for official live images only
 default configuration will be used. For more information, please see
-customization.  % FIXME: <xref linkend="customization"/>
+customization.
+
+% FIXME: <xref linkend="customization"/>
 
 Exception: There are a few essential changes needed to bring a live system
 to life (e.g. configuring pam to allow empty passwords). These essential
@@ -99,7 +101,9 @@ list.
 _* *{BTS}*: The Debian Bug Tracking System (BTS) contains details of bugs
 reported by users and developers. Each bug is given a number, and is kept on
 file until it is marked as having been dealt with. For more information,
-please see bugs.  % FIXME: <xref linkend="bugs"/>
+please see bugs.
+
+% FIXME: <xref linkend="bugs"/>
 
 _* *{Wiki}*: The Debian Live wiki at http://wiki.debian.org/DebianLive is a
 place to gather information, discuss applied technologies, and document
diff --git a/manual/de/index.html.in b/manual/de/index.html.in
new file mode 100644
index 0000000..21d05ba
--- /dev/null
+++ b/manual/de/index.html.in
@@ -0,0 +1,63 @@
+<html>
+
+<head>
+	<title>Debian Live Projekt</title>
+</head>
+
+<body>
+	<h2>Debian Live Handbuch</h2>
+
+	<p>
+		<i>Dieses Handbuch ist noch nicht fertig und befindet sich im Aufbau.</i>
+	</p>
+
+	<p>
+		Fehler, Vergessenes, Patches und Vorschläge können an unsere Mailing Liste
+unter <a
+href="mailto:debian-live at lists.debian.org">debian-live at lists.debian.org</a>
+(englischspraching) gemeldet werden. Informationen wie man <a
+href="html/meta.html#contributing">zum Handbuch beitragen</a> kann, können
+im Handbuch gefunden werden.
+	</p>
+
+	<h3>Verfügbare Formate</h3>
+
+	<ul>
+		<li><a href="epub/live-manual.epub">EPUB</a></li>
+		<li>HTML: <a href="html/index.html">mehrere Seiten</a>, <a
+href="html/live-manual.html">einzelne Seite</a></li>
+		<li><a href="odf/live-manual.odt">ODF</a></li>
+		<li>PDF: <a href="pdf/live-manual.portrait-a4.pdf">A4 Hochformat</a>, <a
+href="pdf/live-manual.landscape-a4.pdf">A4 Querformat</a>, <a
+href="pdf/live-manual.portrait-letter.pdf">Letter Hochformat</a>, <a
+href="pdf/live-manual.landscape-letter.pdf">Letter Querformat</a></li>
+		<li><a href="txt/live-manual.txt">Text</a></li>
+	</ul>
+
+	<p>
+		Letzte Änderung: @DATE_CHANGE@<br />
+		Letzte Aktualisierung: @DATE_BUILD@
+	</p>
+
+	<h3>Quellen</h3>
+
+	<p>
+		Die Quellen dieses Handbuches sind in einem <a
+href="http://git.or.cz/">Git</a> Repository auf live.debian.net verfügbar.
+	</p>
+
+	<ul>
+		<li>Browse: <a
+href="http://live.debian.net/gitweb/?p=live-manual.git"><small><tt>http://live.debian.net/gitweb/?p=live-manual.git</tt></small></a></li>
+		<li>Git: <a
+href="git://live.debian.net/git/live-manual.git"><small><tt>git://live.debian.net/git/live-manual.git</tt></small></a></li>
+	</ul>
+
+	<p>
+		<a href="http://live.debian.net/">Debian Live</a> &lt;<a
+href="mailto:debian-live at lists.debian.org">debian-live at lists.debian.org</a>&gt;
+- <a href="http://live.debian.net/legal.html">Rechtliche Hinweise</a>
+	</p>
+</body>
+
+</html>
diff --git a/manual/de/live-manual.ssm b/manual/de/live-manual.ssm
index 4f4f5d7..d27d569 100644
--- a/manual/de/live-manual.ssm
+++ b/manual/de/live-manual.ssm
@@ -1,6 +1,6 @@
 % SiSU 2.0
 
- at title: Debian Live Manual
+ at title: Debian Live Handbuch
 
 @creator: Debian Live Project <debian-live at lists.debian.org>
 
@@ -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-09-19
+ :published: 2010-10-03
 
 @publisher: Debian Live Project <debian-live at lists.debian.org>
 
diff --git a/manual/de/other_live-environment.ssi b/manual/de/other_live-environment.ssi
index cae3855..8924b1c 100644
--- a/manual/de/other_live-environment.ssi
+++ b/manual/de/other_live-environment.ssi
@@ -110,7 +110,7 @@ configure console layout using X (XKB) definitions; you can then setup your
 keyboard layout more precisely with #{klayout}#, #{kvariant}#, #{koptions}#
 and #{kmodel}# variables; #{live-initramfs}# will use also these parameters
 for X configuration. For example, to set up a french system with a
-french-dvorak layout (called B????po) on a TypeMatrix keyboard, both in
+french-dvorak layout (called Bépo) on a TypeMatrix keyboard, both in
 console and X11, use:
 
 code{
diff --git a/manual/de/other_procedures.ssi b/manual/de/other_procedures.ssi
index 2ecf1ca..a0c193f 100644
--- a/manual/de/other_procedures.ssi
+++ b/manual/de/other_procedures.ssi
@@ -96,7 +96,7 @@ Download location of updated images:
 
   <http://cdimage.debian.org/cdimage/release/current-live/>
 
-Debian Live project homepage:
+Debian Live Projekt Homepage:
 
   <http://live.debian.net/>
 
diff --git a/manual/de/user_basics.ssi b/manual/de/user_basics.ssi
index f28e781..f9b0843 100644
--- a/manual/de/user_basics.ssi
+++ b/manual/de/user_basics.ssi
@@ -10,7 +10,9 @@ containing instructions on how to boot the various binary image types.
 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).  % FIXME: <xref linkend="terms"/>
+done at runtime (see terms).
+
+% FIXME: <xref linkend="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
@@ -29,8 +31,9 @@ uses SquashFS, a compressed filesystem, to minimize its 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).  % FIXME:
-<xref linkend="persistence"/>
+optional persistence partition(s) are 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
@@ -62,7 +65,9 @@ $ lb config
 }code
 
 By passing no parameters to #{lb config}# we indicated that we wish to use
-the defaults (see lb-config).  % FIXME: <xref linkend="lb-config"/>
+the defaults (see lb-config).
+
+% FIXME: <xref linkend="lb-config"/>
 
 Now that we have a "config/" hierarchy, we may build the image with the lb
 build command:
@@ -74,7 +79,9 @@ code{
 }code
 
 This process can take a while, depending on the speed of your network
-connection (see lb-build).  % FIXME: <xref linkend="lb-build"/>
+connection (see lb-build).
+
+% FIXME: <xref linkend="lb-build"/>
 
 3~ Testing an ISO image with Qemu
 
@@ -125,6 +132,7 @@ devices.
 
 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 lb-clean):
+
 % FIXME: <xref linkend="lb-clean"/>
 
 code{
@@ -272,7 +280,9 @@ bootloader.
 Here is an example for inspiration, written for the ISC DHCP server
 #{isc-dhcp-server}# in the /etc/dhcp/dhcpd.conf configuration file;
 
-% FIXME code{
+% FIXME
+
+code{
 
 subnet 192.168.1.0 netmask 255.255.255.0 {   # 192.168.1.0/24
 
@@ -283,13 +293,13 @@ subnet 192.168.1.0 netmask 255.255.255.0 {   # 192.168.1.0/24
   allow bootp;
 
   # for net booting, server where the first file to be loaded (by TFTP
-  # protocol) ("filename" following definition) lies??: so the TFTP
+  # protocol) ("filename" following definition) lies : so the TFTP
   # server's name.
   next-server myserver;
 
-  # net boot configuration for guests with a PXE client??:
+  # 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)
     filename "pxelinux.0";
diff --git a/manual/de/user_customization-contents.ssi b/manual/de/user_customization-contents.ssi
index 23a08aa..7c43045 100644
--- a/manual/de/user_customization-contents.ssi
+++ b/manual/de/user_customization-contents.ssi
@@ -11,19 +11,25 @@ Debian Live image. live-build provides three mechanisms for using them:
 
 _* Chroot local includes: These allow you to add or replace files to the
 chroot/Live filesystem. Please see chroot-local-includes for more
-information.  % FIXME: <xref linkend="chroot-local-includes"/>
+information.
+
+% FIXME: <xref linkend="chroot-local-includes"/>
 
 _* Binary local includes: These allow you to add or replace files in the
-binary image. Please see binary-local-includes for more information.  %
-FIXME: <xref linkend="binary-local-includes"/>
+binary image. Please see binary-local-includes for more information.
+
+% FIXME: <xref linkend="binary-local-includes"/>
 
 _* Binary includes: These allow you to add or replace Debian specific files
 in the binary image, such as the templates and tools directories. Please see
-binary-includes for more information.  % FIXME: <xref
-linkend="binary-includes"/>
+binary-includes for more information.
+
+% FIXME: <xref linkend="binary-includes"/>
 
 Please see terms for more information about the distinction between the
-"Live" and "binary" images.  % FIXME: <xref linkend="terms"/>
+"Live" and "binary" images.
+
+% FIXME: <xref linkend="terms"/>
 
 3~ Live/chroot local includes
 
diff --git a/manual/de/user_customization-packages.ssi b/manual/de/user_customization-packages.ssi
index 6c75a3b..b848d7f 100644
--- a/manual/de/user_customization-packages.ssi
+++ b/manual/de/user_customization-packages.ssi
@@ -136,12 +136,15 @@ $ lb config --packages "package1 package2 package3"
 
 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
-details.  % FIXME: <xref linkend="package-installation"/>
+details.
+
+% FIXME: <xref linkend="package-installation"/>
 
 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
-using package lists. See package-lists for more information.  % FIXME: <xref
-linkend="package-lists"/>
+using package lists. See package-lists for more information.
+
+% FIXME: <xref linkend="package-lists"/>
 
 3~ Package lists
 
@@ -273,7 +276,9 @@ control
 
 Unlike using #{chroot_local-packages}#, when using a custom APT repository
 you must ensure that you specify the packages elsewhere. See lb-packages for
-details.  % FIXME: <xref linkend="lb-packages"/>
+details.
+
+% FIXME: <xref linkend="lb-packages"/>
 
 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
@@ -291,8 +296,9 @@ Because of this, you may wish to increment the version number in your custom
 packages' #{debian/changelog}# files to ensure that your modified version is
 installed over one in the official Debian repositories. This may also be
 achieved by altering the live system's APT pinning preferences - see
-apt-preferences for more information.  % FIXME: <xref
-linkend="apt-preferences"/>
+apt-preferences for more information.
+
+% FIXME: <xref linkend="apt-preferences"/>
 
 3~ Altering APT preferences during Live system
 
diff --git a/manual/de/user_installation.ssi b/manual/de/user_installation.ssi
index 8ef8d9a..d330950 100644
--- a/manual/de/user_installation.ssi
+++ b/manual/de/user_installation.ssi
@@ -99,8 +99,9 @@ are available on http://live.debian.net/debian/.
 3~ Using a customised live-boot
 
 To modify the code you can follow the process below. Please ensure you are
-familiar with the terms mentioned in terms.  % FIXME: <xref
-linkend="terms"/>
+familiar with the terms mentioned in terms.
+
+% FIXME: <xref linkend="terms"/>
 
 _* Checkout the live-boot source
 
@@ -136,8 +137,10 @@ _* Use the generated live-boot .deb
 As live-boot is installed by live-build system, installing the package in
 the host system is not sufficient: you should treat the generated .deb like
 another custom package. Please see custom-packages for more information. You
-should pay particular attention to custom-packages-apt.  % FIXME: <xref
-linkend="custom-packages"/> <xref linkend="custom-packages-apt"/>
+should pay particular attention to custom-packages-apt.
+
+% FIXME: <xref linkend="custom-packages"/> <xref
+linkend="custom-packages-apt"/>
 
 3~ Using live-boot snapshots
 
diff --git a/manual/de/user_overview.ssi b/manual/de/user_overview.ssi
index 229f373..49fdf79 100644
--- a/manual/de/user_overview.ssi
+++ b/manual/de/user_overview.ssi
@@ -30,7 +30,9 @@ each command.
 Unlike debhelper, live-build contains a tool to generate a skeleton
 configuration directory, #{lb config}#. This could be considered to be
 similar to tools such as #{dh-make}#. For more information about #{lb
-config}#, please see lb-config.  % FIXME: <xref linkend="lb-config"/>
+config}#, please see lb-config.
+
+% FIXME: <xref linkend="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
@@ -63,28 +65,35 @@ 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.
 
-Please see installation for information on how to install live-build.  %
-FIXME: <xref linkend="installation"/>
+Please see installation for information on how to install live-build.
+
+% FIXME: <xref linkend="installation"/>
 
 The remainder of this section discusses the three most important commands:
 
 _* *{lb config}*: Responsible for initialising a Live system configuration
-directory. See lb-config for more information.  % FIXME: <xref
-linkend="lb-config"/>
+directory. See lb-config for more information.
+
+% FIXME: <xref linkend="lb-config"/>
 
 _* *{lb build}*: Responsible for starting a Live system build. See lb-build
-for more information.  % FIXME: <xref linkend="lb-build"/>
+for more information.
+
+% FIXME: <xref linkend="lb-build"/>
 
 _* *{lb clean}*: Responsible for removing parts of a Live system build. See
-lb-clean for more information.  % FIXME: <xref linkend="lb-clean"/
+lb-clean for more information.
+
+% FIXME: <xref linkend="lb-clean"/
 
 3~ The #{lb config}# command
 
 As discussed in live-build, the scripts that make up live-build source their
 configuration from a single directory named config/. As constructing this
 directory by hand would be time-consuming and error-prone, the #{lb config}#
-command can be used to create skeleton configuration folders.  % FIXME:
-<xref linkend="live-build"/>
+command can be used to create skeleton configuration folders.
+
+% FIXME: <xref linkend="live-build"/>
 
 Issuing #{lb config}# without any arguments creates a config subdirectory
 which it populates with some default settings:
diff --git a/manual/en/about_manual.ssi b/manual/en/about_manual.ssi
index e1e362c..ae26112 100644
--- a/manual/en/about_manual.ssi
+++ b/manual/en/about_manual.ssi
@@ -71,6 +71,7 @@ _* Trent W. Buck
 2~ Contributing to this document
 
 This manual is intended as a community project and all proposals for improvements and contributions are extremely welcome. The preferred way to submit a contribution is to send it to the mailing list. Please see contact for more information.
+
 % FIXME: <xref linkend="contact"/>
 
 When submitting a contribution please clearly identify its copyright holder and include the licensing statement. Note that to be accepted the contribution must be licensed under the same license as the rest of the document, namely GPL version 3 or later.
diff --git a/manual/en/about_project.ssi b/manual/en/about_project.ssi
index e8c4a0d..c7215fd 100644
--- a/manual/en/about_project.ssi
+++ b/manual/en/about_project.ssi
@@ -57,6 +57,7 @@ In this phase we will not ship or install sample or alternative configurations.
 Whenever we need a different default configuration, we will do that in coordination with its package maintainer in Debian.
 
 A system for configuring packages is provided using debconf in #{lh config}# (use --preseed FILE) allowing custom configured packages to be installed in your custom produced Debian Live images, but for official live images only default configuration will be used. For more information, please see customization.
+
 % FIXME: <xref linkend="customization"/>
 
 Exception: There are a few essential changes needed to bring a live system to life (e.g. configuring pam to allow empty passwords). These essential changes have to be kept as minimal as possible and should be merged within the Debian repository if possible.
@@ -68,6 +69,7 @@ _* *{Mailing list}*: The primary contact for the project is the mailing list at
 _* *{IRC}*: A number of users and developers are present in the #debian-live channel on irc.debian.org (OFTC). When asking a question on IRC, please be patient for an answer. If no answer is forthcoming, please email the mailing list.
 
 _* *{BTS}*: The Debian Bug Tracking System (BTS) contains details of bugs reported by users and developers. Each bug is given a number, and is kept on file until it is marked as having been dealt with. For more information, please see bugs.
+
 % FIXME: <xref linkend="bugs"/>
 
 _* *{Wiki}*: The Debian Live wiki at http://wiki.debian.org/DebianLive is a place to gather information, discuss applied technologies, and document frameworks of Debian Live systems that go beyond the scope of this document.
diff --git a/manual/en/index.html.in b/manual/en/index.html.in
new file mode 100644
index 0000000..27530f4
--- /dev/null
+++ b/manual/en/index.html.in
@@ -0,0 +1,49 @@
+<html>
+
+<head>
+	<title>Debian Live Project</title>
+</head>
+
+<body>
+	<h2>Debian Live Manual</h2>
+
+	<p>
+		<i>This manual is under heavy construction.</i>
+	</p>
+
+	<p>
+		Please report errors, omissions, patches and suggestions to our mailinglist at <a href="mailto:debian-live at lists.debian.org">debian-live at lists.debian.org</a> and read about <a href="html/meta.html#contributing">how to contribute</a> to the manual.
+	</p>
+
+	<h3>Available Formats</h3>
+
+	<ul>
+		<li><a href="epub/live-manual.epub">EPUB</a></li>
+		<li>HTML: <a href="html/index.html">multi page</a>, <a href="html/live-manual.html">single page</a></li>
+		<li><a href="odf/live-manual.odt">ODF</a></li>
+		<li>PDF: <a href="pdf/live-manual.portrait-a4.pdf">A4 portrait</a>, <a href="pdf/live-manual.landscape-a4.pdf">A4 landscape</a>, <a href="pdf/live-manual.portrait-letter.pdf">letter portrait</a>, <a href="pdf/live-manual.landscape-letter.pdf">letter landscape</a></li>
+		<li><a href="txt/live-manual.txt">Plain text</a></li>
+	</ul>
+
+	<p>
+		Last changed: @DATE_CHANGE@<br />
+		Last built: @DATE_BUILD@
+	</p>
+
+	<h3>Source</h3>
+
+	<p>
+		The sources for this manual is available in a <a href="http://git.or.cz/">git</a> repository at live.debian.net.
+	</p>
+
+	<ul>
+		<li>Browse: <a href="http://live.debian.net/gitweb/?p=live-manual.git"><small><tt>http://live.debian.net/gitweb/?p=live-manual.git</tt></small></a></li>
+		<li>Git: <a href="git://live.debian.net/git/live-manual.git"><small><tt>git://live.debian.net/git/live-manual.git</tt></small></a></li>
+	</ul>
+
+	<p>
+		<a href="http://live.debian.net/">Debian Live</a> &lt;<a href="mailto:debian-live at lists.debian.org">debian-live at lists.debian.org</a>&gt; - <a href="http://live.debian.net/legal.html">Legal Notice</a>
+	</p>
+</body>
+
+</html>
diff --git a/manual/en/live-manual.ssm b/manual/en/live-manual.ssm
index 4f4f5d7..eaca0b5 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-09-19
+ :published: 2010-10-03
 
 @publisher: Debian Live Project <debian-live at lists.debian.org>
 
diff --git a/manual/en/user_basics.ssi b/manual/en/user_basics.ssi
index 2ec267b..f281d28 100644
--- a/manual/en/user_basics.ssi
+++ b/manual/en/user_basics.ssi
@@ -7,6 +7,7 @@ This chapter contains a brief overview of the build process as well as containin
 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).
+
 % FIXME: <xref linkend="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:
@@ -18,6 +19,7 @@ _* 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 scripts to do it.
 
 _* *{System image}*: The operating systems filesystem image. Debian Live uses SquashFS, a compressed filesystem, to minimize its 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).
+
 % 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.
@@ -37,6 +39,7 @@ $ lb config
 }code
 
 By passing no parameters to #{lb config}# we indicated that we wish to use the defaults (see lb-config).
+
 % FIXME: <xref linkend="lb-config"/>
 
 Now that we have a "config/" hierarchy, we may build the image with the lb build command:
@@ -48,6 +51,7 @@ code{
 }code
 
 This process can take a while, depending on the speed of your network connection (see lb-build).
+
 % FIXME: <xref linkend="lb-build"/>
 
 3~ Testing an ISO image with Qemu
@@ -93,6 +97,7 @@ $ wodim binary.iso
 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.
 
 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 lb-clean):
+
 % FIXME: <xref linkend="lb-clean"/>
 
 code{
@@ -212,6 +217,7 @@ We must configure our network's DHCP server to be sure to give an IP address to
 Here is an example for inspiration, written for the ISC DHCP server #{isc-dhcp-server}# in the /etc/dhcp/dhcpd.conf configuration file;
 
 % FIXME
+
 code{
 
 subnet 192.168.1.0 netmask 255.255.255.0 {   # 192.168.1.0/24
diff --git a/manual/en/user_customization-contents.ssi b/manual/en/user_customization-contents.ssi
index 68f1ed8..60c9f7b 100644
--- a/manual/en/user_customization-contents.ssi
+++ b/manual/en/user_customization-contents.ssi
@@ -9,15 +9,19 @@ This chapter discusses further customisation of the live system.
 Using includes, it is possible to add (or replace) arbitrary files in your Debian Live image. live-build provides three mechanisms for using them:
 
 _* Chroot local includes: These allow you to add or replace files to the chroot/Live filesystem. Please see chroot-local-includes for more information.
+
 % FIXME: <xref linkend="chroot-local-includes"/>
 
 _* Binary local includes: These allow you to add or replace files in the binary image. Please see binary-local-includes for more information.
+
 % FIXME: <xref linkend="binary-local-includes"/>
 
 _* Binary includes: These allow you to add or replace Debian specific files in the binary image, such as the templates and tools directories. Please see binary-includes for more information.
+
 % FIXME: <xref linkend="binary-includes"/>
 
 Please see terms for more information about the distinction between the "Live" and "binary" images.
+
 % FIXME: <xref linkend="terms"/>
 
 3~ Live/chroot local includes
diff --git a/manual/en/user_customization-packages.ssi b/manual/en/user_customization-packages.ssi
index 838b348..a94ac0f 100644
--- a/manual/en/user_customization-packages.ssi
+++ b/manual/en/user_customization-packages.ssi
@@ -114,9 +114,11 @@ $ lb config --packages "package1 package2 package3"
 }code
 
 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 details.
+
 % FIXME: <xref linkend="package-installation"/>
 
 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 using package lists. See package-lists for more information.
+
 % FIXME: <xref linkend="package-lists"/>
 
 3~ Package lists
@@ -231,6 +233,7 @@ _* It does not lend itself to storing Debian Live configurations in revision con
 3~ Using an APT repository to install custom packages
 
 Unlike using #{chroot_local-packages}#, when using a custom APT repository you must ensure that you specify the packages elsewhere. See lb-packages for details.
+
 % FIXME: <xref linkend="lb-packages"/>
 
 Whilst it may seem unnecessary effort to create an APT repository to install custom packages, the infrastructure can be easily re-used at a later date to offer updates of the modified packages.
@@ -240,6 +243,7 @@ Whilst it may seem unnecessary effort to create an APT repository to install cus
 live-build uses APT to install all packages into the live system so will therefore inherit behaviours from this program. One relevant example is that (assuming a default configuration) given a package available in two different repositories with different version numbers, APT will elect to install the package with the higher version number.
 
 Because of this, you may wish to increment the version number in your custom packages' #{debian/changelog}# files to ensure that your modified version is installed over one in the official Debian repositories. This may also be achieved by altering the live system's APT pinning preferences - see apt-preferences for more information.
+
 % FIXME: <xref linkend="apt-preferences"/>
 
 3~ Altering APT preferences during Live system
diff --git a/manual/en/user_installation.ssi b/manual/en/user_installation.ssi
index 88e763f..58ad880 100644
--- a/manual/en/user_installation.ssi
+++ b/manual/en/user_installation.ssi
@@ -96,6 +96,7 @@ If you do not wish to build or install live-build from source, you can use snaps
 3~ Using a customised live-boot
 
 To modify the code you can follow the process below. Please ensure you are familiar with the terms mentioned in terms.
+
 % FIXME: <xref linkend="terms"/>
 
 _* Checkout the live-boot source
@@ -124,6 +125,7 @@ $ dpkg-buildpackage -rfakeroot -b -uc -us
 _* Use the generated live-boot .deb
 
 As live-boot is installed by live-build system, installing the package in the host system is not sufficient: you should treat the generated .deb like another custom package. Please see custom-packages for more information. You should pay particular attention to custom-packages-apt.
+
 % FIXME: <xref linkend="custom-packages"/> <xref linkend="custom-packages-apt"/>
 
 3~ Using live-boot snapshots
diff --git a/manual/en/user_overview.ssi b/manual/en/user_overview.ssi
index 43fda74..4425783 100644
--- a/manual/en/user_overview.ssi
+++ b/manual/en/user_overview.ssi
@@ -17,6 +17,7 @@ _* The scripts have a central location for configuring their operation. In debhe
 _* The scripts are independent - that is to say, it is always safe to run each command.
 
 Unlike debhelper, live-build contains a tool to generate a skeleton configuration directory, #{lb config}#. This could be considered to be similar to tools such as #{dh-make}#. For more information about #{lb config}#, please see lb-config.
+
 % FIXME: <xref linkend="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).
@@ -30,22 +31,27 @@ All config files are shell scripts which are sourced by a live-build command. Th
 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.
 
 Please see installation for information on how to install live-build.
+
 % FIXME: <xref linkend="installation"/>
 
 The remainder of this section discusses the three most important commands:
 
 _* *{lb config}*: Responsible for initialising a Live system configuration directory. See lb-config for more information.
+
 % FIXME: <xref linkend="lb-config"/>
 
 _* *{lb build}*: Responsible for starting a Live system build. See lb-build for more information.
+
 % FIXME: <xref linkend="lb-build"/>
 
 _* *{lb clean}*: Responsible for removing parts of a Live system build. See lb-clean for more information.
+
 % FIXME: <xref linkend="lb-clean"/
 
 3~ The #{lb config}# command
 
 As discussed in live-build, the scripts that make up live-build source their configuration from a single directory named config/. As constructing this directory by hand would be time-consuming and error-prone, the #{lb config}# command can be used to create skeleton configuration folders.
+
 % FIXME: <xref linkend="live-build"/>
 
 Issuing #{lb config}# without any arguments creates a config subdirectory which it populates with some default settings:
diff --git a/manual/po/de/about_manual.ssi.po b/manual/po/de/about_manual.ssi.po
index b35af59..ad28636 100644
--- a/manual/po/de/about_manual.ssi.po
+++ b/manual/po/de/about_manual.ssi.po
@@ -6,13 +6,13 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-09-17 23:43+0300\n"
-"PO-Revision-Date: 2010-09-17 23:43+0300\n"
+"POT-Creation-Date: 2010-10-03 20:30+0300\n"
+"PO-Revision-Date: 2010-10-03 20:30+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ASCII\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
@@ -248,16 +248,21 @@ msgid "2~ Contributing to this document"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:75
+#: en/about_manual.ssi:74
 msgid ""
 "This manual is intended as a community project and all proposals for "
 "improvements and contributions are extremely welcome. The preferred way to "
 "submit a contribution is to send it to the mailing list. Please see contact "
-"for more information.  % FIXME: <xref linkend=\"contact\"/>"
+"for more information."
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:77
+#: en/about_manual.ssi:76
+msgid "% FIXME: <xref linkend=\"contact\"/>"
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:78
 msgid ""
 "When submitting a contribution please clearly identify its copyright holder "
 "and include the licensing statement. Note that to be accepted the "
@@ -266,24 +271,22 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:79
+#: en/about_manual.ssi:80
 msgid ""
 "The sources for this manual are maintained using the Git version control "
 "system. You can checkout the latest copy by executing:"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:81 en/about_manual.ssi:89 en/about_manual.ssi:97
-#: en/about_manual.ssi:109 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:141 en/about_manual.ssi:149 en/about_manual.ssi:157
+#: en/about_manual.ssi:82 en/about_manual.ssi:90 en/about_manual.ssi:98
+#: en/about_manual.ssi:110 en/about_manual.ssi:121 en/about_manual.ssi:134
+#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
 #: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
 #: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
 #: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
 #: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
 #: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
 #: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
-#: en/other_customization-contents.ssi:30
-#: en/other_customization-contents.ssi:39
 #: en/other_customization-internationalization.ssi:10
 #: en/other_customization-internationalization.ssi:18
 #: en/other_customization-internationalization.ssi:26
@@ -304,49 +307,49 @@ msgstr ""
 #: 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:45
-#: en/user_basics.ssi:58 en/user_basics.ssi:70 en/user_basics.ssi:84
-#: en/user_basics.ssi:99 en/user_basics.ssi:107 en/user_basics.ssi:115
-#: en/user_basics.ssi:125 en/user_basics.ssi:137 en/user_basics.ssi:149
-#: en/user_basics.ssi:157 en/user_basics.ssi:165 en/user_basics.ssi:179
-#: en/user_basics.ssi:187 en/user_basics.ssi:197 en/user_basics.ssi:249
-#: en/user_basics.ssi:265 en/user_basics.ssi:273 en/user_basics.ssi:293
-#: en/user_basics.ssi:318 en/user_customization-packages.ssi:16
+#: en/other_use-cases.ssi:111 en/user_basics.ssi:36 en/user_basics.ssi:48
+#: en/user_basics.ssi:62 en/user_basics.ssi:74 en/user_basics.ssi:88
+#: en/user_basics.ssi:104 en/user_basics.ssi:112 en/user_basics.ssi:120
+#: en/user_basics.ssi:130 en/user_basics.ssi:142 en/user_basics.ssi:154
+#: en/user_basics.ssi:162 en/user_basics.ssi:170 en/user_basics.ssi:184
+#: en/user_basics.ssi:192 en/user_basics.ssi:202 en/user_basics.ssi:222
+#: en/user_basics.ssi:255 en/user_basics.ssi:271 en/user_basics.ssi:279
+#: en/user_basics.ssi:299 en/user_basics.ssi:324
+#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
+#: en/user_customization-contents.ssi:66 en/user_customization-packages.ssi:16
 #: en/user_customization-packages.ssi:24 en/user_customization-packages.ssi:36
 #: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:59
 #: en/user_customization-packages.ssi:73
 #: en/user_customization-packages.ssi:103
 #: en/user_customization-packages.ssi:111
-#: en/user_customization-packages.ssi:129
-#: en/user_customization-packages.ssi:158
-#: en/user_customization-packages.ssi:168
-#: en/user_customization-packages.ssi:178
-#: en/user_customization-packages.ssi:188 en/user_installation.ssi:38
+#: en/user_customization-packages.ssi:131
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:180
+#: en/user_customization-packages.ssi:190 en/user_installation.ssi:38
 #: en/user_installation.ssi:46 en/user_installation.ssi:56
 #: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:104
-#: en/user_installation.ssi:118 en/user_installation.ssi:134
-#: en/user_overview.ssi:54 en/user_overview.ssi:98 en/user_overview.ssi:106
+#: en/user_installation.ssi:84 en/user_installation.ssi:105
+#: en/user_installation.ssi:119 en/user_installation.ssi:136
+#: en/user_overview.ssi:60 en/user_overview.ssi:104 en/user_overview.ssi:112
 msgid "code{"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:83
+#: en/about_manual.ssi:84
 msgid "$ git clone git://live.debian.net/git/live-manual.git"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:85 en/about_manual.ssi:93 en/about_manual.ssi:101
-#: en/about_manual.ssi:116 en/about_manual.ssi:129 en/about_manual.ssi:137
-#: en/about_manual.ssi:145 en/about_manual.ssi:153 en/about_manual.ssi:160
+#: en/about_manual.ssi:86 en/about_manual.ssi:94 en/about_manual.ssi:102
+#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
 #: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
 #: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
 #: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
 #: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
 #: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
 #: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: en/other_customization-contents.ssi:35
-#: en/other_customization-contents.ssi:50
 #: en/other_customization-internationalization.ssi:14
 #: en/other_customization-internationalization.ssi:22
 #: en/other_customization-internationalization.ssi:30
@@ -367,34 +370,35 @@ 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:49
-#: en/user_basics.ssi:64 en/user_basics.ssi:74 en/user_basics.ssi:90
-#: en/user_basics.ssi:103 en/user_basics.ssi:111 en/user_basics.ssi:119
-#: en/user_basics.ssi:129 en/user_basics.ssi:143 en/user_basics.ssi:153
-#: en/user_basics.ssi:161 en/user_basics.ssi:169 en/user_basics.ssi:183
-#: en/user_basics.ssi:191 en/user_basics.ssi:201 en/user_basics.ssi:241
-#: en/user_basics.ssi:269 en/user_basics.ssi:277 en/user_basics.ssi:304
-#: en/user_basics.ssi:343 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/other_use-cases.ssi:137 en/user_basics.ssi:40 en/user_basics.ssi:52
+#: en/user_basics.ssi:68 en/user_basics.ssi:78 en/user_basics.ssi:94
+#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:124
+#: en/user_basics.ssi:134 en/user_basics.ssi:148 en/user_basics.ssi:158
+#: en/user_basics.ssi:166 en/user_basics.ssi:174 en/user_basics.ssi:188
+#: en/user_basics.ssi:196 en/user_basics.ssi:206 en/user_basics.ssi:247
+#: en/user_basics.ssi:275 en/user_basics.ssi:283 en/user_basics.ssi:310
+#: en/user_basics.ssi:349 en/user_customization-contents.ssi:39
+#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:70
+#: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
+#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
+#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
 #: en/user_customization-packages.ssi:107
 #: en/user_customization-packages.ssi:115
-#: en/user_customization-packages.ssi:133
-#: en/user_customization-packages.ssi:164
-#: en/user_customization-packages.ssi:174
-#: en/user_customization-packages.ssi:184
-#: en/user_customization-packages.ssi:194 en/user_installation.ssi:42
+#: en/user_customization-packages.ssi:135
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:186
+#: en/user_customization-packages.ssi:196 en/user_installation.ssi:42
 #: en/user_installation.ssi:50 en/user_installation.ssi:60
 #: en/user_installation.ssi:72 en/user_installation.ssi:80
-#: en/user_installation.ssi:108 en/user_installation.ssi:123
-#: en/user_installation.ssi:137 en/user_overview.ssi:92
-#: en/user_overview.ssi:102 en/user_overview.ssi:110
+#: en/user_installation.ssi:109 en/user_installation.ssi:124
+#: en/user_installation.ssi:139 en/user_overview.ssi:98
+#: en/user_overview.ssi:108 en/user_overview.ssi:116
 msgid "}code"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:87
+#: en/about_manual.ssi:88
 msgid ""
 "Prior to submission of your contribution, please preview your work. To "
 "preview the live-manual, ensure the packages needed for building are "
@@ -402,29 +406,29 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:91
+#: en/about_manual.ssi:92
 msgid "# apt-get install sisu-complete"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:95
+#: en/about_manual.ssi:96
 msgid ""
 "You may build the live-manual from the top level directory of your git "
 "checkout by executing:"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:99
+#: en/about_manual.ssi:100
 msgid "$ make build"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:103
+#: en/about_manual.ssi:104
 msgid "3~ Applying patches"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:105
+#: en/about_manual.ssi:106
 msgid ""
 "Directly commiting to the repository is possible by anyone. However, we ask "
 "you to send bigger changes to the mailinglist to discuss them first. In "
@@ -432,12 +436,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:107
+#: en/about_manual.ssi:108
 msgid "_* Fetch the public commit key:"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:114
+#: en/about_manual.ssi:115
 msgid ""
 "$ mkdir -p ~/.ssh/identity.d $ wget http://live.debian.net/other/openssh/"
 "repository-public-commit-key-current/live-manual at debian-live -O ~/.ssh/"
@@ -448,12 +452,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:118
+#: en/about_manual.ssi:119
 msgid "_* Add the following section to your openssh-client config:"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:127
+#: en/about_manual.ssi:128
 #, no-wrap
 msgid ""
 "$ cat >> ~/.ssh/config << EOF\n"
@@ -465,17 +469,17 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:131
+#: en/about_manual.ssi:132
 msgid "_* Checkout a clone of the manual through ssh:"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:135
+#: en/about_manual.ssi:136
 msgid "$ git clone gitosis at live.debian.net:/live-manual.git"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:139
+#: en/about_manual.ssi:140
 msgid ""
 "_* After editing the files in manual/en/, please call the 'commit' target in "
 "the toplevel directory to sanitize the files and update the translation "
@@ -483,12 +487,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:143
+#: en/about_manual.ssi:144
 msgid "$ make commit"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:147
+#: en/about_manual.ssi:148
 msgid ""
 "_* After sanitizing commit the changes. Write commit messages, that consist "
 "of full useful sentences, starting with a capital letter and ending with a "
@@ -497,16 +501,16 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:151
+#: en/about_manual.ssi:152
 msgid "$ git commit -a"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:155
+#: en/about_manual.ssi:156
 msgid "_* Push the commit to the server:"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:159
+#: en/about_manual.ssi:160
 msgid "$ git push"
 msgstr ""
diff --git a/manual/po/de/about_project.ssi.po b/manual/po/de/about_project.ssi.po
index 50f6fa3..3393dba 100644
--- a/manual/po/de/about_project.ssi.po
+++ b/manual/po/de/about_project.ssi.po
@@ -6,25 +6,25 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-09-17 23:43+0300\n"
-"PO-Revision-Date: 2010-09-17 23:43+0300\n"
+"POT-Creation-Date: 2010-10-03 20:30+0300\n"
+"PO-Revision-Date: 2010-10-03 20:30+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ASCII\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. type: Plain text
 #: en/about_project.ssi:2
 msgid ":B~ About the Debian Live Project"
-msgstr ""
+msgstr ":B~ Über das Debian Live Projekt"
 
 #. type: Plain text
 #: en/about_project.ssi:4
 msgid "1~ About the Debian Live Project"
-msgstr ""
+msgstr "1~ Über das Debian Live Projekt"
 
 #. type: Plain text
 #: en/about_project.ssi:6
@@ -190,17 +190,22 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/about_project.ssi:61
+#: en/about_project.ssi:60
 msgid ""
 "A system for configuring packages is provided using debconf in #{lh config}# "
 "(use --preseed FILE) allowing custom configured packages to be installed in "
 "your custom produced Debian Live images, but for official live images only "
 "default configuration will be used. For more information, please see "
-"customization.  % FIXME: <xref linkend=\"customization\"/>"
+"customization."
+msgstr ""
+
+#. type: Plain text
+#: en/about_project.ssi:62
+msgid "% FIXME: <xref linkend=\"customization\"/>"
 msgstr ""
 
 #. type: Plain text
-#: en/about_project.ssi:63
+#: en/about_project.ssi:64
 msgid ""
 "Exception: There are a few essential changes needed to bring a live system "
 "to life (e.g. configuring pam to allow empty passwords). These essential "
@@ -209,12 +214,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/about_project.ssi:65
+#: en/about_project.ssi:66
 msgid "2~ Contact"
 msgstr ""
 
 #. type: Plain text
-#: en/about_project.ssi:67
+#: en/about_project.ssi:68
 msgid ""
 "_* *{Mailing list}*: The primary contact for the project is the mailing list "
 "at http://lists.debian.org/debian-live/. You can email the list directly by "
@@ -223,7 +228,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/about_project.ssi:69
+#: en/about_project.ssi:70
 msgid ""
 "_* *{IRC}*: A number of users and developers are present in the #debian-live "
 "channel on irc.debian.org (OFTC). When asking a question on IRC, please be "
@@ -237,11 +242,16 @@ msgid ""
 "_* *{BTS}*: The Debian Bug Tracking System (BTS) contains details of bugs "
 "reported by users and developers. Each bug is given a number, and is kept on "
 "file until it is marked as having been dealt with. For more information, "
-"please see bugs.  % FIXME: <xref linkend=\"bugs\"/>"
+"please see bugs."
+msgstr ""
+
+#. type: Plain text
+#: en/about_project.ssi:74
+msgid "% FIXME: <xref linkend=\"bugs\"/>"
 msgstr ""
 
 #. type: Plain text
-#: en/about_project.ssi:73
+#: en/about_project.ssi:75
 msgid ""
 "_* *{Wiki}*: The Debian Live wiki at http://wiki.debian.org/DebianLive is a "
 "place to gather information, discuss applied technologies, and document "
diff --git a/manual/po/de/index.html.in.po b/manual/po/de/index.html.in.po
new file mode 100644
index 0000000..54a77a2
--- /dev/null
+++ b/manual/po/de/index.html.in.po
@@ -0,0 +1,144 @@
+# German translations for live-manual package
+# Copyright (C) 2010 Free Software Foundation, Inc.
+# This file is distributed under the same license as the live-manual package.
+# Automatically generated, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: live-manual 2.0~a3\n"
+"POT-Creation-Date: 2010-10-03 12:43+0300\n"
+"PO-Revision-Date: 2010-06-06 15:21+0300\n"
+"Last-Translator: Daniel Baumann <daniel at debian.org>\n"
+"Language-Team: none\n"
+"Language: de\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. type: Content of: <html><head><title>
+#: en/index.html.in:4
+msgid "Debian Live Project"
+msgstr "Debian Live Projekt"
+
+#. type: Content of: <html><body><h2>
+#: en/index.html.in:8
+msgid "Debian Live Manual"
+msgstr "Debian Live Handbuch"
+
+#. type: Content of: <html><body><p>
+#: en/index.html.in:11
+msgid "<i>This manual is under heavy construction.</i>"
+msgstr ""
+"<i>Dieses Handbuch ist noch nicht fertig und befindet sich im Aufbau.</i>"
+
+#. type: Content of: <html><body><p>
+#: en/index.html.in:15
+msgid ""
+"Please report errors, omissions, patches and suggestions to our mailinglist "
+"at <a href=\"mailto:debian-live at lists.debian.org\">debian-live at lists.debian."
+"org</a> and read about <a href=\"html/meta.html#contributing\">how to "
+"contribute</a> to the manual."
+msgstr ""
+"Fehler, Vergessenes, Patches und Vorschläge können an unsere Mailing Liste "
+"unter <a href=\"mailto:debian-live at lists.debian.org\">debian-live at lists."
+"debian.org</a> (englischspraching) gemeldet werden. Informationen wie man <a "
+"href=\"html/meta.html#contributing\">zum Handbuch beitragen</a> kann, können "
+"im Handbuch gefunden werden."
+
+#. type: Content of: <html><body><h3>
+#: en/index.html.in:18
+msgid "Available Formats"
+msgstr "Verfügbare Formate"
+
+#. type: Content of: <html><body><ul><li>
+#: en/index.html.in:21
+msgid "<a href=\"epub/live-manual.epub\">EPUB</a>"
+msgstr "<a href=\"epub/live-manual.epub\">EPUB</a>"
+
+#. type: Content of: <html><body><ul><li>
+#: en/index.html.in:22
+msgid ""
+"HTML: <a href=\"html/index.html\">multi page</a>, <a href=\"html/live-manual."
+"html\">single page</a>"
+msgstr ""
+"HTML: <a href=\"html/index.html\">mehrere Seiten</a>, <a href=\"html/live-"
+"manual.html\">einzelne Seite</a>"
+
+#. type: Content of: <html><body><ul><li>
+#: en/index.html.in:23
+msgid "<a href=\"odf/live-manual.odt\">ODF</a>"
+msgstr "<a href=\"odf/live-manual.odt\">ODF</a>"
+
+#. type: Content of: <html><body><ul><li>
+#: en/index.html.in:24
+msgid ""
+"PDF: <a href=\"pdf/live-manual.portrait-a4.pdf\">A4 portrait</a>, <a href="
+"\"pdf/live-manual.landscape-a4.pdf\">A4 landscape</a>, <a href=\"pdf/live-"
+"manual.portrait-letter.pdf\">letter portrait</a>, <a href=\"pdf/live-manual."
+"landscape-letter.pdf\">letter landscape</a>"
+msgstr ""
+"PDF: <a href=\"pdf/live-manual.portrait-a4.pdf\">A4 Hochformat</a>, <a href="
+"\"pdf/live-manual.landscape-a4.pdf\">A4 Querformat</a>, <a href=\"pdf/live-"
+"manual.portrait-letter.pdf\">Letter Hochformat</a>, <a href=\"pdf/live-"
+"manual.landscape-letter.pdf\">Letter Querformat</a>"
+
+#. type: Content of: <html><body><ul><li>
+#: en/index.html.in:25
+msgid "<a href=\"txt/live-manual.txt\">Plain text</a>"
+msgstr "<a href=\"txt/live-manual.txt\">Text</a>"
+
+#. type: Content of: <html><body><p>
+#: en/index.html.in:29
+msgid "Last changed: @DATE_CHANGE@"
+msgstr "Letzte Änderung: @DATE_CHANGE@"
+
+#. type: Content of: <html><body><p>
+#: en/index.html.in:30
+msgid "Last built: @DATE_BUILD@"
+msgstr "Letzte Aktualisierung: @DATE_BUILD@"
+
+#. type: Content of: <html><body><h3>
+#: en/index.html.in:33
+msgid "Source"
+msgstr "Quellen"
+
+#. type: Content of: <html><body><p>
+#: en/index.html.in:36
+msgid ""
+"The sources for this manual is available in a <a href=\"http://git.or.cz/"
+"\">git</a> repository at live.debian.net."
+msgstr ""
+"Die Quellen dieses Handbuches sind in einem <a href=\"http://git.or.cz/"
+"\">Git</a> Repository auf live.debian.net verfügbar."
+
+#. type: Content of: <html><body><ul><li>
+#: en/index.html.in:40
+msgid ""
+"Browse: <a href=\"http://live.debian.net/gitweb/?p=live-manual.git"
+"\"><small><tt>http://live.debian.net/gitweb/?p=live-manual.git</tt></small></"
+"a>"
+msgstr ""
+"Browse: <a href=\"http://live.debian.net/gitweb/?p=live-manual.git"
+"\"><small><tt>http://live.debian.net/gitweb/?p=live-manual.git</tt></small></"
+"a>"
+
+#. type: Content of: <html><body><ul><li>
+#: en/index.html.in:41
+msgid ""
+"Git: <a href=\"git://live.debian.net/git/live-manual.git\"><small><tt>git://"
+"live.debian.net/git/live-manual.git</tt></small></a>"
+msgstr ""
+"Git: <a href=\"git://live.debian.net/git/live-manual.git\"><small><tt>git://"
+"live.debian.net/git/live-manual.git</tt></small></a>"
+
+#. type: Content of: <html><body><p>
+#: en/index.html.in:45
+msgid ""
+"<a href=\"http://live.debian.net/\">Debian Live</a> &lt;<a href=\"mailto:"
+"debian-live at lists.debian.org\">debian-live at lists.debian.org</a>&gt; - <a "
+"href=\"http://live.debian.net/legal.html\">Legal Notice</a>"
+msgstr ""
+"<a href=\"http://live.debian.net/\">Debian Live</a> &lt;<a href=\"mailto:"
+"debian-live at lists.debian.org\">debian-live at lists.debian.org</a>&gt; - <a "
+"href=\"http://live.debian.net/legal.html\">Rechtliche Hinweise</a>"
diff --git a/manual/po/de/live-manual.ssm.po b/manual/po/de/live-manual.ssm.po
index 5128cea..bb7f289 100644
--- a/manual/po/de/live-manual.ssm.po
+++ b/manual/po/de/live-manual.ssm.po
@@ -6,13 +6,13 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-09-19 01:23+0300\n"
-"PO-Revision-Date: 2010-09-17 23:43+0300\n"
+"POT-Creation-Date: 2010-10-03 20:30+0300\n"
+"PO-Revision-Date: 2010-10-03 20:30+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ASCII\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
@@ -24,7 +24,7 @@ msgstr ""
 #. type: Plain text
 #: en/live-manual.ssm:4
 msgid "@title: Debian Live Manual"
-msgstr ""
+msgstr "@title: Debian Live Handbuch"
 
 #. type: Plain text
 #: en/live-manual.ssm:6
@@ -45,7 +45,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 "@date:\n"
-" :published: 2010-09-19\n"
+" :published: 2010-10-03\n"
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/po/de/other_coding-style.ssi.po b/manual/po/de/other_coding-style.ssi.po
index f5c196c..81ab20f 100644
--- a/manual/po/de/other_coding-style.ssi.po
+++ b/manual/po/de/other_coding-style.ssi.po
@@ -6,28 +6,26 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-09-17 23:43+0300\n"
-"PO-Revision-Date: 2010-09-17 23:43+0300\n"
+"POT-Creation-Date: 2010-10-03 20:30+0300\n"
+"PO-Revision-Date: 2010-10-03 20:30+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ASCII\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. type: Plain text
-#: en/about_manual.ssi:81 en/about_manual.ssi:89 en/about_manual.ssi:97
-#: en/about_manual.ssi:109 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:141 en/about_manual.ssi:149 en/about_manual.ssi:157
+#: en/about_manual.ssi:82 en/about_manual.ssi:90 en/about_manual.ssi:98
+#: en/about_manual.ssi:110 en/about_manual.ssi:121 en/about_manual.ssi:134
+#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
 #: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
 #: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
 #: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
 #: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
 #: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
 #: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
-#: en/other_customization-contents.ssi:30
-#: en/other_customization-contents.ssi:39
 #: en/other_customization-internationalization.ssi:10
 #: en/other_customization-internationalization.ssi:18
 #: en/other_customization-internationalization.ssi:26
@@ -48,44 +46,44 @@ msgstr ""
 #: 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:45
-#: en/user_basics.ssi:58 en/user_basics.ssi:70 en/user_basics.ssi:84
-#: en/user_basics.ssi:99 en/user_basics.ssi:107 en/user_basics.ssi:115
-#: en/user_basics.ssi:125 en/user_basics.ssi:137 en/user_basics.ssi:149
-#: en/user_basics.ssi:157 en/user_basics.ssi:165 en/user_basics.ssi:179
-#: en/user_basics.ssi:187 en/user_basics.ssi:197 en/user_basics.ssi:249
-#: en/user_basics.ssi:265 en/user_basics.ssi:273 en/user_basics.ssi:293
-#: en/user_basics.ssi:318 en/user_customization-packages.ssi:16
+#: en/other_use-cases.ssi:111 en/user_basics.ssi:36 en/user_basics.ssi:48
+#: en/user_basics.ssi:62 en/user_basics.ssi:74 en/user_basics.ssi:88
+#: en/user_basics.ssi:104 en/user_basics.ssi:112 en/user_basics.ssi:120
+#: en/user_basics.ssi:130 en/user_basics.ssi:142 en/user_basics.ssi:154
+#: en/user_basics.ssi:162 en/user_basics.ssi:170 en/user_basics.ssi:184
+#: en/user_basics.ssi:192 en/user_basics.ssi:202 en/user_basics.ssi:222
+#: en/user_basics.ssi:255 en/user_basics.ssi:271 en/user_basics.ssi:279
+#: en/user_basics.ssi:299 en/user_basics.ssi:324
+#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
+#: en/user_customization-contents.ssi:66 en/user_customization-packages.ssi:16
 #: en/user_customization-packages.ssi:24 en/user_customization-packages.ssi:36
 #: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:59
 #: en/user_customization-packages.ssi:73
 #: en/user_customization-packages.ssi:103
 #: en/user_customization-packages.ssi:111
-#: en/user_customization-packages.ssi:129
-#: en/user_customization-packages.ssi:158
-#: en/user_customization-packages.ssi:168
-#: en/user_customization-packages.ssi:178
-#: en/user_customization-packages.ssi:188 en/user_installation.ssi:38
+#: en/user_customization-packages.ssi:131
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:180
+#: en/user_customization-packages.ssi:190 en/user_installation.ssi:38
 #: en/user_installation.ssi:46 en/user_installation.ssi:56
 #: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:104
-#: en/user_installation.ssi:118 en/user_installation.ssi:134
-#: en/user_overview.ssi:54 en/user_overview.ssi:98 en/user_overview.ssi:106
+#: en/user_installation.ssi:84 en/user_installation.ssi:105
+#: en/user_installation.ssi:119 en/user_installation.ssi:136
+#: en/user_overview.ssi:60 en/user_overview.ssi:104 en/user_overview.ssi:112
 msgid "code{"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:85 en/about_manual.ssi:93 en/about_manual.ssi:101
-#: en/about_manual.ssi:116 en/about_manual.ssi:129 en/about_manual.ssi:137
-#: en/about_manual.ssi:145 en/about_manual.ssi:153 en/about_manual.ssi:160
+#: en/about_manual.ssi:86 en/about_manual.ssi:94 en/about_manual.ssi:102
+#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
 #: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
 #: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
 #: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
 #: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
 #: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
 #: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: en/other_customization-contents.ssi:35
-#: en/other_customization-contents.ssi:50
 #: en/other_customization-internationalization.ssi:14
 #: en/other_customization-internationalization.ssi:22
 #: en/other_customization-internationalization.ssi:30
@@ -106,29 +104,30 @@ 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:49
-#: en/user_basics.ssi:64 en/user_basics.ssi:74 en/user_basics.ssi:90
-#: en/user_basics.ssi:103 en/user_basics.ssi:111 en/user_basics.ssi:119
-#: en/user_basics.ssi:129 en/user_basics.ssi:143 en/user_basics.ssi:153
-#: en/user_basics.ssi:161 en/user_basics.ssi:169 en/user_basics.ssi:183
-#: en/user_basics.ssi:191 en/user_basics.ssi:201 en/user_basics.ssi:241
-#: en/user_basics.ssi:269 en/user_basics.ssi:277 en/user_basics.ssi:304
-#: en/user_basics.ssi:343 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/other_use-cases.ssi:137 en/user_basics.ssi:40 en/user_basics.ssi:52
+#: en/user_basics.ssi:68 en/user_basics.ssi:78 en/user_basics.ssi:94
+#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:124
+#: en/user_basics.ssi:134 en/user_basics.ssi:148 en/user_basics.ssi:158
+#: en/user_basics.ssi:166 en/user_basics.ssi:174 en/user_basics.ssi:188
+#: en/user_basics.ssi:196 en/user_basics.ssi:206 en/user_basics.ssi:247
+#: en/user_basics.ssi:275 en/user_basics.ssi:283 en/user_basics.ssi:310
+#: en/user_basics.ssi:349 en/user_customization-contents.ssi:39
+#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:70
+#: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
+#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
+#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
 #: en/user_customization-packages.ssi:107
 #: en/user_customization-packages.ssi:115
-#: en/user_customization-packages.ssi:133
-#: en/user_customization-packages.ssi:164
-#: en/user_customization-packages.ssi:174
-#: en/user_customization-packages.ssi:184
-#: en/user_customization-packages.ssi:194 en/user_installation.ssi:42
+#: en/user_customization-packages.ssi:135
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:186
+#: en/user_customization-packages.ssi:196 en/user_installation.ssi:42
 #: en/user_installation.ssi:50 en/user_installation.ssi:60
 #: en/user_installation.ssi:72 en/user_installation.ssi:80
-#: en/user_installation.ssi:108 en/user_installation.ssi:123
-#: en/user_installation.ssi:137 en/user_overview.ssi:92
-#: en/user_overview.ssi:102 en/user_overview.ssi:110
+#: en/user_installation.ssi:109 en/user_installation.ssi:124
+#: en/user_installation.ssi:139 en/user_overview.ssi:98
+#: en/user_overview.ssi:108 en/user_overview.ssi:116
 msgid "}code"
 msgstr ""
 
diff --git a/manual/po/de/other_common-tasks.ssi.po b/manual/po/de/other_common-tasks.ssi.po
index 77c79b7..10396a9 100644
--- a/manual/po/de/other_common-tasks.ssi.po
+++ b/manual/po/de/other_common-tasks.ssi.po
@@ -6,28 +6,26 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-09-17 23:43+0300\n"
-"PO-Revision-Date: 2010-09-17 23:43+0300\n"
+"POT-Creation-Date: 2010-10-03 20:30+0300\n"
+"PO-Revision-Date: 2010-10-03 20:30+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ASCII\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. type: Plain text
-#: en/about_manual.ssi:81 en/about_manual.ssi:89 en/about_manual.ssi:97
-#: en/about_manual.ssi:109 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:141 en/about_manual.ssi:149 en/about_manual.ssi:157
+#: en/about_manual.ssi:82 en/about_manual.ssi:90 en/about_manual.ssi:98
+#: en/about_manual.ssi:110 en/about_manual.ssi:121 en/about_manual.ssi:134
+#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
 #: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
 #: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
 #: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
 #: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
 #: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
 #: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
-#: en/other_customization-contents.ssi:30
-#: en/other_customization-contents.ssi:39
 #: en/other_customization-internationalization.ssi:10
 #: en/other_customization-internationalization.ssi:18
 #: en/other_customization-internationalization.ssi:26
@@ -48,44 +46,44 @@ msgstr ""
 #: 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:45
-#: en/user_basics.ssi:58 en/user_basics.ssi:70 en/user_basics.ssi:84
-#: en/user_basics.ssi:99 en/user_basics.ssi:107 en/user_basics.ssi:115
-#: en/user_basics.ssi:125 en/user_basics.ssi:137 en/user_basics.ssi:149
-#: en/user_basics.ssi:157 en/user_basics.ssi:165 en/user_basics.ssi:179
-#: en/user_basics.ssi:187 en/user_basics.ssi:197 en/user_basics.ssi:249
-#: en/user_basics.ssi:265 en/user_basics.ssi:273 en/user_basics.ssi:293
-#: en/user_basics.ssi:318 en/user_customization-packages.ssi:16
+#: en/other_use-cases.ssi:111 en/user_basics.ssi:36 en/user_basics.ssi:48
+#: en/user_basics.ssi:62 en/user_basics.ssi:74 en/user_basics.ssi:88
+#: en/user_basics.ssi:104 en/user_basics.ssi:112 en/user_basics.ssi:120
+#: en/user_basics.ssi:130 en/user_basics.ssi:142 en/user_basics.ssi:154
+#: en/user_basics.ssi:162 en/user_basics.ssi:170 en/user_basics.ssi:184
+#: en/user_basics.ssi:192 en/user_basics.ssi:202 en/user_basics.ssi:222
+#: en/user_basics.ssi:255 en/user_basics.ssi:271 en/user_basics.ssi:279
+#: en/user_basics.ssi:299 en/user_basics.ssi:324
+#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
+#: en/user_customization-contents.ssi:66 en/user_customization-packages.ssi:16
 #: en/user_customization-packages.ssi:24 en/user_customization-packages.ssi:36
 #: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:59
 #: en/user_customization-packages.ssi:73
 #: en/user_customization-packages.ssi:103
 #: en/user_customization-packages.ssi:111
-#: en/user_customization-packages.ssi:129
-#: en/user_customization-packages.ssi:158
-#: en/user_customization-packages.ssi:168
-#: en/user_customization-packages.ssi:178
-#: en/user_customization-packages.ssi:188 en/user_installation.ssi:38
+#: en/user_customization-packages.ssi:131
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:180
+#: en/user_customization-packages.ssi:190 en/user_installation.ssi:38
 #: en/user_installation.ssi:46 en/user_installation.ssi:56
 #: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:104
-#: en/user_installation.ssi:118 en/user_installation.ssi:134
-#: en/user_overview.ssi:54 en/user_overview.ssi:98 en/user_overview.ssi:106
+#: en/user_installation.ssi:84 en/user_installation.ssi:105
+#: en/user_installation.ssi:119 en/user_installation.ssi:136
+#: en/user_overview.ssi:60 en/user_overview.ssi:104 en/user_overview.ssi:112
 msgid "code{"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:85 en/about_manual.ssi:93 en/about_manual.ssi:101
-#: en/about_manual.ssi:116 en/about_manual.ssi:129 en/about_manual.ssi:137
-#: en/about_manual.ssi:145 en/about_manual.ssi:153 en/about_manual.ssi:160
+#: en/about_manual.ssi:86 en/about_manual.ssi:94 en/about_manual.ssi:102
+#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
 #: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
 #: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
 #: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
 #: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
 #: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
 #: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: en/other_customization-contents.ssi:35
-#: en/other_customization-contents.ssi:50
 #: en/other_customization-internationalization.ssi:14
 #: en/other_customization-internationalization.ssi:22
 #: en/other_customization-internationalization.ssi:30
@@ -106,29 +104,30 @@ 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:49
-#: en/user_basics.ssi:64 en/user_basics.ssi:74 en/user_basics.ssi:90
-#: en/user_basics.ssi:103 en/user_basics.ssi:111 en/user_basics.ssi:119
-#: en/user_basics.ssi:129 en/user_basics.ssi:143 en/user_basics.ssi:153
-#: en/user_basics.ssi:161 en/user_basics.ssi:169 en/user_basics.ssi:183
-#: en/user_basics.ssi:191 en/user_basics.ssi:201 en/user_basics.ssi:241
-#: en/user_basics.ssi:269 en/user_basics.ssi:277 en/user_basics.ssi:304
-#: en/user_basics.ssi:343 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/other_use-cases.ssi:137 en/user_basics.ssi:40 en/user_basics.ssi:52
+#: en/user_basics.ssi:68 en/user_basics.ssi:78 en/user_basics.ssi:94
+#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:124
+#: en/user_basics.ssi:134 en/user_basics.ssi:148 en/user_basics.ssi:158
+#: en/user_basics.ssi:166 en/user_basics.ssi:174 en/user_basics.ssi:188
+#: en/user_basics.ssi:196 en/user_basics.ssi:206 en/user_basics.ssi:247
+#: en/user_basics.ssi:275 en/user_basics.ssi:283 en/user_basics.ssi:310
+#: en/user_basics.ssi:349 en/user_customization-contents.ssi:39
+#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:70
+#: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
+#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
+#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
 #: en/user_customization-packages.ssi:107
 #: en/user_customization-packages.ssi:115
-#: en/user_customization-packages.ssi:133
-#: en/user_customization-packages.ssi:164
-#: en/user_customization-packages.ssi:174
-#: en/user_customization-packages.ssi:184
-#: en/user_customization-packages.ssi:194 en/user_installation.ssi:42
+#: en/user_customization-packages.ssi:135
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:186
+#: en/user_customization-packages.ssi:196 en/user_installation.ssi:42
 #: en/user_installation.ssi:50 en/user_installation.ssi:60
 #: en/user_installation.ssi:72 en/user_installation.ssi:80
-#: en/user_installation.ssi:108 en/user_installation.ssi:123
-#: en/user_installation.ssi:137 en/user_overview.ssi:92
-#: en/user_overview.ssi:102 en/user_overview.ssi:110
+#: en/user_installation.ssi:109 en/user_installation.ssi:124
+#: en/user_installation.ssi:139 en/user_overview.ssi:98
+#: en/user_overview.ssi:108 en/user_overview.ssi:116
 msgid "}code"
 msgstr ""
 
diff --git a/manual/po/de/other_configuration-files.ssi.po b/manual/po/de/other_configuration-files.ssi.po
index 7dc9c1b..8c1ca55 100644
--- a/manual/po/de/other_configuration-files.ssi.po
+++ b/manual/po/de/other_configuration-files.ssi.po
@@ -6,13 +6,13 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-09-17 23:43+0300\n"
-"PO-Revision-Date: 2010-09-17 23:43+0300\n"
+"POT-Creation-Date: 2010-10-03 20:30+0300\n"
+"PO-Revision-Date: 2010-10-03 20:30+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ASCII\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
diff --git a/manual/po/de/other_configuration-layout.ssi.po b/manual/po/de/other_configuration-layout.ssi.po
index c44cca5..ad61482 100644
--- a/manual/po/de/other_configuration-layout.ssi.po
+++ b/manual/po/de/other_configuration-layout.ssi.po
@@ -6,13 +6,13 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-09-17 23:43+0300\n"
-"PO-Revision-Date: 2010-09-17 23:43+0300\n"
+"POT-Creation-Date: 2010-10-03 20:30+0300\n"
+"PO-Revision-Date: 2010-10-03 20:30+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ASCII\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
diff --git a/manual/po/de/other_customization-backports.ssi.po b/manual/po/de/other_customization-backports.ssi.po
index dd0294a..b8a1ef4 100644
--- a/manual/po/de/other_customization-backports.ssi.po
+++ b/manual/po/de/other_customization-backports.ssi.po
@@ -6,28 +6,26 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-09-17 23:43+0300\n"
-"PO-Revision-Date: 2010-09-17 23:43+0300\n"
+"POT-Creation-Date: 2010-10-03 20:30+0300\n"
+"PO-Revision-Date: 2010-10-03 20:30+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ASCII\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. type: Plain text
-#: en/about_manual.ssi:81 en/about_manual.ssi:89 en/about_manual.ssi:97
-#: en/about_manual.ssi:109 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:141 en/about_manual.ssi:149 en/about_manual.ssi:157
+#: en/about_manual.ssi:82 en/about_manual.ssi:90 en/about_manual.ssi:98
+#: en/about_manual.ssi:110 en/about_manual.ssi:121 en/about_manual.ssi:134
+#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
 #: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
 #: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
 #: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
 #: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
 #: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
 #: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
-#: en/other_customization-contents.ssi:30
-#: en/other_customization-contents.ssi:39
 #: en/other_customization-internationalization.ssi:10
 #: en/other_customization-internationalization.ssi:18
 #: en/other_customization-internationalization.ssi:26
@@ -48,44 +46,44 @@ msgstr ""
 #: 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:45
-#: en/user_basics.ssi:58 en/user_basics.ssi:70 en/user_basics.ssi:84
-#: en/user_basics.ssi:99 en/user_basics.ssi:107 en/user_basics.ssi:115
-#: en/user_basics.ssi:125 en/user_basics.ssi:137 en/user_basics.ssi:149
-#: en/user_basics.ssi:157 en/user_basics.ssi:165 en/user_basics.ssi:179
-#: en/user_basics.ssi:187 en/user_basics.ssi:197 en/user_basics.ssi:249
-#: en/user_basics.ssi:265 en/user_basics.ssi:273 en/user_basics.ssi:293
-#: en/user_basics.ssi:318 en/user_customization-packages.ssi:16
+#: en/other_use-cases.ssi:111 en/user_basics.ssi:36 en/user_basics.ssi:48
+#: en/user_basics.ssi:62 en/user_basics.ssi:74 en/user_basics.ssi:88
+#: en/user_basics.ssi:104 en/user_basics.ssi:112 en/user_basics.ssi:120
+#: en/user_basics.ssi:130 en/user_basics.ssi:142 en/user_basics.ssi:154
+#: en/user_basics.ssi:162 en/user_basics.ssi:170 en/user_basics.ssi:184
+#: en/user_basics.ssi:192 en/user_basics.ssi:202 en/user_basics.ssi:222
+#: en/user_basics.ssi:255 en/user_basics.ssi:271 en/user_basics.ssi:279
+#: en/user_basics.ssi:299 en/user_basics.ssi:324
+#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
+#: en/user_customization-contents.ssi:66 en/user_customization-packages.ssi:16
 #: en/user_customization-packages.ssi:24 en/user_customization-packages.ssi:36
 #: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:59
 #: en/user_customization-packages.ssi:73
 #: en/user_customization-packages.ssi:103
 #: en/user_customization-packages.ssi:111
-#: en/user_customization-packages.ssi:129
-#: en/user_customization-packages.ssi:158
-#: en/user_customization-packages.ssi:168
-#: en/user_customization-packages.ssi:178
-#: en/user_customization-packages.ssi:188 en/user_installation.ssi:38
+#: en/user_customization-packages.ssi:131
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:180
+#: en/user_customization-packages.ssi:190 en/user_installation.ssi:38
 #: en/user_installation.ssi:46 en/user_installation.ssi:56
 #: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:104
-#: en/user_installation.ssi:118 en/user_installation.ssi:134
-#: en/user_overview.ssi:54 en/user_overview.ssi:98 en/user_overview.ssi:106
+#: en/user_installation.ssi:84 en/user_installation.ssi:105
+#: en/user_installation.ssi:119 en/user_installation.ssi:136
+#: en/user_overview.ssi:60 en/user_overview.ssi:104 en/user_overview.ssi:112
 msgid "code{"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:85 en/about_manual.ssi:93 en/about_manual.ssi:101
-#: en/about_manual.ssi:116 en/about_manual.ssi:129 en/about_manual.ssi:137
-#: en/about_manual.ssi:145 en/about_manual.ssi:153 en/about_manual.ssi:160
+#: en/about_manual.ssi:86 en/about_manual.ssi:94 en/about_manual.ssi:102
+#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
 #: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
 #: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
 #: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
 #: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
 #: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
 #: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: en/other_customization-contents.ssi:35
-#: en/other_customization-contents.ssi:50
 #: en/other_customization-internationalization.ssi:14
 #: en/other_customization-internationalization.ssi:22
 #: en/other_customization-internationalization.ssi:30
@@ -106,29 +104,30 @@ 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:49
-#: en/user_basics.ssi:64 en/user_basics.ssi:74 en/user_basics.ssi:90
-#: en/user_basics.ssi:103 en/user_basics.ssi:111 en/user_basics.ssi:119
-#: en/user_basics.ssi:129 en/user_basics.ssi:143 en/user_basics.ssi:153
-#: en/user_basics.ssi:161 en/user_basics.ssi:169 en/user_basics.ssi:183
-#: en/user_basics.ssi:191 en/user_basics.ssi:201 en/user_basics.ssi:241
-#: en/user_basics.ssi:269 en/user_basics.ssi:277 en/user_basics.ssi:304
-#: en/user_basics.ssi:343 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/other_use-cases.ssi:137 en/user_basics.ssi:40 en/user_basics.ssi:52
+#: en/user_basics.ssi:68 en/user_basics.ssi:78 en/user_basics.ssi:94
+#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:124
+#: en/user_basics.ssi:134 en/user_basics.ssi:148 en/user_basics.ssi:158
+#: en/user_basics.ssi:166 en/user_basics.ssi:174 en/user_basics.ssi:188
+#: en/user_basics.ssi:196 en/user_basics.ssi:206 en/user_basics.ssi:247
+#: en/user_basics.ssi:275 en/user_basics.ssi:283 en/user_basics.ssi:310
+#: en/user_basics.ssi:349 en/user_customization-contents.ssi:39
+#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:70
+#: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
+#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
+#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
 #: en/user_customization-packages.ssi:107
 #: en/user_customization-packages.ssi:115
-#: en/user_customization-packages.ssi:133
-#: en/user_customization-packages.ssi:164
-#: en/user_customization-packages.ssi:174
-#: en/user_customization-packages.ssi:184
-#: en/user_customization-packages.ssi:194 en/user_installation.ssi:42
+#: en/user_customization-packages.ssi:135
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:186
+#: en/user_customization-packages.ssi:196 en/user_installation.ssi:42
 #: en/user_installation.ssi:50 en/user_installation.ssi:60
 #: en/user_installation.ssi:72 en/user_installation.ssi:80
-#: en/user_installation.ssi:108 en/user_installation.ssi:123
-#: en/user_installation.ssi:137 en/user_overview.ssi:92
-#: en/user_overview.ssi:102 en/user_overview.ssi:110
+#: en/user_installation.ssi:109 en/user_installation.ssi:124
+#: en/user_installation.ssi:139 en/user_overview.ssi:98
+#: en/user_overview.ssi:108 en/user_overview.ssi:116
 msgid "}code"
 msgstr ""
 
diff --git a/manual/po/de/other_customization-binary.ssi.po b/manual/po/de/other_customization-binary.ssi.po
index 2dc80b3..18724ed 100644
--- a/manual/po/de/other_customization-binary.ssi.po
+++ b/manual/po/de/other_customization-binary.ssi.po
@@ -6,13 +6,13 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-09-17 23:43+0300\n"
-"PO-Revision-Date: 2010-09-17 23:43+0300\n"
+"POT-Creation-Date: 2010-10-03 20:30+0300\n"
+"PO-Revision-Date: 2010-10-03 20:30+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ASCII\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
diff --git a/manual/po/de/other_customization-bootup.ssi.po b/manual/po/de/other_customization-bootup.ssi.po
index 4156193..360517d 100644
--- a/manual/po/de/other_customization-bootup.ssi.po
+++ b/manual/po/de/other_customization-bootup.ssi.po
@@ -6,28 +6,26 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-09-17 23:43+0300\n"
-"PO-Revision-Date: 2010-09-17 23:43+0300\n"
+"POT-Creation-Date: 2010-10-03 20:30+0300\n"
+"PO-Revision-Date: 2010-10-03 20:30+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ASCII\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. type: Plain text
-#: en/about_manual.ssi:81 en/about_manual.ssi:89 en/about_manual.ssi:97
-#: en/about_manual.ssi:109 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:141 en/about_manual.ssi:149 en/about_manual.ssi:157
+#: en/about_manual.ssi:82 en/about_manual.ssi:90 en/about_manual.ssi:98
+#: en/about_manual.ssi:110 en/about_manual.ssi:121 en/about_manual.ssi:134
+#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
 #: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
 #: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
 #: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
 #: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
 #: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
 #: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
-#: en/other_customization-contents.ssi:30
-#: en/other_customization-contents.ssi:39
 #: en/other_customization-internationalization.ssi:10
 #: en/other_customization-internationalization.ssi:18
 #: en/other_customization-internationalization.ssi:26
@@ -48,44 +46,44 @@ msgstr ""
 #: 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:45
-#: en/user_basics.ssi:58 en/user_basics.ssi:70 en/user_basics.ssi:84
-#: en/user_basics.ssi:99 en/user_basics.ssi:107 en/user_basics.ssi:115
-#: en/user_basics.ssi:125 en/user_basics.ssi:137 en/user_basics.ssi:149
-#: en/user_basics.ssi:157 en/user_basics.ssi:165 en/user_basics.ssi:179
-#: en/user_basics.ssi:187 en/user_basics.ssi:197 en/user_basics.ssi:249
-#: en/user_basics.ssi:265 en/user_basics.ssi:273 en/user_basics.ssi:293
-#: en/user_basics.ssi:318 en/user_customization-packages.ssi:16
+#: en/other_use-cases.ssi:111 en/user_basics.ssi:36 en/user_basics.ssi:48
+#: en/user_basics.ssi:62 en/user_basics.ssi:74 en/user_basics.ssi:88
+#: en/user_basics.ssi:104 en/user_basics.ssi:112 en/user_basics.ssi:120
+#: en/user_basics.ssi:130 en/user_basics.ssi:142 en/user_basics.ssi:154
+#: en/user_basics.ssi:162 en/user_basics.ssi:170 en/user_basics.ssi:184
+#: en/user_basics.ssi:192 en/user_basics.ssi:202 en/user_basics.ssi:222
+#: en/user_basics.ssi:255 en/user_basics.ssi:271 en/user_basics.ssi:279
+#: en/user_basics.ssi:299 en/user_basics.ssi:324
+#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
+#: en/user_customization-contents.ssi:66 en/user_customization-packages.ssi:16
 #: en/user_customization-packages.ssi:24 en/user_customization-packages.ssi:36
 #: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:59
 #: en/user_customization-packages.ssi:73
 #: en/user_customization-packages.ssi:103
 #: en/user_customization-packages.ssi:111
-#: en/user_customization-packages.ssi:129
-#: en/user_customization-packages.ssi:158
-#: en/user_customization-packages.ssi:168
-#: en/user_customization-packages.ssi:178
-#: en/user_customization-packages.ssi:188 en/user_installation.ssi:38
+#: en/user_customization-packages.ssi:131
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:180
+#: en/user_customization-packages.ssi:190 en/user_installation.ssi:38
 #: en/user_installation.ssi:46 en/user_installation.ssi:56
 #: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:104
-#: en/user_installation.ssi:118 en/user_installation.ssi:134
-#: en/user_overview.ssi:54 en/user_overview.ssi:98 en/user_overview.ssi:106
+#: en/user_installation.ssi:84 en/user_installation.ssi:105
+#: en/user_installation.ssi:119 en/user_installation.ssi:136
+#: en/user_overview.ssi:60 en/user_overview.ssi:104 en/user_overview.ssi:112
 msgid "code{"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:85 en/about_manual.ssi:93 en/about_manual.ssi:101
-#: en/about_manual.ssi:116 en/about_manual.ssi:129 en/about_manual.ssi:137
-#: en/about_manual.ssi:145 en/about_manual.ssi:153 en/about_manual.ssi:160
+#: en/about_manual.ssi:86 en/about_manual.ssi:94 en/about_manual.ssi:102
+#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
 #: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
 #: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
 #: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
 #: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
 #: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
 #: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: en/other_customization-contents.ssi:35
-#: en/other_customization-contents.ssi:50
 #: en/other_customization-internationalization.ssi:14
 #: en/other_customization-internationalization.ssi:22
 #: en/other_customization-internationalization.ssi:30
@@ -106,29 +104,30 @@ 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:49
-#: en/user_basics.ssi:64 en/user_basics.ssi:74 en/user_basics.ssi:90
-#: en/user_basics.ssi:103 en/user_basics.ssi:111 en/user_basics.ssi:119
-#: en/user_basics.ssi:129 en/user_basics.ssi:143 en/user_basics.ssi:153
-#: en/user_basics.ssi:161 en/user_basics.ssi:169 en/user_basics.ssi:183
-#: en/user_basics.ssi:191 en/user_basics.ssi:201 en/user_basics.ssi:241
-#: en/user_basics.ssi:269 en/user_basics.ssi:277 en/user_basics.ssi:304
-#: en/user_basics.ssi:343 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/other_use-cases.ssi:137 en/user_basics.ssi:40 en/user_basics.ssi:52
+#: en/user_basics.ssi:68 en/user_basics.ssi:78 en/user_basics.ssi:94
+#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:124
+#: en/user_basics.ssi:134 en/user_basics.ssi:148 en/user_basics.ssi:158
+#: en/user_basics.ssi:166 en/user_basics.ssi:174 en/user_basics.ssi:188
+#: en/user_basics.ssi:196 en/user_basics.ssi:206 en/user_basics.ssi:247
+#: en/user_basics.ssi:275 en/user_basics.ssi:283 en/user_basics.ssi:310
+#: en/user_basics.ssi:349 en/user_customization-contents.ssi:39
+#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:70
+#: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
+#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
+#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
 #: en/user_customization-packages.ssi:107
 #: en/user_customization-packages.ssi:115
-#: en/user_customization-packages.ssi:133
-#: en/user_customization-packages.ssi:164
-#: en/user_customization-packages.ssi:174
-#: en/user_customization-packages.ssi:184
-#: en/user_customization-packages.ssi:194 en/user_installation.ssi:42
+#: en/user_customization-packages.ssi:135
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:186
+#: en/user_customization-packages.ssi:196 en/user_installation.ssi:42
 #: en/user_installation.ssi:50 en/user_installation.ssi:60
 #: en/user_installation.ssi:72 en/user_installation.ssi:80
-#: en/user_installation.ssi:108 en/user_installation.ssi:123
-#: en/user_installation.ssi:137 en/user_overview.ssi:92
-#: en/user_overview.ssi:102 en/user_overview.ssi:110
+#: en/user_installation.ssi:109 en/user_installation.ssi:124
+#: en/user_installation.ssi:139 en/user_overview.ssi:98
+#: en/user_overview.ssi:108 en/user_overview.ssi:116
 msgid "}code"
 msgstr ""
 
@@ -154,9 +153,8 @@ msgstr ""
 #: en/other_customization-bootup.ssi:8 en/other_customization-bootup.ssi:14
 #: en/other_customization-bootup.ssi:56 en/other_customization-bootup.ssi:60
 #: en/other_customization-bootup.ssi:64 en/other_customization-bootup.ssi:68
-#: en/other_customization-contents.ssi:56
-#: en/other_customization-contents.ssi:60 en/other_live-environment.ssi:8
-#: en/other_resources.ssi:8 en/other_success-stories.ssi:7
+#: en/other_live-environment.ssi:8 en/other_resources.ssi:8
+#: en/other_success-stories.ssi:7
 msgid "FIXME"
 msgstr ""
 
diff --git a/manual/po/de/other_customization-internationalization.ssi.po b/manual/po/de/other_customization-internationalization.ssi.po
index 525d231..fbcfc1e 100644
--- a/manual/po/de/other_customization-internationalization.ssi.po
+++ b/manual/po/de/other_customization-internationalization.ssi.po
@@ -6,28 +6,26 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-09-17 23:43+0300\n"
-"PO-Revision-Date: 2010-09-17 23:43+0300\n"
+"POT-Creation-Date: 2010-10-03 20:30+0300\n"
+"PO-Revision-Date: 2010-10-03 20:30+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ASCII\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. type: Plain text
-#: en/about_manual.ssi:81 en/about_manual.ssi:89 en/about_manual.ssi:97
-#: en/about_manual.ssi:109 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:141 en/about_manual.ssi:149 en/about_manual.ssi:157
+#: en/about_manual.ssi:82 en/about_manual.ssi:90 en/about_manual.ssi:98
+#: en/about_manual.ssi:110 en/about_manual.ssi:121 en/about_manual.ssi:134
+#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
 #: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
 #: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
 #: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
 #: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
 #: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
 #: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
-#: en/other_customization-contents.ssi:30
-#: en/other_customization-contents.ssi:39
 #: en/other_customization-internationalization.ssi:10
 #: en/other_customization-internationalization.ssi:18
 #: en/other_customization-internationalization.ssi:26
@@ -48,44 +46,44 @@ msgstr ""
 #: 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:45
-#: en/user_basics.ssi:58 en/user_basics.ssi:70 en/user_basics.ssi:84
-#: en/user_basics.ssi:99 en/user_basics.ssi:107 en/user_basics.ssi:115
-#: en/user_basics.ssi:125 en/user_basics.ssi:137 en/user_basics.ssi:149
-#: en/user_basics.ssi:157 en/user_basics.ssi:165 en/user_basics.ssi:179
-#: en/user_basics.ssi:187 en/user_basics.ssi:197 en/user_basics.ssi:249
-#: en/user_basics.ssi:265 en/user_basics.ssi:273 en/user_basics.ssi:293
-#: en/user_basics.ssi:318 en/user_customization-packages.ssi:16
+#: en/other_use-cases.ssi:111 en/user_basics.ssi:36 en/user_basics.ssi:48
+#: en/user_basics.ssi:62 en/user_basics.ssi:74 en/user_basics.ssi:88
+#: en/user_basics.ssi:104 en/user_basics.ssi:112 en/user_basics.ssi:120
+#: en/user_basics.ssi:130 en/user_basics.ssi:142 en/user_basics.ssi:154
+#: en/user_basics.ssi:162 en/user_basics.ssi:170 en/user_basics.ssi:184
+#: en/user_basics.ssi:192 en/user_basics.ssi:202 en/user_basics.ssi:222
+#: en/user_basics.ssi:255 en/user_basics.ssi:271 en/user_basics.ssi:279
+#: en/user_basics.ssi:299 en/user_basics.ssi:324
+#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
+#: en/user_customization-contents.ssi:66 en/user_customization-packages.ssi:16
 #: en/user_customization-packages.ssi:24 en/user_customization-packages.ssi:36
 #: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:59
 #: en/user_customization-packages.ssi:73
 #: en/user_customization-packages.ssi:103
 #: en/user_customization-packages.ssi:111
-#: en/user_customization-packages.ssi:129
-#: en/user_customization-packages.ssi:158
-#: en/user_customization-packages.ssi:168
-#: en/user_customization-packages.ssi:178
-#: en/user_customization-packages.ssi:188 en/user_installation.ssi:38
+#: en/user_customization-packages.ssi:131
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:180
+#: en/user_customization-packages.ssi:190 en/user_installation.ssi:38
 #: en/user_installation.ssi:46 en/user_installation.ssi:56
 #: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:104
-#: en/user_installation.ssi:118 en/user_installation.ssi:134
-#: en/user_overview.ssi:54 en/user_overview.ssi:98 en/user_overview.ssi:106
+#: en/user_installation.ssi:84 en/user_installation.ssi:105
+#: en/user_installation.ssi:119 en/user_installation.ssi:136
+#: en/user_overview.ssi:60 en/user_overview.ssi:104 en/user_overview.ssi:112
 msgid "code{"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:85 en/about_manual.ssi:93 en/about_manual.ssi:101
-#: en/about_manual.ssi:116 en/about_manual.ssi:129 en/about_manual.ssi:137
-#: en/about_manual.ssi:145 en/about_manual.ssi:153 en/about_manual.ssi:160
+#: en/about_manual.ssi:86 en/about_manual.ssi:94 en/about_manual.ssi:102
+#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
 #: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
 #: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
 #: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
 #: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
 #: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
 #: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: en/other_customization-contents.ssi:35
-#: en/other_customization-contents.ssi:50
 #: en/other_customization-internationalization.ssi:14
 #: en/other_customization-internationalization.ssi:22
 #: en/other_customization-internationalization.ssi:30
@@ -106,29 +104,30 @@ 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:49
-#: en/user_basics.ssi:64 en/user_basics.ssi:74 en/user_basics.ssi:90
-#: en/user_basics.ssi:103 en/user_basics.ssi:111 en/user_basics.ssi:119
-#: en/user_basics.ssi:129 en/user_basics.ssi:143 en/user_basics.ssi:153
-#: en/user_basics.ssi:161 en/user_basics.ssi:169 en/user_basics.ssi:183
-#: en/user_basics.ssi:191 en/user_basics.ssi:201 en/user_basics.ssi:241
-#: en/user_basics.ssi:269 en/user_basics.ssi:277 en/user_basics.ssi:304
-#: en/user_basics.ssi:343 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/other_use-cases.ssi:137 en/user_basics.ssi:40 en/user_basics.ssi:52
+#: en/user_basics.ssi:68 en/user_basics.ssi:78 en/user_basics.ssi:94
+#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:124
+#: en/user_basics.ssi:134 en/user_basics.ssi:148 en/user_basics.ssi:158
+#: en/user_basics.ssi:166 en/user_basics.ssi:174 en/user_basics.ssi:188
+#: en/user_basics.ssi:196 en/user_basics.ssi:206 en/user_basics.ssi:247
+#: en/user_basics.ssi:275 en/user_basics.ssi:283 en/user_basics.ssi:310
+#: en/user_basics.ssi:349 en/user_customization-contents.ssi:39
+#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:70
+#: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
+#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
+#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
 #: en/user_customization-packages.ssi:107
 #: en/user_customization-packages.ssi:115
-#: en/user_customization-packages.ssi:133
-#: en/user_customization-packages.ssi:164
-#: en/user_customization-packages.ssi:174
-#: en/user_customization-packages.ssi:184
-#: en/user_customization-packages.ssi:194 en/user_installation.ssi:42
+#: en/user_customization-packages.ssi:135
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:186
+#: en/user_customization-packages.ssi:196 en/user_installation.ssi:42
 #: en/user_installation.ssi:50 en/user_installation.ssi:60
 #: en/user_installation.ssi:72 en/user_installation.ssi:80
-#: en/user_installation.ssi:108 en/user_installation.ssi:123
-#: en/user_installation.ssi:137 en/user_overview.ssi:92
-#: en/user_overview.ssi:102 en/user_overview.ssi:110
+#: en/user_installation.ssi:109 en/user_installation.ssi:124
+#: en/user_installation.ssi:139 en/user_overview.ssi:98
+#: en/user_overview.ssi:108 en/user_overview.ssi:116
 msgid "}code"
 msgstr ""
 
diff --git a/manual/po/de/other_faq.ssi.po b/manual/po/de/other_faq.ssi.po
index 640b515..de35d69 100644
--- a/manual/po/de/other_faq.ssi.po
+++ b/manual/po/de/other_faq.ssi.po
@@ -6,28 +6,26 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-09-17 23:43+0300\n"
-"PO-Revision-Date: 2010-09-17 23:43+0300\n"
+"POT-Creation-Date: 2010-10-03 20:30+0300\n"
+"PO-Revision-Date: 2010-10-03 20:30+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ASCII\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. type: Plain text
-#: en/about_manual.ssi:81 en/about_manual.ssi:89 en/about_manual.ssi:97
-#: en/about_manual.ssi:109 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:141 en/about_manual.ssi:149 en/about_manual.ssi:157
+#: en/about_manual.ssi:82 en/about_manual.ssi:90 en/about_manual.ssi:98
+#: en/about_manual.ssi:110 en/about_manual.ssi:121 en/about_manual.ssi:134
+#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
 #: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
 #: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
 #: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
 #: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
 #: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
 #: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
-#: en/other_customization-contents.ssi:30
-#: en/other_customization-contents.ssi:39
 #: en/other_customization-internationalization.ssi:10
 #: en/other_customization-internationalization.ssi:18
 #: en/other_customization-internationalization.ssi:26
@@ -48,44 +46,44 @@ msgstr ""
 #: 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:45
-#: en/user_basics.ssi:58 en/user_basics.ssi:70 en/user_basics.ssi:84
-#: en/user_basics.ssi:99 en/user_basics.ssi:107 en/user_basics.ssi:115
-#: en/user_basics.ssi:125 en/user_basics.ssi:137 en/user_basics.ssi:149
-#: en/user_basics.ssi:157 en/user_basics.ssi:165 en/user_basics.ssi:179
-#: en/user_basics.ssi:187 en/user_basics.ssi:197 en/user_basics.ssi:249
-#: en/user_basics.ssi:265 en/user_basics.ssi:273 en/user_basics.ssi:293
-#: en/user_basics.ssi:318 en/user_customization-packages.ssi:16
+#: en/other_use-cases.ssi:111 en/user_basics.ssi:36 en/user_basics.ssi:48
+#: en/user_basics.ssi:62 en/user_basics.ssi:74 en/user_basics.ssi:88
+#: en/user_basics.ssi:104 en/user_basics.ssi:112 en/user_basics.ssi:120
+#: en/user_basics.ssi:130 en/user_basics.ssi:142 en/user_basics.ssi:154
+#: en/user_basics.ssi:162 en/user_basics.ssi:170 en/user_basics.ssi:184
+#: en/user_basics.ssi:192 en/user_basics.ssi:202 en/user_basics.ssi:222
+#: en/user_basics.ssi:255 en/user_basics.ssi:271 en/user_basics.ssi:279
+#: en/user_basics.ssi:299 en/user_basics.ssi:324
+#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
+#: en/user_customization-contents.ssi:66 en/user_customization-packages.ssi:16
 #: en/user_customization-packages.ssi:24 en/user_customization-packages.ssi:36
 #: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:59
 #: en/user_customization-packages.ssi:73
 #: en/user_customization-packages.ssi:103
 #: en/user_customization-packages.ssi:111
-#: en/user_customization-packages.ssi:129
-#: en/user_customization-packages.ssi:158
-#: en/user_customization-packages.ssi:168
-#: en/user_customization-packages.ssi:178
-#: en/user_customization-packages.ssi:188 en/user_installation.ssi:38
+#: en/user_customization-packages.ssi:131
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:180
+#: en/user_customization-packages.ssi:190 en/user_installation.ssi:38
 #: en/user_installation.ssi:46 en/user_installation.ssi:56
 #: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:104
-#: en/user_installation.ssi:118 en/user_installation.ssi:134
-#: en/user_overview.ssi:54 en/user_overview.ssi:98 en/user_overview.ssi:106
+#: en/user_installation.ssi:84 en/user_installation.ssi:105
+#: en/user_installation.ssi:119 en/user_installation.ssi:136
+#: en/user_overview.ssi:60 en/user_overview.ssi:104 en/user_overview.ssi:112
 msgid "code{"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:85 en/about_manual.ssi:93 en/about_manual.ssi:101
-#: en/about_manual.ssi:116 en/about_manual.ssi:129 en/about_manual.ssi:137
-#: en/about_manual.ssi:145 en/about_manual.ssi:153 en/about_manual.ssi:160
+#: en/about_manual.ssi:86 en/about_manual.ssi:94 en/about_manual.ssi:102
+#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
 #: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
 #: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
 #: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
 #: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
 #: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
 #: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: en/other_customization-contents.ssi:35
-#: en/other_customization-contents.ssi:50
 #: en/other_customization-internationalization.ssi:14
 #: en/other_customization-internationalization.ssi:22
 #: en/other_customization-internationalization.ssi:30
@@ -106,29 +104,30 @@ 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:49
-#: en/user_basics.ssi:64 en/user_basics.ssi:74 en/user_basics.ssi:90
-#: en/user_basics.ssi:103 en/user_basics.ssi:111 en/user_basics.ssi:119
-#: en/user_basics.ssi:129 en/user_basics.ssi:143 en/user_basics.ssi:153
-#: en/user_basics.ssi:161 en/user_basics.ssi:169 en/user_basics.ssi:183
-#: en/user_basics.ssi:191 en/user_basics.ssi:201 en/user_basics.ssi:241
-#: en/user_basics.ssi:269 en/user_basics.ssi:277 en/user_basics.ssi:304
-#: en/user_basics.ssi:343 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/other_use-cases.ssi:137 en/user_basics.ssi:40 en/user_basics.ssi:52
+#: en/user_basics.ssi:68 en/user_basics.ssi:78 en/user_basics.ssi:94
+#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:124
+#: en/user_basics.ssi:134 en/user_basics.ssi:148 en/user_basics.ssi:158
+#: en/user_basics.ssi:166 en/user_basics.ssi:174 en/user_basics.ssi:188
+#: en/user_basics.ssi:196 en/user_basics.ssi:206 en/user_basics.ssi:247
+#: en/user_basics.ssi:275 en/user_basics.ssi:283 en/user_basics.ssi:310
+#: en/user_basics.ssi:349 en/user_customization-contents.ssi:39
+#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:70
+#: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
+#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
+#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
 #: en/user_customization-packages.ssi:107
 #: en/user_customization-packages.ssi:115
-#: en/user_customization-packages.ssi:133
-#: en/user_customization-packages.ssi:164
-#: en/user_customization-packages.ssi:174
-#: en/user_customization-packages.ssi:184
-#: en/user_customization-packages.ssi:194 en/user_installation.ssi:42
+#: en/user_customization-packages.ssi:135
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:186
+#: en/user_customization-packages.ssi:196 en/user_installation.ssi:42
 #: en/user_installation.ssi:50 en/user_installation.ssi:60
 #: en/user_installation.ssi:72 en/user_installation.ssi:80
-#: en/user_installation.ssi:108 en/user_installation.ssi:123
-#: en/user_installation.ssi:137 en/user_overview.ssi:92
-#: en/user_overview.ssi:102 en/user_overview.ssi:110
+#: en/user_installation.ssi:109 en/user_installation.ssi:124
+#: en/user_installation.ssi:139 en/user_overview.ssi:98
+#: en/user_overview.ssi:108 en/user_overview.ssi:116
 msgid "}code"
 msgstr ""
 
diff --git a/manual/po/de/other_howtos.ssi.po b/manual/po/de/other_howtos.ssi.po
index 2324067..d98d7ea 100644
--- a/manual/po/de/other_howtos.ssi.po
+++ b/manual/po/de/other_howtos.ssi.po
@@ -6,28 +6,26 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-09-17 23:43+0300\n"
-"PO-Revision-Date: 2010-09-17 23:43+0300\n"
+"POT-Creation-Date: 2010-10-03 20:30+0300\n"
+"PO-Revision-Date: 2010-10-03 20:30+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ASCII\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. type: Plain text
-#: en/about_manual.ssi:81 en/about_manual.ssi:89 en/about_manual.ssi:97
-#: en/about_manual.ssi:109 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:141 en/about_manual.ssi:149 en/about_manual.ssi:157
+#: en/about_manual.ssi:82 en/about_manual.ssi:90 en/about_manual.ssi:98
+#: en/about_manual.ssi:110 en/about_manual.ssi:121 en/about_manual.ssi:134
+#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
 #: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
 #: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
 #: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
 #: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
 #: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
 #: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
-#: en/other_customization-contents.ssi:30
-#: en/other_customization-contents.ssi:39
 #: en/other_customization-internationalization.ssi:10
 #: en/other_customization-internationalization.ssi:18
 #: en/other_customization-internationalization.ssi:26
@@ -48,44 +46,44 @@ msgstr ""
 #: 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:45
-#: en/user_basics.ssi:58 en/user_basics.ssi:70 en/user_basics.ssi:84
-#: en/user_basics.ssi:99 en/user_basics.ssi:107 en/user_basics.ssi:115
-#: en/user_basics.ssi:125 en/user_basics.ssi:137 en/user_basics.ssi:149
-#: en/user_basics.ssi:157 en/user_basics.ssi:165 en/user_basics.ssi:179
-#: en/user_basics.ssi:187 en/user_basics.ssi:197 en/user_basics.ssi:249
-#: en/user_basics.ssi:265 en/user_basics.ssi:273 en/user_basics.ssi:293
-#: en/user_basics.ssi:318 en/user_customization-packages.ssi:16
+#: en/other_use-cases.ssi:111 en/user_basics.ssi:36 en/user_basics.ssi:48
+#: en/user_basics.ssi:62 en/user_basics.ssi:74 en/user_basics.ssi:88
+#: en/user_basics.ssi:104 en/user_basics.ssi:112 en/user_basics.ssi:120
+#: en/user_basics.ssi:130 en/user_basics.ssi:142 en/user_basics.ssi:154
+#: en/user_basics.ssi:162 en/user_basics.ssi:170 en/user_basics.ssi:184
+#: en/user_basics.ssi:192 en/user_basics.ssi:202 en/user_basics.ssi:222
+#: en/user_basics.ssi:255 en/user_basics.ssi:271 en/user_basics.ssi:279
+#: en/user_basics.ssi:299 en/user_basics.ssi:324
+#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
+#: en/user_customization-contents.ssi:66 en/user_customization-packages.ssi:16
 #: en/user_customization-packages.ssi:24 en/user_customization-packages.ssi:36
 #: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:59
 #: en/user_customization-packages.ssi:73
 #: en/user_customization-packages.ssi:103
 #: en/user_customization-packages.ssi:111
-#: en/user_customization-packages.ssi:129
-#: en/user_customization-packages.ssi:158
-#: en/user_customization-packages.ssi:168
-#: en/user_customization-packages.ssi:178
-#: en/user_customization-packages.ssi:188 en/user_installation.ssi:38
+#: en/user_customization-packages.ssi:131
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:180
+#: en/user_customization-packages.ssi:190 en/user_installation.ssi:38
 #: en/user_installation.ssi:46 en/user_installation.ssi:56
 #: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:104
-#: en/user_installation.ssi:118 en/user_installation.ssi:134
-#: en/user_overview.ssi:54 en/user_overview.ssi:98 en/user_overview.ssi:106
+#: en/user_installation.ssi:84 en/user_installation.ssi:105
+#: en/user_installation.ssi:119 en/user_installation.ssi:136
+#: en/user_overview.ssi:60 en/user_overview.ssi:104 en/user_overview.ssi:112
 msgid "code{"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:85 en/about_manual.ssi:93 en/about_manual.ssi:101
-#: en/about_manual.ssi:116 en/about_manual.ssi:129 en/about_manual.ssi:137
-#: en/about_manual.ssi:145 en/about_manual.ssi:153 en/about_manual.ssi:160
+#: en/about_manual.ssi:86 en/about_manual.ssi:94 en/about_manual.ssi:102
+#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
 #: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
 #: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
 #: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
 #: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
 #: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
 #: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: en/other_customization-contents.ssi:35
-#: en/other_customization-contents.ssi:50
 #: en/other_customization-internationalization.ssi:14
 #: en/other_customization-internationalization.ssi:22
 #: en/other_customization-internationalization.ssi:30
@@ -106,29 +104,30 @@ 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:49
-#: en/user_basics.ssi:64 en/user_basics.ssi:74 en/user_basics.ssi:90
-#: en/user_basics.ssi:103 en/user_basics.ssi:111 en/user_basics.ssi:119
-#: en/user_basics.ssi:129 en/user_basics.ssi:143 en/user_basics.ssi:153
-#: en/user_basics.ssi:161 en/user_basics.ssi:169 en/user_basics.ssi:183
-#: en/user_basics.ssi:191 en/user_basics.ssi:201 en/user_basics.ssi:241
-#: en/user_basics.ssi:269 en/user_basics.ssi:277 en/user_basics.ssi:304
-#: en/user_basics.ssi:343 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/other_use-cases.ssi:137 en/user_basics.ssi:40 en/user_basics.ssi:52
+#: en/user_basics.ssi:68 en/user_basics.ssi:78 en/user_basics.ssi:94
+#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:124
+#: en/user_basics.ssi:134 en/user_basics.ssi:148 en/user_basics.ssi:158
+#: en/user_basics.ssi:166 en/user_basics.ssi:174 en/user_basics.ssi:188
+#: en/user_basics.ssi:196 en/user_basics.ssi:206 en/user_basics.ssi:247
+#: en/user_basics.ssi:275 en/user_basics.ssi:283 en/user_basics.ssi:310
+#: en/user_basics.ssi:349 en/user_customization-contents.ssi:39
+#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:70
+#: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
+#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
+#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
 #: en/user_customization-packages.ssi:107
 #: en/user_customization-packages.ssi:115
-#: en/user_customization-packages.ssi:133
-#: en/user_customization-packages.ssi:164
-#: en/user_customization-packages.ssi:174
-#: en/user_customization-packages.ssi:184
-#: en/user_customization-packages.ssi:194 en/user_installation.ssi:42
+#: en/user_customization-packages.ssi:135
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:186
+#: en/user_customization-packages.ssi:196 en/user_installation.ssi:42
 #: en/user_installation.ssi:50 en/user_installation.ssi:60
 #: en/user_installation.ssi:72 en/user_installation.ssi:80
-#: en/user_installation.ssi:108 en/user_installation.ssi:123
-#: en/user_installation.ssi:137 en/user_overview.ssi:92
-#: en/user_overview.ssi:102 en/user_overview.ssi:110
+#: en/user_installation.ssi:109 en/user_installation.ssi:124
+#: en/user_installation.ssi:139 en/user_overview.ssi:98
+#: en/user_overview.ssi:108 en/user_overview.ssi:116
 msgid "}code"
 msgstr ""
 
diff --git a/manual/po/de/other_live-environment.ssi.po b/manual/po/de/other_live-environment.ssi.po
index fcd5a95..fea7cfb 100644
--- a/manual/po/de/other_live-environment.ssi.po
+++ b/manual/po/de/other_live-environment.ssi.po
@@ -6,28 +6,26 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-09-17 23:43+0300\n"
-"PO-Revision-Date: 2010-09-17 23:43+0300\n"
+"POT-Creation-Date: 2010-10-03 20:30+0300\n"
+"PO-Revision-Date: 2010-10-03 20:30+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ASCII\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. type: Plain text
-#: en/about_manual.ssi:81 en/about_manual.ssi:89 en/about_manual.ssi:97
-#: en/about_manual.ssi:109 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:141 en/about_manual.ssi:149 en/about_manual.ssi:157
+#: en/about_manual.ssi:82 en/about_manual.ssi:90 en/about_manual.ssi:98
+#: en/about_manual.ssi:110 en/about_manual.ssi:121 en/about_manual.ssi:134
+#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
 #: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
 #: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
 #: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
 #: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
 #: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
 #: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
-#: en/other_customization-contents.ssi:30
-#: en/other_customization-contents.ssi:39
 #: en/other_customization-internationalization.ssi:10
 #: en/other_customization-internationalization.ssi:18
 #: en/other_customization-internationalization.ssi:26
@@ -48,44 +46,44 @@ msgstr ""
 #: 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:45
-#: en/user_basics.ssi:58 en/user_basics.ssi:70 en/user_basics.ssi:84
-#: en/user_basics.ssi:99 en/user_basics.ssi:107 en/user_basics.ssi:115
-#: en/user_basics.ssi:125 en/user_basics.ssi:137 en/user_basics.ssi:149
-#: en/user_basics.ssi:157 en/user_basics.ssi:165 en/user_basics.ssi:179
-#: en/user_basics.ssi:187 en/user_basics.ssi:197 en/user_basics.ssi:249
-#: en/user_basics.ssi:265 en/user_basics.ssi:273 en/user_basics.ssi:293
-#: en/user_basics.ssi:318 en/user_customization-packages.ssi:16
+#: en/other_use-cases.ssi:111 en/user_basics.ssi:36 en/user_basics.ssi:48
+#: en/user_basics.ssi:62 en/user_basics.ssi:74 en/user_basics.ssi:88
+#: en/user_basics.ssi:104 en/user_basics.ssi:112 en/user_basics.ssi:120
+#: en/user_basics.ssi:130 en/user_basics.ssi:142 en/user_basics.ssi:154
+#: en/user_basics.ssi:162 en/user_basics.ssi:170 en/user_basics.ssi:184
+#: en/user_basics.ssi:192 en/user_basics.ssi:202 en/user_basics.ssi:222
+#: en/user_basics.ssi:255 en/user_basics.ssi:271 en/user_basics.ssi:279
+#: en/user_basics.ssi:299 en/user_basics.ssi:324
+#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
+#: en/user_customization-contents.ssi:66 en/user_customization-packages.ssi:16
 #: en/user_customization-packages.ssi:24 en/user_customization-packages.ssi:36
 #: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:59
 #: en/user_customization-packages.ssi:73
 #: en/user_customization-packages.ssi:103
 #: en/user_customization-packages.ssi:111
-#: en/user_customization-packages.ssi:129
-#: en/user_customization-packages.ssi:158
-#: en/user_customization-packages.ssi:168
-#: en/user_customization-packages.ssi:178
-#: en/user_customization-packages.ssi:188 en/user_installation.ssi:38
+#: en/user_customization-packages.ssi:131
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:180
+#: en/user_customization-packages.ssi:190 en/user_installation.ssi:38
 #: en/user_installation.ssi:46 en/user_installation.ssi:56
 #: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:104
-#: en/user_installation.ssi:118 en/user_installation.ssi:134
-#: en/user_overview.ssi:54 en/user_overview.ssi:98 en/user_overview.ssi:106
+#: en/user_installation.ssi:84 en/user_installation.ssi:105
+#: en/user_installation.ssi:119 en/user_installation.ssi:136
+#: en/user_overview.ssi:60 en/user_overview.ssi:104 en/user_overview.ssi:112
 msgid "code{"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:85 en/about_manual.ssi:93 en/about_manual.ssi:101
-#: en/about_manual.ssi:116 en/about_manual.ssi:129 en/about_manual.ssi:137
-#: en/about_manual.ssi:145 en/about_manual.ssi:153 en/about_manual.ssi:160
+#: en/about_manual.ssi:86 en/about_manual.ssi:94 en/about_manual.ssi:102
+#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
 #: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
 #: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
 #: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
 #: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
 #: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
 #: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: en/other_customization-contents.ssi:35
-#: en/other_customization-contents.ssi:50
 #: en/other_customization-internationalization.ssi:14
 #: en/other_customization-internationalization.ssi:22
 #: en/other_customization-internationalization.ssi:30
@@ -106,29 +104,30 @@ 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:49
-#: en/user_basics.ssi:64 en/user_basics.ssi:74 en/user_basics.ssi:90
-#: en/user_basics.ssi:103 en/user_basics.ssi:111 en/user_basics.ssi:119
-#: en/user_basics.ssi:129 en/user_basics.ssi:143 en/user_basics.ssi:153
-#: en/user_basics.ssi:161 en/user_basics.ssi:169 en/user_basics.ssi:183
-#: en/user_basics.ssi:191 en/user_basics.ssi:201 en/user_basics.ssi:241
-#: en/user_basics.ssi:269 en/user_basics.ssi:277 en/user_basics.ssi:304
-#: en/user_basics.ssi:343 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/other_use-cases.ssi:137 en/user_basics.ssi:40 en/user_basics.ssi:52
+#: en/user_basics.ssi:68 en/user_basics.ssi:78 en/user_basics.ssi:94
+#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:124
+#: en/user_basics.ssi:134 en/user_basics.ssi:148 en/user_basics.ssi:158
+#: en/user_basics.ssi:166 en/user_basics.ssi:174 en/user_basics.ssi:188
+#: en/user_basics.ssi:196 en/user_basics.ssi:206 en/user_basics.ssi:247
+#: en/user_basics.ssi:275 en/user_basics.ssi:283 en/user_basics.ssi:310
+#: en/user_basics.ssi:349 en/user_customization-contents.ssi:39
+#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:70
+#: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
+#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
+#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
 #: en/user_customization-packages.ssi:107
 #: en/user_customization-packages.ssi:115
-#: en/user_customization-packages.ssi:133
-#: en/user_customization-packages.ssi:164
-#: en/user_customization-packages.ssi:174
-#: en/user_customization-packages.ssi:184
-#: en/user_customization-packages.ssi:194 en/user_installation.ssi:42
+#: en/user_customization-packages.ssi:135
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:186
+#: en/user_customization-packages.ssi:196 en/user_installation.ssi:42
 #: en/user_installation.ssi:50 en/user_installation.ssi:60
 #: en/user_installation.ssi:72 en/user_installation.ssi:80
-#: en/user_installation.ssi:108 en/user_installation.ssi:123
-#: en/user_installation.ssi:137 en/user_overview.ssi:92
-#: en/user_overview.ssi:102 en/user_overview.ssi:110
+#: en/user_installation.ssi:109 en/user_installation.ssi:124
+#: en/user_installation.ssi:139 en/user_overview.ssi:98
+#: en/user_overview.ssi:108 en/user_overview.ssi:116
 msgid "}code"
 msgstr ""
 
@@ -136,9 +135,8 @@ msgstr ""
 #: en/other_customization-bootup.ssi:8 en/other_customization-bootup.ssi:14
 #: en/other_customization-bootup.ssi:56 en/other_customization-bootup.ssi:60
 #: en/other_customization-bootup.ssi:64 en/other_customization-bootup.ssi:68
-#: en/other_customization-contents.ssi:56
-#: en/other_customization-contents.ssi:60 en/other_live-environment.ssi:8
-#: en/other_resources.ssi:8 en/other_success-stories.ssi:7
+#: en/other_live-environment.ssi:8 en/other_resources.ssi:8
+#: en/other_success-stories.ssi:7
 msgid "FIXME"
 msgstr ""
 
diff --git a/manual/po/de/other_procedures.ssi.po b/manual/po/de/other_procedures.ssi.po
index a4cc49f..3858198 100644
--- a/manual/po/de/other_procedures.ssi.po
+++ b/manual/po/de/other_procedures.ssi.po
@@ -6,28 +6,26 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-09-17 23:43+0300\n"
-"PO-Revision-Date: 2010-09-17 23:43+0300\n"
+"POT-Creation-Date: 2010-10-03 20:30+0300\n"
+"PO-Revision-Date: 2010-10-03 20:30+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ASCII\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. type: Plain text
-#: en/about_manual.ssi:81 en/about_manual.ssi:89 en/about_manual.ssi:97
-#: en/about_manual.ssi:109 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:141 en/about_manual.ssi:149 en/about_manual.ssi:157
+#: en/about_manual.ssi:82 en/about_manual.ssi:90 en/about_manual.ssi:98
+#: en/about_manual.ssi:110 en/about_manual.ssi:121 en/about_manual.ssi:134
+#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
 #: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
 #: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
 #: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
 #: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
 #: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
 #: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
-#: en/other_customization-contents.ssi:30
-#: en/other_customization-contents.ssi:39
 #: en/other_customization-internationalization.ssi:10
 #: en/other_customization-internationalization.ssi:18
 #: en/other_customization-internationalization.ssi:26
@@ -48,44 +46,44 @@ msgstr ""
 #: 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:45
-#: en/user_basics.ssi:58 en/user_basics.ssi:70 en/user_basics.ssi:84
-#: en/user_basics.ssi:99 en/user_basics.ssi:107 en/user_basics.ssi:115
-#: en/user_basics.ssi:125 en/user_basics.ssi:137 en/user_basics.ssi:149
-#: en/user_basics.ssi:157 en/user_basics.ssi:165 en/user_basics.ssi:179
-#: en/user_basics.ssi:187 en/user_basics.ssi:197 en/user_basics.ssi:249
-#: en/user_basics.ssi:265 en/user_basics.ssi:273 en/user_basics.ssi:293
-#: en/user_basics.ssi:318 en/user_customization-packages.ssi:16
+#: en/other_use-cases.ssi:111 en/user_basics.ssi:36 en/user_basics.ssi:48
+#: en/user_basics.ssi:62 en/user_basics.ssi:74 en/user_basics.ssi:88
+#: en/user_basics.ssi:104 en/user_basics.ssi:112 en/user_basics.ssi:120
+#: en/user_basics.ssi:130 en/user_basics.ssi:142 en/user_basics.ssi:154
+#: en/user_basics.ssi:162 en/user_basics.ssi:170 en/user_basics.ssi:184
+#: en/user_basics.ssi:192 en/user_basics.ssi:202 en/user_basics.ssi:222
+#: en/user_basics.ssi:255 en/user_basics.ssi:271 en/user_basics.ssi:279
+#: en/user_basics.ssi:299 en/user_basics.ssi:324
+#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
+#: en/user_customization-contents.ssi:66 en/user_customization-packages.ssi:16
 #: en/user_customization-packages.ssi:24 en/user_customization-packages.ssi:36
 #: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:59
 #: en/user_customization-packages.ssi:73
 #: en/user_customization-packages.ssi:103
 #: en/user_customization-packages.ssi:111
-#: en/user_customization-packages.ssi:129
-#: en/user_customization-packages.ssi:158
-#: en/user_customization-packages.ssi:168
-#: en/user_customization-packages.ssi:178
-#: en/user_customization-packages.ssi:188 en/user_installation.ssi:38
+#: en/user_customization-packages.ssi:131
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:180
+#: en/user_customization-packages.ssi:190 en/user_installation.ssi:38
 #: en/user_installation.ssi:46 en/user_installation.ssi:56
 #: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:104
-#: en/user_installation.ssi:118 en/user_installation.ssi:134
-#: en/user_overview.ssi:54 en/user_overview.ssi:98 en/user_overview.ssi:106
+#: en/user_installation.ssi:84 en/user_installation.ssi:105
+#: en/user_installation.ssi:119 en/user_installation.ssi:136
+#: en/user_overview.ssi:60 en/user_overview.ssi:104 en/user_overview.ssi:112
 msgid "code{"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:85 en/about_manual.ssi:93 en/about_manual.ssi:101
-#: en/about_manual.ssi:116 en/about_manual.ssi:129 en/about_manual.ssi:137
-#: en/about_manual.ssi:145 en/about_manual.ssi:153 en/about_manual.ssi:160
+#: en/about_manual.ssi:86 en/about_manual.ssi:94 en/about_manual.ssi:102
+#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
 #: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
 #: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
 #: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
 #: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
 #: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
 #: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: en/other_customization-contents.ssi:35
-#: en/other_customization-contents.ssi:50
 #: en/other_customization-internationalization.ssi:14
 #: en/other_customization-internationalization.ssi:22
 #: en/other_customization-internationalization.ssi:30
@@ -106,29 +104,30 @@ 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:49
-#: en/user_basics.ssi:64 en/user_basics.ssi:74 en/user_basics.ssi:90
-#: en/user_basics.ssi:103 en/user_basics.ssi:111 en/user_basics.ssi:119
-#: en/user_basics.ssi:129 en/user_basics.ssi:143 en/user_basics.ssi:153
-#: en/user_basics.ssi:161 en/user_basics.ssi:169 en/user_basics.ssi:183
-#: en/user_basics.ssi:191 en/user_basics.ssi:201 en/user_basics.ssi:241
-#: en/user_basics.ssi:269 en/user_basics.ssi:277 en/user_basics.ssi:304
-#: en/user_basics.ssi:343 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/other_use-cases.ssi:137 en/user_basics.ssi:40 en/user_basics.ssi:52
+#: en/user_basics.ssi:68 en/user_basics.ssi:78 en/user_basics.ssi:94
+#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:124
+#: en/user_basics.ssi:134 en/user_basics.ssi:148 en/user_basics.ssi:158
+#: en/user_basics.ssi:166 en/user_basics.ssi:174 en/user_basics.ssi:188
+#: en/user_basics.ssi:196 en/user_basics.ssi:206 en/user_basics.ssi:247
+#: en/user_basics.ssi:275 en/user_basics.ssi:283 en/user_basics.ssi:310
+#: en/user_basics.ssi:349 en/user_customization-contents.ssi:39
+#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:70
+#: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
+#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
+#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
 #: en/user_customization-packages.ssi:107
 #: en/user_customization-packages.ssi:115
-#: en/user_customization-packages.ssi:133
-#: en/user_customization-packages.ssi:164
-#: en/user_customization-packages.ssi:174
-#: en/user_customization-packages.ssi:184
-#: en/user_customization-packages.ssi:194 en/user_installation.ssi:42
+#: en/user_customization-packages.ssi:135
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:186
+#: en/user_customization-packages.ssi:196 en/user_installation.ssi:42
 #: en/user_installation.ssi:50 en/user_installation.ssi:60
 #: en/user_installation.ssi:72 en/user_installation.ssi:80
-#: en/user_installation.ssi:108 en/user_installation.ssi:123
-#: en/user_installation.ssi:137 en/user_overview.ssi:92
-#: en/user_overview.ssi:102 en/user_overview.ssi:110
+#: en/user_installation.ssi:109 en/user_installation.ssi:124
+#: en/user_installation.ssi:139 en/user_overview.ssi:98
+#: en/user_overview.ssi:108 en/user_overview.ssi:116
 msgid "}code"
 msgstr ""
 
@@ -336,7 +335,7 @@ msgstr ""
 #. type: Plain text
 #: en/other_procedures.ssi:91
 msgid "Debian Live project homepage:"
-msgstr ""
+msgstr "Debian Live Projekt Homepage:"
 
 #. type: Plain text
 #: en/other_procedures.ssi:93
diff --git a/manual/po/de/other_reporting-bugs.ssi.po b/manual/po/de/other_reporting-bugs.ssi.po
index 0403cfb..e6afe93 100644
--- a/manual/po/de/other_reporting-bugs.ssi.po
+++ b/manual/po/de/other_reporting-bugs.ssi.po
@@ -6,13 +6,13 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-09-17 23:43+0300\n"
-"PO-Revision-Date: 2010-09-17 23:43+0300\n"
+"POT-Creation-Date: 2010-10-03 20:30+0300\n"
+"PO-Revision-Date: 2010-10-03 20:30+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ASCII\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
diff --git a/manual/po/de/other_resources.ssi.po b/manual/po/de/other_resources.ssi.po
index 68fecb5..ebfbb80 100644
--- a/manual/po/de/other_resources.ssi.po
+++ b/manual/po/de/other_resources.ssi.po
@@ -6,13 +6,13 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-09-17 23:43+0300\n"
-"PO-Revision-Date: 2010-09-17 23:43+0300\n"
+"POT-Creation-Date: 2010-10-03 20:30+0300\n"
+"PO-Revision-Date: 2010-10-03 20:30+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ASCII\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
@@ -20,9 +20,8 @@ msgstr ""
 #: en/other_customization-bootup.ssi:8 en/other_customization-bootup.ssi:14
 #: en/other_customization-bootup.ssi:56 en/other_customization-bootup.ssi:60
 #: en/other_customization-bootup.ssi:64 en/other_customization-bootup.ssi:68
-#: en/other_customization-contents.ssi:56
-#: en/other_customization-contents.ssi:60 en/other_live-environment.ssi:8
-#: en/other_resources.ssi:8 en/other_success-stories.ssi:7
+#: en/other_live-environment.ssi:8 en/other_resources.ssi:8
+#: en/other_success-stories.ssi:7
 msgid "FIXME"
 msgstr ""
 
diff --git a/manual/po/de/other_success-stories.ssi.po b/manual/po/de/other_success-stories.ssi.po
index c30dc7e..c88b9e3 100644
--- a/manual/po/de/other_success-stories.ssi.po
+++ b/manual/po/de/other_success-stories.ssi.po
@@ -6,13 +6,13 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-09-17 23:43+0300\n"
-"PO-Revision-Date: 2010-09-17 23:43+0300\n"
+"POT-Creation-Date: 2010-10-03 20:30+0300\n"
+"PO-Revision-Date: 2010-10-03 20:30+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ASCII\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
@@ -20,9 +20,8 @@ msgstr ""
 #: en/other_customization-bootup.ssi:8 en/other_customization-bootup.ssi:14
 #: en/other_customization-bootup.ssi:56 en/other_customization-bootup.ssi:60
 #: en/other_customization-bootup.ssi:64 en/other_customization-bootup.ssi:68
-#: en/other_customization-contents.ssi:56
-#: en/other_customization-contents.ssi:60 en/other_live-environment.ssi:8
-#: en/other_resources.ssi:8 en/other_success-stories.ssi:7
+#: en/other_live-environment.ssi:8 en/other_resources.ssi:8
+#: en/other_success-stories.ssi:7
 msgid "FIXME"
 msgstr ""
 
diff --git a/manual/po/de/other_troubleshooting.ssi.po b/manual/po/de/other_troubleshooting.ssi.po
index 2f8539b..05185bd 100644
--- a/manual/po/de/other_troubleshooting.ssi.po
+++ b/manual/po/de/other_troubleshooting.ssi.po
@@ -6,13 +6,13 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-09-17 23:43+0300\n"
-"PO-Revision-Date: 2010-09-17 23:43+0300\n"
+"POT-Creation-Date: 2010-10-03 20:30+0300\n"
+"PO-Revision-Date: 2010-10-03 20:30+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ASCII\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
diff --git a/manual/po/de/other_use-cases.ssi.po b/manual/po/de/other_use-cases.ssi.po
index be92d23..172dd6e 100644
--- a/manual/po/de/other_use-cases.ssi.po
+++ b/manual/po/de/other_use-cases.ssi.po
@@ -6,28 +6,26 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-09-17 23:43+0300\n"
-"PO-Revision-Date: 2010-09-17 23:43+0300\n"
+"POT-Creation-Date: 2010-10-03 20:30+0300\n"
+"PO-Revision-Date: 2010-10-03 20:30+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ASCII\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. type: Plain text
-#: en/about_manual.ssi:81 en/about_manual.ssi:89 en/about_manual.ssi:97
-#: en/about_manual.ssi:109 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:141 en/about_manual.ssi:149 en/about_manual.ssi:157
+#: en/about_manual.ssi:82 en/about_manual.ssi:90 en/about_manual.ssi:98
+#: en/about_manual.ssi:110 en/about_manual.ssi:121 en/about_manual.ssi:134
+#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
 #: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
 #: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
 #: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
 #: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
 #: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
 #: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
-#: en/other_customization-contents.ssi:30
-#: en/other_customization-contents.ssi:39
 #: en/other_customization-internationalization.ssi:10
 #: en/other_customization-internationalization.ssi:18
 #: en/other_customization-internationalization.ssi:26
@@ -48,44 +46,44 @@ msgstr ""
 #: 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:45
-#: en/user_basics.ssi:58 en/user_basics.ssi:70 en/user_basics.ssi:84
-#: en/user_basics.ssi:99 en/user_basics.ssi:107 en/user_basics.ssi:115
-#: en/user_basics.ssi:125 en/user_basics.ssi:137 en/user_basics.ssi:149
-#: en/user_basics.ssi:157 en/user_basics.ssi:165 en/user_basics.ssi:179
-#: en/user_basics.ssi:187 en/user_basics.ssi:197 en/user_basics.ssi:249
-#: en/user_basics.ssi:265 en/user_basics.ssi:273 en/user_basics.ssi:293
-#: en/user_basics.ssi:318 en/user_customization-packages.ssi:16
+#: en/other_use-cases.ssi:111 en/user_basics.ssi:36 en/user_basics.ssi:48
+#: en/user_basics.ssi:62 en/user_basics.ssi:74 en/user_basics.ssi:88
+#: en/user_basics.ssi:104 en/user_basics.ssi:112 en/user_basics.ssi:120
+#: en/user_basics.ssi:130 en/user_basics.ssi:142 en/user_basics.ssi:154
+#: en/user_basics.ssi:162 en/user_basics.ssi:170 en/user_basics.ssi:184
+#: en/user_basics.ssi:192 en/user_basics.ssi:202 en/user_basics.ssi:222
+#: en/user_basics.ssi:255 en/user_basics.ssi:271 en/user_basics.ssi:279
+#: en/user_basics.ssi:299 en/user_basics.ssi:324
+#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
+#: en/user_customization-contents.ssi:66 en/user_customization-packages.ssi:16
 #: en/user_customization-packages.ssi:24 en/user_customization-packages.ssi:36
 #: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:59
 #: en/user_customization-packages.ssi:73
 #: en/user_customization-packages.ssi:103
 #: en/user_customization-packages.ssi:111
-#: en/user_customization-packages.ssi:129
-#: en/user_customization-packages.ssi:158
-#: en/user_customization-packages.ssi:168
-#: en/user_customization-packages.ssi:178
-#: en/user_customization-packages.ssi:188 en/user_installation.ssi:38
+#: en/user_customization-packages.ssi:131
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:180
+#: en/user_customization-packages.ssi:190 en/user_installation.ssi:38
 #: en/user_installation.ssi:46 en/user_installation.ssi:56
 #: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:104
-#: en/user_installation.ssi:118 en/user_installation.ssi:134
-#: en/user_overview.ssi:54 en/user_overview.ssi:98 en/user_overview.ssi:106
+#: en/user_installation.ssi:84 en/user_installation.ssi:105
+#: en/user_installation.ssi:119 en/user_installation.ssi:136
+#: en/user_overview.ssi:60 en/user_overview.ssi:104 en/user_overview.ssi:112
 msgid "code{"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:85 en/about_manual.ssi:93 en/about_manual.ssi:101
-#: en/about_manual.ssi:116 en/about_manual.ssi:129 en/about_manual.ssi:137
-#: en/about_manual.ssi:145 en/about_manual.ssi:153 en/about_manual.ssi:160
+#: en/about_manual.ssi:86 en/about_manual.ssi:94 en/about_manual.ssi:102
+#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
 #: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
 #: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
 #: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
 #: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
 #: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
 #: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: en/other_customization-contents.ssi:35
-#: en/other_customization-contents.ssi:50
 #: en/other_customization-internationalization.ssi:14
 #: en/other_customization-internationalization.ssi:22
 #: en/other_customization-internationalization.ssi:30
@@ -106,29 +104,30 @@ 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:49
-#: en/user_basics.ssi:64 en/user_basics.ssi:74 en/user_basics.ssi:90
-#: en/user_basics.ssi:103 en/user_basics.ssi:111 en/user_basics.ssi:119
-#: en/user_basics.ssi:129 en/user_basics.ssi:143 en/user_basics.ssi:153
-#: en/user_basics.ssi:161 en/user_basics.ssi:169 en/user_basics.ssi:183
-#: en/user_basics.ssi:191 en/user_basics.ssi:201 en/user_basics.ssi:241
-#: en/user_basics.ssi:269 en/user_basics.ssi:277 en/user_basics.ssi:304
-#: en/user_basics.ssi:343 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/other_use-cases.ssi:137 en/user_basics.ssi:40 en/user_basics.ssi:52
+#: en/user_basics.ssi:68 en/user_basics.ssi:78 en/user_basics.ssi:94
+#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:124
+#: en/user_basics.ssi:134 en/user_basics.ssi:148 en/user_basics.ssi:158
+#: en/user_basics.ssi:166 en/user_basics.ssi:174 en/user_basics.ssi:188
+#: en/user_basics.ssi:196 en/user_basics.ssi:206 en/user_basics.ssi:247
+#: en/user_basics.ssi:275 en/user_basics.ssi:283 en/user_basics.ssi:310
+#: en/user_basics.ssi:349 en/user_customization-contents.ssi:39
+#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:70
+#: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
+#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
+#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
 #: en/user_customization-packages.ssi:107
 #: en/user_customization-packages.ssi:115
-#: en/user_customization-packages.ssi:133
-#: en/user_customization-packages.ssi:164
-#: en/user_customization-packages.ssi:174
-#: en/user_customization-packages.ssi:184
-#: en/user_customization-packages.ssi:194 en/user_installation.ssi:42
+#: en/user_customization-packages.ssi:135
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:186
+#: en/user_customization-packages.ssi:196 en/user_installation.ssi:42
 #: en/user_installation.ssi:50 en/user_installation.ssi:60
 #: en/user_installation.ssi:72 en/user_installation.ssi:80
-#: en/user_installation.ssi:108 en/user_installation.ssi:123
-#: en/user_installation.ssi:137 en/user_overview.ssi:92
-#: en/user_overview.ssi:102 en/user_overview.ssi:110
+#: en/user_installation.ssi:109 en/user_installation.ssi:124
+#: en/user_installation.ssi:139 en/user_overview.ssi:98
+#: en/user_overview.ssi:108 en/user_overview.ssi:116
 msgid "}code"
 msgstr ""
 
diff --git a/manual/po/de/user_basics.ssi.po b/manual/po/de/user_basics.ssi.po
index 12cf317..e8d344f 100644
--- a/manual/po/de/user_basics.ssi.po
+++ b/manual/po/de/user_basics.ssi.po
@@ -6,28 +6,26 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-09-17 23:43+0300\n"
-"PO-Revision-Date: 2010-09-17 23:43+0300\n"
+"POT-Creation-Date: 2010-10-03 20:30+0300\n"
+"PO-Revision-Date: 2010-10-03 20:30+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ASCII\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. type: Plain text
-#: en/about_manual.ssi:81 en/about_manual.ssi:89 en/about_manual.ssi:97
-#: en/about_manual.ssi:109 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:141 en/about_manual.ssi:149 en/about_manual.ssi:157
+#: en/about_manual.ssi:82 en/about_manual.ssi:90 en/about_manual.ssi:98
+#: en/about_manual.ssi:110 en/about_manual.ssi:121 en/about_manual.ssi:134
+#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
 #: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
 #: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
 #: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
 #: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
 #: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
 #: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
-#: en/other_customization-contents.ssi:30
-#: en/other_customization-contents.ssi:39
 #: en/other_customization-internationalization.ssi:10
 #: en/other_customization-internationalization.ssi:18
 #: en/other_customization-internationalization.ssi:26
@@ -48,44 +46,44 @@ msgstr ""
 #: 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:45
-#: en/user_basics.ssi:58 en/user_basics.ssi:70 en/user_basics.ssi:84
-#: en/user_basics.ssi:99 en/user_basics.ssi:107 en/user_basics.ssi:115
-#: en/user_basics.ssi:125 en/user_basics.ssi:137 en/user_basics.ssi:149
-#: en/user_basics.ssi:157 en/user_basics.ssi:165 en/user_basics.ssi:179
-#: en/user_basics.ssi:187 en/user_basics.ssi:197 en/user_basics.ssi:249
-#: en/user_basics.ssi:265 en/user_basics.ssi:273 en/user_basics.ssi:293
-#: en/user_basics.ssi:318 en/user_customization-packages.ssi:16
+#: en/other_use-cases.ssi:111 en/user_basics.ssi:36 en/user_basics.ssi:48
+#: en/user_basics.ssi:62 en/user_basics.ssi:74 en/user_basics.ssi:88
+#: en/user_basics.ssi:104 en/user_basics.ssi:112 en/user_basics.ssi:120
+#: en/user_basics.ssi:130 en/user_basics.ssi:142 en/user_basics.ssi:154
+#: en/user_basics.ssi:162 en/user_basics.ssi:170 en/user_basics.ssi:184
+#: en/user_basics.ssi:192 en/user_basics.ssi:202 en/user_basics.ssi:222
+#: en/user_basics.ssi:255 en/user_basics.ssi:271 en/user_basics.ssi:279
+#: en/user_basics.ssi:299 en/user_basics.ssi:324
+#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
+#: en/user_customization-contents.ssi:66 en/user_customization-packages.ssi:16
 #: en/user_customization-packages.ssi:24 en/user_customization-packages.ssi:36
 #: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:59
 #: en/user_customization-packages.ssi:73
 #: en/user_customization-packages.ssi:103
 #: en/user_customization-packages.ssi:111
-#: en/user_customization-packages.ssi:129
-#: en/user_customization-packages.ssi:158
-#: en/user_customization-packages.ssi:168
-#: en/user_customization-packages.ssi:178
-#: en/user_customization-packages.ssi:188 en/user_installation.ssi:38
+#: en/user_customization-packages.ssi:131
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:180
+#: en/user_customization-packages.ssi:190 en/user_installation.ssi:38
 #: en/user_installation.ssi:46 en/user_installation.ssi:56
 #: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:104
-#: en/user_installation.ssi:118 en/user_installation.ssi:134
-#: en/user_overview.ssi:54 en/user_overview.ssi:98 en/user_overview.ssi:106
+#: en/user_installation.ssi:84 en/user_installation.ssi:105
+#: en/user_installation.ssi:119 en/user_installation.ssi:136
+#: en/user_overview.ssi:60 en/user_overview.ssi:104 en/user_overview.ssi:112
 msgid "code{"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:85 en/about_manual.ssi:93 en/about_manual.ssi:101
-#: en/about_manual.ssi:116 en/about_manual.ssi:129 en/about_manual.ssi:137
-#: en/about_manual.ssi:145 en/about_manual.ssi:153 en/about_manual.ssi:160
+#: en/about_manual.ssi:86 en/about_manual.ssi:94 en/about_manual.ssi:102
+#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
 #: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
 #: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
 #: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
 #: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
 #: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
 #: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: en/other_customization-contents.ssi:35
-#: en/other_customization-contents.ssi:50
 #: en/other_customization-internationalization.ssi:14
 #: en/other_customization-internationalization.ssi:22
 #: en/other_customization-internationalization.ssi:30
@@ -106,29 +104,30 @@ 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:49
-#: en/user_basics.ssi:64 en/user_basics.ssi:74 en/user_basics.ssi:90
-#: en/user_basics.ssi:103 en/user_basics.ssi:111 en/user_basics.ssi:119
-#: en/user_basics.ssi:129 en/user_basics.ssi:143 en/user_basics.ssi:153
-#: en/user_basics.ssi:161 en/user_basics.ssi:169 en/user_basics.ssi:183
-#: en/user_basics.ssi:191 en/user_basics.ssi:201 en/user_basics.ssi:241
-#: en/user_basics.ssi:269 en/user_basics.ssi:277 en/user_basics.ssi:304
-#: en/user_basics.ssi:343 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/other_use-cases.ssi:137 en/user_basics.ssi:40 en/user_basics.ssi:52
+#: en/user_basics.ssi:68 en/user_basics.ssi:78 en/user_basics.ssi:94
+#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:124
+#: en/user_basics.ssi:134 en/user_basics.ssi:148 en/user_basics.ssi:158
+#: en/user_basics.ssi:166 en/user_basics.ssi:174 en/user_basics.ssi:188
+#: en/user_basics.ssi:196 en/user_basics.ssi:206 en/user_basics.ssi:247
+#: en/user_basics.ssi:275 en/user_basics.ssi:283 en/user_basics.ssi:310
+#: en/user_basics.ssi:349 en/user_customization-contents.ssi:39
+#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:70
+#: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
+#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
+#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
 #: en/user_customization-packages.ssi:107
 #: en/user_customization-packages.ssi:115
-#: en/user_customization-packages.ssi:133
-#: en/user_customization-packages.ssi:164
-#: en/user_customization-packages.ssi:174
-#: en/user_customization-packages.ssi:184
-#: en/user_customization-packages.ssi:194 en/user_installation.ssi:42
+#: en/user_customization-packages.ssi:135
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:186
+#: en/user_customization-packages.ssi:196 en/user_installation.ssi:42
 #: en/user_installation.ssi:50 en/user_installation.ssi:60
 #: en/user_installation.ssi:72 en/user_installation.ssi:80
-#: en/user_installation.ssi:108 en/user_installation.ssi:123
-#: en/user_installation.ssi:137 en/user_overview.ssi:92
-#: en/user_overview.ssi:102 en/user_overview.ssi:110
+#: en/user_installation.ssi:109 en/user_installation.ssi:124
+#: en/user_installation.ssi:139 en/user_overview.ssi:98
+#: en/user_overview.ssi:108 en/user_overview.ssi:116
 msgid "}code"
 msgstr ""
 
@@ -155,16 +154,22 @@ msgid "2~ What is a live system?"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:11
+#: 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).  % FIXME: <xref linkend=\"terms\"/>"
+"done at runtime (see terms)."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:13
+#: en/user_basics.ssi:12 en/user_customization-contents.ssi:26
+#: en/user_installation.ssi:101
+msgid "% FIXME: <xref linkend=\"terms\"/>"
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:14
 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 "
@@ -172,17 +177,17 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:15
+#: en/user_basics.ssi:16
 msgid "_* Linux kernel"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:17
+#: en/user_basics.ssi:18
 msgid "_* The Linux image, usually named #{vmlinuz*}#"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:19
+#: en/user_basics.ssi:20
 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 "
@@ -197,12 +202,16 @@ msgid ""
 "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).  % FIXME: "
-"<xref linkend=\"persistence\"/>"
+"optional persistence partition(s) are used (see persistence)."
 msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:24
+msgid "% FIXME: <xref linkend=\"persistence\"/>"
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:26
 msgid ""
 "_* *{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/"
@@ -216,7 +225,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:26
+#: en/user_basics.ssi:28
 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-"
@@ -224,12 +233,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:28
+#: en/user_basics.ssi:30
 msgid "2~ First steps: building an ISO image"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:30
+#: en/user_basics.ssi:32
 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 "
@@ -237,119 +246,129 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:32
+#: en/user_basics.ssi:34
 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:38
 msgid "$ lb config"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:41
+#: en/user_basics.ssi:42
 msgid ""
 "By passing no parameters to #{lb config}# we indicated that we wish to use "
-"the defaults (see lb-config).  % FIXME: <xref linkend=\"lb-config\"/>"
+"the defaults (see lb-config)."
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:44 en/user_overview.ssi:22 en/user_overview.ssi:42
+msgid "% FIXME: <xref linkend=\"lb-config\"/>"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:43
+#: en/user_basics.ssi:46
 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:47 en/user_basics.ssi:117 en/user_basics.ssi:199
+#: en/user_basics.ssi:50 en/user_basics.ssi:122 en/user_basics.ssi:204
 msgid "# lb build"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:52
+#: en/user_basics.ssi:54
 msgid ""
 "This process can take a while, depending on the speed of your network "
-"connection (see lb-build).  % FIXME: <xref linkend=\"lb-build\"/>"
+"connection (see lb-build)."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:54
+#: en/user_basics.ssi:56 en/user_overview.ssi:46
+msgid "% FIXME: <xref linkend=\"lb-build\"/>"
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:58
 msgid "3~ Testing an ISO image with Qemu"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:56
+#: en/user_basics.ssi:60
 msgid "Testing an ISO is simple:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:60 en/user_basics.ssi:139
+#: en/user_basics.ssi:64 en/user_basics.ssi:144
 msgid "# apt-get install qemu"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:62
+#: en/user_basics.ssi:66
 msgid "$ qemu -cdrom binary.iso"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:66
+#: en/user_basics.ssi:70
 msgid "3~ Testing an ISO image with virtualbox-ose"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:68
+#: en/user_basics.ssi:72
 msgid "In order to test the ISO with virtualbox-ose:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:72
+#: en/user_basics.ssi:76
 msgid "# apt-get install virtualbox-ose"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:76
+#: en/user_basics.ssi:80
 msgid ""
 "and either install #{virtualbox-ose-source}# or #{virtualbox-ose-dkms}# to "
 "build the required kernel modules to run virtualbox-ose."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:78
+#: en/user_basics.ssi:82
 msgid ""
 "After successful installation, virtualbox can be e.g. found in the GNOME "
 "menu under 'Applications/System Tools/VirtualBox OSE'."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:80
+#: en/user_basics.ssi:84
 msgid "3~ Burning an ISO image to a physical medium"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:82
+#: en/user_basics.ssi:86
 msgid "Burning an ISO image is easy:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:86
+#: en/user_basics.ssi:90
 msgid "# apt-get install wodim"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:88
+#: en/user_basics.ssi:92
 msgid "$ wodim binary.iso"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:92
+#: en/user_basics.ssi:96
 msgid "2~ Building an USB/HDD image"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:94
+#: 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 "
@@ -358,42 +377,46 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:97
+#: 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 lb-clean): "
-"% FIXME: <xref linkend=\"lb-clean\"/>"
+"clean up your working directory with the #{lb clean} command (see lb-clean):"
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:102
+msgid "% FIXME: <xref linkend=\"lb-clean\"/>"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:101 en/user_basics.ssi:181
+#: en/user_basics.ssi:106 en/user_basics.ssi:186
 msgid "$ lb clean --binary"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:105
+#: en/user_basics.ssi:110
 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:109
+#: en/user_basics.ssi:114
 msgid "$ lb config -b usb-hdd"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:113
+#: en/user_basics.ssi:118
 msgid "Now build the image with the #{lb build} command:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:121
+#: en/user_basics.ssi:126
 msgid "3~ Copying USB/HDD image to a USB stick"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:123
+#: en/user_basics.ssi:128
 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 "
@@ -401,12 +424,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:127
+#: en/user_basics.ssi:132
 msgid "$ dd if=binary.img of=${USBSTICK}"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:131
+#: en/user_basics.ssi:136
 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 "
@@ -414,28 +437,28 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:133
+#: en/user_basics.ssi:138
 #, no-wrap
 msgid "*{This will definitely overwrite any previous contents on your stick!}*\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:135
+#: en/user_basics.ssi:140
 msgid "3~ Testing a USB/HDD image with Qemu"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:141
+#: en/user_basics.ssi:146
 msgid "$ qemu -hda binary.img"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:145
+#: en/user_basics.ssi:150
 msgid "3~ Using the space left on a USB stick"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:147
+#: en/user_basics.ssi:152
 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}"
@@ -444,45 +467,45 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:151
+#: en/user_basics.ssi:156
 msgid "# gparted ${USBSTICK}"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:155
+#: en/user_basics.ssi:160
 msgid ""
 "Ater the creation of the partition you have to create a filsystem on it. One "
 "possible choice would be ext4."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:159
+#: en/user_basics.ssi:164
 msgid "# mkfs.ext4 ${USBSTICK}"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:163
+#: en/user_basics.ssi:168
 msgid "If you want to use this data partition with Windows, use FAT32."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:167
+#: en/user_basics.ssi:172
 msgid "# mkfs.vfat -F 32"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:171
+#: en/user_basics.ssi:176
 #, 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"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:173
+#: en/user_basics.ssi:178
 msgid "2~ Building a netboot image"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:175
+#: en/user_basics.ssi:180
 msgid ""
 "The following sequence of commands will create a basic netboot image "
 "containing the Debian standard system without X.org. It is suitable for "
@@ -490,28 +513,28 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:177
+#: en/user_basics.ssi:182
 msgid ""
 "Note if you performed any previous examples, you will need to clean up your "
 "working directory with the #{lb clean}# command:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:185
+#: en/user_basics.ssi:190
 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:189
+#: en/user_basics.ssi:194
 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:193
+#: en/user_basics.ssi:198
 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 "
@@ -521,12 +544,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:195
+#: en/user_basics.ssi:200
 msgid "Now build the image with the #{lb build}# command:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:203
+#: en/user_basics.ssi:208
 msgid ""
 "In a network boot the client runs a small piece of software, which usually "
 "resides on the EPROM of the Ethernet card. This program sends a DHCP request "
@@ -537,7 +560,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:205
+#: en/user_basics.ssi:210
 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/"
@@ -546,17 +569,17 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:207
+#: en/user_basics.ssi:212
 msgid "We must now configure three services on the server to enable netboot."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:209
+#: en/user_basics.ssi:214
 msgid "3~ DHCP server"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:211
+#: en/user_basics.ssi:216
 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 "
@@ -564,25 +587,25 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:213
+#: en/user_basics.ssi:218
 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:216
-msgid "% FIXME code{"
+#: en/user_basics.ssi:220 en/user_customization-packages.ssi:147
+msgid "% FIXME"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:218
+#: en/user_basics.ssi:224
 #, 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:221
+#: en/user_basics.ssi:227
 #, no-wrap
 msgid ""
 "  # IP addresses available for guests\n"
@@ -590,7 +613,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:224
+#: en/user_basics.ssi:230
 #, no-wrap
 msgid ""
 "  # allow booting from the net\n"
@@ -598,7 +621,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:229
+#: en/user_basics.ssi:235
 #, no-wrap
 msgid ""
 "  # for net booting, server where the first file to be loaded (by TFTP\n"
@@ -608,7 +631,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:233
+#: en/user_basics.ssi:239
 #, no-wrap
 msgid ""
 "  # net boot configuration for guests with a PXE client:\n"
@@ -617,7 +640,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:236
+#: en/user_basics.ssi:242
 #, no-wrap
 msgid ""
 "    # PXE boot loader (first program to be loaded, by TFTP)\n"
@@ -625,7 +648,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:239
+#: en/user_basics.ssi:245
 #, no-wrap
 msgid ""
 "  }\n"
@@ -633,17 +656,17 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:243
+#: en/user_basics.ssi:249
 msgid "3~ TFTP server"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:245
+#: en/user_basics.ssi:251
 msgid "This serves the kernel and initial ramdisk to the system at run-time."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:247
+#: en/user_basics.ssi:253
 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 /"
@@ -651,27 +674,27 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:251
+#: en/user_basics.ssi:257
 msgid "dpkg-reconfigure -plow tftpd-hpa"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:253
+#: en/user_basics.ssi:259
 msgid "code}"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:255
+#: en/user_basics.ssi:261
 msgid "and fill in the new tftp server directory when being asked about it."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:257
+#: en/user_basics.ssi:263
 msgid "3~ NFS server"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:259
+#: en/user_basics.ssi:265
 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 "
@@ -679,35 +702,35 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:261
+#: en/user_basics.ssi:267
 msgid "You need to install the nfs-kernel-server package."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:263
+#: en/user_basics.ssi:269
 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:267
+#: en/user_basics.ssi:273
 msgid "/srv/debian-live *(ro,async,no_root_squash,no_subtree_check)"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:271
+#: en/user_basics.ssi:277
 msgid ""
 "and tell the NFS server about this new export with the following command:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:275
+#: en/user_basics.ssi:281
 msgid "# exportfs -rv"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:279
+#: en/user_basics.ssi:285
 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 "
@@ -716,40 +739,40 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:281
+#: en/user_basics.ssi:287
 msgid "3~ Netboot testing HowTo"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:283
+#: en/user_basics.ssi:289
 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:285
+#: en/user_basics.ssi:291
 msgid ""
 "To make our life easier, we can use virtualization. There are two solutions."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:287
+#: en/user_basics.ssi:293
 msgid "3~ Qemu"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:289
+#: en/user_basics.ssi:295
 msgid "_* Install qemu, bridge-utils, sudo."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:291
+#: en/user_basics.ssi:297
 msgid "Edit /etc/qemu-ifup:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:302
+#: en/user_basics.ssi:308
 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...\" "
@@ -758,62 +781,62 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:306
+#: en/user_basics.ssi:312
 msgid "Get, or build a grub-floppy-netboot (in the svn)."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:308
+#: en/user_basics.ssi:314
 msgid "Launch qemu with \"-net nic,vlan=0 -net tap,vlan=0,ifname=tun0\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:310
+#: en/user_basics.ssi:316
 msgid "3~ VMWare Player"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:312
+#: en/user_basics.ssi:318
 msgid "_* Install VMWare Player (\"free as in beer\" edition)"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:314
+#: en/user_basics.ssi:320
 msgid ""
 "_* Create a PXETester directory, and create a text file called pxe.vwx inside"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:316
+#: en/user_basics.ssi:322
 msgid "_* Paste this text inside:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:324
+#: en/user_basics.ssi:330
 msgid ""
 "#!/usr/bin/vmware config.version = \"8\" virtualHW.version = \"4\" memsize = "
 "\"512\" MemAllowAutoScaleDown = \"FALSE\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:330
+#: en/user_basics.ssi:336
 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:333
+#: en/user_basics.ssi:339
 msgid "ethernet0.present = \"TRUE\" ethernet0.addressType = \"generated\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:336
+#: en/user_basics.ssi:342
 msgid "displayName = \"Test Boot PXE\" guestOS = \"other\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:341
+#: en/user_basics.ssi:347
 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 "
@@ -821,19 +844,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:345
+#: en/user_basics.ssi:351
 msgid ""
 "_* You can play with this configuration file (i.e. change memory limit to "
 "256)"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:347
+#: en/user_basics.ssi:353
 msgid ""
 "_* Double click on this file (or run VMWare player and selecet this file)."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:348
+#: en/user_basics.ssi:354
 msgid "_* When running just press space if that strange question comes up..."
 msgstr ""
diff --git a/manual/po/de/user_customization-contents.ssi.po b/manual/po/de/user_customization-contents.ssi.po
index 518ec18..be9ddad 100644
--- a/manual/po/de/user_customization-contents.ssi.po
+++ b/manual/po/de/user_customization-contents.ssi.po
@@ -6,20 +6,20 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-09-18 11:15+0300\n"
-"PO-Revision-Date: 2010-09-18 11:15+0300\n"
+"POT-Creation-Date: 2010-10-03 20:30+0300\n"
+"PO-Revision-Date: 2010-10-03 20:30+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ASCII\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. type: Plain text
-#: en/about_manual.ssi:81 en/about_manual.ssi:89 en/about_manual.ssi:97
-#: en/about_manual.ssi:109 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:141 en/about_manual.ssi:149 en/about_manual.ssi:157
+#: en/about_manual.ssi:82 en/about_manual.ssi:90 en/about_manual.ssi:98
+#: en/about_manual.ssi:110 en/about_manual.ssi:121 en/about_manual.ssi:134
+#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
 #: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
 #: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
 #: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
@@ -46,37 +46,38 @@ msgstr ""
 #: 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:45
-#: en/user_basics.ssi:58 en/user_basics.ssi:70 en/user_basics.ssi:84
-#: en/user_basics.ssi:99 en/user_basics.ssi:107 en/user_basics.ssi:115
-#: en/user_basics.ssi:125 en/user_basics.ssi:137 en/user_basics.ssi:149
-#: en/user_basics.ssi:157 en/user_basics.ssi:165 en/user_basics.ssi:179
-#: en/user_basics.ssi:187 en/user_basics.ssi:197 en/user_basics.ssi:249
-#: en/user_basics.ssi:265 en/user_basics.ssi:273 en/user_basics.ssi:293
-#: en/user_basics.ssi:318 en/user_customization-contents.ssi:30
-#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:62
-#: 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/other_use-cases.ssi:111 en/user_basics.ssi:36 en/user_basics.ssi:48
+#: en/user_basics.ssi:62 en/user_basics.ssi:74 en/user_basics.ssi:88
+#: en/user_basics.ssi:104 en/user_basics.ssi:112 en/user_basics.ssi:120
+#: en/user_basics.ssi:130 en/user_basics.ssi:142 en/user_basics.ssi:154
+#: en/user_basics.ssi:162 en/user_basics.ssi:170 en/user_basics.ssi:184
+#: en/user_basics.ssi:192 en/user_basics.ssi:202 en/user_basics.ssi:222
+#: en/user_basics.ssi:255 en/user_basics.ssi:271 en/user_basics.ssi:279
+#: en/user_basics.ssi:299 en/user_basics.ssi:324
+#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
+#: en/user_customization-contents.ssi:66 en/user_customization-packages.ssi:16
+#: en/user_customization-packages.ssi:24 en/user_customization-packages.ssi:36
+#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:59
+#: en/user_customization-packages.ssi:73
 #: en/user_customization-packages.ssi:103
 #: en/user_customization-packages.ssi:111
-#: en/user_customization-packages.ssi:129
-#: en/user_customization-packages.ssi:158
-#: en/user_customization-packages.ssi:168
-#: en/user_customization-packages.ssi:178
-#: en/user_customization-packages.ssi:188 en/user_installation.ssi:38
+#: en/user_customization-packages.ssi:131
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:180
+#: en/user_customization-packages.ssi:190 en/user_installation.ssi:38
 #: en/user_installation.ssi:46 en/user_installation.ssi:56
 #: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:104
-#: en/user_installation.ssi:118 en/user_installation.ssi:134
-#: en/user_overview.ssi:54 en/user_overview.ssi:98 en/user_overview.ssi:106
+#: en/user_installation.ssi:84 en/user_installation.ssi:105
+#: en/user_installation.ssi:119 en/user_installation.ssi:136
+#: en/user_overview.ssi:60 en/user_overview.ssi:104 en/user_overview.ssi:112
 msgid "code{"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:85 en/about_manual.ssi:93 en/about_manual.ssi:101
-#: en/about_manual.ssi:116 en/about_manual.ssi:129 en/about_manual.ssi:137
-#: en/about_manual.ssi:145 en/about_manual.ssi:153 en/about_manual.ssi:160
+#: en/about_manual.ssi:86 en/about_manual.ssi:94 en/about_manual.ssi:102
+#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
 #: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
 #: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
 #: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
@@ -103,34 +104,40 @@ 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:49
-#: en/user_basics.ssi:64 en/user_basics.ssi:74 en/user_basics.ssi:90
-#: en/user_basics.ssi:103 en/user_basics.ssi:111 en/user_basics.ssi:119
-#: en/user_basics.ssi:129 en/user_basics.ssi:143 en/user_basics.ssi:153
-#: en/user_basics.ssi:161 en/user_basics.ssi:169 en/user_basics.ssi:183
-#: en/user_basics.ssi:191 en/user_basics.ssi:201 en/user_basics.ssi:241
-#: en/user_basics.ssi:269 en/user_basics.ssi:277 en/user_basics.ssi:304
-#: en/user_basics.ssi:343 en/user_customization-contents.ssi:35
-#: en/user_customization-contents.ssi:50 en/user_customization-contents.ssi:66
+#: en/other_use-cases.ssi:137 en/user_basics.ssi:40 en/user_basics.ssi:52
+#: en/user_basics.ssi:68 en/user_basics.ssi:78 en/user_basics.ssi:94
+#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:124
+#: en/user_basics.ssi:134 en/user_basics.ssi:148 en/user_basics.ssi:158
+#: en/user_basics.ssi:166 en/user_basics.ssi:174 en/user_basics.ssi:188
+#: en/user_basics.ssi:196 en/user_basics.ssi:206 en/user_basics.ssi:247
+#: en/user_basics.ssi:275 en/user_basics.ssi:283 en/user_basics.ssi:310
+#: en/user_basics.ssi:349 en/user_customization-contents.ssi:39
+#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:70
 #: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
 #: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
 #: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
 #: en/user_customization-packages.ssi:107
 #: en/user_customization-packages.ssi:115
-#: en/user_customization-packages.ssi:133
-#: en/user_customization-packages.ssi:164
-#: en/user_customization-packages.ssi:174
-#: en/user_customization-packages.ssi:184
-#: en/user_customization-packages.ssi:194 en/user_installation.ssi:42
+#: en/user_customization-packages.ssi:135
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:186
+#: en/user_customization-packages.ssi:196 en/user_installation.ssi:42
 #: en/user_installation.ssi:50 en/user_installation.ssi:60
 #: en/user_installation.ssi:72 en/user_installation.ssi:80
-#: en/user_installation.ssi:108 en/user_installation.ssi:123
-#: en/user_installation.ssi:137 en/user_overview.ssi:92
-#: en/user_overview.ssi:102 en/user_overview.ssi:110
+#: en/user_installation.ssi:109 en/user_installation.ssi:124
+#: en/user_installation.ssi:139 en/user_overview.ssi:98
+#: en/user_overview.ssi:108 en/user_overview.ssi:116
 msgid "}code"
 msgstr ""
 
 #. type: Plain text
+#: en/user_basics.ssi:12 en/user_customization-contents.ssi:26
+#: en/user_installation.ssi:101
+msgid "% FIXME: <xref linkend=\"terms\"/>"
+msgstr ""
+
+#. type: Plain text
 #: en/user_customization-contents.ssi:2
 msgid "B~ Customising contents"
 msgstr ""
@@ -158,44 +165,57 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-contents.ssi:13
+#: en/user_customization-contents.ssi:12
 msgid ""
 "_* Chroot local includes: These allow you to add or replace files to the "
 "chroot/Live filesystem. Please see chroot-local-includes for more "
-"information.  % FIXME: <xref linkend=\"chroot-local-includes\"/>"
+"information."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-contents.ssi:14
+msgid "% FIXME: <xref linkend=\"chroot-local-includes\"/>"
 msgstr ""
 
 #. type: Plain text
 #: en/user_customization-contents.ssi:16
 msgid ""
 "_* Binary local includes: These allow you to add or replace files in the "
-"binary image. Please see binary-local-includes for more information.  % "
-"FIXME: <xref linkend=\"binary-local-includes\"/>"
+"binary image. Please see binary-local-includes for more information."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-contents.ssi:19
+#: en/user_customization-contents.ssi:18
+msgid "% FIXME: <xref linkend=\"binary-local-includes\"/>"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-contents.ssi:20
 msgid ""
 "_* Binary includes: These allow you to add or replace Debian specific files "
 "in the binary image, such as the templates and tools directories. Please see "
-"binary-includes for more information.  % FIXME: <xref linkend=\"binary-"
-"includes\"/>"
+"binary-includes for more information."
 msgstr ""
 
 #. type: Plain text
 #: en/user_customization-contents.ssi:22
+msgid "% FIXME: <xref linkend=\"binary-includes\"/>"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-contents.ssi:24
 msgid ""
 "Please see terms for more information about the distinction between the "
-"\"Live\" and \"binary\" images.  % FIXME: <xref linkend=\"terms\"/>"
+"\"Live\" and \"binary\" images."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-contents.ssi:24
+#: en/user_customization-contents.ssi:28
 msgid "3~ Live/chroot local includes"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-contents.ssi:26
+#: en/user_customization-contents.ssi:30
 msgid ""
 "Chroot local includes can be used to add or replace files in the chroot/Live "
 "filesystem so that they are visible when the Live system is booted. Typical "
@@ -205,7 +225,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-contents.ssi:28
+#: en/user_customization-contents.ssi:32
 msgid ""
 "To include files, simply add them to your #{config/chroot_local-includes}# "
 "directory. This directory corresponds to the root directory (#{/}#) of the "
@@ -214,19 +234,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-contents.ssi:33
+#: en/user_customization-contents.ssi:37
 msgid ""
 "$ mkdir -p config/chroot_local-includes/var/www $ cp /path/to/my/index.html "
 "config/chroot_local-includes/var/www"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-contents.ssi:37
+#: en/user_customization-contents.ssi:41
 msgid "Your configuration will then have the following layout:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-contents.ssi:48
+#: en/user_customization-contents.ssi:52
 #, no-wrap
 msgid ""
 "-- config\n"
@@ -240,60 +260,60 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-contents.ssi:52
+#: en/user_customization-contents.ssi:56
 msgid ""
 "Chroot local includes are installed after package installation so that files "
 "installed by packages are overwritten."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:58
 msgid "3~ Binary local includes"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-contents.ssi:56
+#: en/user_customization-contents.ssi:60
 msgid ""
 "The same way as chroot local includes work, there exists the corresponding "
 "mechanism to include files in the live media itself."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-contents.ssi:58
+#: en/user_customization-contents.ssi:62
 msgid "3~ Binary includes"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-contents.ssi:60
+#: en/user_customization-contents.ssi:64
 msgid ""
 "live-build has some standard files (like documentation) that gets included "
 "in the default configuration on every live media. This can be disabled with:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-contents.ssi:64
+#: en/user_customization-contents.ssi:68
 msgid "$ lb config --includes none"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-contents.ssi:68
+#: en/user_customization-contents.ssi:72
 msgid "2~ Hooks"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-contents.ssi:70
+#: en/user_customization-contents.ssi:74
 msgid ""
 "Hooks allow commands to be performed in the chroot and binary stages of the "
 "build in order to customize the image."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-contents.ssi:72
+#: en/user_customization-contents.ssi:76
 msgid "3~ Live/chroot local hooks"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-contents.ssi:74
+#: en/user_customization-contents.ssi:78
 msgid ""
 "To run commands in the chroot stage, create a hook script containing the "
 "commands in the #{config/chroot_local-hooks}# directory. The hook will run "
@@ -306,12 +326,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-contents.ssi:76
+#: en/user_customization-contents.ssi:80
 msgid "3~ Binary local hooks"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-contents.ssi:78
+#: en/user_customization-contents.ssi:82
 msgid ""
 "To run commands in the binary stage, create a hook script containing the "
 "commands in the #{config/binary_local-hooks}#. The hook will run after all "
@@ -324,12 +344,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-contents.ssi:80
+#: en/user_customization-contents.ssi:84
 msgid "2~ Preseeding Debconf questions"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-contents.ssi:82
+#: en/user_customization-contents.ssi:86
 msgid ""
 "Files in the #{config/chroot_local-preseed}# directory are considered to be "
 "debconf preseed files and are installed by live-build using #{debconf-set-"
@@ -337,7 +357,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-contents.ssi:83
+#: en/user_customization-contents.ssi:87
 msgid ""
 "For more information about debconf, please see debconf(7) in the #{debconf}# "
 "package."
diff --git a/manual/po/de/user_customization-packages.ssi.po b/manual/po/de/user_customization-packages.ssi.po
index 6826f67..e2d0159 100644
--- a/manual/po/de/user_customization-packages.ssi.po
+++ b/manual/po/de/user_customization-packages.ssi.po
@@ -6,28 +6,26 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-09-17 23:43+0300\n"
-"PO-Revision-Date: 2010-09-17 23:43+0300\n"
+"POT-Creation-Date: 2010-10-03 20:30+0300\n"
+"PO-Revision-Date: 2010-10-03 20:30+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ASCII\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. type: Plain text
-#: en/about_manual.ssi:81 en/about_manual.ssi:89 en/about_manual.ssi:97
-#: en/about_manual.ssi:109 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:141 en/about_manual.ssi:149 en/about_manual.ssi:157
+#: en/about_manual.ssi:82 en/about_manual.ssi:90 en/about_manual.ssi:98
+#: en/about_manual.ssi:110 en/about_manual.ssi:121 en/about_manual.ssi:134
+#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
 #: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
 #: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
 #: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
 #: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
 #: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
 #: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
-#: en/other_customization-contents.ssi:30
-#: en/other_customization-contents.ssi:39
 #: en/other_customization-internationalization.ssi:10
 #: en/other_customization-internationalization.ssi:18
 #: en/other_customization-internationalization.ssi:26
@@ -48,44 +46,44 @@ msgstr ""
 #: 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:45
-#: en/user_basics.ssi:58 en/user_basics.ssi:70 en/user_basics.ssi:84
-#: en/user_basics.ssi:99 en/user_basics.ssi:107 en/user_basics.ssi:115
-#: en/user_basics.ssi:125 en/user_basics.ssi:137 en/user_basics.ssi:149
-#: en/user_basics.ssi:157 en/user_basics.ssi:165 en/user_basics.ssi:179
-#: en/user_basics.ssi:187 en/user_basics.ssi:197 en/user_basics.ssi:249
-#: en/user_basics.ssi:265 en/user_basics.ssi:273 en/user_basics.ssi:293
-#: en/user_basics.ssi:318 en/user_customization-packages.ssi:16
+#: en/other_use-cases.ssi:111 en/user_basics.ssi:36 en/user_basics.ssi:48
+#: en/user_basics.ssi:62 en/user_basics.ssi:74 en/user_basics.ssi:88
+#: en/user_basics.ssi:104 en/user_basics.ssi:112 en/user_basics.ssi:120
+#: en/user_basics.ssi:130 en/user_basics.ssi:142 en/user_basics.ssi:154
+#: en/user_basics.ssi:162 en/user_basics.ssi:170 en/user_basics.ssi:184
+#: en/user_basics.ssi:192 en/user_basics.ssi:202 en/user_basics.ssi:222
+#: en/user_basics.ssi:255 en/user_basics.ssi:271 en/user_basics.ssi:279
+#: en/user_basics.ssi:299 en/user_basics.ssi:324
+#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
+#: en/user_customization-contents.ssi:66 en/user_customization-packages.ssi:16
 #: en/user_customization-packages.ssi:24 en/user_customization-packages.ssi:36
 #: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:59
 #: en/user_customization-packages.ssi:73
 #: en/user_customization-packages.ssi:103
 #: en/user_customization-packages.ssi:111
-#: en/user_customization-packages.ssi:129
-#: en/user_customization-packages.ssi:158
-#: en/user_customization-packages.ssi:168
-#: en/user_customization-packages.ssi:178
-#: en/user_customization-packages.ssi:188 en/user_installation.ssi:38
+#: en/user_customization-packages.ssi:131
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:180
+#: en/user_customization-packages.ssi:190 en/user_installation.ssi:38
 #: en/user_installation.ssi:46 en/user_installation.ssi:56
 #: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:104
-#: en/user_installation.ssi:118 en/user_installation.ssi:134
-#: en/user_overview.ssi:54 en/user_overview.ssi:98 en/user_overview.ssi:106
+#: en/user_installation.ssi:84 en/user_installation.ssi:105
+#: en/user_installation.ssi:119 en/user_installation.ssi:136
+#: en/user_overview.ssi:60 en/user_overview.ssi:104 en/user_overview.ssi:112
 msgid "code{"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:85 en/about_manual.ssi:93 en/about_manual.ssi:101
-#: en/about_manual.ssi:116 en/about_manual.ssi:129 en/about_manual.ssi:137
-#: en/about_manual.ssi:145 en/about_manual.ssi:153 en/about_manual.ssi:160
+#: en/about_manual.ssi:86 en/about_manual.ssi:94 en/about_manual.ssi:102
+#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
 #: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
 #: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
 #: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
 #: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
 #: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
 #: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: en/other_customization-contents.ssi:35
-#: en/other_customization-contents.ssi:50
 #: en/other_customization-internationalization.ssi:14
 #: en/other_customization-internationalization.ssi:22
 #: en/other_customization-internationalization.ssi:30
@@ -106,33 +104,39 @@ 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:49
-#: en/user_basics.ssi:64 en/user_basics.ssi:74 en/user_basics.ssi:90
-#: en/user_basics.ssi:103 en/user_basics.ssi:111 en/user_basics.ssi:119
-#: en/user_basics.ssi:129 en/user_basics.ssi:143 en/user_basics.ssi:153
-#: en/user_basics.ssi:161 en/user_basics.ssi:169 en/user_basics.ssi:183
-#: en/user_basics.ssi:191 en/user_basics.ssi:201 en/user_basics.ssi:241
-#: en/user_basics.ssi:269 en/user_basics.ssi:277 en/user_basics.ssi:304
-#: en/user_basics.ssi:343 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/other_use-cases.ssi:137 en/user_basics.ssi:40 en/user_basics.ssi:52
+#: en/user_basics.ssi:68 en/user_basics.ssi:78 en/user_basics.ssi:94
+#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:124
+#: en/user_basics.ssi:134 en/user_basics.ssi:148 en/user_basics.ssi:158
+#: en/user_basics.ssi:166 en/user_basics.ssi:174 en/user_basics.ssi:188
+#: en/user_basics.ssi:196 en/user_basics.ssi:206 en/user_basics.ssi:247
+#: en/user_basics.ssi:275 en/user_basics.ssi:283 en/user_basics.ssi:310
+#: en/user_basics.ssi:349 en/user_customization-contents.ssi:39
+#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:70
+#: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
+#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
+#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
 #: en/user_customization-packages.ssi:107
 #: en/user_customization-packages.ssi:115
-#: en/user_customization-packages.ssi:133
-#: en/user_customization-packages.ssi:164
-#: en/user_customization-packages.ssi:174
-#: en/user_customization-packages.ssi:184
-#: en/user_customization-packages.ssi:194 en/user_installation.ssi:42
+#: en/user_customization-packages.ssi:135
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:186
+#: en/user_customization-packages.ssi:196 en/user_installation.ssi:42
 #: en/user_installation.ssi:50 en/user_installation.ssi:60
 #: en/user_installation.ssi:72 en/user_installation.ssi:80
-#: en/user_installation.ssi:108 en/user_installation.ssi:123
-#: en/user_installation.ssi:137 en/user_overview.ssi:92
-#: en/user_overview.ssi:102 en/user_overview.ssi:110
+#: en/user_installation.ssi:109 en/user_installation.ssi:124
+#: en/user_installation.ssi:139 en/user_overview.ssi:98
+#: en/user_overview.ssi:108 en/user_overview.ssi:116
 msgid "}code"
 msgstr ""
 
 #. type: Plain text
+#: en/user_basics.ssi:220 en/user_customization-packages.ssi:147
+msgid "% FIXME"
+msgstr ""
+
+#. type: Plain text
 #: en/user_customization-packages.ssi:2
 msgid ":B~ Customising package installation"
 msgstr ""
@@ -376,11 +380,16 @@ msgid "$ lb config --packages \"package1 package2 package3\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:118
+#: en/user_customization-packages.ssi:117
 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 "
-"details.  % FIXME: <xref linkend=\"package-installation\"/>"
+"details."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:119
+msgid "% FIXME: <xref linkend=\"package-installation\"/>"
 msgstr ""
 
 #. type: Plain text
@@ -388,17 +397,21 @@ msgstr ""
 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 "
-"using package lists. See package-lists for more information.  % FIXME: <xref "
-"linkend=\"package-lists\"/>"
+"using package lists. See package-lists for more information."
 msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:123
-msgid "3~ Package lists"
+msgid "% FIXME: <xref linkend=\"package-lists\"/>"
 msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:125
+msgid "3~ Package lists"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:127
 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 "
@@ -407,37 +420,37 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:129
 msgid "To specify one or more package list, you can use:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:131
+#: en/user_customization-packages.ssi:133
 msgid "$ lb config --packages-lists \"list1 list2 list3\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:135
+#: en/user_customization-packages.ssi:137
 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:137
+#: en/user_customization-packages.ssi:139
 #, no-wrap
 msgid "*{Local packages lists}*\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:139
+#: en/user_customization-packages.ssi:141
 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:141
+#: en/user_customization-packages.ssi:143
 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 "
@@ -446,23 +459,18 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:143
+#: en/user_customization-packages.ssi:145
 #, no-wrap
 msgid "*{Extending a provided package list using includes}*\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:145
-msgid "% FIXME"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:152
+#: en/user_customization-packages.ssi:154
 msgid "% code{ % % #include <gnome> % iceweasel % % }code"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:154
+#: en/user_customization-packages.ssi:156
 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}# "
@@ -470,75 +478,75 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:156
+#: en/user_customization-packages.ssi:158
 #, no-wrap
 msgid "*{Using conditionals inside packages lists}*\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:162
+#: en/user_customization-packages.ssi:164
 msgid "#if ARCHITECTURE amd64 ia32-libs #endif"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:168
 msgid "or if #{LB_ARCHITECTURE}# is set to #{i386}# or #{amd64}#:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:172
+#: en/user_customization-packages.ssi:174
 msgid "#if ARCHITECTURE i386 amd64 memtest86+ #endif"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:178
 msgid "or if #{LB_ARCHIVE_AREAS}# contains either #{contrib}# or #{non-free}#:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:182
+#: en/user_customization-packages.ssi:184
 msgid "#if ARCHIVE_AREAS contrib non-free vrms #endif"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:186
+#: en/user_customization-packages.ssi:188
 msgid "A conditional may surround an #{#include}# directive:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:192
+#: en/user_customization-packages.ssi:194
 msgid "#if ARCHITECTURE amd64 #include <gnome-full> #endif"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:196
+#: en/user_customization-packages.ssi:198
 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:198
+#: en/user_customization-packages.ssi:200
 msgid "The nesting of conditionals is not supported."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:200
+#: en/user_customization-packages.ssi:202
 msgid "3~ Tasks"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:202
+#: en/user_customization-packages.ssi:204
 msgid "%FIXME"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:204
+#: en/user_customization-packages.ssi:206
 msgid "2~ Installing modified or third-party packages"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:206
+#: en/user_customization-packages.ssi:208
 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 "
@@ -549,7 +557,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:208
+#: en/user_customization-packages.ssi:210
 msgid ""
 "This section does not cover advice regarding building or maintaining "
 "modified packages. Joachim Breitner's 'How to fork privately' method from "
@@ -560,22 +568,22 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:210
+#: en/user_customization-packages.ssi:212
 msgid "There are two ways of installing modified custom packages:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:212
+#: en/user_customization-packages.ssi:214
 msgid "_* #{chroot_local-packages}#"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:214
+#: en/user_customization-packages.ssi:216
 msgid "_* Using a custom APT repository"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:218
 msgid ""
 "The #{chroot_local-packages}# is simpler to achieve and useful for \"one-off"
 "\" customisations but has a number of drawbacks, whilst using a custom APT "
@@ -583,12 +591,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:218
+#: en/user_customization-packages.ssi:220
 msgid "3~ Using #{chroot_local-packages}# to install custom packages"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:220
+#: en/user_customization-packages.ssi:222
 msgid ""
 "To install a custom package, simply copy it to the #{config/chroot_local-"
 "packages}# directory. Packages that are inside this directory will be "
@@ -597,53 +605,58 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:222
+#: en/user_customization-packages.ssi:224
 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:224
+#: en/user_customization-packages.ssi:226
 msgid ""
 "Using #{chroot_local-packages}# for installation of custom packages has "
 "disadvantages:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:226
+#: en/user_customization-packages.ssi:228
 msgid "_* It is not possible to use secure APT"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:228
+#: en/user_customization-packages.ssi:230
 msgid ""
 "_* You must install all appropriate packages in the #{config/chroot_local-"
 "packages}# directory"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:230
+#: en/user_customization-packages.ssi:232
 msgid ""
 "_* It does not lend itself to storing Debian Live configurations in revision "
 "control"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:232
+#: en/user_customization-packages.ssi:234
 msgid "3~ Using an APT repository to install custom packages"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:235
+#: en/user_customization-packages.ssi:236
 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 "
-"details.  % FIXME: <xref linkend=\"lb-packages\"/>"
+"details."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:237
+#: en/user_customization-packages.ssi:238
+msgid "% FIXME: <xref linkend=\"lb-packages\"/>"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:240
 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 "
@@ -651,12 +664,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:239
+#: en/user_customization-packages.ssi:242
 msgid "3~ Custom packages and APT"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:241
+#: en/user_customization-packages.ssi:244
 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 "
@@ -666,23 +679,27 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:244
+#: en/user_customization-packages.ssi:246
 msgid ""
 "Because of this, you may wish to increment the version number in your custom "
 "packages' #{debian/changelog}# files to ensure that your modified version is "
 "installed over one in the official Debian repositories. This may also be "
 "achieved by altering the live system's APT pinning preferences - see apt-"
-"preferences for more information.  % FIXME: <xref linkend=\"apt-preferences"
-"\"/>"
+"preferences for more information."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:246
+#: en/user_customization-packages.ssi:248
+msgid "% FIXME: <xref linkend=\"apt-preferences\"/>"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:250
 msgid "3~ Altering APT preferences during Live system"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:247
+#: en/user_customization-packages.ssi:251
 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_installation.ssi.po b/manual/po/de/user_installation.ssi.po
index 38ff806..5e0e898 100644
--- a/manual/po/de/user_installation.ssi.po
+++ b/manual/po/de/user_installation.ssi.po
@@ -6,28 +6,26 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-09-17 23:43+0300\n"
-"PO-Revision-Date: 2010-09-17 23:43+0300\n"
+"POT-Creation-Date: 2010-10-03 20:30+0300\n"
+"PO-Revision-Date: 2010-10-03 20:30+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ASCII\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. type: Plain text
-#: en/about_manual.ssi:81 en/about_manual.ssi:89 en/about_manual.ssi:97
-#: en/about_manual.ssi:109 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:141 en/about_manual.ssi:149 en/about_manual.ssi:157
+#: en/about_manual.ssi:82 en/about_manual.ssi:90 en/about_manual.ssi:98
+#: en/about_manual.ssi:110 en/about_manual.ssi:121 en/about_manual.ssi:134
+#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
 #: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
 #: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
 #: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
 #: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
 #: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
 #: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
-#: en/other_customization-contents.ssi:30
-#: en/other_customization-contents.ssi:39
 #: en/other_customization-internationalization.ssi:10
 #: en/other_customization-internationalization.ssi:18
 #: en/other_customization-internationalization.ssi:26
@@ -48,44 +46,44 @@ msgstr ""
 #: 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:45
-#: en/user_basics.ssi:58 en/user_basics.ssi:70 en/user_basics.ssi:84
-#: en/user_basics.ssi:99 en/user_basics.ssi:107 en/user_basics.ssi:115
-#: en/user_basics.ssi:125 en/user_basics.ssi:137 en/user_basics.ssi:149
-#: en/user_basics.ssi:157 en/user_basics.ssi:165 en/user_basics.ssi:179
-#: en/user_basics.ssi:187 en/user_basics.ssi:197 en/user_basics.ssi:249
-#: en/user_basics.ssi:265 en/user_basics.ssi:273 en/user_basics.ssi:293
-#: en/user_basics.ssi:318 en/user_customization-packages.ssi:16
+#: en/other_use-cases.ssi:111 en/user_basics.ssi:36 en/user_basics.ssi:48
+#: en/user_basics.ssi:62 en/user_basics.ssi:74 en/user_basics.ssi:88
+#: en/user_basics.ssi:104 en/user_basics.ssi:112 en/user_basics.ssi:120
+#: en/user_basics.ssi:130 en/user_basics.ssi:142 en/user_basics.ssi:154
+#: en/user_basics.ssi:162 en/user_basics.ssi:170 en/user_basics.ssi:184
+#: en/user_basics.ssi:192 en/user_basics.ssi:202 en/user_basics.ssi:222
+#: en/user_basics.ssi:255 en/user_basics.ssi:271 en/user_basics.ssi:279
+#: en/user_basics.ssi:299 en/user_basics.ssi:324
+#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
+#: en/user_customization-contents.ssi:66 en/user_customization-packages.ssi:16
 #: en/user_customization-packages.ssi:24 en/user_customization-packages.ssi:36
 #: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:59
 #: en/user_customization-packages.ssi:73
 #: en/user_customization-packages.ssi:103
 #: en/user_customization-packages.ssi:111
-#: en/user_customization-packages.ssi:129
-#: en/user_customization-packages.ssi:158
-#: en/user_customization-packages.ssi:168
-#: en/user_customization-packages.ssi:178
-#: en/user_customization-packages.ssi:188 en/user_installation.ssi:38
+#: en/user_customization-packages.ssi:131
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:180
+#: en/user_customization-packages.ssi:190 en/user_installation.ssi:38
 #: en/user_installation.ssi:46 en/user_installation.ssi:56
 #: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:104
-#: en/user_installation.ssi:118 en/user_installation.ssi:134
-#: en/user_overview.ssi:54 en/user_overview.ssi:98 en/user_overview.ssi:106
+#: en/user_installation.ssi:84 en/user_installation.ssi:105
+#: en/user_installation.ssi:119 en/user_installation.ssi:136
+#: en/user_overview.ssi:60 en/user_overview.ssi:104 en/user_overview.ssi:112
 msgid "code{"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:85 en/about_manual.ssi:93 en/about_manual.ssi:101
-#: en/about_manual.ssi:116 en/about_manual.ssi:129 en/about_manual.ssi:137
-#: en/about_manual.ssi:145 en/about_manual.ssi:153 en/about_manual.ssi:160
+#: en/about_manual.ssi:86 en/about_manual.ssi:94 en/about_manual.ssi:102
+#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
 #: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
 #: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
 #: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
 #: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
 #: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
 #: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: en/other_customization-contents.ssi:35
-#: en/other_customization-contents.ssi:50
 #: en/other_customization-internationalization.ssi:14
 #: en/other_customization-internationalization.ssi:22
 #: en/other_customization-internationalization.ssi:30
@@ -106,29 +104,30 @@ 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:49
-#: en/user_basics.ssi:64 en/user_basics.ssi:74 en/user_basics.ssi:90
-#: en/user_basics.ssi:103 en/user_basics.ssi:111 en/user_basics.ssi:119
-#: en/user_basics.ssi:129 en/user_basics.ssi:143 en/user_basics.ssi:153
-#: en/user_basics.ssi:161 en/user_basics.ssi:169 en/user_basics.ssi:183
-#: en/user_basics.ssi:191 en/user_basics.ssi:201 en/user_basics.ssi:241
-#: en/user_basics.ssi:269 en/user_basics.ssi:277 en/user_basics.ssi:304
-#: en/user_basics.ssi:343 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/other_use-cases.ssi:137 en/user_basics.ssi:40 en/user_basics.ssi:52
+#: en/user_basics.ssi:68 en/user_basics.ssi:78 en/user_basics.ssi:94
+#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:124
+#: en/user_basics.ssi:134 en/user_basics.ssi:148 en/user_basics.ssi:158
+#: en/user_basics.ssi:166 en/user_basics.ssi:174 en/user_basics.ssi:188
+#: en/user_basics.ssi:196 en/user_basics.ssi:206 en/user_basics.ssi:247
+#: en/user_basics.ssi:275 en/user_basics.ssi:283 en/user_basics.ssi:310
+#: en/user_basics.ssi:349 en/user_customization-contents.ssi:39
+#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:70
+#: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
+#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
+#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
 #: en/user_customization-packages.ssi:107
 #: en/user_customization-packages.ssi:115
-#: en/user_customization-packages.ssi:133
-#: en/user_customization-packages.ssi:164
-#: en/user_customization-packages.ssi:174
-#: en/user_customization-packages.ssi:184
-#: en/user_customization-packages.ssi:194 en/user_installation.ssi:42
+#: en/user_customization-packages.ssi:135
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:186
+#: en/user_customization-packages.ssi:196 en/user_installation.ssi:42
 #: en/user_installation.ssi:50 en/user_installation.ssi:60
 #: en/user_installation.ssi:72 en/user_installation.ssi:80
-#: en/user_installation.ssi:108 en/user_installation.ssi:123
-#: en/user_installation.ssi:137 en/user_overview.ssi:92
-#: en/user_overview.ssi:102 en/user_overview.ssi:110
+#: en/user_installation.ssi:109 en/user_installation.ssi:124
+#: en/user_installation.ssi:139 en/user_overview.ssi:98
+#: en/user_overview.ssi:108 en/user_overview.ssi:116
 msgid "}code"
 msgstr ""
 
@@ -139,6 +138,12 @@ msgid "or"
 msgstr ""
 
 #. type: Plain text
+#: en/user_basics.ssi:12 en/user_customization-contents.ssi:26
+#: en/user_installation.ssi:101
+msgid "% FIXME: <xref linkend=\"terms\"/>"
+msgstr ""
+
+#. type: Plain text
 #: en/user_installation.ssi:2
 msgid ":B~ Installation"
 msgstr ""
@@ -325,30 +330,29 @@ msgid "3~ Using a customised live-boot"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:100
+#: en/user_installation.ssi:99
 msgid ""
 "To modify the code you can follow the process below. Please ensure you are "
-"familiar with the terms mentioned in terms.  % FIXME: <xref linkend=\"terms"
-"\"/>"
+"familiar with the terms mentioned in terms."
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:102
+#: en/user_installation.ssi:103
 msgid "_* Checkout the live-boot source"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:106
+#: en/user_installation.ssi:107
 msgid "$ git clone git://live.debian.net/git/live-boot.git"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:110
+#: en/user_installation.ssi:111
 msgid "_* Make changes to your local copy"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:112
+#: en/user_installation.ssi:113
 msgid ""
 "And beware that if you want to add your pre-init script in live-bottom, you "
 "should name it without dashes '-', e.g: call it \"99new_feature\" and not "
@@ -356,12 +360,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:114
+#: en/user_installation.ssi:115
 msgid "_* Build a live-boot .deb"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:116
+#: en/user_installation.ssi:117
 msgid ""
 "You must build either on your target distribution or in a chroot containing "
 "your target platform: this means if your target is squeeze then you should "
@@ -372,12 +376,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:121
+#: en/user_installation.ssi:122
 msgid "$ cd live-boot $ dpkg-buildpackage -rfakeroot -b -uc -us"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:125
+#: en/user_installation.ssi:126
 msgid "_* Use the generated live-boot .deb"
 msgstr ""
 
@@ -387,17 +391,23 @@ msgid ""
 "As live-boot is installed by live-build system, installing the package in "
 "the host system is not sufficient: you should treat the generated .deb like "
 "another custom package. Please see custom-packages for more information. You "
-"should pay particular attention to custom-packages-apt.  % FIXME: <xref "
-"linkend=\"custom-packages\"/> <xref linkend=\"custom-packages-apt\"/>"
+"should pay particular attention to custom-packages-apt."
 msgstr ""
 
 #. type: Plain text
 #: en/user_installation.ssi:130
-msgid "3~ Using live-boot snapshots"
+msgid ""
+"% FIXME: <xref linkend=\"custom-packages\"/> <xref linkend=\"custom-packages-"
+"apt\"/>"
 msgstr ""
 
 #. type: Plain text
 #: en/user_installation.ssi:132
+msgid "3~ Using live-boot snapshots"
+msgstr ""
+
+#. type: Plain text
+#: en/user_installation.ssi:134
 msgid ""
 "You can let live-build automatically use the latest snapshot of live-boot by "
 "configuring a third-party repository in your live-build configuration "
@@ -406,6 +416,6 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:136
+#: en/user_installation.ssi:138
 msgid "lb config --repository live.debian.net"
 msgstr ""
diff --git a/manual/po/de/user_overview.ssi.po b/manual/po/de/user_overview.ssi.po
index 9edd2ce..d8c8b3c 100644
--- a/manual/po/de/user_overview.ssi.po
+++ b/manual/po/de/user_overview.ssi.po
@@ -6,28 +6,26 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-09-17 23:43+0300\n"
-"PO-Revision-Date: 2010-09-17 23:43+0300\n"
+"POT-Creation-Date: 2010-10-03 20:30+0300\n"
+"PO-Revision-Date: 2010-10-03 20:30+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ASCII\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. type: Plain text
-#: en/about_manual.ssi:81 en/about_manual.ssi:89 en/about_manual.ssi:97
-#: en/about_manual.ssi:109 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:141 en/about_manual.ssi:149 en/about_manual.ssi:157
+#: en/about_manual.ssi:82 en/about_manual.ssi:90 en/about_manual.ssi:98
+#: en/about_manual.ssi:110 en/about_manual.ssi:121 en/about_manual.ssi:134
+#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
 #: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
 #: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
 #: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
 #: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
 #: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
 #: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
-#: en/other_customization-contents.ssi:30
-#: en/other_customization-contents.ssi:39
 #: en/other_customization-internationalization.ssi:10
 #: en/other_customization-internationalization.ssi:18
 #: en/other_customization-internationalization.ssi:26
@@ -48,44 +46,44 @@ msgstr ""
 #: 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:45
-#: en/user_basics.ssi:58 en/user_basics.ssi:70 en/user_basics.ssi:84
-#: en/user_basics.ssi:99 en/user_basics.ssi:107 en/user_basics.ssi:115
-#: en/user_basics.ssi:125 en/user_basics.ssi:137 en/user_basics.ssi:149
-#: en/user_basics.ssi:157 en/user_basics.ssi:165 en/user_basics.ssi:179
-#: en/user_basics.ssi:187 en/user_basics.ssi:197 en/user_basics.ssi:249
-#: en/user_basics.ssi:265 en/user_basics.ssi:273 en/user_basics.ssi:293
-#: en/user_basics.ssi:318 en/user_customization-packages.ssi:16
+#: en/other_use-cases.ssi:111 en/user_basics.ssi:36 en/user_basics.ssi:48
+#: en/user_basics.ssi:62 en/user_basics.ssi:74 en/user_basics.ssi:88
+#: en/user_basics.ssi:104 en/user_basics.ssi:112 en/user_basics.ssi:120
+#: en/user_basics.ssi:130 en/user_basics.ssi:142 en/user_basics.ssi:154
+#: en/user_basics.ssi:162 en/user_basics.ssi:170 en/user_basics.ssi:184
+#: en/user_basics.ssi:192 en/user_basics.ssi:202 en/user_basics.ssi:222
+#: en/user_basics.ssi:255 en/user_basics.ssi:271 en/user_basics.ssi:279
+#: en/user_basics.ssi:299 en/user_basics.ssi:324
+#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
+#: en/user_customization-contents.ssi:66 en/user_customization-packages.ssi:16
 #: en/user_customization-packages.ssi:24 en/user_customization-packages.ssi:36
 #: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:59
 #: en/user_customization-packages.ssi:73
 #: en/user_customization-packages.ssi:103
 #: en/user_customization-packages.ssi:111
-#: en/user_customization-packages.ssi:129
-#: en/user_customization-packages.ssi:158
-#: en/user_customization-packages.ssi:168
-#: en/user_customization-packages.ssi:178
-#: en/user_customization-packages.ssi:188 en/user_installation.ssi:38
+#: en/user_customization-packages.ssi:131
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:180
+#: en/user_customization-packages.ssi:190 en/user_installation.ssi:38
 #: en/user_installation.ssi:46 en/user_installation.ssi:56
 #: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:104
-#: en/user_installation.ssi:118 en/user_installation.ssi:134
-#: en/user_overview.ssi:54 en/user_overview.ssi:98 en/user_overview.ssi:106
+#: en/user_installation.ssi:84 en/user_installation.ssi:105
+#: en/user_installation.ssi:119 en/user_installation.ssi:136
+#: en/user_overview.ssi:60 en/user_overview.ssi:104 en/user_overview.ssi:112
 msgid "code{"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:85 en/about_manual.ssi:93 en/about_manual.ssi:101
-#: en/about_manual.ssi:116 en/about_manual.ssi:129 en/about_manual.ssi:137
-#: en/about_manual.ssi:145 en/about_manual.ssi:153 en/about_manual.ssi:160
+#: en/about_manual.ssi:86 en/about_manual.ssi:94 en/about_manual.ssi:102
+#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
 #: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
 #: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
 #: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
 #: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
 #: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
 #: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: en/other_customization-contents.ssi:35
-#: en/other_customization-contents.ssi:50
 #: en/other_customization-internationalization.ssi:14
 #: en/other_customization-internationalization.ssi:22
 #: en/other_customization-internationalization.ssi:30
@@ -106,33 +104,44 @@ 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:49
-#: en/user_basics.ssi:64 en/user_basics.ssi:74 en/user_basics.ssi:90
-#: en/user_basics.ssi:103 en/user_basics.ssi:111 en/user_basics.ssi:119
-#: en/user_basics.ssi:129 en/user_basics.ssi:143 en/user_basics.ssi:153
-#: en/user_basics.ssi:161 en/user_basics.ssi:169 en/user_basics.ssi:183
-#: en/user_basics.ssi:191 en/user_basics.ssi:201 en/user_basics.ssi:241
-#: en/user_basics.ssi:269 en/user_basics.ssi:277 en/user_basics.ssi:304
-#: en/user_basics.ssi:343 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/other_use-cases.ssi:137 en/user_basics.ssi:40 en/user_basics.ssi:52
+#: en/user_basics.ssi:68 en/user_basics.ssi:78 en/user_basics.ssi:94
+#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:124
+#: en/user_basics.ssi:134 en/user_basics.ssi:148 en/user_basics.ssi:158
+#: en/user_basics.ssi:166 en/user_basics.ssi:174 en/user_basics.ssi:188
+#: en/user_basics.ssi:196 en/user_basics.ssi:206 en/user_basics.ssi:247
+#: en/user_basics.ssi:275 en/user_basics.ssi:283 en/user_basics.ssi:310
+#: en/user_basics.ssi:349 en/user_customization-contents.ssi:39
+#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:70
+#: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
+#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
+#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
 #: en/user_customization-packages.ssi:107
 #: en/user_customization-packages.ssi:115
-#: en/user_customization-packages.ssi:133
-#: en/user_customization-packages.ssi:164
-#: en/user_customization-packages.ssi:174
-#: en/user_customization-packages.ssi:184
-#: en/user_customization-packages.ssi:194 en/user_installation.ssi:42
+#: en/user_customization-packages.ssi:135
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:186
+#: en/user_customization-packages.ssi:196 en/user_installation.ssi:42
 #: en/user_installation.ssi:50 en/user_installation.ssi:60
 #: en/user_installation.ssi:72 en/user_installation.ssi:80
-#: en/user_installation.ssi:108 en/user_installation.ssi:123
-#: en/user_installation.ssi:137 en/user_overview.ssi:92
-#: en/user_overview.ssi:102 en/user_overview.ssi:110
+#: en/user_installation.ssi:109 en/user_installation.ssi:124
+#: en/user_installation.ssi:139 en/user_overview.ssi:98
+#: en/user_overview.ssi:108 en/user_overview.ssi:116
 msgid "}code"
 msgstr ""
 
 #. type: Plain text
+#: en/user_basics.ssi:44 en/user_overview.ssi:22 en/user_overview.ssi:42
+msgid "% FIXME: <xref linkend=\"lb-config\"/>"
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:56 en/user_overview.ssi:46
+msgid "% FIXME: <xref linkend=\"lb-build\"/>"
+msgstr ""
+
+#. type: Plain text
 #: en/user_overview.ssi:2
 msgid ":B~ Overview of tools"
 msgstr ""
@@ -195,16 +204,16 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:21
+#: en/user_overview.ssi:20
 msgid ""
 "Unlike debhelper, live-build contains a tool to generate a skeleton "
 "configuration directory, #{lb config}#. This could be considered to be "
 "similar to tools such as #{dh-make}#. For more information about #{lb config}"
-"#, please see lb-config.  % FIXME: <xref linkend=\"lb-config\"/>"
+"#, please see lb-config."
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:23
+#: en/user_overview.ssi:24
 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 "
@@ -214,7 +223,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:25
+#: en/user_overview.ssi:26
 msgid ""
 "For example, the #{lb_bootstrap_debootstrap}# command uses files named "
 "config/bootstrap and config/bootstrap_debootstrap to read the options it "
@@ -224,7 +233,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:27
+#: en/user_overview.ssi:28
 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 "
@@ -235,7 +244,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:29
+#: en/user_overview.ssi:30
 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 "
@@ -243,7 +252,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:31
+#: en/user_overview.ssi:32
 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."
@@ -256,75 +265,86 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_overview.ssi:34
-msgid ""
-"Please see installation for information on how to install live-build.  % "
-"FIXME: <xref linkend=\"installation\"/>"
+msgid "Please see installation for information on how to install live-build."
 msgstr ""
 
 #. type: Plain text
 #: en/user_overview.ssi:36
+msgid "% FIXME: <xref linkend=\"installation\"/>"
+msgstr ""
+
+#. type: Plain text
+#: en/user_overview.ssi:38
 msgid ""
 "The remainder of this section discusses the three most important commands:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:39
+#: en/user_overview.ssi:40
 msgid ""
 "_* *{lb config}*: Responsible for initialising a Live system configuration "
-"directory. See lb-config for more information.  % FIXME: <xref linkend=\"lb-"
-"config\"/>"
+"directory. See lb-config for more information."
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:42
+#: en/user_overview.ssi:44
 msgid ""
 "_* *{lb build}*: Responsible for starting a Live system build. See lb-build "
-"for more information.  % FIXME: <xref linkend=\"lb-build\"/>"
+"for more information."
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:45
+#: en/user_overview.ssi:48
 msgid ""
 "_* *{lb clean}*: Responsible for removing parts of a Live system build. See "
-"lb-clean for more information.  % FIXME: <xref linkend=\"lb-clean\"/"
+"lb-clean for more information."
+msgstr ""
+
+#. type: Plain text
+#: en/user_overview.ssi:50
+msgid "% FIXME: <xref linkend=\"lb-clean\"/"
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:47
+#: en/user_overview.ssi:52
 msgid "3~ The #{lb config}# command"
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:50
+#: en/user_overview.ssi:54
 msgid ""
 "As discussed in live-build, the scripts that make up live-build source their "
 "configuration from a single directory named config/. As constructing this "
 "directory by hand would be time-consuming and error-prone, the #{lb config}# "
-"command can be used to create skeleton configuration folders.  % FIXME: "
-"<xref linkend=\"live-build\"/>"
+"command can be used to create skeleton configuration folders."
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:52
+#: en/user_overview.ssi:56
+msgid "% FIXME: <xref linkend=\"live-build\"/>"
+msgstr ""
+
+#. type: Plain text
+#: en/user_overview.ssi:58
 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:57
+#: en/user_overview.ssi:63
 msgid "$ lb config P: Creating config tree"
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:62
+#: en/user_overview.ssi:68
 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:90
+#: en/user_overview.ssi:96
 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 "
@@ -349,7 +369,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:94
+#: en/user_overview.ssi:100
 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 "
@@ -357,7 +377,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:96
+#: en/user_overview.ssi:102
 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 "
@@ -365,38 +385,38 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:100
+#: en/user_overview.ssi:106
 msgid "$ lb config -p gnome"
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:104
+#: en/user_overview.ssi:110
 msgid ""
 "will build a config/ directory configured to include the 'gnome' package "
 "list. It is possible to specify many options:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:108
+#: en/user_overview.ssi:114
 msgid ""
 "$ lb config --binary-images net --hostname live-machine --username live-"
 "user ..."
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:112
+#: en/user_overview.ssi:118
 msgid ""
 "A full list of options is available in the #{lb_config}# man page. Most "
 "options have a parallel with an \"LB_\" prefixed variable."
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:114
+#: en/user_overview.ssi:120
 msgid "3~ The #{lb build}# command"
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:116
+#: en/user_overview.ssi:122
 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 "
@@ -404,24 +424,24 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:118
+#: en/user_overview.ssi:124
 msgid "3~ The #{lb clean}# command"
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:120
+#: en/user_overview.ssi:126
 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:122
+#: en/user_overview.ssi:128
 msgid "2~ The live-boot package"
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:124
+#: en/user_overview.ssi:130
 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 "
@@ -430,7 +450,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:126
+#: en/user_overview.ssi:132
 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 "
@@ -439,7 +459,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:127
+#: en/user_overview.ssi:133
 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 "
diff --git a/manual/po4a.cfg b/manual/po4a.cfg
index b802f8a..e992ed7 100644
--- a/manual/po4a.cfg
+++ b/manual/po4a.cfg
@@ -25,3 +25,4 @@
 [type: text] en/user_customization-packages.ssi $lang:$lang/user_customization-packages.ssi
 [type: text] en/user_installation.ssi $lang:$lang/user_installation.ssi
 [type: text] en/user_overview.ssi $lang:$lang/user_overview.ssi
+[type: xhtml] en/index.html.in $lang:$lang/index.html.in
diff --git a/manual/pot/about_manual.ssi.pot b/manual/pot/about_manual.ssi.pot
index 18ad507..eeaafc6 100644
--- a/manual/pot/about_manual.ssi.pot
+++ b/manual/pot/about_manual.ssi.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-09-17 23:43+0300\n"
+"POT-Creation-Date: 2010-10-03 20:30+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -248,16 +248,21 @@ msgid "2~ Contributing to this document"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:75
+#: en/about_manual.ssi:74
 msgid ""
 "This manual is intended as a community project and all proposals for "
 "improvements and contributions are extremely welcome. The preferred way to "
 "submit a contribution is to send it to the mailing list. Please see contact "
-"for more information.  % FIXME: <xref linkend=\"contact\"/>"
+"for more information."
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:77
+#: en/about_manual.ssi:76
+msgid "% FIXME: <xref linkend=\"contact\"/>"
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:78
 msgid ""
 "When submitting a contribution please clearly identify its copyright holder "
 "and include the licensing statement. Note that to be accepted the "
@@ -266,24 +271,22 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:79
+#: en/about_manual.ssi:80
 msgid ""
 "The sources for this manual are maintained using the Git version control "
 "system. You can checkout the latest copy by executing:"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:81 en/about_manual.ssi:89 en/about_manual.ssi:97
-#: en/about_manual.ssi:109 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:141 en/about_manual.ssi:149 en/about_manual.ssi:157
+#: en/about_manual.ssi:82 en/about_manual.ssi:90 en/about_manual.ssi:98
+#: en/about_manual.ssi:110 en/about_manual.ssi:121 en/about_manual.ssi:134
+#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
 #: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
 #: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
 #: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
 #: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
 #: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
 #: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
-#: en/other_customization-contents.ssi:30
-#: en/other_customization-contents.ssi:39
 #: en/other_customization-internationalization.ssi:10
 #: en/other_customization-internationalization.ssi:18
 #: en/other_customization-internationalization.ssi:26
@@ -304,49 +307,49 @@ msgstr ""
 #: 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:45
-#: en/user_basics.ssi:58 en/user_basics.ssi:70 en/user_basics.ssi:84
-#: en/user_basics.ssi:99 en/user_basics.ssi:107 en/user_basics.ssi:115
-#: en/user_basics.ssi:125 en/user_basics.ssi:137 en/user_basics.ssi:149
-#: en/user_basics.ssi:157 en/user_basics.ssi:165 en/user_basics.ssi:179
-#: en/user_basics.ssi:187 en/user_basics.ssi:197 en/user_basics.ssi:249
-#: en/user_basics.ssi:265 en/user_basics.ssi:273 en/user_basics.ssi:293
-#: en/user_basics.ssi:318 en/user_customization-packages.ssi:16
+#: en/other_use-cases.ssi:111 en/user_basics.ssi:36 en/user_basics.ssi:48
+#: en/user_basics.ssi:62 en/user_basics.ssi:74 en/user_basics.ssi:88
+#: en/user_basics.ssi:104 en/user_basics.ssi:112 en/user_basics.ssi:120
+#: en/user_basics.ssi:130 en/user_basics.ssi:142 en/user_basics.ssi:154
+#: en/user_basics.ssi:162 en/user_basics.ssi:170 en/user_basics.ssi:184
+#: en/user_basics.ssi:192 en/user_basics.ssi:202 en/user_basics.ssi:222
+#: en/user_basics.ssi:255 en/user_basics.ssi:271 en/user_basics.ssi:279
+#: en/user_basics.ssi:299 en/user_basics.ssi:324
+#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
+#: en/user_customization-contents.ssi:66 en/user_customization-packages.ssi:16
 #: en/user_customization-packages.ssi:24 en/user_customization-packages.ssi:36
 #: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:59
 #: en/user_customization-packages.ssi:73
 #: en/user_customization-packages.ssi:103
 #: en/user_customization-packages.ssi:111
-#: en/user_customization-packages.ssi:129
-#: en/user_customization-packages.ssi:158
-#: en/user_customization-packages.ssi:168
-#: en/user_customization-packages.ssi:178
-#: en/user_customization-packages.ssi:188 en/user_installation.ssi:38
+#: en/user_customization-packages.ssi:131
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:180
+#: en/user_customization-packages.ssi:190 en/user_installation.ssi:38
 #: en/user_installation.ssi:46 en/user_installation.ssi:56
 #: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:104
-#: en/user_installation.ssi:118 en/user_installation.ssi:134
-#: en/user_overview.ssi:54 en/user_overview.ssi:98 en/user_overview.ssi:106
+#: en/user_installation.ssi:84 en/user_installation.ssi:105
+#: en/user_installation.ssi:119 en/user_installation.ssi:136
+#: en/user_overview.ssi:60 en/user_overview.ssi:104 en/user_overview.ssi:112
 msgid "code{"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:83
+#: en/about_manual.ssi:84
 msgid "$ git clone git://live.debian.net/git/live-manual.git"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:85 en/about_manual.ssi:93 en/about_manual.ssi:101
-#: en/about_manual.ssi:116 en/about_manual.ssi:129 en/about_manual.ssi:137
-#: en/about_manual.ssi:145 en/about_manual.ssi:153 en/about_manual.ssi:160
+#: en/about_manual.ssi:86 en/about_manual.ssi:94 en/about_manual.ssi:102
+#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
 #: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
 #: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
 #: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
 #: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
 #: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
 #: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: en/other_customization-contents.ssi:35
-#: en/other_customization-contents.ssi:50
 #: en/other_customization-internationalization.ssi:14
 #: en/other_customization-internationalization.ssi:22
 #: en/other_customization-internationalization.ssi:30
@@ -367,34 +370,35 @@ 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:49
-#: en/user_basics.ssi:64 en/user_basics.ssi:74 en/user_basics.ssi:90
-#: en/user_basics.ssi:103 en/user_basics.ssi:111 en/user_basics.ssi:119
-#: en/user_basics.ssi:129 en/user_basics.ssi:143 en/user_basics.ssi:153
-#: en/user_basics.ssi:161 en/user_basics.ssi:169 en/user_basics.ssi:183
-#: en/user_basics.ssi:191 en/user_basics.ssi:201 en/user_basics.ssi:241
-#: en/user_basics.ssi:269 en/user_basics.ssi:277 en/user_basics.ssi:304
-#: en/user_basics.ssi:343 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/other_use-cases.ssi:137 en/user_basics.ssi:40 en/user_basics.ssi:52
+#: en/user_basics.ssi:68 en/user_basics.ssi:78 en/user_basics.ssi:94
+#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:124
+#: en/user_basics.ssi:134 en/user_basics.ssi:148 en/user_basics.ssi:158
+#: en/user_basics.ssi:166 en/user_basics.ssi:174 en/user_basics.ssi:188
+#: en/user_basics.ssi:196 en/user_basics.ssi:206 en/user_basics.ssi:247
+#: en/user_basics.ssi:275 en/user_basics.ssi:283 en/user_basics.ssi:310
+#: en/user_basics.ssi:349 en/user_customization-contents.ssi:39
+#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:70
+#: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
+#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
+#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
 #: en/user_customization-packages.ssi:107
 #: en/user_customization-packages.ssi:115
-#: en/user_customization-packages.ssi:133
-#: en/user_customization-packages.ssi:164
-#: en/user_customization-packages.ssi:174
-#: en/user_customization-packages.ssi:184
-#: en/user_customization-packages.ssi:194 en/user_installation.ssi:42
+#: en/user_customization-packages.ssi:135
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:186
+#: en/user_customization-packages.ssi:196 en/user_installation.ssi:42
 #: en/user_installation.ssi:50 en/user_installation.ssi:60
 #: en/user_installation.ssi:72 en/user_installation.ssi:80
-#: en/user_installation.ssi:108 en/user_installation.ssi:123
-#: en/user_installation.ssi:137 en/user_overview.ssi:92
-#: en/user_overview.ssi:102 en/user_overview.ssi:110
+#: en/user_installation.ssi:109 en/user_installation.ssi:124
+#: en/user_installation.ssi:139 en/user_overview.ssi:98
+#: en/user_overview.ssi:108 en/user_overview.ssi:116
 msgid "}code"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:87
+#: en/about_manual.ssi:88
 msgid ""
 "Prior to submission of your contribution, please preview your work. To "
 "preview the live-manual, ensure the packages needed for building are "
@@ -402,29 +406,29 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:91
+#: en/about_manual.ssi:92
 msgid "# apt-get install sisu-complete"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:95
+#: en/about_manual.ssi:96
 msgid ""
 "You may build the live-manual from the top level directory of your git "
 "checkout by executing:"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:99
+#: en/about_manual.ssi:100
 msgid "$ make build"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:103
+#: en/about_manual.ssi:104
 msgid "3~ Applying patches"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:105
+#: en/about_manual.ssi:106
 msgid ""
 "Directly commiting to the repository is possible by anyone. However, we ask "
 "you to send bigger changes to the mailinglist to discuss them first. In "
@@ -432,12 +436,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:107
+#: en/about_manual.ssi:108
 msgid "_* Fetch the public commit key:"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:114
+#: en/about_manual.ssi:115
 msgid ""
 "$ mkdir -p ~/.ssh/identity.d $ wget http://live.debian.net/other/openssh/"
 "repository-public-commit-key-current/live-manual at debian-live -O ~/.ssh/"
@@ -448,12 +452,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:118
+#: en/about_manual.ssi:119
 msgid "_* Add the following section to your openssh-client config:"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:127
+#: en/about_manual.ssi:128
 #, no-wrap
 msgid ""
 "$ cat >> ~/.ssh/config << EOF\n"
@@ -465,17 +469,17 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:131
+#: en/about_manual.ssi:132
 msgid "_* Checkout a clone of the manual through ssh:"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:135
+#: en/about_manual.ssi:136
 msgid "$ git clone gitosis at live.debian.net:/live-manual.git"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:139
+#: en/about_manual.ssi:140
 msgid ""
 "_* After editing the files in manual/en/, please call the 'commit' target in "
 "the toplevel directory to sanitize the files and update the translation "
@@ -483,12 +487,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:143
+#: en/about_manual.ssi:144
 msgid "$ make commit"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:147
+#: en/about_manual.ssi:148
 msgid ""
 "_* After sanitizing commit the changes. Write commit messages, that consist "
 "of full useful sentences, starting with a capital letter and ending with a "
@@ -497,16 +501,16 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:151
+#: en/about_manual.ssi:152
 msgid "$ git commit -a"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:155
+#: en/about_manual.ssi:156
 msgid "_* Push the commit to the server:"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:159
+#: en/about_manual.ssi:160
 msgid "$ git push"
 msgstr ""
diff --git a/manual/pot/about_project.ssi.pot b/manual/pot/about_project.ssi.pot
index f850624..6887cca 100644
--- a/manual/pot/about_project.ssi.pot
+++ b/manual/pot/about_project.ssi.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-09-17 23:43+0300\n"
+"POT-Creation-Date: 2010-10-03 20:30+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -190,17 +190,22 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/about_project.ssi:61
+#: en/about_project.ssi:60
 msgid ""
 "A system for configuring packages is provided using debconf in #{lh config}# "
 "(use --preseed FILE) allowing custom configured packages to be installed in "
 "your custom produced Debian Live images, but for official live images only "
 "default configuration will be used. For more information, please see "
-"customization.  % FIXME: <xref linkend=\"customization\"/>"
+"customization."
 msgstr ""
 
 #. type: Plain text
-#: en/about_project.ssi:63
+#: en/about_project.ssi:62
+msgid "% FIXME: <xref linkend=\"customization\"/>"
+msgstr ""
+
+#. type: Plain text
+#: en/about_project.ssi:64
 msgid ""
 "Exception: There are a few essential changes needed to bring a live system "
 "to life (e.g. configuring pam to allow empty passwords). These essential "
@@ -209,12 +214,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/about_project.ssi:65
+#: en/about_project.ssi:66
 msgid "2~ Contact"
 msgstr ""
 
 #. type: Plain text
-#: en/about_project.ssi:67
+#: en/about_project.ssi:68
 msgid ""
 "_* *{Mailing list}*: The primary contact for the project is the mailing list "
 "at http://lists.debian.org/debian-live/. You can email the list directly by "
@@ -223,7 +228,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/about_project.ssi:69
+#: en/about_project.ssi:70
 msgid ""
 "_* *{IRC}*: A number of users and developers are present in the #debian-live "
 "channel on irc.debian.org (OFTC). When asking a question on IRC, please be "
@@ -237,11 +242,16 @@ msgid ""
 "_* *{BTS}*: The Debian Bug Tracking System (BTS) contains details of bugs "
 "reported by users and developers. Each bug is given a number, and is kept on "
 "file until it is marked as having been dealt with. For more information, "
-"please see bugs.  % FIXME: <xref linkend=\"bugs\"/>"
+"please see bugs."
+msgstr ""
+
+#. type: Plain text
+#: en/about_project.ssi:74
+msgid "% FIXME: <xref linkend=\"bugs\"/>"
 msgstr ""
 
 #. type: Plain text
-#: en/about_project.ssi:73
+#: en/about_project.ssi:75
 msgid ""
 "_* *{Wiki}*: The Debian Live wiki at http://wiki.debian.org/DebianLive is a "
 "place to gather information, discuss applied technologies, and document "
diff --git a/manual/pot/index.html.in.pot b/manual/pot/index.html.in.pot
new file mode 100644
index 0000000..facd290
--- /dev/null
+++ b/manual/pot/index.html.in.pot
@@ -0,0 +1,122 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the live-manual package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: live-manual VERSION\n"
+"POT-Creation-Date: 2010-10-03 20:30+0300\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Content of: <html><head><title>
+#: en/index.html.in:4
+msgid "Debian Live Project"
+msgstr ""
+
+#. type: Content of: <html><body><h2>
+#: en/index.html.in:8
+msgid "Debian Live Manual"
+msgstr ""
+
+#. type: Content of: <html><body><p>
+#: en/index.html.in:11
+msgid "<i>This manual is under heavy construction.</i>"
+msgstr ""
+
+#. type: Content of: <html><body><p>
+#: en/index.html.in:15
+msgid ""
+"Please report errors, omissions, patches and suggestions to our mailinglist "
+"at <a href=\"mailto:debian-live at lists.debian.org\">debian-live at lists.debian."
+"org</a> and read about <a href=\"html/meta.html#contributing\">how to "
+"contribute</a> to the manual."
+msgstr ""
+
+#. type: Content of: <html><body><h3>
+#: en/index.html.in:18
+msgid "Available Formats"
+msgstr ""
+
+#. type: Content of: <html><body><ul><li>
+#: en/index.html.in:21
+msgid "<a href=\"epub/live-manual.epub\">EPUB</a>"
+msgstr ""
+
+#. type: Content of: <html><body><ul><li>
+#: en/index.html.in:22
+msgid ""
+"HTML: <a href=\"html/index.html\">multi page</a>, <a href=\"html/live-manual."
+"html\">single page</a>"
+msgstr ""
+
+#. type: Content of: <html><body><ul><li>
+#: en/index.html.in:23
+msgid "<a href=\"odf/live-manual.odt\">ODF</a>"
+msgstr ""
+
+#. type: Content of: <html><body><ul><li>
+#: en/index.html.in:24
+msgid ""
+"PDF: <a href=\"pdf/live-manual.portrait-a4.pdf\">A4 portrait</a>, <a href="
+"\"pdf/live-manual.landscape-a4.pdf\">A4 landscape</a>, <a href=\"pdf/live-"
+"manual.portrait-letter.pdf\">letter portrait</a>, <a href=\"pdf/live-manual."
+"landscape-letter.pdf\">letter landscape</a>"
+msgstr ""
+
+#. type: Content of: <html><body><ul><li>
+#: en/index.html.in:25
+msgid "<a href=\"txt/live-manual.txt\">Plain text</a>"
+msgstr ""
+
+#. type: Content of: <html><body><p>
+#: en/index.html.in:29
+msgid "Last changed: @DATE_CHANGE@"
+msgstr ""
+
+#. type: Content of: <html><body><p>
+#: en/index.html.in:30
+msgid "Last built: @DATE_BUILD@"
+msgstr ""
+
+#. type: Content of: <html><body><h3>
+#: en/index.html.in:33
+msgid "Source"
+msgstr ""
+
+#. type: Content of: <html><body><p>
+#: en/index.html.in:36
+msgid ""
+"The sources for this manual is available in a <a href=\"http://git.or.cz/"
+"\">git</a> repository at live.debian.net."
+msgstr ""
+
+#. type: Content of: <html><body><ul><li>
+#: en/index.html.in:40
+msgid ""
+"Browse: <a href=\"http://live.debian.net/gitweb/?p=live-manual.git"
+"\"><small><tt>http://live.debian.net/gitweb/?p=live-manual.git</tt></small></"
+"a>"
+msgstr ""
+
+#. type: Content of: <html><body><ul><li>
+#: en/index.html.in:41
+msgid ""
+"Git: <a href=\"git://live.debian.net/git/live-manual.git\"><small><tt>git://"
+"live.debian.net/git/live-manual.git</tt></small></a>"
+msgstr ""
+
+#. type: Content of: <html><body><p>
+#: en/index.html.in:45
+msgid ""
+"<a href=\"http://live.debian.net/\">Debian Live</a> &lt;<a href=\"mailto:"
+"debian-live at lists.debian.org\">debian-live at lists.debian.org</a>&gt; - <a "
+"href=\"http://live.debian.net/legal.html\">Legal Notice</a>"
+msgstr ""
diff --git a/manual/pot/live-manual.ssm.pot b/manual/pot/live-manual.ssm.pot
index 4d8c658..b5ed00f 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-09-19 01:23+0300\n"
+"POT-Creation-Date: 2010-10-03 20:30+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -45,7 +45,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 "@date:\n"
-" :published: 2010-09-19\n"
+" :published: 2010-10-03\n"
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/pot/other_coding-style.ssi.pot b/manual/pot/other_coding-style.ssi.pot
index 5aa42ae..a1dfa3c 100644
--- a/manual/pot/other_coding-style.ssi.pot
+++ b/manual/pot/other_coding-style.ssi.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-09-17 23:43+0300\n"
+"POT-Creation-Date: 2010-10-03 20:30+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -17,17 +17,15 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. type: Plain text
-#: en/about_manual.ssi:81 en/about_manual.ssi:89 en/about_manual.ssi:97
-#: en/about_manual.ssi:109 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:141 en/about_manual.ssi:149 en/about_manual.ssi:157
+#: en/about_manual.ssi:82 en/about_manual.ssi:90 en/about_manual.ssi:98
+#: en/about_manual.ssi:110 en/about_manual.ssi:121 en/about_manual.ssi:134
+#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
 #: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
 #: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
 #: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
 #: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
 #: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
 #: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
-#: en/other_customization-contents.ssi:30
-#: en/other_customization-contents.ssi:39
 #: en/other_customization-internationalization.ssi:10
 #: en/other_customization-internationalization.ssi:18
 #: en/other_customization-internationalization.ssi:26
@@ -48,44 +46,44 @@ msgstr ""
 #: 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:45
-#: en/user_basics.ssi:58 en/user_basics.ssi:70 en/user_basics.ssi:84
-#: en/user_basics.ssi:99 en/user_basics.ssi:107 en/user_basics.ssi:115
-#: en/user_basics.ssi:125 en/user_basics.ssi:137 en/user_basics.ssi:149
-#: en/user_basics.ssi:157 en/user_basics.ssi:165 en/user_basics.ssi:179
-#: en/user_basics.ssi:187 en/user_basics.ssi:197 en/user_basics.ssi:249
-#: en/user_basics.ssi:265 en/user_basics.ssi:273 en/user_basics.ssi:293
-#: en/user_basics.ssi:318 en/user_customization-packages.ssi:16
+#: en/other_use-cases.ssi:111 en/user_basics.ssi:36 en/user_basics.ssi:48
+#: en/user_basics.ssi:62 en/user_basics.ssi:74 en/user_basics.ssi:88
+#: en/user_basics.ssi:104 en/user_basics.ssi:112 en/user_basics.ssi:120
+#: en/user_basics.ssi:130 en/user_basics.ssi:142 en/user_basics.ssi:154
+#: en/user_basics.ssi:162 en/user_basics.ssi:170 en/user_basics.ssi:184
+#: en/user_basics.ssi:192 en/user_basics.ssi:202 en/user_basics.ssi:222
+#: en/user_basics.ssi:255 en/user_basics.ssi:271 en/user_basics.ssi:279
+#: en/user_basics.ssi:299 en/user_basics.ssi:324
+#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
+#: en/user_customization-contents.ssi:66 en/user_customization-packages.ssi:16
 #: en/user_customization-packages.ssi:24 en/user_customization-packages.ssi:36
 #: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:59
 #: en/user_customization-packages.ssi:73
 #: en/user_customization-packages.ssi:103
 #: en/user_customization-packages.ssi:111
-#: en/user_customization-packages.ssi:129
-#: en/user_customization-packages.ssi:158
-#: en/user_customization-packages.ssi:168
-#: en/user_customization-packages.ssi:178
-#: en/user_customization-packages.ssi:188 en/user_installation.ssi:38
+#: en/user_customization-packages.ssi:131
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:180
+#: en/user_customization-packages.ssi:190 en/user_installation.ssi:38
 #: en/user_installation.ssi:46 en/user_installation.ssi:56
 #: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:104
-#: en/user_installation.ssi:118 en/user_installation.ssi:134
-#: en/user_overview.ssi:54 en/user_overview.ssi:98 en/user_overview.ssi:106
+#: en/user_installation.ssi:84 en/user_installation.ssi:105
+#: en/user_installation.ssi:119 en/user_installation.ssi:136
+#: en/user_overview.ssi:60 en/user_overview.ssi:104 en/user_overview.ssi:112
 msgid "code{"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:85 en/about_manual.ssi:93 en/about_manual.ssi:101
-#: en/about_manual.ssi:116 en/about_manual.ssi:129 en/about_manual.ssi:137
-#: en/about_manual.ssi:145 en/about_manual.ssi:153 en/about_manual.ssi:160
+#: en/about_manual.ssi:86 en/about_manual.ssi:94 en/about_manual.ssi:102
+#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
 #: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
 #: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
 #: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
 #: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
 #: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
 #: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: en/other_customization-contents.ssi:35
-#: en/other_customization-contents.ssi:50
 #: en/other_customization-internationalization.ssi:14
 #: en/other_customization-internationalization.ssi:22
 #: en/other_customization-internationalization.ssi:30
@@ -106,29 +104,30 @@ 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:49
-#: en/user_basics.ssi:64 en/user_basics.ssi:74 en/user_basics.ssi:90
-#: en/user_basics.ssi:103 en/user_basics.ssi:111 en/user_basics.ssi:119
-#: en/user_basics.ssi:129 en/user_basics.ssi:143 en/user_basics.ssi:153
-#: en/user_basics.ssi:161 en/user_basics.ssi:169 en/user_basics.ssi:183
-#: en/user_basics.ssi:191 en/user_basics.ssi:201 en/user_basics.ssi:241
-#: en/user_basics.ssi:269 en/user_basics.ssi:277 en/user_basics.ssi:304
-#: en/user_basics.ssi:343 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/other_use-cases.ssi:137 en/user_basics.ssi:40 en/user_basics.ssi:52
+#: en/user_basics.ssi:68 en/user_basics.ssi:78 en/user_basics.ssi:94
+#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:124
+#: en/user_basics.ssi:134 en/user_basics.ssi:148 en/user_basics.ssi:158
+#: en/user_basics.ssi:166 en/user_basics.ssi:174 en/user_basics.ssi:188
+#: en/user_basics.ssi:196 en/user_basics.ssi:206 en/user_basics.ssi:247
+#: en/user_basics.ssi:275 en/user_basics.ssi:283 en/user_basics.ssi:310
+#: en/user_basics.ssi:349 en/user_customization-contents.ssi:39
+#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:70
+#: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
+#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
+#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
 #: en/user_customization-packages.ssi:107
 #: en/user_customization-packages.ssi:115
-#: en/user_customization-packages.ssi:133
-#: en/user_customization-packages.ssi:164
-#: en/user_customization-packages.ssi:174
-#: en/user_customization-packages.ssi:184
-#: en/user_customization-packages.ssi:194 en/user_installation.ssi:42
+#: en/user_customization-packages.ssi:135
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:186
+#: en/user_customization-packages.ssi:196 en/user_installation.ssi:42
 #: en/user_installation.ssi:50 en/user_installation.ssi:60
 #: en/user_installation.ssi:72 en/user_installation.ssi:80
-#: en/user_installation.ssi:108 en/user_installation.ssi:123
-#: en/user_installation.ssi:137 en/user_overview.ssi:92
-#: en/user_overview.ssi:102 en/user_overview.ssi:110
+#: en/user_installation.ssi:109 en/user_installation.ssi:124
+#: en/user_installation.ssi:139 en/user_overview.ssi:98
+#: en/user_overview.ssi:108 en/user_overview.ssi:116
 msgid "}code"
 msgstr ""
 
diff --git a/manual/pot/other_common-tasks.ssi.pot b/manual/pot/other_common-tasks.ssi.pot
index 58521f0..b0c7ea0 100644
--- a/manual/pot/other_common-tasks.ssi.pot
+++ b/manual/pot/other_common-tasks.ssi.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-09-17 23:43+0300\n"
+"POT-Creation-Date: 2010-10-03 20:30+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -17,17 +17,15 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. type: Plain text
-#: en/about_manual.ssi:81 en/about_manual.ssi:89 en/about_manual.ssi:97
-#: en/about_manual.ssi:109 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:141 en/about_manual.ssi:149 en/about_manual.ssi:157
+#: en/about_manual.ssi:82 en/about_manual.ssi:90 en/about_manual.ssi:98
+#: en/about_manual.ssi:110 en/about_manual.ssi:121 en/about_manual.ssi:134
+#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
 #: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
 #: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
 #: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
 #: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
 #: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
 #: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
-#: en/other_customization-contents.ssi:30
-#: en/other_customization-contents.ssi:39
 #: en/other_customization-internationalization.ssi:10
 #: en/other_customization-internationalization.ssi:18
 #: en/other_customization-internationalization.ssi:26
@@ -48,44 +46,44 @@ msgstr ""
 #: 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:45
-#: en/user_basics.ssi:58 en/user_basics.ssi:70 en/user_basics.ssi:84
-#: en/user_basics.ssi:99 en/user_basics.ssi:107 en/user_basics.ssi:115
-#: en/user_basics.ssi:125 en/user_basics.ssi:137 en/user_basics.ssi:149
-#: en/user_basics.ssi:157 en/user_basics.ssi:165 en/user_basics.ssi:179
-#: en/user_basics.ssi:187 en/user_basics.ssi:197 en/user_basics.ssi:249
-#: en/user_basics.ssi:265 en/user_basics.ssi:273 en/user_basics.ssi:293
-#: en/user_basics.ssi:318 en/user_customization-packages.ssi:16
+#: en/other_use-cases.ssi:111 en/user_basics.ssi:36 en/user_basics.ssi:48
+#: en/user_basics.ssi:62 en/user_basics.ssi:74 en/user_basics.ssi:88
+#: en/user_basics.ssi:104 en/user_basics.ssi:112 en/user_basics.ssi:120
+#: en/user_basics.ssi:130 en/user_basics.ssi:142 en/user_basics.ssi:154
+#: en/user_basics.ssi:162 en/user_basics.ssi:170 en/user_basics.ssi:184
+#: en/user_basics.ssi:192 en/user_basics.ssi:202 en/user_basics.ssi:222
+#: en/user_basics.ssi:255 en/user_basics.ssi:271 en/user_basics.ssi:279
+#: en/user_basics.ssi:299 en/user_basics.ssi:324
+#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
+#: en/user_customization-contents.ssi:66 en/user_customization-packages.ssi:16
 #: en/user_customization-packages.ssi:24 en/user_customization-packages.ssi:36
 #: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:59
 #: en/user_customization-packages.ssi:73
 #: en/user_customization-packages.ssi:103
 #: en/user_customization-packages.ssi:111
-#: en/user_customization-packages.ssi:129
-#: en/user_customization-packages.ssi:158
-#: en/user_customization-packages.ssi:168
-#: en/user_customization-packages.ssi:178
-#: en/user_customization-packages.ssi:188 en/user_installation.ssi:38
+#: en/user_customization-packages.ssi:131
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:180
+#: en/user_customization-packages.ssi:190 en/user_installation.ssi:38
 #: en/user_installation.ssi:46 en/user_installation.ssi:56
 #: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:104
-#: en/user_installation.ssi:118 en/user_installation.ssi:134
-#: en/user_overview.ssi:54 en/user_overview.ssi:98 en/user_overview.ssi:106
+#: en/user_installation.ssi:84 en/user_installation.ssi:105
+#: en/user_installation.ssi:119 en/user_installation.ssi:136
+#: en/user_overview.ssi:60 en/user_overview.ssi:104 en/user_overview.ssi:112
 msgid "code{"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:85 en/about_manual.ssi:93 en/about_manual.ssi:101
-#: en/about_manual.ssi:116 en/about_manual.ssi:129 en/about_manual.ssi:137
-#: en/about_manual.ssi:145 en/about_manual.ssi:153 en/about_manual.ssi:160
+#: en/about_manual.ssi:86 en/about_manual.ssi:94 en/about_manual.ssi:102
+#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
 #: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
 #: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
 #: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
 #: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
 #: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
 #: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: en/other_customization-contents.ssi:35
-#: en/other_customization-contents.ssi:50
 #: en/other_customization-internationalization.ssi:14
 #: en/other_customization-internationalization.ssi:22
 #: en/other_customization-internationalization.ssi:30
@@ -106,29 +104,30 @@ 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:49
-#: en/user_basics.ssi:64 en/user_basics.ssi:74 en/user_basics.ssi:90
-#: en/user_basics.ssi:103 en/user_basics.ssi:111 en/user_basics.ssi:119
-#: en/user_basics.ssi:129 en/user_basics.ssi:143 en/user_basics.ssi:153
-#: en/user_basics.ssi:161 en/user_basics.ssi:169 en/user_basics.ssi:183
-#: en/user_basics.ssi:191 en/user_basics.ssi:201 en/user_basics.ssi:241
-#: en/user_basics.ssi:269 en/user_basics.ssi:277 en/user_basics.ssi:304
-#: en/user_basics.ssi:343 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/other_use-cases.ssi:137 en/user_basics.ssi:40 en/user_basics.ssi:52
+#: en/user_basics.ssi:68 en/user_basics.ssi:78 en/user_basics.ssi:94
+#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:124
+#: en/user_basics.ssi:134 en/user_basics.ssi:148 en/user_basics.ssi:158
+#: en/user_basics.ssi:166 en/user_basics.ssi:174 en/user_basics.ssi:188
+#: en/user_basics.ssi:196 en/user_basics.ssi:206 en/user_basics.ssi:247
+#: en/user_basics.ssi:275 en/user_basics.ssi:283 en/user_basics.ssi:310
+#: en/user_basics.ssi:349 en/user_customization-contents.ssi:39
+#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:70
+#: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
+#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
+#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
 #: en/user_customization-packages.ssi:107
 #: en/user_customization-packages.ssi:115
-#: en/user_customization-packages.ssi:133
-#: en/user_customization-packages.ssi:164
-#: en/user_customization-packages.ssi:174
-#: en/user_customization-packages.ssi:184
-#: en/user_customization-packages.ssi:194 en/user_installation.ssi:42
+#: en/user_customization-packages.ssi:135
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:186
+#: en/user_customization-packages.ssi:196 en/user_installation.ssi:42
 #: en/user_installation.ssi:50 en/user_installation.ssi:60
 #: en/user_installation.ssi:72 en/user_installation.ssi:80
-#: en/user_installation.ssi:108 en/user_installation.ssi:123
-#: en/user_installation.ssi:137 en/user_overview.ssi:92
-#: en/user_overview.ssi:102 en/user_overview.ssi:110
+#: en/user_installation.ssi:109 en/user_installation.ssi:124
+#: en/user_installation.ssi:139 en/user_overview.ssi:98
+#: en/user_overview.ssi:108 en/user_overview.ssi:116
 msgid "}code"
 msgstr ""
 
diff --git a/manual/pot/other_configuration-files.ssi.pot b/manual/pot/other_configuration-files.ssi.pot
index 92df939..bf92cf6 100644
--- a/manual/pot/other_configuration-files.ssi.pot
+++ b/manual/pot/other_configuration-files.ssi.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-09-17 23:43+0300\n"
+"POT-Creation-Date: 2010-10-03 20:30+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
diff --git a/manual/pot/other_configuration-layout.ssi.pot b/manual/pot/other_configuration-layout.ssi.pot
index 39da468..3aacb91 100644
--- a/manual/pot/other_configuration-layout.ssi.pot
+++ b/manual/pot/other_configuration-layout.ssi.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-09-17 23:43+0300\n"
+"POT-Creation-Date: 2010-10-03 20:30+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
diff --git a/manual/pot/other_customization-backports.ssi.pot b/manual/pot/other_customization-backports.ssi.pot
index 40ac959..ab3f585 100644
--- a/manual/pot/other_customization-backports.ssi.pot
+++ b/manual/pot/other_customization-backports.ssi.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-09-17 23:43+0300\n"
+"POT-Creation-Date: 2010-10-03 20:30+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -17,17 +17,15 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. type: Plain text
-#: en/about_manual.ssi:81 en/about_manual.ssi:89 en/about_manual.ssi:97
-#: en/about_manual.ssi:109 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:141 en/about_manual.ssi:149 en/about_manual.ssi:157
+#: en/about_manual.ssi:82 en/about_manual.ssi:90 en/about_manual.ssi:98
+#: en/about_manual.ssi:110 en/about_manual.ssi:121 en/about_manual.ssi:134
+#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
 #: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
 #: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
 #: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
 #: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
 #: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
 #: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
-#: en/other_customization-contents.ssi:30
-#: en/other_customization-contents.ssi:39
 #: en/other_customization-internationalization.ssi:10
 #: en/other_customization-internationalization.ssi:18
 #: en/other_customization-internationalization.ssi:26
@@ -48,44 +46,44 @@ msgstr ""
 #: 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:45
-#: en/user_basics.ssi:58 en/user_basics.ssi:70 en/user_basics.ssi:84
-#: en/user_basics.ssi:99 en/user_basics.ssi:107 en/user_basics.ssi:115
-#: en/user_basics.ssi:125 en/user_basics.ssi:137 en/user_basics.ssi:149
-#: en/user_basics.ssi:157 en/user_basics.ssi:165 en/user_basics.ssi:179
-#: en/user_basics.ssi:187 en/user_basics.ssi:197 en/user_basics.ssi:249
-#: en/user_basics.ssi:265 en/user_basics.ssi:273 en/user_basics.ssi:293
-#: en/user_basics.ssi:318 en/user_customization-packages.ssi:16
+#: en/other_use-cases.ssi:111 en/user_basics.ssi:36 en/user_basics.ssi:48
+#: en/user_basics.ssi:62 en/user_basics.ssi:74 en/user_basics.ssi:88
+#: en/user_basics.ssi:104 en/user_basics.ssi:112 en/user_basics.ssi:120
+#: en/user_basics.ssi:130 en/user_basics.ssi:142 en/user_basics.ssi:154
+#: en/user_basics.ssi:162 en/user_basics.ssi:170 en/user_basics.ssi:184
+#: en/user_basics.ssi:192 en/user_basics.ssi:202 en/user_basics.ssi:222
+#: en/user_basics.ssi:255 en/user_basics.ssi:271 en/user_basics.ssi:279
+#: en/user_basics.ssi:299 en/user_basics.ssi:324
+#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
+#: en/user_customization-contents.ssi:66 en/user_customization-packages.ssi:16
 #: en/user_customization-packages.ssi:24 en/user_customization-packages.ssi:36
 #: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:59
 #: en/user_customization-packages.ssi:73
 #: en/user_customization-packages.ssi:103
 #: en/user_customization-packages.ssi:111
-#: en/user_customization-packages.ssi:129
-#: en/user_customization-packages.ssi:158
-#: en/user_customization-packages.ssi:168
-#: en/user_customization-packages.ssi:178
-#: en/user_customization-packages.ssi:188 en/user_installation.ssi:38
+#: en/user_customization-packages.ssi:131
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:180
+#: en/user_customization-packages.ssi:190 en/user_installation.ssi:38
 #: en/user_installation.ssi:46 en/user_installation.ssi:56
 #: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:104
-#: en/user_installation.ssi:118 en/user_installation.ssi:134
-#: en/user_overview.ssi:54 en/user_overview.ssi:98 en/user_overview.ssi:106
+#: en/user_installation.ssi:84 en/user_installation.ssi:105
+#: en/user_installation.ssi:119 en/user_installation.ssi:136
+#: en/user_overview.ssi:60 en/user_overview.ssi:104 en/user_overview.ssi:112
 msgid "code{"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:85 en/about_manual.ssi:93 en/about_manual.ssi:101
-#: en/about_manual.ssi:116 en/about_manual.ssi:129 en/about_manual.ssi:137
-#: en/about_manual.ssi:145 en/about_manual.ssi:153 en/about_manual.ssi:160
+#: en/about_manual.ssi:86 en/about_manual.ssi:94 en/about_manual.ssi:102
+#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
 #: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
 #: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
 #: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
 #: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
 #: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
 #: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: en/other_customization-contents.ssi:35
-#: en/other_customization-contents.ssi:50
 #: en/other_customization-internationalization.ssi:14
 #: en/other_customization-internationalization.ssi:22
 #: en/other_customization-internationalization.ssi:30
@@ -106,29 +104,30 @@ 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:49
-#: en/user_basics.ssi:64 en/user_basics.ssi:74 en/user_basics.ssi:90
-#: en/user_basics.ssi:103 en/user_basics.ssi:111 en/user_basics.ssi:119
-#: en/user_basics.ssi:129 en/user_basics.ssi:143 en/user_basics.ssi:153
-#: en/user_basics.ssi:161 en/user_basics.ssi:169 en/user_basics.ssi:183
-#: en/user_basics.ssi:191 en/user_basics.ssi:201 en/user_basics.ssi:241
-#: en/user_basics.ssi:269 en/user_basics.ssi:277 en/user_basics.ssi:304
-#: en/user_basics.ssi:343 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/other_use-cases.ssi:137 en/user_basics.ssi:40 en/user_basics.ssi:52
+#: en/user_basics.ssi:68 en/user_basics.ssi:78 en/user_basics.ssi:94
+#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:124
+#: en/user_basics.ssi:134 en/user_basics.ssi:148 en/user_basics.ssi:158
+#: en/user_basics.ssi:166 en/user_basics.ssi:174 en/user_basics.ssi:188
+#: en/user_basics.ssi:196 en/user_basics.ssi:206 en/user_basics.ssi:247
+#: en/user_basics.ssi:275 en/user_basics.ssi:283 en/user_basics.ssi:310
+#: en/user_basics.ssi:349 en/user_customization-contents.ssi:39
+#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:70
+#: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
+#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
+#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
 #: en/user_customization-packages.ssi:107
 #: en/user_customization-packages.ssi:115
-#: en/user_customization-packages.ssi:133
-#: en/user_customization-packages.ssi:164
-#: en/user_customization-packages.ssi:174
-#: en/user_customization-packages.ssi:184
-#: en/user_customization-packages.ssi:194 en/user_installation.ssi:42
+#: en/user_customization-packages.ssi:135
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:186
+#: en/user_customization-packages.ssi:196 en/user_installation.ssi:42
 #: en/user_installation.ssi:50 en/user_installation.ssi:60
 #: en/user_installation.ssi:72 en/user_installation.ssi:80
-#: en/user_installation.ssi:108 en/user_installation.ssi:123
-#: en/user_installation.ssi:137 en/user_overview.ssi:92
-#: en/user_overview.ssi:102 en/user_overview.ssi:110
+#: en/user_installation.ssi:109 en/user_installation.ssi:124
+#: en/user_installation.ssi:139 en/user_overview.ssi:98
+#: en/user_overview.ssi:108 en/user_overview.ssi:116
 msgid "}code"
 msgstr ""
 
diff --git a/manual/pot/other_customization-binary.ssi.pot b/manual/pot/other_customization-binary.ssi.pot
index f029df0..d61c183 100644
--- a/manual/pot/other_customization-binary.ssi.pot
+++ b/manual/pot/other_customization-binary.ssi.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-09-17 23:43+0300\n"
+"POT-Creation-Date: 2010-10-03 20:30+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
diff --git a/manual/pot/other_customization-bootup.ssi.pot b/manual/pot/other_customization-bootup.ssi.pot
index cd2af22..bb11a29 100644
--- a/manual/pot/other_customization-bootup.ssi.pot
+++ b/manual/pot/other_customization-bootup.ssi.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-09-17 23:43+0300\n"
+"POT-Creation-Date: 2010-10-03 20:30+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -17,17 +17,15 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. type: Plain text
-#: en/about_manual.ssi:81 en/about_manual.ssi:89 en/about_manual.ssi:97
-#: en/about_manual.ssi:109 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:141 en/about_manual.ssi:149 en/about_manual.ssi:157
+#: en/about_manual.ssi:82 en/about_manual.ssi:90 en/about_manual.ssi:98
+#: en/about_manual.ssi:110 en/about_manual.ssi:121 en/about_manual.ssi:134
+#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
 #: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
 #: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
 #: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
 #: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
 #: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
 #: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
-#: en/other_customization-contents.ssi:30
-#: en/other_customization-contents.ssi:39
 #: en/other_customization-internationalization.ssi:10
 #: en/other_customization-internationalization.ssi:18
 #: en/other_customization-internationalization.ssi:26
@@ -48,44 +46,44 @@ msgstr ""
 #: 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:45
-#: en/user_basics.ssi:58 en/user_basics.ssi:70 en/user_basics.ssi:84
-#: en/user_basics.ssi:99 en/user_basics.ssi:107 en/user_basics.ssi:115
-#: en/user_basics.ssi:125 en/user_basics.ssi:137 en/user_basics.ssi:149
-#: en/user_basics.ssi:157 en/user_basics.ssi:165 en/user_basics.ssi:179
-#: en/user_basics.ssi:187 en/user_basics.ssi:197 en/user_basics.ssi:249
-#: en/user_basics.ssi:265 en/user_basics.ssi:273 en/user_basics.ssi:293
-#: en/user_basics.ssi:318 en/user_customization-packages.ssi:16
+#: en/other_use-cases.ssi:111 en/user_basics.ssi:36 en/user_basics.ssi:48
+#: en/user_basics.ssi:62 en/user_basics.ssi:74 en/user_basics.ssi:88
+#: en/user_basics.ssi:104 en/user_basics.ssi:112 en/user_basics.ssi:120
+#: en/user_basics.ssi:130 en/user_basics.ssi:142 en/user_basics.ssi:154
+#: en/user_basics.ssi:162 en/user_basics.ssi:170 en/user_basics.ssi:184
+#: en/user_basics.ssi:192 en/user_basics.ssi:202 en/user_basics.ssi:222
+#: en/user_basics.ssi:255 en/user_basics.ssi:271 en/user_basics.ssi:279
+#: en/user_basics.ssi:299 en/user_basics.ssi:324
+#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
+#: en/user_customization-contents.ssi:66 en/user_customization-packages.ssi:16
 #: en/user_customization-packages.ssi:24 en/user_customization-packages.ssi:36
 #: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:59
 #: en/user_customization-packages.ssi:73
 #: en/user_customization-packages.ssi:103
 #: en/user_customization-packages.ssi:111
-#: en/user_customization-packages.ssi:129
-#: en/user_customization-packages.ssi:158
-#: en/user_customization-packages.ssi:168
-#: en/user_customization-packages.ssi:178
-#: en/user_customization-packages.ssi:188 en/user_installation.ssi:38
+#: en/user_customization-packages.ssi:131
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:180
+#: en/user_customization-packages.ssi:190 en/user_installation.ssi:38
 #: en/user_installation.ssi:46 en/user_installation.ssi:56
 #: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:104
-#: en/user_installation.ssi:118 en/user_installation.ssi:134
-#: en/user_overview.ssi:54 en/user_overview.ssi:98 en/user_overview.ssi:106
+#: en/user_installation.ssi:84 en/user_installation.ssi:105
+#: en/user_installation.ssi:119 en/user_installation.ssi:136
+#: en/user_overview.ssi:60 en/user_overview.ssi:104 en/user_overview.ssi:112
 msgid "code{"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:85 en/about_manual.ssi:93 en/about_manual.ssi:101
-#: en/about_manual.ssi:116 en/about_manual.ssi:129 en/about_manual.ssi:137
-#: en/about_manual.ssi:145 en/about_manual.ssi:153 en/about_manual.ssi:160
+#: en/about_manual.ssi:86 en/about_manual.ssi:94 en/about_manual.ssi:102
+#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
 #: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
 #: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
 #: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
 #: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
 #: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
 #: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: en/other_customization-contents.ssi:35
-#: en/other_customization-contents.ssi:50
 #: en/other_customization-internationalization.ssi:14
 #: en/other_customization-internationalization.ssi:22
 #: en/other_customization-internationalization.ssi:30
@@ -106,29 +104,30 @@ 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:49
-#: en/user_basics.ssi:64 en/user_basics.ssi:74 en/user_basics.ssi:90
-#: en/user_basics.ssi:103 en/user_basics.ssi:111 en/user_basics.ssi:119
-#: en/user_basics.ssi:129 en/user_basics.ssi:143 en/user_basics.ssi:153
-#: en/user_basics.ssi:161 en/user_basics.ssi:169 en/user_basics.ssi:183
-#: en/user_basics.ssi:191 en/user_basics.ssi:201 en/user_basics.ssi:241
-#: en/user_basics.ssi:269 en/user_basics.ssi:277 en/user_basics.ssi:304
-#: en/user_basics.ssi:343 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/other_use-cases.ssi:137 en/user_basics.ssi:40 en/user_basics.ssi:52
+#: en/user_basics.ssi:68 en/user_basics.ssi:78 en/user_basics.ssi:94
+#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:124
+#: en/user_basics.ssi:134 en/user_basics.ssi:148 en/user_basics.ssi:158
+#: en/user_basics.ssi:166 en/user_basics.ssi:174 en/user_basics.ssi:188
+#: en/user_basics.ssi:196 en/user_basics.ssi:206 en/user_basics.ssi:247
+#: en/user_basics.ssi:275 en/user_basics.ssi:283 en/user_basics.ssi:310
+#: en/user_basics.ssi:349 en/user_customization-contents.ssi:39
+#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:70
+#: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
+#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
+#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
 #: en/user_customization-packages.ssi:107
 #: en/user_customization-packages.ssi:115
-#: en/user_customization-packages.ssi:133
-#: en/user_customization-packages.ssi:164
-#: en/user_customization-packages.ssi:174
-#: en/user_customization-packages.ssi:184
-#: en/user_customization-packages.ssi:194 en/user_installation.ssi:42
+#: en/user_customization-packages.ssi:135
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:186
+#: en/user_customization-packages.ssi:196 en/user_installation.ssi:42
 #: en/user_installation.ssi:50 en/user_installation.ssi:60
 #: en/user_installation.ssi:72 en/user_installation.ssi:80
-#: en/user_installation.ssi:108 en/user_installation.ssi:123
-#: en/user_installation.ssi:137 en/user_overview.ssi:92
-#: en/user_overview.ssi:102 en/user_overview.ssi:110
+#: en/user_installation.ssi:109 en/user_installation.ssi:124
+#: en/user_installation.ssi:139 en/user_overview.ssi:98
+#: en/user_overview.ssi:108 en/user_overview.ssi:116
 msgid "}code"
 msgstr ""
 
@@ -154,9 +153,8 @@ msgstr ""
 #: en/other_customization-bootup.ssi:8 en/other_customization-bootup.ssi:14
 #: en/other_customization-bootup.ssi:56 en/other_customization-bootup.ssi:60
 #: en/other_customization-bootup.ssi:64 en/other_customization-bootup.ssi:68
-#: en/other_customization-contents.ssi:56
-#: en/other_customization-contents.ssi:60 en/other_live-environment.ssi:8
-#: en/other_resources.ssi:8 en/other_success-stories.ssi:7
+#: en/other_live-environment.ssi:8 en/other_resources.ssi:8
+#: en/other_success-stories.ssi:7
 msgid "FIXME"
 msgstr ""
 
diff --git a/manual/pot/other_customization-internationalization.ssi.pot b/manual/pot/other_customization-internationalization.ssi.pot
index 1b4360e..651607e 100644
--- a/manual/pot/other_customization-internationalization.ssi.pot
+++ b/manual/pot/other_customization-internationalization.ssi.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-09-17 23:43+0300\n"
+"POT-Creation-Date: 2010-10-03 20:30+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -17,17 +17,15 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. type: Plain text
-#: en/about_manual.ssi:81 en/about_manual.ssi:89 en/about_manual.ssi:97
-#: en/about_manual.ssi:109 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:141 en/about_manual.ssi:149 en/about_manual.ssi:157
+#: en/about_manual.ssi:82 en/about_manual.ssi:90 en/about_manual.ssi:98
+#: en/about_manual.ssi:110 en/about_manual.ssi:121 en/about_manual.ssi:134
+#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
 #: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
 #: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
 #: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
 #: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
 #: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
 #: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
-#: en/other_customization-contents.ssi:30
-#: en/other_customization-contents.ssi:39
 #: en/other_customization-internationalization.ssi:10
 #: en/other_customization-internationalization.ssi:18
 #: en/other_customization-internationalization.ssi:26
@@ -48,44 +46,44 @@ msgstr ""
 #: 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:45
-#: en/user_basics.ssi:58 en/user_basics.ssi:70 en/user_basics.ssi:84
-#: en/user_basics.ssi:99 en/user_basics.ssi:107 en/user_basics.ssi:115
-#: en/user_basics.ssi:125 en/user_basics.ssi:137 en/user_basics.ssi:149
-#: en/user_basics.ssi:157 en/user_basics.ssi:165 en/user_basics.ssi:179
-#: en/user_basics.ssi:187 en/user_basics.ssi:197 en/user_basics.ssi:249
-#: en/user_basics.ssi:265 en/user_basics.ssi:273 en/user_basics.ssi:293
-#: en/user_basics.ssi:318 en/user_customization-packages.ssi:16
+#: en/other_use-cases.ssi:111 en/user_basics.ssi:36 en/user_basics.ssi:48
+#: en/user_basics.ssi:62 en/user_basics.ssi:74 en/user_basics.ssi:88
+#: en/user_basics.ssi:104 en/user_basics.ssi:112 en/user_basics.ssi:120
+#: en/user_basics.ssi:130 en/user_basics.ssi:142 en/user_basics.ssi:154
+#: en/user_basics.ssi:162 en/user_basics.ssi:170 en/user_basics.ssi:184
+#: en/user_basics.ssi:192 en/user_basics.ssi:202 en/user_basics.ssi:222
+#: en/user_basics.ssi:255 en/user_basics.ssi:271 en/user_basics.ssi:279
+#: en/user_basics.ssi:299 en/user_basics.ssi:324
+#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
+#: en/user_customization-contents.ssi:66 en/user_customization-packages.ssi:16
 #: en/user_customization-packages.ssi:24 en/user_customization-packages.ssi:36
 #: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:59
 #: en/user_customization-packages.ssi:73
 #: en/user_customization-packages.ssi:103
 #: en/user_customization-packages.ssi:111
-#: en/user_customization-packages.ssi:129
-#: en/user_customization-packages.ssi:158
-#: en/user_customization-packages.ssi:168
-#: en/user_customization-packages.ssi:178
-#: en/user_customization-packages.ssi:188 en/user_installation.ssi:38
+#: en/user_customization-packages.ssi:131
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:180
+#: en/user_customization-packages.ssi:190 en/user_installation.ssi:38
 #: en/user_installation.ssi:46 en/user_installation.ssi:56
 #: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:104
-#: en/user_installation.ssi:118 en/user_installation.ssi:134
-#: en/user_overview.ssi:54 en/user_overview.ssi:98 en/user_overview.ssi:106
+#: en/user_installation.ssi:84 en/user_installation.ssi:105
+#: en/user_installation.ssi:119 en/user_installation.ssi:136
+#: en/user_overview.ssi:60 en/user_overview.ssi:104 en/user_overview.ssi:112
 msgid "code{"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:85 en/about_manual.ssi:93 en/about_manual.ssi:101
-#: en/about_manual.ssi:116 en/about_manual.ssi:129 en/about_manual.ssi:137
-#: en/about_manual.ssi:145 en/about_manual.ssi:153 en/about_manual.ssi:160
+#: en/about_manual.ssi:86 en/about_manual.ssi:94 en/about_manual.ssi:102
+#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
 #: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
 #: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
 #: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
 #: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
 #: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
 #: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: en/other_customization-contents.ssi:35
-#: en/other_customization-contents.ssi:50
 #: en/other_customization-internationalization.ssi:14
 #: en/other_customization-internationalization.ssi:22
 #: en/other_customization-internationalization.ssi:30
@@ -106,29 +104,30 @@ 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:49
-#: en/user_basics.ssi:64 en/user_basics.ssi:74 en/user_basics.ssi:90
-#: en/user_basics.ssi:103 en/user_basics.ssi:111 en/user_basics.ssi:119
-#: en/user_basics.ssi:129 en/user_basics.ssi:143 en/user_basics.ssi:153
-#: en/user_basics.ssi:161 en/user_basics.ssi:169 en/user_basics.ssi:183
-#: en/user_basics.ssi:191 en/user_basics.ssi:201 en/user_basics.ssi:241
-#: en/user_basics.ssi:269 en/user_basics.ssi:277 en/user_basics.ssi:304
-#: en/user_basics.ssi:343 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/other_use-cases.ssi:137 en/user_basics.ssi:40 en/user_basics.ssi:52
+#: en/user_basics.ssi:68 en/user_basics.ssi:78 en/user_basics.ssi:94
+#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:124
+#: en/user_basics.ssi:134 en/user_basics.ssi:148 en/user_basics.ssi:158
+#: en/user_basics.ssi:166 en/user_basics.ssi:174 en/user_basics.ssi:188
+#: en/user_basics.ssi:196 en/user_basics.ssi:206 en/user_basics.ssi:247
+#: en/user_basics.ssi:275 en/user_basics.ssi:283 en/user_basics.ssi:310
+#: en/user_basics.ssi:349 en/user_customization-contents.ssi:39
+#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:70
+#: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
+#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
+#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
 #: en/user_customization-packages.ssi:107
 #: en/user_customization-packages.ssi:115
-#: en/user_customization-packages.ssi:133
-#: en/user_customization-packages.ssi:164
-#: en/user_customization-packages.ssi:174
-#: en/user_customization-packages.ssi:184
-#: en/user_customization-packages.ssi:194 en/user_installation.ssi:42
+#: en/user_customization-packages.ssi:135
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:186
+#: en/user_customization-packages.ssi:196 en/user_installation.ssi:42
 #: en/user_installation.ssi:50 en/user_installation.ssi:60
 #: en/user_installation.ssi:72 en/user_installation.ssi:80
-#: en/user_installation.ssi:108 en/user_installation.ssi:123
-#: en/user_installation.ssi:137 en/user_overview.ssi:92
-#: en/user_overview.ssi:102 en/user_overview.ssi:110
+#: en/user_installation.ssi:109 en/user_installation.ssi:124
+#: en/user_installation.ssi:139 en/user_overview.ssi:98
+#: en/user_overview.ssi:108 en/user_overview.ssi:116
 msgid "}code"
 msgstr ""
 
diff --git a/manual/pot/other_faq.ssi.pot b/manual/pot/other_faq.ssi.pot
index 58693e1..683713c 100644
--- a/manual/pot/other_faq.ssi.pot
+++ b/manual/pot/other_faq.ssi.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-09-17 23:43+0300\n"
+"POT-Creation-Date: 2010-10-03 20:30+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -17,17 +17,15 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. type: Plain text
-#: en/about_manual.ssi:81 en/about_manual.ssi:89 en/about_manual.ssi:97
-#: en/about_manual.ssi:109 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:141 en/about_manual.ssi:149 en/about_manual.ssi:157
+#: en/about_manual.ssi:82 en/about_manual.ssi:90 en/about_manual.ssi:98
+#: en/about_manual.ssi:110 en/about_manual.ssi:121 en/about_manual.ssi:134
+#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
 #: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
 #: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
 #: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
 #: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
 #: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
 #: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
-#: en/other_customization-contents.ssi:30
-#: en/other_customization-contents.ssi:39
 #: en/other_customization-internationalization.ssi:10
 #: en/other_customization-internationalization.ssi:18
 #: en/other_customization-internationalization.ssi:26
@@ -48,44 +46,44 @@ msgstr ""
 #: 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:45
-#: en/user_basics.ssi:58 en/user_basics.ssi:70 en/user_basics.ssi:84
-#: en/user_basics.ssi:99 en/user_basics.ssi:107 en/user_basics.ssi:115
-#: en/user_basics.ssi:125 en/user_basics.ssi:137 en/user_basics.ssi:149
-#: en/user_basics.ssi:157 en/user_basics.ssi:165 en/user_basics.ssi:179
-#: en/user_basics.ssi:187 en/user_basics.ssi:197 en/user_basics.ssi:249
-#: en/user_basics.ssi:265 en/user_basics.ssi:273 en/user_basics.ssi:293
-#: en/user_basics.ssi:318 en/user_customization-packages.ssi:16
+#: en/other_use-cases.ssi:111 en/user_basics.ssi:36 en/user_basics.ssi:48
+#: en/user_basics.ssi:62 en/user_basics.ssi:74 en/user_basics.ssi:88
+#: en/user_basics.ssi:104 en/user_basics.ssi:112 en/user_basics.ssi:120
+#: en/user_basics.ssi:130 en/user_basics.ssi:142 en/user_basics.ssi:154
+#: en/user_basics.ssi:162 en/user_basics.ssi:170 en/user_basics.ssi:184
+#: en/user_basics.ssi:192 en/user_basics.ssi:202 en/user_basics.ssi:222
+#: en/user_basics.ssi:255 en/user_basics.ssi:271 en/user_basics.ssi:279
+#: en/user_basics.ssi:299 en/user_basics.ssi:324
+#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
+#: en/user_customization-contents.ssi:66 en/user_customization-packages.ssi:16
 #: en/user_customization-packages.ssi:24 en/user_customization-packages.ssi:36
 #: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:59
 #: en/user_customization-packages.ssi:73
 #: en/user_customization-packages.ssi:103
 #: en/user_customization-packages.ssi:111
-#: en/user_customization-packages.ssi:129
-#: en/user_customization-packages.ssi:158
-#: en/user_customization-packages.ssi:168
-#: en/user_customization-packages.ssi:178
-#: en/user_customization-packages.ssi:188 en/user_installation.ssi:38
+#: en/user_customization-packages.ssi:131
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:180
+#: en/user_customization-packages.ssi:190 en/user_installation.ssi:38
 #: en/user_installation.ssi:46 en/user_installation.ssi:56
 #: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:104
-#: en/user_installation.ssi:118 en/user_installation.ssi:134
-#: en/user_overview.ssi:54 en/user_overview.ssi:98 en/user_overview.ssi:106
+#: en/user_installation.ssi:84 en/user_installation.ssi:105
+#: en/user_installation.ssi:119 en/user_installation.ssi:136
+#: en/user_overview.ssi:60 en/user_overview.ssi:104 en/user_overview.ssi:112
 msgid "code{"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:85 en/about_manual.ssi:93 en/about_manual.ssi:101
-#: en/about_manual.ssi:116 en/about_manual.ssi:129 en/about_manual.ssi:137
-#: en/about_manual.ssi:145 en/about_manual.ssi:153 en/about_manual.ssi:160
+#: en/about_manual.ssi:86 en/about_manual.ssi:94 en/about_manual.ssi:102
+#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
 #: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
 #: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
 #: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
 #: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
 #: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
 #: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: en/other_customization-contents.ssi:35
-#: en/other_customization-contents.ssi:50
 #: en/other_customization-internationalization.ssi:14
 #: en/other_customization-internationalization.ssi:22
 #: en/other_customization-internationalization.ssi:30
@@ -106,29 +104,30 @@ 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:49
-#: en/user_basics.ssi:64 en/user_basics.ssi:74 en/user_basics.ssi:90
-#: en/user_basics.ssi:103 en/user_basics.ssi:111 en/user_basics.ssi:119
-#: en/user_basics.ssi:129 en/user_basics.ssi:143 en/user_basics.ssi:153
-#: en/user_basics.ssi:161 en/user_basics.ssi:169 en/user_basics.ssi:183
-#: en/user_basics.ssi:191 en/user_basics.ssi:201 en/user_basics.ssi:241
-#: en/user_basics.ssi:269 en/user_basics.ssi:277 en/user_basics.ssi:304
-#: en/user_basics.ssi:343 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/other_use-cases.ssi:137 en/user_basics.ssi:40 en/user_basics.ssi:52
+#: en/user_basics.ssi:68 en/user_basics.ssi:78 en/user_basics.ssi:94
+#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:124
+#: en/user_basics.ssi:134 en/user_basics.ssi:148 en/user_basics.ssi:158
+#: en/user_basics.ssi:166 en/user_basics.ssi:174 en/user_basics.ssi:188
+#: en/user_basics.ssi:196 en/user_basics.ssi:206 en/user_basics.ssi:247
+#: en/user_basics.ssi:275 en/user_basics.ssi:283 en/user_basics.ssi:310
+#: en/user_basics.ssi:349 en/user_customization-contents.ssi:39
+#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:70
+#: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
+#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
+#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
 #: en/user_customization-packages.ssi:107
 #: en/user_customization-packages.ssi:115
-#: en/user_customization-packages.ssi:133
-#: en/user_customization-packages.ssi:164
-#: en/user_customization-packages.ssi:174
-#: en/user_customization-packages.ssi:184
-#: en/user_customization-packages.ssi:194 en/user_installation.ssi:42
+#: en/user_customization-packages.ssi:135
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:186
+#: en/user_customization-packages.ssi:196 en/user_installation.ssi:42
 #: en/user_installation.ssi:50 en/user_installation.ssi:60
 #: en/user_installation.ssi:72 en/user_installation.ssi:80
-#: en/user_installation.ssi:108 en/user_installation.ssi:123
-#: en/user_installation.ssi:137 en/user_overview.ssi:92
-#: en/user_overview.ssi:102 en/user_overview.ssi:110
+#: en/user_installation.ssi:109 en/user_installation.ssi:124
+#: en/user_installation.ssi:139 en/user_overview.ssi:98
+#: en/user_overview.ssi:108 en/user_overview.ssi:116
 msgid "}code"
 msgstr ""
 
diff --git a/manual/pot/other_howtos.ssi.pot b/manual/pot/other_howtos.ssi.pot
index 8645413..aff720e 100644
--- a/manual/pot/other_howtos.ssi.pot
+++ b/manual/pot/other_howtos.ssi.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-09-17 23:43+0300\n"
+"POT-Creation-Date: 2010-10-03 20:30+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -17,17 +17,15 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. type: Plain text
-#: en/about_manual.ssi:81 en/about_manual.ssi:89 en/about_manual.ssi:97
-#: en/about_manual.ssi:109 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:141 en/about_manual.ssi:149 en/about_manual.ssi:157
+#: en/about_manual.ssi:82 en/about_manual.ssi:90 en/about_manual.ssi:98
+#: en/about_manual.ssi:110 en/about_manual.ssi:121 en/about_manual.ssi:134
+#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
 #: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
 #: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
 #: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
 #: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
 #: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
 #: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
-#: en/other_customization-contents.ssi:30
-#: en/other_customization-contents.ssi:39
 #: en/other_customization-internationalization.ssi:10
 #: en/other_customization-internationalization.ssi:18
 #: en/other_customization-internationalization.ssi:26
@@ -48,44 +46,44 @@ msgstr ""
 #: 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:45
-#: en/user_basics.ssi:58 en/user_basics.ssi:70 en/user_basics.ssi:84
-#: en/user_basics.ssi:99 en/user_basics.ssi:107 en/user_basics.ssi:115
-#: en/user_basics.ssi:125 en/user_basics.ssi:137 en/user_basics.ssi:149
-#: en/user_basics.ssi:157 en/user_basics.ssi:165 en/user_basics.ssi:179
-#: en/user_basics.ssi:187 en/user_basics.ssi:197 en/user_basics.ssi:249
-#: en/user_basics.ssi:265 en/user_basics.ssi:273 en/user_basics.ssi:293
-#: en/user_basics.ssi:318 en/user_customization-packages.ssi:16
+#: en/other_use-cases.ssi:111 en/user_basics.ssi:36 en/user_basics.ssi:48
+#: en/user_basics.ssi:62 en/user_basics.ssi:74 en/user_basics.ssi:88
+#: en/user_basics.ssi:104 en/user_basics.ssi:112 en/user_basics.ssi:120
+#: en/user_basics.ssi:130 en/user_basics.ssi:142 en/user_basics.ssi:154
+#: en/user_basics.ssi:162 en/user_basics.ssi:170 en/user_basics.ssi:184
+#: en/user_basics.ssi:192 en/user_basics.ssi:202 en/user_basics.ssi:222
+#: en/user_basics.ssi:255 en/user_basics.ssi:271 en/user_basics.ssi:279
+#: en/user_basics.ssi:299 en/user_basics.ssi:324
+#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
+#: en/user_customization-contents.ssi:66 en/user_customization-packages.ssi:16
 #: en/user_customization-packages.ssi:24 en/user_customization-packages.ssi:36
 #: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:59
 #: en/user_customization-packages.ssi:73
 #: en/user_customization-packages.ssi:103
 #: en/user_customization-packages.ssi:111
-#: en/user_customization-packages.ssi:129
-#: en/user_customization-packages.ssi:158
-#: en/user_customization-packages.ssi:168
-#: en/user_customization-packages.ssi:178
-#: en/user_customization-packages.ssi:188 en/user_installation.ssi:38
+#: en/user_customization-packages.ssi:131
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:180
+#: en/user_customization-packages.ssi:190 en/user_installation.ssi:38
 #: en/user_installation.ssi:46 en/user_installation.ssi:56
 #: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:104
-#: en/user_installation.ssi:118 en/user_installation.ssi:134
-#: en/user_overview.ssi:54 en/user_overview.ssi:98 en/user_overview.ssi:106
+#: en/user_installation.ssi:84 en/user_installation.ssi:105
+#: en/user_installation.ssi:119 en/user_installation.ssi:136
+#: en/user_overview.ssi:60 en/user_overview.ssi:104 en/user_overview.ssi:112
 msgid "code{"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:85 en/about_manual.ssi:93 en/about_manual.ssi:101
-#: en/about_manual.ssi:116 en/about_manual.ssi:129 en/about_manual.ssi:137
-#: en/about_manual.ssi:145 en/about_manual.ssi:153 en/about_manual.ssi:160
+#: en/about_manual.ssi:86 en/about_manual.ssi:94 en/about_manual.ssi:102
+#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
 #: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
 #: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
 #: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
 #: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
 #: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
 #: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: en/other_customization-contents.ssi:35
-#: en/other_customization-contents.ssi:50
 #: en/other_customization-internationalization.ssi:14
 #: en/other_customization-internationalization.ssi:22
 #: en/other_customization-internationalization.ssi:30
@@ -106,29 +104,30 @@ 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:49
-#: en/user_basics.ssi:64 en/user_basics.ssi:74 en/user_basics.ssi:90
-#: en/user_basics.ssi:103 en/user_basics.ssi:111 en/user_basics.ssi:119
-#: en/user_basics.ssi:129 en/user_basics.ssi:143 en/user_basics.ssi:153
-#: en/user_basics.ssi:161 en/user_basics.ssi:169 en/user_basics.ssi:183
-#: en/user_basics.ssi:191 en/user_basics.ssi:201 en/user_basics.ssi:241
-#: en/user_basics.ssi:269 en/user_basics.ssi:277 en/user_basics.ssi:304
-#: en/user_basics.ssi:343 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/other_use-cases.ssi:137 en/user_basics.ssi:40 en/user_basics.ssi:52
+#: en/user_basics.ssi:68 en/user_basics.ssi:78 en/user_basics.ssi:94
+#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:124
+#: en/user_basics.ssi:134 en/user_basics.ssi:148 en/user_basics.ssi:158
+#: en/user_basics.ssi:166 en/user_basics.ssi:174 en/user_basics.ssi:188
+#: en/user_basics.ssi:196 en/user_basics.ssi:206 en/user_basics.ssi:247
+#: en/user_basics.ssi:275 en/user_basics.ssi:283 en/user_basics.ssi:310
+#: en/user_basics.ssi:349 en/user_customization-contents.ssi:39
+#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:70
+#: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
+#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
+#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
 #: en/user_customization-packages.ssi:107
 #: en/user_customization-packages.ssi:115
-#: en/user_customization-packages.ssi:133
-#: en/user_customization-packages.ssi:164
-#: en/user_customization-packages.ssi:174
-#: en/user_customization-packages.ssi:184
-#: en/user_customization-packages.ssi:194 en/user_installation.ssi:42
+#: en/user_customization-packages.ssi:135
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:186
+#: en/user_customization-packages.ssi:196 en/user_installation.ssi:42
 #: en/user_installation.ssi:50 en/user_installation.ssi:60
 #: en/user_installation.ssi:72 en/user_installation.ssi:80
-#: en/user_installation.ssi:108 en/user_installation.ssi:123
-#: en/user_installation.ssi:137 en/user_overview.ssi:92
-#: en/user_overview.ssi:102 en/user_overview.ssi:110
+#: en/user_installation.ssi:109 en/user_installation.ssi:124
+#: en/user_installation.ssi:139 en/user_overview.ssi:98
+#: en/user_overview.ssi:108 en/user_overview.ssi:116
 msgid "}code"
 msgstr ""
 
diff --git a/manual/pot/other_live-environment.ssi.pot b/manual/pot/other_live-environment.ssi.pot
index 3c64e33..80cc2fa 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-09-17 23:43+0300\n"
+"POT-Creation-Date: 2010-10-03 20:30+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -17,17 +17,15 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. type: Plain text
-#: en/about_manual.ssi:81 en/about_manual.ssi:89 en/about_manual.ssi:97
-#: en/about_manual.ssi:109 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:141 en/about_manual.ssi:149 en/about_manual.ssi:157
+#: en/about_manual.ssi:82 en/about_manual.ssi:90 en/about_manual.ssi:98
+#: en/about_manual.ssi:110 en/about_manual.ssi:121 en/about_manual.ssi:134
+#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
 #: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
 #: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
 #: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
 #: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
 #: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
 #: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
-#: en/other_customization-contents.ssi:30
-#: en/other_customization-contents.ssi:39
 #: en/other_customization-internationalization.ssi:10
 #: en/other_customization-internationalization.ssi:18
 #: en/other_customization-internationalization.ssi:26
@@ -48,44 +46,44 @@ msgstr ""
 #: 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:45
-#: en/user_basics.ssi:58 en/user_basics.ssi:70 en/user_basics.ssi:84
-#: en/user_basics.ssi:99 en/user_basics.ssi:107 en/user_basics.ssi:115
-#: en/user_basics.ssi:125 en/user_basics.ssi:137 en/user_basics.ssi:149
-#: en/user_basics.ssi:157 en/user_basics.ssi:165 en/user_basics.ssi:179
-#: en/user_basics.ssi:187 en/user_basics.ssi:197 en/user_basics.ssi:249
-#: en/user_basics.ssi:265 en/user_basics.ssi:273 en/user_basics.ssi:293
-#: en/user_basics.ssi:318 en/user_customization-packages.ssi:16
+#: en/other_use-cases.ssi:111 en/user_basics.ssi:36 en/user_basics.ssi:48
+#: en/user_basics.ssi:62 en/user_basics.ssi:74 en/user_basics.ssi:88
+#: en/user_basics.ssi:104 en/user_basics.ssi:112 en/user_basics.ssi:120
+#: en/user_basics.ssi:130 en/user_basics.ssi:142 en/user_basics.ssi:154
+#: en/user_basics.ssi:162 en/user_basics.ssi:170 en/user_basics.ssi:184
+#: en/user_basics.ssi:192 en/user_basics.ssi:202 en/user_basics.ssi:222
+#: en/user_basics.ssi:255 en/user_basics.ssi:271 en/user_basics.ssi:279
+#: en/user_basics.ssi:299 en/user_basics.ssi:324
+#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
+#: en/user_customization-contents.ssi:66 en/user_customization-packages.ssi:16
 #: en/user_customization-packages.ssi:24 en/user_customization-packages.ssi:36
 #: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:59
 #: en/user_customization-packages.ssi:73
 #: en/user_customization-packages.ssi:103
 #: en/user_customization-packages.ssi:111
-#: en/user_customization-packages.ssi:129
-#: en/user_customization-packages.ssi:158
-#: en/user_customization-packages.ssi:168
-#: en/user_customization-packages.ssi:178
-#: en/user_customization-packages.ssi:188 en/user_installation.ssi:38
+#: en/user_customization-packages.ssi:131
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:180
+#: en/user_customization-packages.ssi:190 en/user_installation.ssi:38
 #: en/user_installation.ssi:46 en/user_installation.ssi:56
 #: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:104
-#: en/user_installation.ssi:118 en/user_installation.ssi:134
-#: en/user_overview.ssi:54 en/user_overview.ssi:98 en/user_overview.ssi:106
+#: en/user_installation.ssi:84 en/user_installation.ssi:105
+#: en/user_installation.ssi:119 en/user_installation.ssi:136
+#: en/user_overview.ssi:60 en/user_overview.ssi:104 en/user_overview.ssi:112
 msgid "code{"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:85 en/about_manual.ssi:93 en/about_manual.ssi:101
-#: en/about_manual.ssi:116 en/about_manual.ssi:129 en/about_manual.ssi:137
-#: en/about_manual.ssi:145 en/about_manual.ssi:153 en/about_manual.ssi:160
+#: en/about_manual.ssi:86 en/about_manual.ssi:94 en/about_manual.ssi:102
+#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
 #: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
 #: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
 #: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
 #: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
 #: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
 #: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: en/other_customization-contents.ssi:35
-#: en/other_customization-contents.ssi:50
 #: en/other_customization-internationalization.ssi:14
 #: en/other_customization-internationalization.ssi:22
 #: en/other_customization-internationalization.ssi:30
@@ -106,29 +104,30 @@ 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:49
-#: en/user_basics.ssi:64 en/user_basics.ssi:74 en/user_basics.ssi:90
-#: en/user_basics.ssi:103 en/user_basics.ssi:111 en/user_basics.ssi:119
-#: en/user_basics.ssi:129 en/user_basics.ssi:143 en/user_basics.ssi:153
-#: en/user_basics.ssi:161 en/user_basics.ssi:169 en/user_basics.ssi:183
-#: en/user_basics.ssi:191 en/user_basics.ssi:201 en/user_basics.ssi:241
-#: en/user_basics.ssi:269 en/user_basics.ssi:277 en/user_basics.ssi:304
-#: en/user_basics.ssi:343 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/other_use-cases.ssi:137 en/user_basics.ssi:40 en/user_basics.ssi:52
+#: en/user_basics.ssi:68 en/user_basics.ssi:78 en/user_basics.ssi:94
+#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:124
+#: en/user_basics.ssi:134 en/user_basics.ssi:148 en/user_basics.ssi:158
+#: en/user_basics.ssi:166 en/user_basics.ssi:174 en/user_basics.ssi:188
+#: en/user_basics.ssi:196 en/user_basics.ssi:206 en/user_basics.ssi:247
+#: en/user_basics.ssi:275 en/user_basics.ssi:283 en/user_basics.ssi:310
+#: en/user_basics.ssi:349 en/user_customization-contents.ssi:39
+#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:70
+#: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
+#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
+#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
 #: en/user_customization-packages.ssi:107
 #: en/user_customization-packages.ssi:115
-#: en/user_customization-packages.ssi:133
-#: en/user_customization-packages.ssi:164
-#: en/user_customization-packages.ssi:174
-#: en/user_customization-packages.ssi:184
-#: en/user_customization-packages.ssi:194 en/user_installation.ssi:42
+#: en/user_customization-packages.ssi:135
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:186
+#: en/user_customization-packages.ssi:196 en/user_installation.ssi:42
 #: en/user_installation.ssi:50 en/user_installation.ssi:60
 #: en/user_installation.ssi:72 en/user_installation.ssi:80
-#: en/user_installation.ssi:108 en/user_installation.ssi:123
-#: en/user_installation.ssi:137 en/user_overview.ssi:92
-#: en/user_overview.ssi:102 en/user_overview.ssi:110
+#: en/user_installation.ssi:109 en/user_installation.ssi:124
+#: en/user_installation.ssi:139 en/user_overview.ssi:98
+#: en/user_overview.ssi:108 en/user_overview.ssi:116
 msgid "}code"
 msgstr ""
 
@@ -136,9 +135,8 @@ msgstr ""
 #: en/other_customization-bootup.ssi:8 en/other_customization-bootup.ssi:14
 #: en/other_customization-bootup.ssi:56 en/other_customization-bootup.ssi:60
 #: en/other_customization-bootup.ssi:64 en/other_customization-bootup.ssi:68
-#: en/other_customization-contents.ssi:56
-#: en/other_customization-contents.ssi:60 en/other_live-environment.ssi:8
-#: en/other_resources.ssi:8 en/other_success-stories.ssi:7
+#: en/other_live-environment.ssi:8 en/other_resources.ssi:8
+#: en/other_success-stories.ssi:7
 msgid "FIXME"
 msgstr ""
 
diff --git a/manual/pot/other_procedures.ssi.pot b/manual/pot/other_procedures.ssi.pot
index 2cadfa2..0270ee3 100644
--- a/manual/pot/other_procedures.ssi.pot
+++ b/manual/pot/other_procedures.ssi.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-09-17 23:43+0300\n"
+"POT-Creation-Date: 2010-10-03 20:30+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -17,17 +17,15 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. type: Plain text
-#: en/about_manual.ssi:81 en/about_manual.ssi:89 en/about_manual.ssi:97
-#: en/about_manual.ssi:109 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:141 en/about_manual.ssi:149 en/about_manual.ssi:157
+#: en/about_manual.ssi:82 en/about_manual.ssi:90 en/about_manual.ssi:98
+#: en/about_manual.ssi:110 en/about_manual.ssi:121 en/about_manual.ssi:134
+#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
 #: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
 #: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
 #: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
 #: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
 #: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
 #: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
-#: en/other_customization-contents.ssi:30
-#: en/other_customization-contents.ssi:39
 #: en/other_customization-internationalization.ssi:10
 #: en/other_customization-internationalization.ssi:18
 #: en/other_customization-internationalization.ssi:26
@@ -48,44 +46,44 @@ msgstr ""
 #: 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:45
-#: en/user_basics.ssi:58 en/user_basics.ssi:70 en/user_basics.ssi:84
-#: en/user_basics.ssi:99 en/user_basics.ssi:107 en/user_basics.ssi:115
-#: en/user_basics.ssi:125 en/user_basics.ssi:137 en/user_basics.ssi:149
-#: en/user_basics.ssi:157 en/user_basics.ssi:165 en/user_basics.ssi:179
-#: en/user_basics.ssi:187 en/user_basics.ssi:197 en/user_basics.ssi:249
-#: en/user_basics.ssi:265 en/user_basics.ssi:273 en/user_basics.ssi:293
-#: en/user_basics.ssi:318 en/user_customization-packages.ssi:16
+#: en/other_use-cases.ssi:111 en/user_basics.ssi:36 en/user_basics.ssi:48
+#: en/user_basics.ssi:62 en/user_basics.ssi:74 en/user_basics.ssi:88
+#: en/user_basics.ssi:104 en/user_basics.ssi:112 en/user_basics.ssi:120
+#: en/user_basics.ssi:130 en/user_basics.ssi:142 en/user_basics.ssi:154
+#: en/user_basics.ssi:162 en/user_basics.ssi:170 en/user_basics.ssi:184
+#: en/user_basics.ssi:192 en/user_basics.ssi:202 en/user_basics.ssi:222
+#: en/user_basics.ssi:255 en/user_basics.ssi:271 en/user_basics.ssi:279
+#: en/user_basics.ssi:299 en/user_basics.ssi:324
+#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
+#: en/user_customization-contents.ssi:66 en/user_customization-packages.ssi:16
 #: en/user_customization-packages.ssi:24 en/user_customization-packages.ssi:36
 #: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:59
 #: en/user_customization-packages.ssi:73
 #: en/user_customization-packages.ssi:103
 #: en/user_customization-packages.ssi:111
-#: en/user_customization-packages.ssi:129
-#: en/user_customization-packages.ssi:158
-#: en/user_customization-packages.ssi:168
-#: en/user_customization-packages.ssi:178
-#: en/user_customization-packages.ssi:188 en/user_installation.ssi:38
+#: en/user_customization-packages.ssi:131
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:180
+#: en/user_customization-packages.ssi:190 en/user_installation.ssi:38
 #: en/user_installation.ssi:46 en/user_installation.ssi:56
 #: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:104
-#: en/user_installation.ssi:118 en/user_installation.ssi:134
-#: en/user_overview.ssi:54 en/user_overview.ssi:98 en/user_overview.ssi:106
+#: en/user_installation.ssi:84 en/user_installation.ssi:105
+#: en/user_installation.ssi:119 en/user_installation.ssi:136
+#: en/user_overview.ssi:60 en/user_overview.ssi:104 en/user_overview.ssi:112
 msgid "code{"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:85 en/about_manual.ssi:93 en/about_manual.ssi:101
-#: en/about_manual.ssi:116 en/about_manual.ssi:129 en/about_manual.ssi:137
-#: en/about_manual.ssi:145 en/about_manual.ssi:153 en/about_manual.ssi:160
+#: en/about_manual.ssi:86 en/about_manual.ssi:94 en/about_manual.ssi:102
+#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
 #: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
 #: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
 #: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
 #: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
 #: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
 #: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: en/other_customization-contents.ssi:35
-#: en/other_customization-contents.ssi:50
 #: en/other_customization-internationalization.ssi:14
 #: en/other_customization-internationalization.ssi:22
 #: en/other_customization-internationalization.ssi:30
@@ -106,29 +104,30 @@ 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:49
-#: en/user_basics.ssi:64 en/user_basics.ssi:74 en/user_basics.ssi:90
-#: en/user_basics.ssi:103 en/user_basics.ssi:111 en/user_basics.ssi:119
-#: en/user_basics.ssi:129 en/user_basics.ssi:143 en/user_basics.ssi:153
-#: en/user_basics.ssi:161 en/user_basics.ssi:169 en/user_basics.ssi:183
-#: en/user_basics.ssi:191 en/user_basics.ssi:201 en/user_basics.ssi:241
-#: en/user_basics.ssi:269 en/user_basics.ssi:277 en/user_basics.ssi:304
-#: en/user_basics.ssi:343 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/other_use-cases.ssi:137 en/user_basics.ssi:40 en/user_basics.ssi:52
+#: en/user_basics.ssi:68 en/user_basics.ssi:78 en/user_basics.ssi:94
+#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:124
+#: en/user_basics.ssi:134 en/user_basics.ssi:148 en/user_basics.ssi:158
+#: en/user_basics.ssi:166 en/user_basics.ssi:174 en/user_basics.ssi:188
+#: en/user_basics.ssi:196 en/user_basics.ssi:206 en/user_basics.ssi:247
+#: en/user_basics.ssi:275 en/user_basics.ssi:283 en/user_basics.ssi:310
+#: en/user_basics.ssi:349 en/user_customization-contents.ssi:39
+#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:70
+#: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
+#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
+#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
 #: en/user_customization-packages.ssi:107
 #: en/user_customization-packages.ssi:115
-#: en/user_customization-packages.ssi:133
-#: en/user_customization-packages.ssi:164
-#: en/user_customization-packages.ssi:174
-#: en/user_customization-packages.ssi:184
-#: en/user_customization-packages.ssi:194 en/user_installation.ssi:42
+#: en/user_customization-packages.ssi:135
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:186
+#: en/user_customization-packages.ssi:196 en/user_installation.ssi:42
 #: en/user_installation.ssi:50 en/user_installation.ssi:60
 #: en/user_installation.ssi:72 en/user_installation.ssi:80
-#: en/user_installation.ssi:108 en/user_installation.ssi:123
-#: en/user_installation.ssi:137 en/user_overview.ssi:92
-#: en/user_overview.ssi:102 en/user_overview.ssi:110
+#: en/user_installation.ssi:109 en/user_installation.ssi:124
+#: en/user_installation.ssi:139 en/user_overview.ssi:98
+#: en/user_overview.ssi:108 en/user_overview.ssi:116
 msgid "}code"
 msgstr ""
 
diff --git a/manual/pot/other_reporting-bugs.ssi.pot b/manual/pot/other_reporting-bugs.ssi.pot
index 2be0d12..a441fd8 100644
--- a/manual/pot/other_reporting-bugs.ssi.pot
+++ b/manual/pot/other_reporting-bugs.ssi.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-09-17 23:43+0300\n"
+"POT-Creation-Date: 2010-10-03 20:30+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
diff --git a/manual/pot/other_resources.ssi.pot b/manual/pot/other_resources.ssi.pot
index 1bc6382..a743f4d 100644
--- a/manual/pot/other_resources.ssi.pot
+++ b/manual/pot/other_resources.ssi.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-09-17 23:43+0300\n"
+"POT-Creation-Date: 2010-10-03 20:30+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -20,9 +20,8 @@ msgstr ""
 #: en/other_customization-bootup.ssi:8 en/other_customization-bootup.ssi:14
 #: en/other_customization-bootup.ssi:56 en/other_customization-bootup.ssi:60
 #: en/other_customization-bootup.ssi:64 en/other_customization-bootup.ssi:68
-#: en/other_customization-contents.ssi:56
-#: en/other_customization-contents.ssi:60 en/other_live-environment.ssi:8
-#: en/other_resources.ssi:8 en/other_success-stories.ssi:7
+#: en/other_live-environment.ssi:8 en/other_resources.ssi:8
+#: en/other_success-stories.ssi:7
 msgid "FIXME"
 msgstr ""
 
diff --git a/manual/pot/other_success-stories.ssi.pot b/manual/pot/other_success-stories.ssi.pot
index 08d1147..4e93622 100644
--- a/manual/pot/other_success-stories.ssi.pot
+++ b/manual/pot/other_success-stories.ssi.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-09-17 23:43+0300\n"
+"POT-Creation-Date: 2010-10-03 20:30+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -20,9 +20,8 @@ msgstr ""
 #: en/other_customization-bootup.ssi:8 en/other_customization-bootup.ssi:14
 #: en/other_customization-bootup.ssi:56 en/other_customization-bootup.ssi:60
 #: en/other_customization-bootup.ssi:64 en/other_customization-bootup.ssi:68
-#: en/other_customization-contents.ssi:56
-#: en/other_customization-contents.ssi:60 en/other_live-environment.ssi:8
-#: en/other_resources.ssi:8 en/other_success-stories.ssi:7
+#: en/other_live-environment.ssi:8 en/other_resources.ssi:8
+#: en/other_success-stories.ssi:7
 msgid "FIXME"
 msgstr ""
 
diff --git a/manual/pot/other_troubleshooting.ssi.pot b/manual/pot/other_troubleshooting.ssi.pot
index b24a9b3..ecbfbb4 100644
--- a/manual/pot/other_troubleshooting.ssi.pot
+++ b/manual/pot/other_troubleshooting.ssi.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-09-17 23:43+0300\n"
+"POT-Creation-Date: 2010-10-03 20:30+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
diff --git a/manual/pot/other_use-cases.ssi.pot b/manual/pot/other_use-cases.ssi.pot
index ad28f10..1b83eac 100644
--- a/manual/pot/other_use-cases.ssi.pot
+++ b/manual/pot/other_use-cases.ssi.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-09-17 23:43+0300\n"
+"POT-Creation-Date: 2010-10-03 20:30+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -17,17 +17,15 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. type: Plain text
-#: en/about_manual.ssi:81 en/about_manual.ssi:89 en/about_manual.ssi:97
-#: en/about_manual.ssi:109 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:141 en/about_manual.ssi:149 en/about_manual.ssi:157
+#: en/about_manual.ssi:82 en/about_manual.ssi:90 en/about_manual.ssi:98
+#: en/about_manual.ssi:110 en/about_manual.ssi:121 en/about_manual.ssi:134
+#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
 #: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
 #: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
 #: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
 #: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
 #: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
 #: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
-#: en/other_customization-contents.ssi:30
-#: en/other_customization-contents.ssi:39
 #: en/other_customization-internationalization.ssi:10
 #: en/other_customization-internationalization.ssi:18
 #: en/other_customization-internationalization.ssi:26
@@ -48,44 +46,44 @@ msgstr ""
 #: 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:45
-#: en/user_basics.ssi:58 en/user_basics.ssi:70 en/user_basics.ssi:84
-#: en/user_basics.ssi:99 en/user_basics.ssi:107 en/user_basics.ssi:115
-#: en/user_basics.ssi:125 en/user_basics.ssi:137 en/user_basics.ssi:149
-#: en/user_basics.ssi:157 en/user_basics.ssi:165 en/user_basics.ssi:179
-#: en/user_basics.ssi:187 en/user_basics.ssi:197 en/user_basics.ssi:249
-#: en/user_basics.ssi:265 en/user_basics.ssi:273 en/user_basics.ssi:293
-#: en/user_basics.ssi:318 en/user_customization-packages.ssi:16
+#: en/other_use-cases.ssi:111 en/user_basics.ssi:36 en/user_basics.ssi:48
+#: en/user_basics.ssi:62 en/user_basics.ssi:74 en/user_basics.ssi:88
+#: en/user_basics.ssi:104 en/user_basics.ssi:112 en/user_basics.ssi:120
+#: en/user_basics.ssi:130 en/user_basics.ssi:142 en/user_basics.ssi:154
+#: en/user_basics.ssi:162 en/user_basics.ssi:170 en/user_basics.ssi:184
+#: en/user_basics.ssi:192 en/user_basics.ssi:202 en/user_basics.ssi:222
+#: en/user_basics.ssi:255 en/user_basics.ssi:271 en/user_basics.ssi:279
+#: en/user_basics.ssi:299 en/user_basics.ssi:324
+#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
+#: en/user_customization-contents.ssi:66 en/user_customization-packages.ssi:16
 #: en/user_customization-packages.ssi:24 en/user_customization-packages.ssi:36
 #: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:59
 #: en/user_customization-packages.ssi:73
 #: en/user_customization-packages.ssi:103
 #: en/user_customization-packages.ssi:111
-#: en/user_customization-packages.ssi:129
-#: en/user_customization-packages.ssi:158
-#: en/user_customization-packages.ssi:168
-#: en/user_customization-packages.ssi:178
-#: en/user_customization-packages.ssi:188 en/user_installation.ssi:38
+#: en/user_customization-packages.ssi:131
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:180
+#: en/user_customization-packages.ssi:190 en/user_installation.ssi:38
 #: en/user_installation.ssi:46 en/user_installation.ssi:56
 #: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:104
-#: en/user_installation.ssi:118 en/user_installation.ssi:134
-#: en/user_overview.ssi:54 en/user_overview.ssi:98 en/user_overview.ssi:106
+#: en/user_installation.ssi:84 en/user_installation.ssi:105
+#: en/user_installation.ssi:119 en/user_installation.ssi:136
+#: en/user_overview.ssi:60 en/user_overview.ssi:104 en/user_overview.ssi:112
 msgid "code{"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:85 en/about_manual.ssi:93 en/about_manual.ssi:101
-#: en/about_manual.ssi:116 en/about_manual.ssi:129 en/about_manual.ssi:137
-#: en/about_manual.ssi:145 en/about_manual.ssi:153 en/about_manual.ssi:160
+#: en/about_manual.ssi:86 en/about_manual.ssi:94 en/about_manual.ssi:102
+#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
 #: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
 #: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
 #: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
 #: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
 #: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
 #: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: en/other_customization-contents.ssi:35
-#: en/other_customization-contents.ssi:50
 #: en/other_customization-internationalization.ssi:14
 #: en/other_customization-internationalization.ssi:22
 #: en/other_customization-internationalization.ssi:30
@@ -106,29 +104,30 @@ 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:49
-#: en/user_basics.ssi:64 en/user_basics.ssi:74 en/user_basics.ssi:90
-#: en/user_basics.ssi:103 en/user_basics.ssi:111 en/user_basics.ssi:119
-#: en/user_basics.ssi:129 en/user_basics.ssi:143 en/user_basics.ssi:153
-#: en/user_basics.ssi:161 en/user_basics.ssi:169 en/user_basics.ssi:183
-#: en/user_basics.ssi:191 en/user_basics.ssi:201 en/user_basics.ssi:241
-#: en/user_basics.ssi:269 en/user_basics.ssi:277 en/user_basics.ssi:304
-#: en/user_basics.ssi:343 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/other_use-cases.ssi:137 en/user_basics.ssi:40 en/user_basics.ssi:52
+#: en/user_basics.ssi:68 en/user_basics.ssi:78 en/user_basics.ssi:94
+#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:124
+#: en/user_basics.ssi:134 en/user_basics.ssi:148 en/user_basics.ssi:158
+#: en/user_basics.ssi:166 en/user_basics.ssi:174 en/user_basics.ssi:188
+#: en/user_basics.ssi:196 en/user_basics.ssi:206 en/user_basics.ssi:247
+#: en/user_basics.ssi:275 en/user_basics.ssi:283 en/user_basics.ssi:310
+#: en/user_basics.ssi:349 en/user_customization-contents.ssi:39
+#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:70
+#: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
+#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
+#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
 #: en/user_customization-packages.ssi:107
 #: en/user_customization-packages.ssi:115
-#: en/user_customization-packages.ssi:133
-#: en/user_customization-packages.ssi:164
-#: en/user_customization-packages.ssi:174
-#: en/user_customization-packages.ssi:184
-#: en/user_customization-packages.ssi:194 en/user_installation.ssi:42
+#: en/user_customization-packages.ssi:135
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:186
+#: en/user_customization-packages.ssi:196 en/user_installation.ssi:42
 #: en/user_installation.ssi:50 en/user_installation.ssi:60
 #: en/user_installation.ssi:72 en/user_installation.ssi:80
-#: en/user_installation.ssi:108 en/user_installation.ssi:123
-#: en/user_installation.ssi:137 en/user_overview.ssi:92
-#: en/user_overview.ssi:102 en/user_overview.ssi:110
+#: en/user_installation.ssi:109 en/user_installation.ssi:124
+#: en/user_installation.ssi:139 en/user_overview.ssi:98
+#: en/user_overview.ssi:108 en/user_overview.ssi:116
 msgid "}code"
 msgstr ""
 
diff --git a/manual/pot/user_basics.ssi.pot b/manual/pot/user_basics.ssi.pot
index a37cbad..a6e8e15 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-09-17 23:43+0300\n"
+"POT-Creation-Date: 2010-10-03 20:30+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -17,17 +17,15 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. type: Plain text
-#: en/about_manual.ssi:81 en/about_manual.ssi:89 en/about_manual.ssi:97
-#: en/about_manual.ssi:109 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:141 en/about_manual.ssi:149 en/about_manual.ssi:157
+#: en/about_manual.ssi:82 en/about_manual.ssi:90 en/about_manual.ssi:98
+#: en/about_manual.ssi:110 en/about_manual.ssi:121 en/about_manual.ssi:134
+#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
 #: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
 #: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
 #: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
 #: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
 #: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
 #: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
-#: en/other_customization-contents.ssi:30
-#: en/other_customization-contents.ssi:39
 #: en/other_customization-internationalization.ssi:10
 #: en/other_customization-internationalization.ssi:18
 #: en/other_customization-internationalization.ssi:26
@@ -48,44 +46,44 @@ msgstr ""
 #: 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:45
-#: en/user_basics.ssi:58 en/user_basics.ssi:70 en/user_basics.ssi:84
-#: en/user_basics.ssi:99 en/user_basics.ssi:107 en/user_basics.ssi:115
-#: en/user_basics.ssi:125 en/user_basics.ssi:137 en/user_basics.ssi:149
-#: en/user_basics.ssi:157 en/user_basics.ssi:165 en/user_basics.ssi:179
-#: en/user_basics.ssi:187 en/user_basics.ssi:197 en/user_basics.ssi:249
-#: en/user_basics.ssi:265 en/user_basics.ssi:273 en/user_basics.ssi:293
-#: en/user_basics.ssi:318 en/user_customization-packages.ssi:16
+#: en/other_use-cases.ssi:111 en/user_basics.ssi:36 en/user_basics.ssi:48
+#: en/user_basics.ssi:62 en/user_basics.ssi:74 en/user_basics.ssi:88
+#: en/user_basics.ssi:104 en/user_basics.ssi:112 en/user_basics.ssi:120
+#: en/user_basics.ssi:130 en/user_basics.ssi:142 en/user_basics.ssi:154
+#: en/user_basics.ssi:162 en/user_basics.ssi:170 en/user_basics.ssi:184
+#: en/user_basics.ssi:192 en/user_basics.ssi:202 en/user_basics.ssi:222
+#: en/user_basics.ssi:255 en/user_basics.ssi:271 en/user_basics.ssi:279
+#: en/user_basics.ssi:299 en/user_basics.ssi:324
+#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
+#: en/user_customization-contents.ssi:66 en/user_customization-packages.ssi:16
 #: en/user_customization-packages.ssi:24 en/user_customization-packages.ssi:36
 #: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:59
 #: en/user_customization-packages.ssi:73
 #: en/user_customization-packages.ssi:103
 #: en/user_customization-packages.ssi:111
-#: en/user_customization-packages.ssi:129
-#: en/user_customization-packages.ssi:158
-#: en/user_customization-packages.ssi:168
-#: en/user_customization-packages.ssi:178
-#: en/user_customization-packages.ssi:188 en/user_installation.ssi:38
+#: en/user_customization-packages.ssi:131
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:180
+#: en/user_customization-packages.ssi:190 en/user_installation.ssi:38
 #: en/user_installation.ssi:46 en/user_installation.ssi:56
 #: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:104
-#: en/user_installation.ssi:118 en/user_installation.ssi:134
-#: en/user_overview.ssi:54 en/user_overview.ssi:98 en/user_overview.ssi:106
+#: en/user_installation.ssi:84 en/user_installation.ssi:105
+#: en/user_installation.ssi:119 en/user_installation.ssi:136
+#: en/user_overview.ssi:60 en/user_overview.ssi:104 en/user_overview.ssi:112
 msgid "code{"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:85 en/about_manual.ssi:93 en/about_manual.ssi:101
-#: en/about_manual.ssi:116 en/about_manual.ssi:129 en/about_manual.ssi:137
-#: en/about_manual.ssi:145 en/about_manual.ssi:153 en/about_manual.ssi:160
+#: en/about_manual.ssi:86 en/about_manual.ssi:94 en/about_manual.ssi:102
+#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
 #: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
 #: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
 #: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
 #: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
 #: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
 #: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: en/other_customization-contents.ssi:35
-#: en/other_customization-contents.ssi:50
 #: en/other_customization-internationalization.ssi:14
 #: en/other_customization-internationalization.ssi:22
 #: en/other_customization-internationalization.ssi:30
@@ -106,29 +104,30 @@ 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:49
-#: en/user_basics.ssi:64 en/user_basics.ssi:74 en/user_basics.ssi:90
-#: en/user_basics.ssi:103 en/user_basics.ssi:111 en/user_basics.ssi:119
-#: en/user_basics.ssi:129 en/user_basics.ssi:143 en/user_basics.ssi:153
-#: en/user_basics.ssi:161 en/user_basics.ssi:169 en/user_basics.ssi:183
-#: en/user_basics.ssi:191 en/user_basics.ssi:201 en/user_basics.ssi:241
-#: en/user_basics.ssi:269 en/user_basics.ssi:277 en/user_basics.ssi:304
-#: en/user_basics.ssi:343 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/other_use-cases.ssi:137 en/user_basics.ssi:40 en/user_basics.ssi:52
+#: en/user_basics.ssi:68 en/user_basics.ssi:78 en/user_basics.ssi:94
+#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:124
+#: en/user_basics.ssi:134 en/user_basics.ssi:148 en/user_basics.ssi:158
+#: en/user_basics.ssi:166 en/user_basics.ssi:174 en/user_basics.ssi:188
+#: en/user_basics.ssi:196 en/user_basics.ssi:206 en/user_basics.ssi:247
+#: en/user_basics.ssi:275 en/user_basics.ssi:283 en/user_basics.ssi:310
+#: en/user_basics.ssi:349 en/user_customization-contents.ssi:39
+#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:70
+#: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
+#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
+#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
 #: en/user_customization-packages.ssi:107
 #: en/user_customization-packages.ssi:115
-#: en/user_customization-packages.ssi:133
-#: en/user_customization-packages.ssi:164
-#: en/user_customization-packages.ssi:174
-#: en/user_customization-packages.ssi:184
-#: en/user_customization-packages.ssi:194 en/user_installation.ssi:42
+#: en/user_customization-packages.ssi:135
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:186
+#: en/user_customization-packages.ssi:196 en/user_installation.ssi:42
 #: en/user_installation.ssi:50 en/user_installation.ssi:60
 #: en/user_installation.ssi:72 en/user_installation.ssi:80
-#: en/user_installation.ssi:108 en/user_installation.ssi:123
-#: en/user_installation.ssi:137 en/user_overview.ssi:92
-#: en/user_overview.ssi:102 en/user_overview.ssi:110
+#: en/user_installation.ssi:109 en/user_installation.ssi:124
+#: en/user_installation.ssi:139 en/user_overview.ssi:98
+#: en/user_overview.ssi:108 en/user_overview.ssi:116
 msgid "}code"
 msgstr ""
 
@@ -155,16 +154,22 @@ msgid "2~ What is a live system?"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:11
+#: 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).  % FIXME: <xref linkend=\"terms\"/>"
+"done at runtime (see terms)."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:13
+#: en/user_basics.ssi:12 en/user_customization-contents.ssi:26
+#: en/user_installation.ssi:101
+msgid "% FIXME: <xref linkend=\"terms\"/>"
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:14
 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 "
@@ -172,17 +177,17 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:15
+#: en/user_basics.ssi:16
 msgid "_* Linux kernel"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:17
+#: en/user_basics.ssi:18
 msgid "_* The Linux image, usually named #{vmlinuz*}#"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:19
+#: en/user_basics.ssi:20
 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 "
@@ -197,12 +202,16 @@ msgid ""
 "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).  % FIXME: "
-"<xref linkend=\"persistence\"/>"
+"optional persistence partition(s) are used (see persistence)."
 msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:24
+msgid "% FIXME: <xref linkend=\"persistence\"/>"
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:26
 msgid ""
 "_* *{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/"
@@ -216,7 +225,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:26
+#: en/user_basics.ssi:28
 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-"
@@ -224,12 +233,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:28
+#: en/user_basics.ssi:30
 msgid "2~ First steps: building an ISO image"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:30
+#: en/user_basics.ssi:32
 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 "
@@ -237,119 +246,129 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:32
+#: en/user_basics.ssi:34
 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:38
 msgid "$ lb config"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:41
+#: en/user_basics.ssi:42
 msgid ""
 "By passing no parameters to #{lb config}# we indicated that we wish to use "
-"the defaults (see lb-config).  % FIXME: <xref linkend=\"lb-config\"/>"
+"the defaults (see lb-config)."
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:44 en/user_overview.ssi:22 en/user_overview.ssi:42
+msgid "% FIXME: <xref linkend=\"lb-config\"/>"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:43
+#: en/user_basics.ssi:46
 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:47 en/user_basics.ssi:117 en/user_basics.ssi:199
+#: en/user_basics.ssi:50 en/user_basics.ssi:122 en/user_basics.ssi:204
 msgid "# lb build"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:52
+#: en/user_basics.ssi:54
 msgid ""
 "This process can take a while, depending on the speed of your network "
-"connection (see lb-build).  % FIXME: <xref linkend=\"lb-build\"/>"
+"connection (see lb-build)."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:54
+#: en/user_basics.ssi:56 en/user_overview.ssi:46
+msgid "% FIXME: <xref linkend=\"lb-build\"/>"
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:58
 msgid "3~ Testing an ISO image with Qemu"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:56
+#: en/user_basics.ssi:60
 msgid "Testing an ISO is simple:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:60 en/user_basics.ssi:139
+#: en/user_basics.ssi:64 en/user_basics.ssi:144
 msgid "# apt-get install qemu"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:62
+#: en/user_basics.ssi:66
 msgid "$ qemu -cdrom binary.iso"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:66
+#: en/user_basics.ssi:70
 msgid "3~ Testing an ISO image with virtualbox-ose"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:68
+#: en/user_basics.ssi:72
 msgid "In order to test the ISO with virtualbox-ose:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:72
+#: en/user_basics.ssi:76
 msgid "# apt-get install virtualbox-ose"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:76
+#: en/user_basics.ssi:80
 msgid ""
 "and either install #{virtualbox-ose-source}# or #{virtualbox-ose-dkms}# to "
 "build the required kernel modules to run virtualbox-ose."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:78
+#: en/user_basics.ssi:82
 msgid ""
 "After successful installation, virtualbox can be e.g. found in the GNOME "
 "menu under 'Applications/System Tools/VirtualBox OSE'."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:80
+#: en/user_basics.ssi:84
 msgid "3~ Burning an ISO image to a physical medium"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:82
+#: en/user_basics.ssi:86
 msgid "Burning an ISO image is easy:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:86
+#: en/user_basics.ssi:90
 msgid "# apt-get install wodim"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:88
+#: en/user_basics.ssi:92
 msgid "$ wodim binary.iso"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:92
+#: en/user_basics.ssi:96
 msgid "2~ Building an USB/HDD image"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:94
+#: 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 "
@@ -358,42 +377,46 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:97
+#: 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 lb-clean): "
-"% FIXME: <xref linkend=\"lb-clean\"/>"
+"clean up your working directory with the #{lb clean} command (see lb-clean):"
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:102
+msgid "% FIXME: <xref linkend=\"lb-clean\"/>"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:101 en/user_basics.ssi:181
+#: en/user_basics.ssi:106 en/user_basics.ssi:186
 msgid "$ lb clean --binary"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:105
+#: en/user_basics.ssi:110
 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:109
+#: en/user_basics.ssi:114
 msgid "$ lb config -b usb-hdd"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:113
+#: en/user_basics.ssi:118
 msgid "Now build the image with the #{lb build} command:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:121
+#: en/user_basics.ssi:126
 msgid "3~ Copying USB/HDD image to a USB stick"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:123
+#: en/user_basics.ssi:128
 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 "
@@ -401,12 +424,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:127
+#: en/user_basics.ssi:132
 msgid "$ dd if=binary.img of=${USBSTICK}"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:131
+#: en/user_basics.ssi:136
 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 "
@@ -414,28 +437,28 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:133
+#: en/user_basics.ssi:138
 #, no-wrap
 msgid "*{This will definitely overwrite any previous contents on your stick!}*\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:135
+#: en/user_basics.ssi:140
 msgid "3~ Testing a USB/HDD image with Qemu"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:141
+#: en/user_basics.ssi:146
 msgid "$ qemu -hda binary.img"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:145
+#: en/user_basics.ssi:150
 msgid "3~ Using the space left on a USB stick"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:147
+#: en/user_basics.ssi:152
 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}"
@@ -444,45 +467,45 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:151
+#: en/user_basics.ssi:156
 msgid "# gparted ${USBSTICK}"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:155
+#: en/user_basics.ssi:160
 msgid ""
 "Ater the creation of the partition you have to create a filsystem on it. One "
 "possible choice would be ext4."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:159
+#: en/user_basics.ssi:164
 msgid "# mkfs.ext4 ${USBSTICK}"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:163
+#: en/user_basics.ssi:168
 msgid "If you want to use this data partition with Windows, use FAT32."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:167
+#: en/user_basics.ssi:172
 msgid "# mkfs.vfat -F 32"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:171
+#: en/user_basics.ssi:176
 #, 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"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:173
+#: en/user_basics.ssi:178
 msgid "2~ Building a netboot image"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:175
+#: en/user_basics.ssi:180
 msgid ""
 "The following sequence of commands will create a basic netboot image "
 "containing the Debian standard system without X.org. It is suitable for "
@@ -490,28 +513,28 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:177
+#: en/user_basics.ssi:182
 msgid ""
 "Note if you performed any previous examples, you will need to clean up your "
 "working directory with the #{lb clean}# command:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:185
+#: en/user_basics.ssi:190
 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:189
+#: en/user_basics.ssi:194
 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:193
+#: en/user_basics.ssi:198
 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 "
@@ -521,12 +544,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:195
+#: en/user_basics.ssi:200
 msgid "Now build the image with the #{lb build}# command:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:203
+#: en/user_basics.ssi:208
 msgid ""
 "In a network boot the client runs a small piece of software, which usually "
 "resides on the EPROM of the Ethernet card. This program sends a DHCP request "
@@ -537,7 +560,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:205
+#: en/user_basics.ssi:210
 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/"
@@ -546,17 +569,17 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:207
+#: en/user_basics.ssi:212
 msgid "We must now configure three services on the server to enable netboot."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:209
+#: en/user_basics.ssi:214
 msgid "3~ DHCP server"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:211
+#: en/user_basics.ssi:216
 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 "
@@ -564,25 +587,25 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:213
+#: en/user_basics.ssi:218
 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:216
-msgid "% FIXME code{"
+#: en/user_basics.ssi:220 en/user_customization-packages.ssi:147
+msgid "% FIXME"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:218
+#: en/user_basics.ssi:224
 #, 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:221
+#: en/user_basics.ssi:227
 #, no-wrap
 msgid ""
 "  # IP addresses available for guests\n"
@@ -590,7 +613,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:224
+#: en/user_basics.ssi:230
 #, no-wrap
 msgid ""
 "  # allow booting from the net\n"
@@ -598,7 +621,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:229
+#: en/user_basics.ssi:235
 #, no-wrap
 msgid ""
 "  # for net booting, server where the first file to be loaded (by TFTP\n"
@@ -608,7 +631,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:233
+#: en/user_basics.ssi:239
 #, no-wrap
 msgid ""
 "  # net boot configuration for guests with a PXE client:\n"
@@ -617,7 +640,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:236
+#: en/user_basics.ssi:242
 #, no-wrap
 msgid ""
 "    # PXE boot loader (first program to be loaded, by TFTP)\n"
@@ -625,7 +648,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:239
+#: en/user_basics.ssi:245
 #, no-wrap
 msgid ""
 "  }\n"
@@ -633,17 +656,17 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:243
+#: en/user_basics.ssi:249
 msgid "3~ TFTP server"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:245
+#: en/user_basics.ssi:251
 msgid "This serves the kernel and initial ramdisk to the system at run-time."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:247
+#: en/user_basics.ssi:253
 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 /"
@@ -651,27 +674,27 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:251
+#: en/user_basics.ssi:257
 msgid "dpkg-reconfigure -plow tftpd-hpa"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:253
+#: en/user_basics.ssi:259
 msgid "code}"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:255
+#: en/user_basics.ssi:261
 msgid "and fill in the new tftp server directory when being asked about it."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:257
+#: en/user_basics.ssi:263
 msgid "3~ NFS server"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:259
+#: en/user_basics.ssi:265
 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 "
@@ -679,35 +702,35 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:261
+#: en/user_basics.ssi:267
 msgid "You need to install the nfs-kernel-server package."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:263
+#: en/user_basics.ssi:269
 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:267
+#: en/user_basics.ssi:273
 msgid "/srv/debian-live *(ro,async,no_root_squash,no_subtree_check)"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:271
+#: en/user_basics.ssi:277
 msgid ""
 "and tell the NFS server about this new export with the following command:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:275
+#: en/user_basics.ssi:281
 msgid "# exportfs -rv"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:279
+#: en/user_basics.ssi:285
 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 "
@@ -716,40 +739,40 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:281
+#: en/user_basics.ssi:287
 msgid "3~ Netboot testing HowTo"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:283
+#: en/user_basics.ssi:289
 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:285
+#: en/user_basics.ssi:291
 msgid ""
 "To make our life easier, we can use virtualization. There are two solutions."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:287
+#: en/user_basics.ssi:293
 msgid "3~ Qemu"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:289
+#: en/user_basics.ssi:295
 msgid "_* Install qemu, bridge-utils, sudo."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:291
+#: en/user_basics.ssi:297
 msgid "Edit /etc/qemu-ifup:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:302
+#: en/user_basics.ssi:308
 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...\" "
@@ -758,62 +781,62 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:306
+#: en/user_basics.ssi:312
 msgid "Get, or build a grub-floppy-netboot (in the svn)."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:308
+#: en/user_basics.ssi:314
 msgid "Launch qemu with \"-net nic,vlan=0 -net tap,vlan=0,ifname=tun0\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:310
+#: en/user_basics.ssi:316
 msgid "3~ VMWare Player"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:312
+#: en/user_basics.ssi:318
 msgid "_* Install VMWare Player (\"free as in beer\" edition)"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:314
+#: en/user_basics.ssi:320
 msgid ""
 "_* Create a PXETester directory, and create a text file called pxe.vwx inside"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:316
+#: en/user_basics.ssi:322
 msgid "_* Paste this text inside:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:324
+#: en/user_basics.ssi:330
 msgid ""
 "#!/usr/bin/vmware config.version = \"8\" virtualHW.version = \"4\" memsize = "
 "\"512\" MemAllowAutoScaleDown = \"FALSE\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:330
+#: en/user_basics.ssi:336
 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:333
+#: en/user_basics.ssi:339
 msgid "ethernet0.present = \"TRUE\" ethernet0.addressType = \"generated\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:336
+#: en/user_basics.ssi:342
 msgid "displayName = \"Test Boot PXE\" guestOS = \"other\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:341
+#: en/user_basics.ssi:347
 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 "
@@ -821,19 +844,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:345
+#: en/user_basics.ssi:351
 msgid ""
 "_* You can play with this configuration file (i.e. change memory limit to "
 "256)"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:347
+#: en/user_basics.ssi:353
 msgid ""
 "_* Double click on this file (or run VMWare player and selecet this file)."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:348
+#: en/user_basics.ssi:354
 msgid "_* When running just press space if that strange question comes up..."
 msgstr ""
diff --git a/manual/pot/user_customization-contents.ssi.pot b/manual/pot/user_customization-contents.ssi.pot
index bf1c149..f9c43bd 100644
--- a/manual/pot/user_customization-contents.ssi.pot
+++ b/manual/pot/user_customization-contents.ssi.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-09-18 11:15+0300\n"
+"POT-Creation-Date: 2010-10-03 20:30+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -17,9 +17,9 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. type: Plain text
-#: en/about_manual.ssi:81 en/about_manual.ssi:89 en/about_manual.ssi:97
-#: en/about_manual.ssi:109 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:141 en/about_manual.ssi:149 en/about_manual.ssi:157
+#: en/about_manual.ssi:82 en/about_manual.ssi:90 en/about_manual.ssi:98
+#: en/about_manual.ssi:110 en/about_manual.ssi:121 en/about_manual.ssi:134
+#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
 #: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
 #: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
 #: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
@@ -46,37 +46,38 @@ msgstr ""
 #: 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:45
-#: en/user_basics.ssi:58 en/user_basics.ssi:70 en/user_basics.ssi:84
-#: en/user_basics.ssi:99 en/user_basics.ssi:107 en/user_basics.ssi:115
-#: en/user_basics.ssi:125 en/user_basics.ssi:137 en/user_basics.ssi:149
-#: en/user_basics.ssi:157 en/user_basics.ssi:165 en/user_basics.ssi:179
-#: en/user_basics.ssi:187 en/user_basics.ssi:197 en/user_basics.ssi:249
-#: en/user_basics.ssi:265 en/user_basics.ssi:273 en/user_basics.ssi:293
-#: en/user_basics.ssi:318 en/user_customization-contents.ssi:30
-#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:62
-#: 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/other_use-cases.ssi:111 en/user_basics.ssi:36 en/user_basics.ssi:48
+#: en/user_basics.ssi:62 en/user_basics.ssi:74 en/user_basics.ssi:88
+#: en/user_basics.ssi:104 en/user_basics.ssi:112 en/user_basics.ssi:120
+#: en/user_basics.ssi:130 en/user_basics.ssi:142 en/user_basics.ssi:154
+#: en/user_basics.ssi:162 en/user_basics.ssi:170 en/user_basics.ssi:184
+#: en/user_basics.ssi:192 en/user_basics.ssi:202 en/user_basics.ssi:222
+#: en/user_basics.ssi:255 en/user_basics.ssi:271 en/user_basics.ssi:279
+#: en/user_basics.ssi:299 en/user_basics.ssi:324
+#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
+#: en/user_customization-contents.ssi:66 en/user_customization-packages.ssi:16
+#: en/user_customization-packages.ssi:24 en/user_customization-packages.ssi:36
+#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:59
+#: en/user_customization-packages.ssi:73
 #: en/user_customization-packages.ssi:103
 #: en/user_customization-packages.ssi:111
-#: en/user_customization-packages.ssi:129
-#: en/user_customization-packages.ssi:158
-#: en/user_customization-packages.ssi:168
-#: en/user_customization-packages.ssi:178
-#: en/user_customization-packages.ssi:188 en/user_installation.ssi:38
+#: en/user_customization-packages.ssi:131
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:180
+#: en/user_customization-packages.ssi:190 en/user_installation.ssi:38
 #: en/user_installation.ssi:46 en/user_installation.ssi:56
 #: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:104
-#: en/user_installation.ssi:118 en/user_installation.ssi:134
-#: en/user_overview.ssi:54 en/user_overview.ssi:98 en/user_overview.ssi:106
+#: en/user_installation.ssi:84 en/user_installation.ssi:105
+#: en/user_installation.ssi:119 en/user_installation.ssi:136
+#: en/user_overview.ssi:60 en/user_overview.ssi:104 en/user_overview.ssi:112
 msgid "code{"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:85 en/about_manual.ssi:93 en/about_manual.ssi:101
-#: en/about_manual.ssi:116 en/about_manual.ssi:129 en/about_manual.ssi:137
-#: en/about_manual.ssi:145 en/about_manual.ssi:153 en/about_manual.ssi:160
+#: en/about_manual.ssi:86 en/about_manual.ssi:94 en/about_manual.ssi:102
+#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
 #: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
 #: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
 #: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
@@ -103,34 +104,40 @@ 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:49
-#: en/user_basics.ssi:64 en/user_basics.ssi:74 en/user_basics.ssi:90
-#: en/user_basics.ssi:103 en/user_basics.ssi:111 en/user_basics.ssi:119
-#: en/user_basics.ssi:129 en/user_basics.ssi:143 en/user_basics.ssi:153
-#: en/user_basics.ssi:161 en/user_basics.ssi:169 en/user_basics.ssi:183
-#: en/user_basics.ssi:191 en/user_basics.ssi:201 en/user_basics.ssi:241
-#: en/user_basics.ssi:269 en/user_basics.ssi:277 en/user_basics.ssi:304
-#: en/user_basics.ssi:343 en/user_customization-contents.ssi:35
-#: en/user_customization-contents.ssi:50 en/user_customization-contents.ssi:66
+#: en/other_use-cases.ssi:137 en/user_basics.ssi:40 en/user_basics.ssi:52
+#: en/user_basics.ssi:68 en/user_basics.ssi:78 en/user_basics.ssi:94
+#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:124
+#: en/user_basics.ssi:134 en/user_basics.ssi:148 en/user_basics.ssi:158
+#: en/user_basics.ssi:166 en/user_basics.ssi:174 en/user_basics.ssi:188
+#: en/user_basics.ssi:196 en/user_basics.ssi:206 en/user_basics.ssi:247
+#: en/user_basics.ssi:275 en/user_basics.ssi:283 en/user_basics.ssi:310
+#: en/user_basics.ssi:349 en/user_customization-contents.ssi:39
+#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:70
 #: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
 #: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
 #: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
 #: en/user_customization-packages.ssi:107
 #: en/user_customization-packages.ssi:115
-#: en/user_customization-packages.ssi:133
-#: en/user_customization-packages.ssi:164
-#: en/user_customization-packages.ssi:174
-#: en/user_customization-packages.ssi:184
-#: en/user_customization-packages.ssi:194 en/user_installation.ssi:42
+#: en/user_customization-packages.ssi:135
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:186
+#: en/user_customization-packages.ssi:196 en/user_installation.ssi:42
 #: en/user_installation.ssi:50 en/user_installation.ssi:60
 #: en/user_installation.ssi:72 en/user_installation.ssi:80
-#: en/user_installation.ssi:108 en/user_installation.ssi:123
-#: en/user_installation.ssi:137 en/user_overview.ssi:92
-#: en/user_overview.ssi:102 en/user_overview.ssi:110
+#: en/user_installation.ssi:109 en/user_installation.ssi:124
+#: en/user_installation.ssi:139 en/user_overview.ssi:98
+#: en/user_overview.ssi:108 en/user_overview.ssi:116
 msgid "}code"
 msgstr ""
 
 #. type: Plain text
+#: en/user_basics.ssi:12 en/user_customization-contents.ssi:26
+#: en/user_installation.ssi:101
+msgid "% FIXME: <xref linkend=\"terms\"/>"
+msgstr ""
+
+#. type: Plain text
 #: en/user_customization-contents.ssi:2
 msgid "B~ Customising contents"
 msgstr ""
@@ -158,44 +165,57 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-contents.ssi:13
+#: en/user_customization-contents.ssi:12
 msgid ""
 "_* Chroot local includes: These allow you to add or replace files to the "
 "chroot/Live filesystem. Please see chroot-local-includes for more "
-"information.  % FIXME: <xref linkend=\"chroot-local-includes\"/>"
+"information."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-contents.ssi:14
+msgid "% FIXME: <xref linkend=\"chroot-local-includes\"/>"
 msgstr ""
 
 #. type: Plain text
 #: en/user_customization-contents.ssi:16
 msgid ""
 "_* Binary local includes: These allow you to add or replace files in the "
-"binary image. Please see binary-local-includes for more information.  % "
-"FIXME: <xref linkend=\"binary-local-includes\"/>"
+"binary image. Please see binary-local-includes for more information."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-contents.ssi:19
+#: en/user_customization-contents.ssi:18
+msgid "% FIXME: <xref linkend=\"binary-local-includes\"/>"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-contents.ssi:20
 msgid ""
 "_* Binary includes: These allow you to add or replace Debian specific files "
 "in the binary image, such as the templates and tools directories. Please see "
-"binary-includes for more information.  % FIXME: <xref linkend=\"binary-"
-"includes\"/>"
+"binary-includes for more information."
 msgstr ""
 
 #. type: Plain text
 #: en/user_customization-contents.ssi:22
+msgid "% FIXME: <xref linkend=\"binary-includes\"/>"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-contents.ssi:24
 msgid ""
 "Please see terms for more information about the distinction between the "
-"\"Live\" and \"binary\" images.  % FIXME: <xref linkend=\"terms\"/>"
+"\"Live\" and \"binary\" images."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-contents.ssi:24
+#: en/user_customization-contents.ssi:28
 msgid "3~ Live/chroot local includes"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-contents.ssi:26
+#: en/user_customization-contents.ssi:30
 msgid ""
 "Chroot local includes can be used to add or replace files in the chroot/Live "
 "filesystem so that they are visible when the Live system is booted. Typical "
@@ -205,7 +225,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-contents.ssi:28
+#: en/user_customization-contents.ssi:32
 msgid ""
 "To include files, simply add them to your #{config/chroot_local-includes}# "
 "directory. This directory corresponds to the root directory (#{/}#) of the "
@@ -214,19 +234,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-contents.ssi:33
+#: en/user_customization-contents.ssi:37
 msgid ""
 "$ mkdir -p config/chroot_local-includes/var/www $ cp /path/to/my/index.html "
 "config/chroot_local-includes/var/www"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-contents.ssi:37
+#: en/user_customization-contents.ssi:41
 msgid "Your configuration will then have the following layout:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-contents.ssi:48
+#: en/user_customization-contents.ssi:52
 #, no-wrap
 msgid ""
 "-- config\n"
@@ -240,60 +260,60 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-contents.ssi:52
+#: en/user_customization-contents.ssi:56
 msgid ""
 "Chroot local includes are installed after package installation so that files "
 "installed by packages are overwritten."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:58
 msgid "3~ Binary local includes"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-contents.ssi:56
+#: en/user_customization-contents.ssi:60
 msgid ""
 "The same way as chroot local includes work, there exists the corresponding "
 "mechanism to include files in the live media itself."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-contents.ssi:58
+#: en/user_customization-contents.ssi:62
 msgid "3~ Binary includes"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-contents.ssi:60
+#: en/user_customization-contents.ssi:64
 msgid ""
 "live-build has some standard files (like documentation) that gets included "
 "in the default configuration on every live media. This can be disabled with:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-contents.ssi:64
+#: en/user_customization-contents.ssi:68
 msgid "$ lb config --includes none"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-contents.ssi:68
+#: en/user_customization-contents.ssi:72
 msgid "2~ Hooks"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-contents.ssi:70
+#: en/user_customization-contents.ssi:74
 msgid ""
 "Hooks allow commands to be performed in the chroot and binary stages of the "
 "build in order to customize the image."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-contents.ssi:72
+#: en/user_customization-contents.ssi:76
 msgid "3~ Live/chroot local hooks"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-contents.ssi:74
+#: en/user_customization-contents.ssi:78
 msgid ""
 "To run commands in the chroot stage, create a hook script containing the "
 "commands in the #{config/chroot_local-hooks}# directory. The hook will run "
@@ -306,12 +326,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-contents.ssi:76
+#: en/user_customization-contents.ssi:80
 msgid "3~ Binary local hooks"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-contents.ssi:78
+#: en/user_customization-contents.ssi:82
 msgid ""
 "To run commands in the binary stage, create a hook script containing the "
 "commands in the #{config/binary_local-hooks}#. The hook will run after all "
@@ -324,12 +344,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-contents.ssi:80
+#: en/user_customization-contents.ssi:84
 msgid "2~ Preseeding Debconf questions"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-contents.ssi:82
+#: en/user_customization-contents.ssi:86
 msgid ""
 "Files in the #{config/chroot_local-preseed}# directory are considered to be "
 "debconf preseed files and are installed by live-build using #{debconf-set-"
@@ -337,7 +357,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-contents.ssi:83
+#: en/user_customization-contents.ssi:87
 msgid ""
 "For more information about debconf, please see debconf(7) in the #{debconf}# "
 "package."
diff --git a/manual/pot/user_customization-packages.ssi.pot b/manual/pot/user_customization-packages.ssi.pot
index bfa6c35..d90eb4a 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-09-17 23:43+0300\n"
+"POT-Creation-Date: 2010-10-03 20:30+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -17,17 +17,15 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. type: Plain text
-#: en/about_manual.ssi:81 en/about_manual.ssi:89 en/about_manual.ssi:97
-#: en/about_manual.ssi:109 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:141 en/about_manual.ssi:149 en/about_manual.ssi:157
+#: en/about_manual.ssi:82 en/about_manual.ssi:90 en/about_manual.ssi:98
+#: en/about_manual.ssi:110 en/about_manual.ssi:121 en/about_manual.ssi:134
+#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
 #: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
 #: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
 #: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
 #: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
 #: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
 #: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
-#: en/other_customization-contents.ssi:30
-#: en/other_customization-contents.ssi:39
 #: en/other_customization-internationalization.ssi:10
 #: en/other_customization-internationalization.ssi:18
 #: en/other_customization-internationalization.ssi:26
@@ -48,44 +46,44 @@ msgstr ""
 #: 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:45
-#: en/user_basics.ssi:58 en/user_basics.ssi:70 en/user_basics.ssi:84
-#: en/user_basics.ssi:99 en/user_basics.ssi:107 en/user_basics.ssi:115
-#: en/user_basics.ssi:125 en/user_basics.ssi:137 en/user_basics.ssi:149
-#: en/user_basics.ssi:157 en/user_basics.ssi:165 en/user_basics.ssi:179
-#: en/user_basics.ssi:187 en/user_basics.ssi:197 en/user_basics.ssi:249
-#: en/user_basics.ssi:265 en/user_basics.ssi:273 en/user_basics.ssi:293
-#: en/user_basics.ssi:318 en/user_customization-packages.ssi:16
+#: en/other_use-cases.ssi:111 en/user_basics.ssi:36 en/user_basics.ssi:48
+#: en/user_basics.ssi:62 en/user_basics.ssi:74 en/user_basics.ssi:88
+#: en/user_basics.ssi:104 en/user_basics.ssi:112 en/user_basics.ssi:120
+#: en/user_basics.ssi:130 en/user_basics.ssi:142 en/user_basics.ssi:154
+#: en/user_basics.ssi:162 en/user_basics.ssi:170 en/user_basics.ssi:184
+#: en/user_basics.ssi:192 en/user_basics.ssi:202 en/user_basics.ssi:222
+#: en/user_basics.ssi:255 en/user_basics.ssi:271 en/user_basics.ssi:279
+#: en/user_basics.ssi:299 en/user_basics.ssi:324
+#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
+#: en/user_customization-contents.ssi:66 en/user_customization-packages.ssi:16
 #: en/user_customization-packages.ssi:24 en/user_customization-packages.ssi:36
 #: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:59
 #: en/user_customization-packages.ssi:73
 #: en/user_customization-packages.ssi:103
 #: en/user_customization-packages.ssi:111
-#: en/user_customization-packages.ssi:129
-#: en/user_customization-packages.ssi:158
-#: en/user_customization-packages.ssi:168
-#: en/user_customization-packages.ssi:178
-#: en/user_customization-packages.ssi:188 en/user_installation.ssi:38
+#: en/user_customization-packages.ssi:131
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:180
+#: en/user_customization-packages.ssi:190 en/user_installation.ssi:38
 #: en/user_installation.ssi:46 en/user_installation.ssi:56
 #: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:104
-#: en/user_installation.ssi:118 en/user_installation.ssi:134
-#: en/user_overview.ssi:54 en/user_overview.ssi:98 en/user_overview.ssi:106
+#: en/user_installation.ssi:84 en/user_installation.ssi:105
+#: en/user_installation.ssi:119 en/user_installation.ssi:136
+#: en/user_overview.ssi:60 en/user_overview.ssi:104 en/user_overview.ssi:112
 msgid "code{"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:85 en/about_manual.ssi:93 en/about_manual.ssi:101
-#: en/about_manual.ssi:116 en/about_manual.ssi:129 en/about_manual.ssi:137
-#: en/about_manual.ssi:145 en/about_manual.ssi:153 en/about_manual.ssi:160
+#: en/about_manual.ssi:86 en/about_manual.ssi:94 en/about_manual.ssi:102
+#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
 #: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
 #: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
 #: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
 #: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
 #: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
 #: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: en/other_customization-contents.ssi:35
-#: en/other_customization-contents.ssi:50
 #: en/other_customization-internationalization.ssi:14
 #: en/other_customization-internationalization.ssi:22
 #: en/other_customization-internationalization.ssi:30
@@ -106,33 +104,39 @@ 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:49
-#: en/user_basics.ssi:64 en/user_basics.ssi:74 en/user_basics.ssi:90
-#: en/user_basics.ssi:103 en/user_basics.ssi:111 en/user_basics.ssi:119
-#: en/user_basics.ssi:129 en/user_basics.ssi:143 en/user_basics.ssi:153
-#: en/user_basics.ssi:161 en/user_basics.ssi:169 en/user_basics.ssi:183
-#: en/user_basics.ssi:191 en/user_basics.ssi:201 en/user_basics.ssi:241
-#: en/user_basics.ssi:269 en/user_basics.ssi:277 en/user_basics.ssi:304
-#: en/user_basics.ssi:343 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/other_use-cases.ssi:137 en/user_basics.ssi:40 en/user_basics.ssi:52
+#: en/user_basics.ssi:68 en/user_basics.ssi:78 en/user_basics.ssi:94
+#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:124
+#: en/user_basics.ssi:134 en/user_basics.ssi:148 en/user_basics.ssi:158
+#: en/user_basics.ssi:166 en/user_basics.ssi:174 en/user_basics.ssi:188
+#: en/user_basics.ssi:196 en/user_basics.ssi:206 en/user_basics.ssi:247
+#: en/user_basics.ssi:275 en/user_basics.ssi:283 en/user_basics.ssi:310
+#: en/user_basics.ssi:349 en/user_customization-contents.ssi:39
+#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:70
+#: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
+#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
+#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
 #: en/user_customization-packages.ssi:107
 #: en/user_customization-packages.ssi:115
-#: en/user_customization-packages.ssi:133
-#: en/user_customization-packages.ssi:164
-#: en/user_customization-packages.ssi:174
-#: en/user_customization-packages.ssi:184
-#: en/user_customization-packages.ssi:194 en/user_installation.ssi:42
+#: en/user_customization-packages.ssi:135
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:186
+#: en/user_customization-packages.ssi:196 en/user_installation.ssi:42
 #: en/user_installation.ssi:50 en/user_installation.ssi:60
 #: en/user_installation.ssi:72 en/user_installation.ssi:80
-#: en/user_installation.ssi:108 en/user_installation.ssi:123
-#: en/user_installation.ssi:137 en/user_overview.ssi:92
-#: en/user_overview.ssi:102 en/user_overview.ssi:110
+#: en/user_installation.ssi:109 en/user_installation.ssi:124
+#: en/user_installation.ssi:139 en/user_overview.ssi:98
+#: en/user_overview.ssi:108 en/user_overview.ssi:116
 msgid "}code"
 msgstr ""
 
 #. type: Plain text
+#: en/user_basics.ssi:220 en/user_customization-packages.ssi:147
+msgid "% FIXME"
+msgstr ""
+
+#. type: Plain text
 #: en/user_customization-packages.ssi:2
 msgid ":B~ Customising package installation"
 msgstr ""
@@ -376,11 +380,16 @@ msgid "$ lb config --packages \"package1 package2 package3\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:118
+#: en/user_customization-packages.ssi:117
 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 "
-"details.  % FIXME: <xref linkend=\"package-installation\"/>"
+"details."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:119
+msgid "% FIXME: <xref linkend=\"package-installation\"/>"
 msgstr ""
 
 #. type: Plain text
@@ -388,17 +397,21 @@ msgstr ""
 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 "
-"using package lists. See package-lists for more information.  % FIXME: <xref "
-"linkend=\"package-lists\"/>"
+"using package lists. See package-lists for more information."
 msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:123
-msgid "3~ Package lists"
+msgid "% FIXME: <xref linkend=\"package-lists\"/>"
 msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:125
+msgid "3~ Package lists"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:127
 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 "
@@ -407,37 +420,37 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:129
 msgid "To specify one or more package list, you can use:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:131
+#: en/user_customization-packages.ssi:133
 msgid "$ lb config --packages-lists \"list1 list2 list3\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:135
+#: en/user_customization-packages.ssi:137
 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:137
+#: en/user_customization-packages.ssi:139
 #, no-wrap
 msgid "*{Local packages lists}*\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:139
+#: en/user_customization-packages.ssi:141
 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:141
+#: en/user_customization-packages.ssi:143
 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 "
@@ -446,23 +459,18 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:143
+#: en/user_customization-packages.ssi:145
 #, no-wrap
 msgid "*{Extending a provided package list using includes}*\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:145
-msgid "% FIXME"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:152
+#: en/user_customization-packages.ssi:154
 msgid "% code{ % % #include <gnome> % iceweasel % % }code"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:154
+#: en/user_customization-packages.ssi:156
 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}# "
@@ -470,75 +478,75 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:156
+#: en/user_customization-packages.ssi:158
 #, no-wrap
 msgid "*{Using conditionals inside packages lists}*\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:162
+#: en/user_customization-packages.ssi:164
 msgid "#if ARCHITECTURE amd64 ia32-libs #endif"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:168
 msgid "or if #{LB_ARCHITECTURE}# is set to #{i386}# or #{amd64}#:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:172
+#: en/user_customization-packages.ssi:174
 msgid "#if ARCHITECTURE i386 amd64 memtest86+ #endif"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:178
 msgid "or if #{LB_ARCHIVE_AREAS}# contains either #{contrib}# or #{non-free}#:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:182
+#: en/user_customization-packages.ssi:184
 msgid "#if ARCHIVE_AREAS contrib non-free vrms #endif"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:186
+#: en/user_customization-packages.ssi:188
 msgid "A conditional may surround an #{#include}# directive:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:192
+#: en/user_customization-packages.ssi:194
 msgid "#if ARCHITECTURE amd64 #include <gnome-full> #endif"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:196
+#: en/user_customization-packages.ssi:198
 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:198
+#: en/user_customization-packages.ssi:200
 msgid "The nesting of conditionals is not supported."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:200
+#: en/user_customization-packages.ssi:202
 msgid "3~ Tasks"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:202
+#: en/user_customization-packages.ssi:204
 msgid "%FIXME"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:204
+#: en/user_customization-packages.ssi:206
 msgid "2~ Installing modified or third-party packages"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:206
+#: en/user_customization-packages.ssi:208
 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 "
@@ -549,7 +557,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:208
+#: en/user_customization-packages.ssi:210
 msgid ""
 "This section does not cover advice regarding building or maintaining "
 "modified packages. Joachim Breitner's 'How to fork privately' method from "
@@ -560,22 +568,22 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:210
+#: en/user_customization-packages.ssi:212
 msgid "There are two ways of installing modified custom packages:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:212
+#: en/user_customization-packages.ssi:214
 msgid "_* #{chroot_local-packages}#"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:214
+#: en/user_customization-packages.ssi:216
 msgid "_* Using a custom APT repository"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:218
 msgid ""
 "The #{chroot_local-packages}# is simpler to achieve and useful for \"one-off"
 "\" customisations but has a number of drawbacks, whilst using a custom APT "
@@ -583,12 +591,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:218
+#: en/user_customization-packages.ssi:220
 msgid "3~ Using #{chroot_local-packages}# to install custom packages"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:220
+#: en/user_customization-packages.ssi:222
 msgid ""
 "To install a custom package, simply copy it to the #{config/chroot_local-"
 "packages}# directory. Packages that are inside this directory will be "
@@ -597,53 +605,58 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:222
+#: en/user_customization-packages.ssi:224
 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:224
+#: en/user_customization-packages.ssi:226
 msgid ""
 "Using #{chroot_local-packages}# for installation of custom packages has "
 "disadvantages:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:226
+#: en/user_customization-packages.ssi:228
 msgid "_* It is not possible to use secure APT"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:228
+#: en/user_customization-packages.ssi:230
 msgid ""
 "_* You must install all appropriate packages in the #{config/chroot_local-"
 "packages}# directory"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:230
+#: en/user_customization-packages.ssi:232
 msgid ""
 "_* It does not lend itself to storing Debian Live configurations in revision "
 "control"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:232
+#: en/user_customization-packages.ssi:234
 msgid "3~ Using an APT repository to install custom packages"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:235
+#: en/user_customization-packages.ssi:236
 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 "
-"details.  % FIXME: <xref linkend=\"lb-packages\"/>"
+"details."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:237
+#: en/user_customization-packages.ssi:238
+msgid "% FIXME: <xref linkend=\"lb-packages\"/>"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:240
 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 "
@@ -651,12 +664,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:239
+#: en/user_customization-packages.ssi:242
 msgid "3~ Custom packages and APT"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:241
+#: en/user_customization-packages.ssi:244
 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 "
@@ -666,23 +679,27 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:244
+#: en/user_customization-packages.ssi:246
 msgid ""
 "Because of this, you may wish to increment the version number in your custom "
 "packages' #{debian/changelog}# files to ensure that your modified version is "
 "installed over one in the official Debian repositories. This may also be "
 "achieved by altering the live system's APT pinning preferences - see apt-"
-"preferences for more information.  % FIXME: <xref linkend=\"apt-preferences"
-"\"/>"
+"preferences for more information."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:246
+#: en/user_customization-packages.ssi:248
+msgid "% FIXME: <xref linkend=\"apt-preferences\"/>"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:250
 msgid "3~ Altering APT preferences during Live system"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:247
+#: en/user_customization-packages.ssi:251
 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_installation.ssi.pot b/manual/pot/user_installation.ssi.pot
index 1c33784..036cdbe 100644
--- a/manual/pot/user_installation.ssi.pot
+++ b/manual/pot/user_installation.ssi.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-09-17 23:43+0300\n"
+"POT-Creation-Date: 2010-10-03 20:30+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -17,17 +17,15 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. type: Plain text
-#: en/about_manual.ssi:81 en/about_manual.ssi:89 en/about_manual.ssi:97
-#: en/about_manual.ssi:109 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:141 en/about_manual.ssi:149 en/about_manual.ssi:157
+#: en/about_manual.ssi:82 en/about_manual.ssi:90 en/about_manual.ssi:98
+#: en/about_manual.ssi:110 en/about_manual.ssi:121 en/about_manual.ssi:134
+#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
 #: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
 #: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
 #: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
 #: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
 #: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
 #: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
-#: en/other_customization-contents.ssi:30
-#: en/other_customization-contents.ssi:39
 #: en/other_customization-internationalization.ssi:10
 #: en/other_customization-internationalization.ssi:18
 #: en/other_customization-internationalization.ssi:26
@@ -48,44 +46,44 @@ msgstr ""
 #: 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:45
-#: en/user_basics.ssi:58 en/user_basics.ssi:70 en/user_basics.ssi:84
-#: en/user_basics.ssi:99 en/user_basics.ssi:107 en/user_basics.ssi:115
-#: en/user_basics.ssi:125 en/user_basics.ssi:137 en/user_basics.ssi:149
-#: en/user_basics.ssi:157 en/user_basics.ssi:165 en/user_basics.ssi:179
-#: en/user_basics.ssi:187 en/user_basics.ssi:197 en/user_basics.ssi:249
-#: en/user_basics.ssi:265 en/user_basics.ssi:273 en/user_basics.ssi:293
-#: en/user_basics.ssi:318 en/user_customization-packages.ssi:16
+#: en/other_use-cases.ssi:111 en/user_basics.ssi:36 en/user_basics.ssi:48
+#: en/user_basics.ssi:62 en/user_basics.ssi:74 en/user_basics.ssi:88
+#: en/user_basics.ssi:104 en/user_basics.ssi:112 en/user_basics.ssi:120
+#: en/user_basics.ssi:130 en/user_basics.ssi:142 en/user_basics.ssi:154
+#: en/user_basics.ssi:162 en/user_basics.ssi:170 en/user_basics.ssi:184
+#: en/user_basics.ssi:192 en/user_basics.ssi:202 en/user_basics.ssi:222
+#: en/user_basics.ssi:255 en/user_basics.ssi:271 en/user_basics.ssi:279
+#: en/user_basics.ssi:299 en/user_basics.ssi:324
+#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
+#: en/user_customization-contents.ssi:66 en/user_customization-packages.ssi:16
 #: en/user_customization-packages.ssi:24 en/user_customization-packages.ssi:36
 #: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:59
 #: en/user_customization-packages.ssi:73
 #: en/user_customization-packages.ssi:103
 #: en/user_customization-packages.ssi:111
-#: en/user_customization-packages.ssi:129
-#: en/user_customization-packages.ssi:158
-#: en/user_customization-packages.ssi:168
-#: en/user_customization-packages.ssi:178
-#: en/user_customization-packages.ssi:188 en/user_installation.ssi:38
+#: en/user_customization-packages.ssi:131
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:180
+#: en/user_customization-packages.ssi:190 en/user_installation.ssi:38
 #: en/user_installation.ssi:46 en/user_installation.ssi:56
 #: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:104
-#: en/user_installation.ssi:118 en/user_installation.ssi:134
-#: en/user_overview.ssi:54 en/user_overview.ssi:98 en/user_overview.ssi:106
+#: en/user_installation.ssi:84 en/user_installation.ssi:105
+#: en/user_installation.ssi:119 en/user_installation.ssi:136
+#: en/user_overview.ssi:60 en/user_overview.ssi:104 en/user_overview.ssi:112
 msgid "code{"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:85 en/about_manual.ssi:93 en/about_manual.ssi:101
-#: en/about_manual.ssi:116 en/about_manual.ssi:129 en/about_manual.ssi:137
-#: en/about_manual.ssi:145 en/about_manual.ssi:153 en/about_manual.ssi:160
+#: en/about_manual.ssi:86 en/about_manual.ssi:94 en/about_manual.ssi:102
+#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
 #: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
 #: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
 #: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
 #: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
 #: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
 #: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: en/other_customization-contents.ssi:35
-#: en/other_customization-contents.ssi:50
 #: en/other_customization-internationalization.ssi:14
 #: en/other_customization-internationalization.ssi:22
 #: en/other_customization-internationalization.ssi:30
@@ -106,29 +104,30 @@ 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:49
-#: en/user_basics.ssi:64 en/user_basics.ssi:74 en/user_basics.ssi:90
-#: en/user_basics.ssi:103 en/user_basics.ssi:111 en/user_basics.ssi:119
-#: en/user_basics.ssi:129 en/user_basics.ssi:143 en/user_basics.ssi:153
-#: en/user_basics.ssi:161 en/user_basics.ssi:169 en/user_basics.ssi:183
-#: en/user_basics.ssi:191 en/user_basics.ssi:201 en/user_basics.ssi:241
-#: en/user_basics.ssi:269 en/user_basics.ssi:277 en/user_basics.ssi:304
-#: en/user_basics.ssi:343 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/other_use-cases.ssi:137 en/user_basics.ssi:40 en/user_basics.ssi:52
+#: en/user_basics.ssi:68 en/user_basics.ssi:78 en/user_basics.ssi:94
+#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:124
+#: en/user_basics.ssi:134 en/user_basics.ssi:148 en/user_basics.ssi:158
+#: en/user_basics.ssi:166 en/user_basics.ssi:174 en/user_basics.ssi:188
+#: en/user_basics.ssi:196 en/user_basics.ssi:206 en/user_basics.ssi:247
+#: en/user_basics.ssi:275 en/user_basics.ssi:283 en/user_basics.ssi:310
+#: en/user_basics.ssi:349 en/user_customization-contents.ssi:39
+#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:70
+#: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
+#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
+#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
 #: en/user_customization-packages.ssi:107
 #: en/user_customization-packages.ssi:115
-#: en/user_customization-packages.ssi:133
-#: en/user_customization-packages.ssi:164
-#: en/user_customization-packages.ssi:174
-#: en/user_customization-packages.ssi:184
-#: en/user_customization-packages.ssi:194 en/user_installation.ssi:42
+#: en/user_customization-packages.ssi:135
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:186
+#: en/user_customization-packages.ssi:196 en/user_installation.ssi:42
 #: en/user_installation.ssi:50 en/user_installation.ssi:60
 #: en/user_installation.ssi:72 en/user_installation.ssi:80
-#: en/user_installation.ssi:108 en/user_installation.ssi:123
-#: en/user_installation.ssi:137 en/user_overview.ssi:92
-#: en/user_overview.ssi:102 en/user_overview.ssi:110
+#: en/user_installation.ssi:109 en/user_installation.ssi:124
+#: en/user_installation.ssi:139 en/user_overview.ssi:98
+#: en/user_overview.ssi:108 en/user_overview.ssi:116
 msgid "}code"
 msgstr ""
 
@@ -139,6 +138,12 @@ msgid "or"
 msgstr ""
 
 #. type: Plain text
+#: en/user_basics.ssi:12 en/user_customization-contents.ssi:26
+#: en/user_installation.ssi:101
+msgid "% FIXME: <xref linkend=\"terms\"/>"
+msgstr ""
+
+#. type: Plain text
 #: en/user_installation.ssi:2
 msgid ":B~ Installation"
 msgstr ""
@@ -325,30 +330,29 @@ msgid "3~ Using a customised live-boot"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:100
+#: en/user_installation.ssi:99
 msgid ""
 "To modify the code you can follow the process below. Please ensure you are "
-"familiar with the terms mentioned in terms.  % FIXME: <xref linkend=\"terms"
-"\"/>"
+"familiar with the terms mentioned in terms."
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:102
+#: en/user_installation.ssi:103
 msgid "_* Checkout the live-boot source"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:106
+#: en/user_installation.ssi:107
 msgid "$ git clone git://live.debian.net/git/live-boot.git"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:110
+#: en/user_installation.ssi:111
 msgid "_* Make changes to your local copy"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:112
+#: en/user_installation.ssi:113
 msgid ""
 "And beware that if you want to add your pre-init script in live-bottom, you "
 "should name it without dashes '-', e.g: call it \"99new_feature\" and not "
@@ -356,12 +360,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:114
+#: en/user_installation.ssi:115
 msgid "_* Build a live-boot .deb"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:116
+#: en/user_installation.ssi:117
 msgid ""
 "You must build either on your target distribution or in a chroot containing "
 "your target platform: this means if your target is squeeze then you should "
@@ -372,12 +376,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:121
+#: en/user_installation.ssi:122
 msgid "$ cd live-boot $ dpkg-buildpackage -rfakeroot -b -uc -us"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:125
+#: en/user_installation.ssi:126
 msgid "_* Use the generated live-boot .deb"
 msgstr ""
 
@@ -387,17 +391,23 @@ msgid ""
 "As live-boot is installed by live-build system, installing the package in "
 "the host system is not sufficient: you should treat the generated .deb like "
 "another custom package. Please see custom-packages for more information. You "
-"should pay particular attention to custom-packages-apt.  % FIXME: <xref "
-"linkend=\"custom-packages\"/> <xref linkend=\"custom-packages-apt\"/>"
+"should pay particular attention to custom-packages-apt."
 msgstr ""
 
 #. type: Plain text
 #: en/user_installation.ssi:130
-msgid "3~ Using live-boot snapshots"
+msgid ""
+"% FIXME: <xref linkend=\"custom-packages\"/> <xref linkend=\"custom-packages-"
+"apt\"/>"
 msgstr ""
 
 #. type: Plain text
 #: en/user_installation.ssi:132
+msgid "3~ Using live-boot snapshots"
+msgstr ""
+
+#. type: Plain text
+#: en/user_installation.ssi:134
 msgid ""
 "You can let live-build automatically use the latest snapshot of live-boot by "
 "configuring a third-party repository in your live-build configuration "
@@ -406,6 +416,6 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:136
+#: en/user_installation.ssi:138
 msgid "lb config --repository live.debian.net"
 msgstr ""
diff --git a/manual/pot/user_overview.ssi.pot b/manual/pot/user_overview.ssi.pot
index 676dbef..b263f9c 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-09-17 23:43+0300\n"
+"POT-Creation-Date: 2010-10-03 20:30+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -17,17 +17,15 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. type: Plain text
-#: en/about_manual.ssi:81 en/about_manual.ssi:89 en/about_manual.ssi:97
-#: en/about_manual.ssi:109 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:141 en/about_manual.ssi:149 en/about_manual.ssi:157
+#: en/about_manual.ssi:82 en/about_manual.ssi:90 en/about_manual.ssi:98
+#: en/about_manual.ssi:110 en/about_manual.ssi:121 en/about_manual.ssi:134
+#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
 #: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
 #: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
 #: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
 #: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
 #: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
 #: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
-#: en/other_customization-contents.ssi:30
-#: en/other_customization-contents.ssi:39
 #: en/other_customization-internationalization.ssi:10
 #: en/other_customization-internationalization.ssi:18
 #: en/other_customization-internationalization.ssi:26
@@ -48,44 +46,44 @@ msgstr ""
 #: 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:45
-#: en/user_basics.ssi:58 en/user_basics.ssi:70 en/user_basics.ssi:84
-#: en/user_basics.ssi:99 en/user_basics.ssi:107 en/user_basics.ssi:115
-#: en/user_basics.ssi:125 en/user_basics.ssi:137 en/user_basics.ssi:149
-#: en/user_basics.ssi:157 en/user_basics.ssi:165 en/user_basics.ssi:179
-#: en/user_basics.ssi:187 en/user_basics.ssi:197 en/user_basics.ssi:249
-#: en/user_basics.ssi:265 en/user_basics.ssi:273 en/user_basics.ssi:293
-#: en/user_basics.ssi:318 en/user_customization-packages.ssi:16
+#: en/other_use-cases.ssi:111 en/user_basics.ssi:36 en/user_basics.ssi:48
+#: en/user_basics.ssi:62 en/user_basics.ssi:74 en/user_basics.ssi:88
+#: en/user_basics.ssi:104 en/user_basics.ssi:112 en/user_basics.ssi:120
+#: en/user_basics.ssi:130 en/user_basics.ssi:142 en/user_basics.ssi:154
+#: en/user_basics.ssi:162 en/user_basics.ssi:170 en/user_basics.ssi:184
+#: en/user_basics.ssi:192 en/user_basics.ssi:202 en/user_basics.ssi:222
+#: en/user_basics.ssi:255 en/user_basics.ssi:271 en/user_basics.ssi:279
+#: en/user_basics.ssi:299 en/user_basics.ssi:324
+#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
+#: en/user_customization-contents.ssi:66 en/user_customization-packages.ssi:16
 #: en/user_customization-packages.ssi:24 en/user_customization-packages.ssi:36
 #: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:59
 #: en/user_customization-packages.ssi:73
 #: en/user_customization-packages.ssi:103
 #: en/user_customization-packages.ssi:111
-#: en/user_customization-packages.ssi:129
-#: en/user_customization-packages.ssi:158
-#: en/user_customization-packages.ssi:168
-#: en/user_customization-packages.ssi:178
-#: en/user_customization-packages.ssi:188 en/user_installation.ssi:38
+#: en/user_customization-packages.ssi:131
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:180
+#: en/user_customization-packages.ssi:190 en/user_installation.ssi:38
 #: en/user_installation.ssi:46 en/user_installation.ssi:56
 #: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:104
-#: en/user_installation.ssi:118 en/user_installation.ssi:134
-#: en/user_overview.ssi:54 en/user_overview.ssi:98 en/user_overview.ssi:106
+#: en/user_installation.ssi:84 en/user_installation.ssi:105
+#: en/user_installation.ssi:119 en/user_installation.ssi:136
+#: en/user_overview.ssi:60 en/user_overview.ssi:104 en/user_overview.ssi:112
 msgid "code{"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:85 en/about_manual.ssi:93 en/about_manual.ssi:101
-#: en/about_manual.ssi:116 en/about_manual.ssi:129 en/about_manual.ssi:137
-#: en/about_manual.ssi:145 en/about_manual.ssi:153 en/about_manual.ssi:160
+#: en/about_manual.ssi:86 en/about_manual.ssi:94 en/about_manual.ssi:102
+#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
 #: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
 #: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
 #: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
 #: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
 #: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
 #: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: en/other_customization-contents.ssi:35
-#: en/other_customization-contents.ssi:50
 #: en/other_customization-internationalization.ssi:14
 #: en/other_customization-internationalization.ssi:22
 #: en/other_customization-internationalization.ssi:30
@@ -106,33 +104,44 @@ 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:49
-#: en/user_basics.ssi:64 en/user_basics.ssi:74 en/user_basics.ssi:90
-#: en/user_basics.ssi:103 en/user_basics.ssi:111 en/user_basics.ssi:119
-#: en/user_basics.ssi:129 en/user_basics.ssi:143 en/user_basics.ssi:153
-#: en/user_basics.ssi:161 en/user_basics.ssi:169 en/user_basics.ssi:183
-#: en/user_basics.ssi:191 en/user_basics.ssi:201 en/user_basics.ssi:241
-#: en/user_basics.ssi:269 en/user_basics.ssi:277 en/user_basics.ssi:304
-#: en/user_basics.ssi:343 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/other_use-cases.ssi:137 en/user_basics.ssi:40 en/user_basics.ssi:52
+#: en/user_basics.ssi:68 en/user_basics.ssi:78 en/user_basics.ssi:94
+#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:124
+#: en/user_basics.ssi:134 en/user_basics.ssi:148 en/user_basics.ssi:158
+#: en/user_basics.ssi:166 en/user_basics.ssi:174 en/user_basics.ssi:188
+#: en/user_basics.ssi:196 en/user_basics.ssi:206 en/user_basics.ssi:247
+#: en/user_basics.ssi:275 en/user_basics.ssi:283 en/user_basics.ssi:310
+#: en/user_basics.ssi:349 en/user_customization-contents.ssi:39
+#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:70
+#: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
+#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
+#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
 #: en/user_customization-packages.ssi:107
 #: en/user_customization-packages.ssi:115
-#: en/user_customization-packages.ssi:133
-#: en/user_customization-packages.ssi:164
-#: en/user_customization-packages.ssi:174
-#: en/user_customization-packages.ssi:184
-#: en/user_customization-packages.ssi:194 en/user_installation.ssi:42
+#: en/user_customization-packages.ssi:135
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:186
+#: en/user_customization-packages.ssi:196 en/user_installation.ssi:42
 #: en/user_installation.ssi:50 en/user_installation.ssi:60
 #: en/user_installation.ssi:72 en/user_installation.ssi:80
-#: en/user_installation.ssi:108 en/user_installation.ssi:123
-#: en/user_installation.ssi:137 en/user_overview.ssi:92
-#: en/user_overview.ssi:102 en/user_overview.ssi:110
+#: en/user_installation.ssi:109 en/user_installation.ssi:124
+#: en/user_installation.ssi:139 en/user_overview.ssi:98
+#: en/user_overview.ssi:108 en/user_overview.ssi:116
 msgid "}code"
 msgstr ""
 
 #. type: Plain text
+#: en/user_basics.ssi:44 en/user_overview.ssi:22 en/user_overview.ssi:42
+msgid "% FIXME: <xref linkend=\"lb-config\"/>"
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:56 en/user_overview.ssi:46
+msgid "% FIXME: <xref linkend=\"lb-build\"/>"
+msgstr ""
+
+#. type: Plain text
 #: en/user_overview.ssi:2
 msgid ":B~ Overview of tools"
 msgstr ""
@@ -195,16 +204,16 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:21
+#: en/user_overview.ssi:20
 msgid ""
 "Unlike debhelper, live-build contains a tool to generate a skeleton "
 "configuration directory, #{lb config}#. This could be considered to be "
 "similar to tools such as #{dh-make}#. For more information about #{lb config}"
-"#, please see lb-config.  % FIXME: <xref linkend=\"lb-config\"/>"
+"#, please see lb-config."
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:23
+#: en/user_overview.ssi:24
 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 "
@@ -214,7 +223,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:25
+#: en/user_overview.ssi:26
 msgid ""
 "For example, the #{lb_bootstrap_debootstrap}# command uses files named "
 "config/bootstrap and config/bootstrap_debootstrap to read the options it "
@@ -224,7 +233,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:27
+#: en/user_overview.ssi:28
 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 "
@@ -235,7 +244,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:29
+#: en/user_overview.ssi:30
 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 "
@@ -243,7 +252,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:31
+#: en/user_overview.ssi:32
 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."
@@ -256,75 +265,86 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_overview.ssi:34
-msgid ""
-"Please see installation for information on how to install live-build.  % "
-"FIXME: <xref linkend=\"installation\"/>"
+msgid "Please see installation for information on how to install live-build."
 msgstr ""
 
 #. type: Plain text
 #: en/user_overview.ssi:36
+msgid "% FIXME: <xref linkend=\"installation\"/>"
+msgstr ""
+
+#. type: Plain text
+#: en/user_overview.ssi:38
 msgid ""
 "The remainder of this section discusses the three most important commands:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:39
+#: en/user_overview.ssi:40
 msgid ""
 "_* *{lb config}*: Responsible for initialising a Live system configuration "
-"directory. See lb-config for more information.  % FIXME: <xref linkend=\"lb-"
-"config\"/>"
+"directory. See lb-config for more information."
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:42
+#: en/user_overview.ssi:44
 msgid ""
 "_* *{lb build}*: Responsible for starting a Live system build. See lb-build "
-"for more information.  % FIXME: <xref linkend=\"lb-build\"/>"
+"for more information."
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:45
+#: en/user_overview.ssi:48
 msgid ""
 "_* *{lb clean}*: Responsible for removing parts of a Live system build. See "
-"lb-clean for more information.  % FIXME: <xref linkend=\"lb-clean\"/"
+"lb-clean for more information."
+msgstr ""
+
+#. type: Plain text
+#: en/user_overview.ssi:50
+msgid "% FIXME: <xref linkend=\"lb-clean\"/"
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:47
+#: en/user_overview.ssi:52
 msgid "3~ The #{lb config}# command"
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:50
+#: en/user_overview.ssi:54
 msgid ""
 "As discussed in live-build, the scripts that make up live-build source their "
 "configuration from a single directory named config/. As constructing this "
 "directory by hand would be time-consuming and error-prone, the #{lb config}# "
-"command can be used to create skeleton configuration folders.  % FIXME: "
-"<xref linkend=\"live-build\"/>"
+"command can be used to create skeleton configuration folders."
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:52
+#: en/user_overview.ssi:56
+msgid "% FIXME: <xref linkend=\"live-build\"/>"
+msgstr ""
+
+#. type: Plain text
+#: en/user_overview.ssi:58
 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:57
+#: en/user_overview.ssi:63
 msgid "$ lb config P: Creating config tree"
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:62
+#: en/user_overview.ssi:68
 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:90
+#: en/user_overview.ssi:96
 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 "
@@ -349,7 +369,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:94
+#: en/user_overview.ssi:100
 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 "
@@ -357,7 +377,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:96
+#: en/user_overview.ssi:102
 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 "
@@ -365,38 +385,38 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:100
+#: en/user_overview.ssi:106
 msgid "$ lb config -p gnome"
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:104
+#: en/user_overview.ssi:110
 msgid ""
 "will build a config/ directory configured to include the 'gnome' package "
 "list. It is possible to specify many options:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:108
+#: en/user_overview.ssi:114
 msgid ""
 "$ lb config --binary-images net --hostname live-machine --username live-"
 "user ..."
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:112
+#: en/user_overview.ssi:118
 msgid ""
 "A full list of options is available in the #{lb_config}# man page. Most "
 "options have a parallel with an \"LB_\" prefixed variable."
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:114
+#: en/user_overview.ssi:120
 msgid "3~ The #{lb build}# command"
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:116
+#: en/user_overview.ssi:122
 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 "
@@ -404,24 +424,24 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:118
+#: en/user_overview.ssi:124
 msgid "3~ The #{lb clean}# command"
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:120
+#: en/user_overview.ssi:126
 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:122
+#: en/user_overview.ssi:128
 msgid "2~ The live-boot package"
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:124
+#: en/user_overview.ssi:130
 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 "
@@ -430,7 +450,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:126
+#: en/user_overview.ssi:132
 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 "
@@ -439,7 +459,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:127
+#: en/user_overview.ssi:133
 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 "

-- 
live-manual



More information about the debian-live-changes mailing list