[SCM] live-manual branch, debian, updated. debian/2.0_a8-1-30-g5861c71

[Ben Armstrong]

The following commit has been merged in the debian branch:
commit 5861c71c5e3bc63e8e96d13ebf211076d557bc41
Author: Ben Armstrong <synrg at debian.org>
Date:   Fri Oct 22 07:53:16 2010 -0300

    Adding more references, including re-enabled Bugs and stub Customization overview.

diff --git a/manual/de/about_manual.ssi b/manual/de/about_manual.ssi
index 2ae5efe..9a0aa9e 100644
--- a/manual/de/about_manual.ssi
+++ b/manual/de/about_manual.ssi
@@ -105,12 +105,10 @@ _* Trent W. Buck
 
 2~ Contributing to this document
 
-% FIXME: link to about_project.ssi 'Contact' 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"/>
+This manual is intended as a community project and all proposals for
+improvements and contributions are extremely welcome. The preferred way to
+submit a contribution is to send it to the mailing list. Please see
+{Contact}#contact for more information.
 
 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 29d303a..15fd20c 100644
--- a/manual/de/about_project.ssi
+++ b/manual/de/about_project.ssi
@@ -77,16 +77,14 @@ A system for configuring packages is provided using debconf in #{lb 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 overview}#customization-overview.
 
 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.
 
-2~ Contact
+2~contact Contact
 
 _* *{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
@@ -101,9 +99,7 @@ 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 {Reporting bugs}#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/live-manual.ssm b/manual/de/live-manual.ssm
index 4323a59..d5d7f46 100644
--- a/manual/de/live-manual.ssm
+++ b/manual/de/live-manual.ssm
@@ -37,6 +37,8 @@
 
 << user_managing_a_configuration.ssi
 
+<< user_customization-overview.ssi
+
 << user_customization-packages.ssi
 
 << user_customization-contents.ssi
@@ -67,7 +69,7 @@ only after it has been reviewed.
 
 % << other_faq.ssi
 
-% << other_reporting-bugs.ssi
+<< other_reporting-bugs.ssi
 
 % << other_howtos.ssi
 
diff --git a/manual/de/other_reporting-bugs.ssi b/manual/de/other_reporting-bugs.ssi
index cf0c72a..fcf0c13 100644
--- a/manual/de/other_reporting-bugs.ssi
+++ b/manual/de/other_reporting-bugs.ssi
@@ -1,6 +1,6 @@
 B~ Reporting bugs
 
-1~ Reporting bugs
+1~bugs Reporting bugs
 
 Debian Live is far from being perfect, but we want to make it as close as
 possible to perfect - with your help. Do not hesitate to report a bug: it is
@@ -51,7 +51,7 @@ available in Debian anymore, please recognize that the resources of the
 Debian kernel team are limited and will be unlikely to be able to fix the
 problem.
 
-2~ Collect information
+2~collect-information Collect information
 
 Please provide enough information with your report. At a minimum, it should
 contain the exact version of live-helper version where the bug is
@@ -124,11 +124,12 @@ bootstrapping from an official mirror.
 3~ At boot-time
 
 If your image does not boot, please report it to the mailing list together
-with the information requested in collect-information. Do not forget to
-mention, how/when the image failed, in Qemu, VMWare or real hardware. If you
-are using a virtualization technology of any kind, please always run it on
-real hardware before reporting a bug. Providing a screenshot of the failure
-is also very helpful.  % FIXME: <xref linkend="collect-information"/>
+with the information requested in {Collect
+information}#collect-information. Do not forget to mention, how/when the
+image failed, in Qemu, VMWare or real hardware. If you are using a
+virtualization technology of any kind, please always run it on real hardware
+before reporting a bug. Providing a screenshot of the failure is also very
+helpful.
 
 3~ At run-time
 
diff --git a/manual/de/user_customization-contents.ssi b/manual/de/user_customization-contents.ssi
index 7376278..df28e53 100644
--- a/manual/de/user_customization-contents.ssi
+++ b/manual/de/user_customization-contents.ssi
@@ -1,6 +1,6 @@
 B~ Customizing contents
 
-1~ Customizing contents
+1~customizing-contents Customizing contents
 
 This chapter discusses further customization of the live system.
 
diff --git a/manual/de/user_customization-overview.ssi b/manual/de/user_customization-overview.ssi
new file mode 100644
index 0000000..68d7cfa
--- /dev/null
+++ b/manual/de/user_customization-overview.ssi
@@ -0,0 +1,12 @@
+B~ Customizing contents
+
+1~customization-overview Customization overview
+
+% FIXME: just a stub for now.  In conversational style, cover the different
+kinds of customization % and link to each section within the text.
+
+This chapter gives an overview of the various ways in which your Debian live
+systems may be customized.  See sections {Customizing
+contents}#customizing-contents, {Customizing packages}#customizing-packages}
+and {Customizing locale and language}#customizing-locale-and-language.
+
diff --git a/manual/de/user_overview.ssi b/manual/de/user_overview.ssi
index 93b9a97..9c7e8ff 100644
--- a/manual/de/user_overview.ssi
+++ b/manual/de/user_overview.ssi
@@ -5,7 +5,7 @@
 This chapter contains an overview of the three main tools used in building
 Debian Live systems: live-build, live-boot and live-config.
 
-2~ live-build
+2~live-build live-build
 
 live-build is a collection of scripts to build Debian Live systems. These
 scripts are also referred to as "commands".
@@ -30,7 +30,7 @@ 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}#lb-config.
+config}#, please see {The lb config command}#lb-config.
 
 Besides the common config/common, which is used by all live-build commands,
 some additional files can be used to configure the behavior of specific
@@ -63,35 +63,24 @@ 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 initializing a Live system configuration
-directory. See lb-config for more information.
-
-% FIXME: <xref linkend="lb-config"/>
+directory. See {The lb config command}#lb-config for more information.
 
-_* *{lb build}*: Responsible for starting a Live system build. See lb-build
-for more information.
-
-% FIXME: <xref linkend="lb-build"/>
+_* *{lb build}*: Responsible for starting a Live system build. See {The lb
+build command}#lb-build for more information.
 
 _* *{lb clean}*: Responsible for removing parts of a Live system build. See
-lb-clean for more information.
-
-% FIXME: <xref linkend="lb-clean"/
+{The lb clean command}#lb-clean for more information.
 
 3~lb-config 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"/>
+As discussed in {live-build}#live-build, the scripts that make up live-build
+source their configuration from a single directory named config/. As
+constructing this directory by hand would be time-consuming and error-prone,
+the #{lb config}# command can be used to create skeleton configuration
+folders.
 
 Issuing #{lb config}# without any arguments creates a config subdirectory
 which it populates with some default settings:
@@ -154,18 +143,18 @@ $ lb config --binary-images net --hostname live-machine --username live-user
 A full list of options is available in the #{lb_config}# man page. Most
 options have a parallel with an "LB_" prefixed variable.
 
-3~ The #{lb build}# command
+3~lb-build The #{lb build}# command
 
 The #{lb build}# command reads in your configuration from the config/
 directory. It then runs the lower lower level commands needed to build your
 Live system.
 
-3~ The #{lb clean}# command
+3~lb-clean The #{lb clean}# command
 
 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.
 
-2~ The live-boot package
+2~live-boot The live-boot package
 
 live-boot is a collection of scripts providing hooks for the
 initramfs-tools, used to generate an initramfs capable of booting live
@@ -181,7 +170,7 @@ More information on initial ramfs in Debian can be found in the Debian Linux
 Kernel Handbook at http://kernel-handbook.alioth.debian.org/ in the chapter
 on initramfs.
 
-2~ The live-config package
+2~live-config The live-config package
 
 live-config consists of the scripts that run at boot time after live-boot to
 configure the live system automatically. It handles such tasks as setting
diff --git a/manual/en/about_manual.ssi b/manual/en/about_manual.ssi
index c37fbc7..5a3ef6b 100644
--- a/manual/en/about_manual.ssi
+++ b/manual/en/about_manual.ssi
@@ -70,10 +70,7 @@ _* Trent W. Buck
 
 2~ Contributing to this document
 
-% FIXME: link to about_project.ssi 'Contact'
-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"/>
+This manual is intended as a community project and all proposals for improvements and contributions are extremely welcome. The preferred way to submit a contribution is to send it to the mailing list. Please see {Contact}#contact for more information.
 
 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 3573a26..fc4a752 100644
--- a/manual/en/about_project.ssi
+++ b/manual/en/about_project.ssi
@@ -56,20 +56,16 @@ 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 #{lb 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"/>
+A system for configuring packages is provided using debconf in #{lb 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 overview}#customization-overview.
 
 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.
 
-2~ Contact
+2~contact Contact
 
 _* *{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 addressing your mail to debian-live at lists.debian.org. The list archives are available at http://lists.debian.org/debian-live/.
 
 _* *{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"/>
+_* *{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 {Reporting bugs}#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/live-manual.ssm b/manual/en/live-manual.ssm
index 4e546ff..5995b12 100644
--- a/manual/en/live-manual.ssm
+++ b/manual/en/live-manual.ssm
@@ -37,6 +37,8 @@
 
 << user_managing_a_configuration.ssi
 
+<< user_customization-overview.ssi
+
 << user_customization-packages.ssi
 
 << user_customization-contents.ssi
@@ -67,7 +69,7 @@ been reviewed.
 
 % << other_faq.ssi
 
-% << other_reporting-bugs.ssi
+<< other_reporting-bugs.ssi
 
 % << other_howtos.ssi
 
diff --git a/manual/en/other_reporting-bugs.ssi b/manual/en/other_reporting-bugs.ssi
index 8ce8694..a1f2879 100644
--- a/manual/en/other_reporting-bugs.ssi
+++ b/manual/en/other_reporting-bugs.ssi
@@ -1,6 +1,6 @@
 B~ Reporting bugs
 
-1~ Reporting bugs
+1~bugs Reporting bugs
 
 Debian Live is far from being perfect, but we want to make it as close as possible to perfect - with your help. Do not hesitate to report a bug: it is better to fill a report twice than never. However, this chapter includes recommendations how to file good bug reports.
 
@@ -30,7 +30,7 @@ To ensure that a particular bug is not caused by an unclean built system, please
 
 Using outdated packages can cause significant problems when trying to reproduce (and ultimately fix) your problem. If a relevant package is not available in Debian anymore, please recognize that the resources of the Debian kernel team are limited and will be unlikely to be able to fix the problem.
 
-2~ Collect information
+2~collect-information Collect information
 
 Please provide enough information with your report. At a minimum, it should contain the exact version of live-helper version where the bug is encountered, and steps to reproduce it. Please use common sense and include other relevant information if you think that it might help in solving the problem.
 
@@ -82,8 +82,7 @@ Also, if you are using a local mirror and/or any of sort of proxy and you are ex
 
 3~ At boot-time
 
-If your image does not boot, please report it to the mailing list together with the information requested in collect-information. Do not forget to mention, how/when the image failed, in Qemu, VMWare or real hardware. If you are using a virtualization technology of any kind, please always run it on real hardware before reporting a bug. Providing a screenshot of the failure is also very helpful.
-% FIXME: <xref linkend="collect-information"/>
+If your image does not boot, please report it to the mailing list together with the information requested in {Collect information}#collect-information. Do not forget to mention, how/when the image failed, in Qemu, VMWare or real hardware. If you are using a virtualization technology of any kind, please always run it on real hardware before reporting a bug. Providing a screenshot of the failure is also very helpful.
 
 3~ At run-time
 
diff --git a/manual/en/user_customization-contents.ssi b/manual/en/user_customization-contents.ssi
index 1e72c4a..7d706fe 100644
--- a/manual/en/user_customization-contents.ssi
+++ b/manual/en/user_customization-contents.ssi
@@ -1,6 +1,6 @@
 B~ Customizing contents
 
-1~ Customizing contents
+1~customizing-contents Customizing contents
 
 This chapter discusses further customization of the live system.
 
diff --git a/manual/en/user_customization-overview.ssi b/manual/en/user_customization-overview.ssi
new file mode 100644
index 0000000..d1076a7
--- /dev/null
+++ b/manual/en/user_customization-overview.ssi
@@ -0,0 +1,9 @@
+B~ Customizing contents
+
+1~customization-overview Customization overview
+
+% FIXME: just a stub for now.  In conversational style, cover the different kinds of customization
+% and link to each section within the text.
+
+This chapter gives an overview of the various ways in which your Debian live systems may be customized.  See sections {Customizing contents}#customizing-contents, {Customizing packages}#customizing-packages} and {Customizing locale and language}#customizing-locale-and-language.
+
diff --git a/manual/en/user_overview.ssi b/manual/en/user_overview.ssi
index 55d1018..341da61 100644
--- a/manual/en/user_overview.ssi
+++ b/manual/en/user_overview.ssi
@@ -4,7 +4,7 @@
 
 This chapter contains an overview of the three main tools used in building Debian Live systems: live-build, live-boot and live-config.
 
-2~ live-build
+2~live-build live-build
 
 live-build is a collection of scripts to build Debian Live systems. These scripts are also referred to as "commands".
 
@@ -16,7 +16,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}#lb-config.
+Unlike debhelper, live-build contains a tool to generate a skeleton configuration directory, #{lb config}#. This could be considered to be similar to tools such as #{dh-make}#. For more information about #{lb config}#, please see {The lb config command}#lb-config.
 
 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).
 
@@ -28,29 +28,17 @@ 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 initializing a Live system configuration directory. See lb-config for more information.
-
-% FIXME: <xref linkend="lb-config"/>
+_* *{lb config}*: Responsible for initializing a Live system configuration directory. See {The lb config command}#lb-config for more information.
 
-_* *{lb build}*: Responsible for starting a Live system build. See lb-build for more information.
+_* *{lb build}*: Responsible for starting a Live system build. See {The lb build command}#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}*: Responsible for removing parts of a Live system build. See {The lb clean command}#lb-clean for more information.
 
 3~lb-config 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"/>
+As discussed in {live-build}#live-build, the scripts that make up live-build source their configuration from a single directory named config/. As constructing this directory by hand would be time-consuming and error-prone, the #{lb config}# command can be used to create skeleton configuration folders.
 
 Issuing #{lb config}# without any arguments creates a config subdirectory which it populates with some default settings:
 
@@ -114,15 +102,15 @@ $ lb config --binary-images net --hostname live-machine --username live-user ...
 
 A full list of options is available in the #{lb_config}# man page. Most options have a parallel with an "LB_" prefixed variable.
 
-3~ The #{lb build}# command
+3~lb-build The #{lb build}# command
 
 The #{lb build}# command reads in your configuration from the config/ directory. It then runs the lower lower level commands needed to build your Live system.
 
-3~ The #{lb clean}# command
+3~lb-clean The #{lb clean}# command
 
 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.
 
-2~ The live-boot package
+2~live-boot The live-boot package
 
 live-boot is a collection of scripts providing hooks for the initramfs-tools, used to generate an initramfs capable of booting live systems, such as those created by live-build. This includes the Debian Live isos, netboot tarballs, and usb stick images.
 
@@ -130,7 +118,7 @@ At boot time it will look for read-only media containing a "/live" directory whe
 
 More information on initial ramfs in Debian can be found in the Debian Linux Kernel Handbook at http://kernel-handbook.alioth.debian.org/ in the chapter on initramfs.
 
-2~ The live-config package
+2~live-config The live-config package
 
 live-config consists of the scripts that run at boot time after live-boot to configure the live system automatically. It handles such tasks as setting the hostname, locales and timezone, creating the live user, inhibiting cron jobs and performing autologin of the live user.
 
diff --git a/manual/po/de/about_manual.ssi.po b/manual/po/de/about_manual.ssi.po
index 7661ca1..8391a0a 100644
--- a/manual/po/de/about_manual.ssi.po
+++ b/manual/po/de/about_manual.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-22 00:18+0300\n"
+"POT-Creation-Date: 2010-10-22 07:52-0200\n"
 "PO-Revision-Date: 2010-10-03 20:30+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -248,21 +248,16 @@ msgid "2~ Contributing to this document"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:75
+#: en/about_manual.ssi:74
 msgid ""
-"% FIXME: link to about_project.ssi 'Contact' 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."
+"This manual is intended as a community project and all proposals for "
+"improvements and contributions are extremely welcome. The preferred way to "
+"submit a contribution is to send it to the mailing list. Please see {Contact}"
+"#contact for more information."
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:77
-msgid "% FIXME: <xref linkend=\"contact\"/>"
-msgstr ""
-
-#. type: Plain text
-#: en/about_manual.ssi:79
+#: en/about_manual.ssi:76
 msgid ""
 "When submitting a contribution, please clearly identify its copyright holder "
 "and include the licensing statement. Note that to be accepted, the "
@@ -271,16 +266,16 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:81
+#: en/about_manual.ssi:78
 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:83 en/about_manual.ssi:91 en/about_manual.ssi:99
-#: en/about_manual.ssi:111 en/about_manual.ssi:124 en/about_manual.ssi:137
-#: en/about_manual.ssi:145 en/about_manual.ssi:153 en/about_manual.ssi:161
+#: en/about_manual.ssi:80 en/about_manual.ssi:88 en/about_manual.ssi:96
+#: en/about_manual.ssi:108 en/about_manual.ssi:121 en/about_manual.ssi:134
+#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
 #: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
 #: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
 #: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
@@ -332,20 +327,25 @@ msgstr ""
 #: en/user_installation.ssi:120 en/user_installation.ssi:137
 #: en/user_managing_a_configuration.ssi:24
 #: en/user_managing_a_configuration.ssi:35
+<<<<<<< HEAD
 #: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:58
 #: en/user_overview.ssi:102 en/user_overview.ssi:110
+=======
+#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:46
+#: en/user_overview.ssi:90 en/user_overview.ssi:98
+>>>>>>> Adding more references, including re-enabled Bugs and stub Customization overview.
 msgid "code{"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:85
+#: en/about_manual.ssi:82
 msgid "$ git clone git://live.debian.net/git/live-manual.git"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:87 en/about_manual.ssi:95 en/about_manual.ssi:103
-#: en/about_manual.ssi:120 en/about_manual.ssi:133 en/about_manual.ssi:141
-#: en/about_manual.ssi:149 en/about_manual.ssi:157 en/about_manual.ssi:164
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
+#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
 #: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
 #: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
 #: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
@@ -397,13 +397,18 @@ msgstr ""
 #: en/user_installation.ssi:125 en/user_installation.ssi:140
 #: en/user_managing_a_configuration.ssi:31
 #: en/user_managing_a_configuration.ssi:43
+<<<<<<< HEAD
 #: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:96
 #: en/user_overview.ssi:106 en/user_overview.ssi:114
+=======
+#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:84
+#: en/user_overview.ssi:94 en/user_overview.ssi:102
+>>>>>>> Adding more references, including re-enabled Bugs and stub Customization overview.
 msgid "}code"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:89
+#: en/about_manual.ssi:86
 msgid ""
 "Prior to submission of your contribution, please preview your work. To "
 "preview the live-manual, ensure the packages needed for building are "
@@ -411,29 +416,34 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
+<<<<<<< HEAD
 #: en/about_manual.ssi:93
 msgid "# apt-get install make po4a sisu-complete"
+=======
+#: en/about_manual.ssi:90
+msgid "# apt-get install sisu-complete"
+>>>>>>> Adding more references, including re-enabled Bugs and stub Customization overview.
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:97
+#: en/about_manual.ssi:94
 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:101
+#: en/about_manual.ssi:98
 msgid "$ make build"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:105
+#: en/about_manual.ssi:102
 msgid "3~ Applying patches"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:107
+#: en/about_manual.ssi:104
 msgid ""
 "Directly commiting to the repository is possible by anyone. However, we ask "
 "you to send bigger changes to the mailing list to discuss them first. In "
@@ -441,12 +451,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:109
+#: en/about_manual.ssi:106
 msgid "_* Fetch the public commit key:"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:118
+#: en/about_manual.ssi:115
 #, no-wrap
 msgid ""
 "$ mkdir -p ~/.ssh/identity.d\n"
@@ -458,12 +468,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:122
+#: en/about_manual.ssi:119
 msgid "_* Add the following section to your openssh-client config:"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:131
+#: en/about_manual.ssi:128
 #, no-wrap
 msgid ""
 "$ cat >> ~/.ssh/config << EOF\n"
@@ -475,17 +485,17 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:135
+#: en/about_manual.ssi:132
 msgid "_* Checkout a clone of the manual through ssh:"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:139
+#: en/about_manual.ssi:136
 msgid "$ git clone gitosis at live.debian.net:/live-manual.git"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:143
+#: en/about_manual.ssi:140
 msgid ""
 "_* After editing the files in manual/en/, please call the 'commit' target in "
 "the top level directory to sanitize the files and update the translation "
@@ -493,12 +503,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:147
+#: en/about_manual.ssi:144
 msgid "$ make commit"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:151
+#: 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 "
@@ -507,16 +517,16 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:155
+#: en/about_manual.ssi:152
 msgid "$ git commit -a"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:159
+#: en/about_manual.ssi:156
 msgid "_* Push the commit to the server:"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:163
+#: 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 edce712..f41eb26 100644
--- a/manual/po/de/about_project.ssi.po
+++ b/manual/po/de/about_project.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-16 11:30-0200\n"
+"POT-Creation-Date: 2010-10-22 07:52-0200\n"
 "PO-Revision-Date: 2010-10-03 20:30+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -196,16 +196,11 @@ msgid ""
 "(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."
+"{Customization overview}#customization-overview."
 msgstr ""
 
 #. type: Plain text
 #: 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 "
@@ -214,12 +209,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/about_project.ssi:66
-msgid "2~ Contact"
+#: en/about_project.ssi:64
+msgid "2~contact Contact"
 msgstr ""
 
 #. type: Plain text
-#: en/about_project.ssi:68
+#: en/about_project.ssi:66
 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 "
@@ -228,7 +223,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/about_project.ssi:70
+#: en/about_project.ssi:68
 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,21 +232,16 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/about_project.ssi:72
+#: en/about_project.ssi:70
 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."
-msgstr ""
-
-#. type: Plain text
-#: en/about_project.ssi:74
-msgid "% FIXME: <xref linkend=\"bugs\"/>"
+"please see {Reporting bugs}#bugs."
 msgstr ""
 
 #. type: Plain text
-#: en/about_project.ssi:75
+#: en/about_project.ssi:71
 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/live-manual.ssm.po b/manual/po/de/live-manual.ssm.po
index eb14a4f..ab81feb 100644
--- a/manual/po/de/live-manual.ssm.po
+++ b/manual/po/de/live-manual.ssm.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-22 00:01+0300\n"
+"POT-Creation-Date: 2010-10-22 07:52-0200\n"
 "PO-Revision-Date: 2010-10-03 20:30+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -111,36 +111,41 @@ msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:41
-msgid "<< user_customization-packages.ssi"
+msgid "<< user_customization-overview.ssi"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:43
-msgid "<< user_customization-contents.ssi"
+msgid "<< user_customization-packages.ssi"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:45
-msgid "<< user_customization-internationalization.ssi"
+msgid "<< user_customization-contents.ssi"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:47
-msgid ":B~ Development ~#"
+msgid "<< user_customization-internationalization.ssi"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:49
-msgid ":B~ Project ~#"
+msgid ":B~ Development ~#"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:51
+msgid ":B~ Project ~#"
+msgstr ""
+
+#. type: Plain text
+#: en/live-manual.ssm:53
 msgid ":B~ Other ~#"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:57
+#: en/live-manual.ssm:59
 msgid ""
 "Other material that formerly appeared in this section is out of date and/or "
 "has not been approved for release. It has therefore been omitted, but can "
@@ -150,81 +155,81 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:59
+#: en/live-manual.ssm:61
 msgid "% << other_customization-bootup.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:61
+#: en/live-manual.ssm:63
 msgid "% << other_customization-binary.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:63
+#: en/live-manual.ssm:65
 msgid "% << other_customization-backports.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:65
+#: en/live-manual.ssm:67
 msgid "% << other_common-tasks.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:67
+#: en/live-manual.ssm:69
 msgid "% << other_live-environment.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:69
+#: en/live-manual.ssm:71
 msgid "% << other_faq.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:71
-msgid "% << other_reporting-bugs.ssi"
+#: en/live-manual.ssm:73
+msgid "<< other_reporting-bugs.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:73
+#: en/live-manual.ssm:75
 msgid "% << other_howtos.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:75
+#: en/live-manual.ssm:77
 msgid "% << other_coding-style.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:77
+#: en/live-manual.ssm:79
 msgid "% << other_procedures.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:79
+#: en/live-manual.ssm:81
 msgid "% << other_resources.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:81
+#: en/live-manual.ssm:83
 msgid "% << other_use-cases.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:83
+#: en/live-manual.ssm:85
 msgid "% << other_success-stories.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:85
+#: en/live-manual.ssm:87
 msgid "% << other_troubleshooting.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:87
+#: en/live-manual.ssm:89
 msgid "% << other_configuration-layout.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:88
+#: en/live-manual.ssm:90
 msgid "% << other_configuration-files.ssi"
 msgstr ""
diff --git a/manual/po/de/other_reporting-bugs.ssi.po b/manual/po/de/other_reporting-bugs.ssi.po
index e6afe93..85a3dde 100644
--- a/manual/po/de/other_reporting-bugs.ssi.po
+++ b/manual/po/de/other_reporting-bugs.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-03 20:30+0300\n"
+"POT-Creation-Date: 2010-10-22 07:52-0200\n"
 "PO-Revision-Date: 2010-10-03 20:30+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -23,7 +23,7 @@ msgstr ""
 
 #. type: Plain text
 #: en/other_reporting-bugs.ssi:4
-msgid "1~ Reporting bugs"
+msgid "1~bugs Reporting bugs"
 msgstr ""
 
 #. type: Plain text
@@ -129,7 +129,7 @@ msgstr ""
 
 #. type: Plain text
 #: en/other_reporting-bugs.ssi:34
-msgid "2~ Collect information"
+msgid "2~collect-information Collect information"
 msgstr ""
 
 #. type: Plain text
@@ -281,35 +281,35 @@ msgid "3~ At boot-time"
 msgstr ""
 
 #. type: Plain text
-#: en/other_reporting-bugs.ssi:87
+#: en/other_reporting-bugs.ssi:86
 msgid ""
 "If your image does not boot, please report it to the mailing list together "
-"with the information requested in collect-information. Do not forget to "
-"mention, how/when the image failed, in Qemu, VMWare or real hardware. If you "
-"are using a virtualization technology of any kind, please always run it on "
-"real hardware before reporting a bug. Providing a screenshot of the failure "
-"is also very helpful.  % FIXME: <xref linkend=\"collect-information\"/>"
+"with the information requested in {Collect information}#collect-information. "
+"Do not forget to mention, how/when the image failed, in Qemu, VMWare or real "
+"hardware. If you are using a virtualization technology of any kind, please "
+"always run it on real hardware before reporting a bug. Providing a "
+"screenshot of the failure is also very helpful."
 msgstr ""
 
 #. type: Plain text
-#: en/other_reporting-bugs.ssi:89
+#: en/other_reporting-bugs.ssi:88
 msgid "3~ At run-time"
 msgstr ""
 
 #. type: Plain text
-#: en/other_reporting-bugs.ssi:91
+#: en/other_reporting-bugs.ssi:90
 msgid ""
 "If a package was successfully installed, but fails while actually running "
 "the Live system, this is probably a bug in Debian Live. However,"
 msgstr ""
 
 #. type: Plain text
-#: en/other_reporting-bugs.ssi:93
+#: en/other_reporting-bugs.ssi:92
 msgid "2~ Do the research"
 msgstr ""
 
 #. type: Plain text
-#: en/other_reporting-bugs.ssi:95
+#: en/other_reporting-bugs.ssi:94
 msgid ""
 "Before filing the bug, please search the web for the particular error "
 "message or symptom you are getting. As it is highly unlikely that you are "
@@ -319,7 +319,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/other_reporting-bugs.ssi:97
+#: en/other_reporting-bugs.ssi:96
 msgid ""
 "You should pay particular attention to the Debian Live mailing list, as well "
 "as the homepage, as these are likely to contain the most up-to-date "
@@ -328,7 +328,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/other_reporting-bugs.ssi:99
+#: en/other_reporting-bugs.ssi:98
 msgid ""
 "In addition, you should check the current bug list for live-helper and the "
 "current bug list for live-initramfs at to see whether something similar has "
@@ -336,12 +336,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/other_reporting-bugs.ssi:101
+#: en/other_reporting-bugs.ssi:100
 msgid "2~ Where to report bugs"
 msgstr ""
 
 #. type: Plain text
-#: en/other_reporting-bugs.ssi:103
+#: en/other_reporting-bugs.ssi:102
 msgid ""
 "The Debian Live project keeps track of all bugs in the Debian Bug Tracking "
 "System (BTS). For information on how to use the system, please see http://"
@@ -350,7 +350,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/other_reporting-bugs.ssi:105
+#: en/other_reporting-bugs.ssi:104
 msgid ""
 "In general, you should report build time errors against the live-helper "
 "package and run time errors against live-initramfs. If you are unsure of "
@@ -360,7 +360,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/other_reporting-bugs.ssi:106
+#: en/other_reporting-bugs.ssi:105
 msgid ""
 "Please note that bugs found in distributions derived from Debian (such as "
 "Ubuntu, Knoppix, Xandros, etc.) should *{not}* be reported to the Debian BTS "
diff --git a/manual/po/de/user_customization-contents.ssi.po b/manual/po/de/user_customization-contents.ssi.po
index 8086381..d4788fd 100644
--- a/manual/po/de/user_customization-contents.ssi.po
+++ b/manual/po/de/user_customization-contents.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-16 14:45-0200\n"
+"POT-Creation-Date: 2010-10-22 07:52-0200\n"
 "PO-Revision-Date: 2010-10-03 20:30+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,9 +17,9 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. type: Plain text
-#: en/about_manual.ssi:83 en/about_manual.ssi:91 en/about_manual.ssi:99
-#: en/about_manual.ssi:111 en/about_manual.ssi:124 en/about_manual.ssi:137
-#: en/about_manual.ssi:145 en/about_manual.ssi:153 en/about_manual.ssi:161
+#: en/about_manual.ssi:80 en/about_manual.ssi:88 en/about_manual.ssi:96
+#: en/about_manual.ssi:108 en/about_manual.ssi:121 en/about_manual.ssi:134
+#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
 #: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
 #: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
 #: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
@@ -71,15 +71,15 @@ msgstr ""
 #: en/user_installation.ssi:120 en/user_installation.ssi:137
 #: en/user_managing_a_configuration.ssi:24
 #: en/user_managing_a_configuration.ssi:35
-#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:60
-#: en/user_overview.ssi:104 en/user_overview.ssi:112
+#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:46
+#: en/user_overview.ssi:90 en/user_overview.ssi:98
 msgid "code{"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:87 en/about_manual.ssi:95 en/about_manual.ssi:103
-#: en/about_manual.ssi:120 en/about_manual.ssi:133 en/about_manual.ssi:141
-#: en/about_manual.ssi:149 en/about_manual.ssi:157 en/about_manual.ssi:164
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
+#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
 #: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
 #: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
 #: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
@@ -107,8 +107,8 @@ msgstr ""
 #: en/user_basics.ssi:134 en/user_basics.ssi:144 en/user_basics.ssi:158
 #: en/user_basics.ssi:168 en/user_basics.ssi:176 en/user_basics.ssi:184
 #: en/user_basics.ssi:198 en/user_basics.ssi:206 en/user_basics.ssi:216
-#: en/user_basics.ssi:257 en/user_basics.ssi:285 en/user_basics.ssi:293
-#: en/user_basics.ssi:320 en/user_basics.ssi:359
+#: en/user_basics.ssi:257 en/user_basics.ssi:269 en/user_basics.ssi:285
+#: en/user_basics.ssi:293 en/user_basics.ssi:320 en/user_basics.ssi:359
 #: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
 #: en/user_customization-contents.ssi:70
 #: en/user_customization-internationalization.ssi:14
@@ -131,8 +131,8 @@ msgstr ""
 #: en/user_installation.ssi:125 en/user_installation.ssi:140
 #: en/user_managing_a_configuration.ssi:31
 #: en/user_managing_a_configuration.ssi:43
-#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:98
-#: en/user_overview.ssi:108 en/user_overview.ssi:116
+#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:84
+#: en/user_overview.ssi:94 en/user_overview.ssi:102
 msgid "}code"
 msgstr ""
 
@@ -143,13 +143,13 @@ msgid "% FIXME: <xref linkend=\"terms\"/>"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-contents.ssi:2
+#: en/user_customization-contents.ssi:2 en/user_customization-overview.ssi:2
 msgid "B~ Customizing contents"
 msgstr ""
 
 #. type: Plain text
 #: en/user_customization-contents.ssi:4
-msgid "1~ Customizing contents"
+msgid "1~customizing-contents Customizing contents"
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/po/de/user_customization-overview.ssi.po b/manual/po/de/user_customization-overview.ssi.po
new file mode 100644
index 0000000..1d706fb
--- /dev/null
+++ b/manual/po/de/user_customization-overview.ssi.po
@@ -0,0 +1,43 @@
+# 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 VERSION\n"
+"POT-Creation-Date: 2010-10-22 07:52-0200\n"
+"PO-Revision-Date: 2010-10-22 07:52-0200\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-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. type: Plain text
+#: en/user_customization-contents.ssi:2 en/user_customization-overview.ssi:2
+msgid "B~ Customizing contents"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-overview.ssi:4
+msgid "1~customization-overview Customization overview"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-overview.ssi:7
+msgid ""
+"% FIXME: just a stub for now.  In conversational style, cover the different "
+"kinds of customization % and link to each section within the text."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-overview.ssi:9
+msgid ""
+"This chapter gives an overview of the various ways in which your Debian live "
+"systems may be customized.  See sections {Customizing contents}#customizing-"
+"contents, {Customizing packages}#customizing-packages} and {Customizing "
+"locale and language}#customizing-locale-and-language."
+msgstr ""
diff --git a/manual/po/de/user_overview.ssi.po b/manual/po/de/user_overview.ssi.po
index 4538136..e2914a1 100644
--- a/manual/po/de/user_overview.ssi.po
+++ b/manual/po/de/user_overview.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-21 07:06-0200\n"
+"POT-Creation-Date: 2010-10-22 07:52-0200\n"
 "PO-Revision-Date: 2010-10-03 20:30+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,9 +17,9 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. type: Plain text
-#: en/about_manual.ssi:83 en/about_manual.ssi:91 en/about_manual.ssi:99
-#: en/about_manual.ssi:111 en/about_manual.ssi:124 en/about_manual.ssi:137
-#: en/about_manual.ssi:145 en/about_manual.ssi:153 en/about_manual.ssi:161
+#: en/about_manual.ssi:80 en/about_manual.ssi:88 en/about_manual.ssi:96
+#: en/about_manual.ssi:108 en/about_manual.ssi:121 en/about_manual.ssi:134
+#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
 #: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
 #: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
 #: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
@@ -71,15 +71,15 @@ msgstr ""
 #: en/user_installation.ssi:120 en/user_installation.ssi:137
 #: en/user_managing_a_configuration.ssi:24
 #: en/user_managing_a_configuration.ssi:35
-#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:58
-#: en/user_overview.ssi:102 en/user_overview.ssi:110
+#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:46
+#: en/user_overview.ssi:90 en/user_overview.ssi:98
 msgid "code{"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:87 en/about_manual.ssi:95 en/about_manual.ssi:103
-#: en/about_manual.ssi:120 en/about_manual.ssi:133 en/about_manual.ssi:141
-#: en/about_manual.ssi:149 en/about_manual.ssi:157 en/about_manual.ssi:164
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
+#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
 #: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
 #: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
 #: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
@@ -131,22 +131,12 @@ msgstr ""
 #: en/user_installation.ssi:125 en/user_installation.ssi:140
 #: en/user_managing_a_configuration.ssi:31
 #: en/user_managing_a_configuration.ssi:43
-#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:96
-#: en/user_overview.ssi:106 en/user_overview.ssi:114
+#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:84
+#: en/user_overview.ssi:94 en/user_overview.ssi:102
 msgid "}code"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:44 en/user_overview.ssi:40
-msgid "% FIXME: <xref linkend=\"lb-config\"/>"
-msgstr ""
-
-#. type: Plain text
-#: en/user_basics.ssi:56 en/user_overview.ssi:44
-msgid "% FIXME: <xref linkend=\"lb-build\"/>"
-msgstr ""
-
-#. type: Plain text
 #: en/user_overview.ssi:2
 msgid ":B~ Overview of tools"
 msgstr ""
@@ -165,7 +155,7 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_overview.ssi:8
-msgid "2~ live-build"
+msgid "2~live-build live-build"
 msgstr ""
 
 #. type: Plain text
@@ -214,7 +204,7 @@ 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}#lb-config."
+"#, please see {The lb config command}#lb-config."
 msgstr ""
 
 #. type: Plain text
@@ -270,86 +260,67 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_overview.ssi:32
-msgid "Please see installation for information on how to install live-build."
-msgstr ""
-
-#. type: Plain text
-#: en/user_overview.ssi:34
-msgid "% FIXME: <xref linkend=\"installation\"/>"
-msgstr ""
-
-#. type: Plain text
-#: en/user_overview.ssi:36
 msgid ""
 "The remainder of this section discusses the three most important commands:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:38
+#: en/user_overview.ssi:34
 msgid ""
 "_* *{lb config}*: Responsible for initializing a Live system configuration "
-"directory. See lb-config for more information."
+"directory. See {The lb config command}#lb-config for more information."
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:42
+#: en/user_overview.ssi:36
 msgid ""
-"_* *{lb build}*: Responsible for starting a Live system build. See lb-build "
-"for more information."
+"_* *{lb build}*: Responsible for starting a Live system build. See {The lb "
+"build command}#lb-build for more information."
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:46
+#: en/user_overview.ssi:38
 msgid ""
 "_* *{lb clean}*: Responsible for removing parts of a Live system build. See "
-"lb-clean for more information."
+"{The lb clean command}#lb-clean for more information."
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:48
-msgid "% FIXME: <xref linkend=\"lb-clean\"/"
-msgstr ""
-
-#. type: Plain text
-#: en/user_overview.ssi:50
+#: en/user_overview.ssi:40
 msgid "3~lb-config The #{lb config}# command"
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:52
+#: en/user_overview.ssi:42
 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."
+"As discussed in {live-build}#live-build, the scripts that make up live-build "
+"source their configuration from a single directory named config/. As "
+"constructing this directory by hand would be time-consuming and error-prone, "
+"the #{lb config}# command can be used to create skeleton configuration "
+"folders."
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:54
-msgid "% FIXME: <xref linkend=\"live-build\"/>"
-msgstr ""
-
-#. type: Plain text
-#: en/user_overview.ssi:56
+#: en/user_overview.ssi:44
 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:61
+#: en/user_overview.ssi:49
 msgid "$ lb config P: Creating config tree"
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:66
+#: en/user_overview.ssi:54
 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:94
+#: en/user_overview.ssi:82
 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 "
@@ -374,7 +345,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:98
+#: en/user_overview.ssi:86
 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 "
@@ -382,7 +353,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:100
+#: en/user_overview.ssi:88
 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 "
@@ -390,38 +361,38 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:104
+#: en/user_overview.ssi:92
 msgid "$ lb config -p gnome"
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:108
+#: en/user_overview.ssi:96
 msgid ""
 "will build a config/ directory configured to include the 'gnome' package "
 "list. It is possible to specify many options:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:112
+#: en/user_overview.ssi:100
 msgid ""
 "$ lb config --binary-images net --hostname live-machine --username live-"
 "user ..."
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:116
+#: en/user_overview.ssi:104
 msgid ""
 "A full list of options is available in the #{lb_config}# man page. Most "
 "options have a parallel with an \"LB_\" prefixed variable."
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:118
-msgid "3~ The #{lb build}# command"
+#: en/user_overview.ssi:106
+msgid "3~lb-build The #{lb build}# command"
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:120
+#: en/user_overview.ssi:108
 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 "
@@ -429,24 +400,24 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:122
-msgid "3~ The #{lb clean}# command"
+#: en/user_overview.ssi:110
+msgid "3~lb-clean The #{lb clean}# command"
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:124
+#: en/user_overview.ssi:112
 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:126
-msgid "2~ The live-boot package"
+#: en/user_overview.ssi:114
+msgid "2~live-boot The live-boot package"
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:128
+#: en/user_overview.ssi:116
 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 "
@@ -455,7 +426,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:130
+#: en/user_overview.ssi:118
 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 "
@@ -464,7 +435,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:132
+#: en/user_overview.ssi:120
 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 "
@@ -472,12 +443,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:134
-msgid "2~ The live-config package"
+#: en/user_overview.ssi:122
+msgid "2~live-config The live-config package"
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:136
+#: en/user_overview.ssi:124
 msgid ""
 "live-config consists of the scripts that run at boot time after live-boot to "
 "configure the live system automatically. It handles such tasks as setting "
diff --git a/manual/po4a.cfg b/manual/po4a.cfg
index 3d525f0..d8aaf4d 100644
--- a/manual/po4a.cfg
+++ b/manual/po4a.cfg
@@ -22,6 +22,7 @@
 [type: text] en/user_basics.ssi $lang:$lang/user_basics.ssi
 [type: text] en/user_customization-contents.ssi $lang:$lang/user_customization-contents.ssi
 [type: text] en/user_customization-internationalization.ssi $lang:$lang/user_customization-internationalization.ssi
+[type: text] en/user_customization-overview.ssi $lang:$lang/user_customization-overview.ssi
 [type: text] en/user_customization-packages.ssi $lang:$lang/user_customization-packages.ssi
 [type: text] en/user_installation.ssi $lang:$lang/user_installation.ssi
 [type: text] en/user_managing_a_configuration.ssi $lang:$lang/user_managing_a_configuration.ssi
diff --git a/manual/pot/about_manual.ssi.pot b/manual/pot/about_manual.ssi.pot
index 4760cd8..ec74bf3 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-10-22 00:18+0300\n"
+"POT-Creation-Date: 2010-10-22 07:52-0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -248,21 +248,16 @@ msgid "2~ Contributing to this document"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:75
+#: en/about_manual.ssi:74
 msgid ""
-"% FIXME: link to about_project.ssi 'Contact' 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."
+"This manual is intended as a community project and all proposals for "
+"improvements and contributions are extremely welcome. The preferred way to "
+"submit a contribution is to send it to the mailing list. Please see {Contact}"
+"#contact for more information."
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:77
-msgid "% FIXME: <xref linkend=\"contact\"/>"
-msgstr ""
-
-#. type: Plain text
-#: en/about_manual.ssi:79
+#: en/about_manual.ssi:76
 msgid ""
 "When submitting a contribution, please clearly identify its copyright holder "
 "and include the licensing statement. Note that to be accepted, the "
@@ -271,16 +266,16 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:81
+#: en/about_manual.ssi:78
 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:83 en/about_manual.ssi:91 en/about_manual.ssi:99
-#: en/about_manual.ssi:111 en/about_manual.ssi:124 en/about_manual.ssi:137
-#: en/about_manual.ssi:145 en/about_manual.ssi:153 en/about_manual.ssi:161
+#: en/about_manual.ssi:80 en/about_manual.ssi:88 en/about_manual.ssi:96
+#: en/about_manual.ssi:108 en/about_manual.ssi:121 en/about_manual.ssi:134
+#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
 #: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
 #: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
 #: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
@@ -332,20 +327,25 @@ msgstr ""
 #: en/user_installation.ssi:120 en/user_installation.ssi:137
 #: en/user_managing_a_configuration.ssi:24
 #: en/user_managing_a_configuration.ssi:35
+<<<<<<< HEAD
 #: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:58
 #: en/user_overview.ssi:102 en/user_overview.ssi:110
+=======
+#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:46
+#: en/user_overview.ssi:90 en/user_overview.ssi:98
+>>>>>>> Adding more references, including re-enabled Bugs and stub Customization overview.
 msgid "code{"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:85
+#: en/about_manual.ssi:82
 msgid "$ git clone git://live.debian.net/git/live-manual.git"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:87 en/about_manual.ssi:95 en/about_manual.ssi:103
-#: en/about_manual.ssi:120 en/about_manual.ssi:133 en/about_manual.ssi:141
-#: en/about_manual.ssi:149 en/about_manual.ssi:157 en/about_manual.ssi:164
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
+#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
 #: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
 #: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
 #: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
@@ -397,13 +397,18 @@ msgstr ""
 #: en/user_installation.ssi:125 en/user_installation.ssi:140
 #: en/user_managing_a_configuration.ssi:31
 #: en/user_managing_a_configuration.ssi:43
+<<<<<<< HEAD
 #: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:96
 #: en/user_overview.ssi:106 en/user_overview.ssi:114
+=======
+#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:84
+#: en/user_overview.ssi:94 en/user_overview.ssi:102
+>>>>>>> Adding more references, including re-enabled Bugs and stub Customization overview.
 msgid "}code"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:89
+#: en/about_manual.ssi:86
 msgid ""
 "Prior to submission of your contribution, please preview your work. To "
 "preview the live-manual, ensure the packages needed for building are "
@@ -411,29 +416,34 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
+<<<<<<< HEAD
 #: en/about_manual.ssi:93
 msgid "# apt-get install make po4a sisu-complete"
+=======
+#: en/about_manual.ssi:90
+msgid "# apt-get install sisu-complete"
+>>>>>>> Adding more references, including re-enabled Bugs and stub Customization overview.
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:97
+#: en/about_manual.ssi:94
 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:101
+#: en/about_manual.ssi:98
 msgid "$ make build"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:105
+#: en/about_manual.ssi:102
 msgid "3~ Applying patches"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:107
+#: en/about_manual.ssi:104
 msgid ""
 "Directly commiting to the repository is possible by anyone. However, we ask "
 "you to send bigger changes to the mailing list to discuss them first. In "
@@ -441,12 +451,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:109
+#: en/about_manual.ssi:106
 msgid "_* Fetch the public commit key:"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:118
+#: en/about_manual.ssi:115
 #, no-wrap
 msgid ""
 "$ mkdir -p ~/.ssh/identity.d\n"
@@ -458,12 +468,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:122
+#: en/about_manual.ssi:119
 msgid "_* Add the following section to your openssh-client config:"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:131
+#: en/about_manual.ssi:128
 #, no-wrap
 msgid ""
 "$ cat >> ~/.ssh/config << EOF\n"
@@ -475,17 +485,17 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:135
+#: en/about_manual.ssi:132
 msgid "_* Checkout a clone of the manual through ssh:"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:139
+#: en/about_manual.ssi:136
 msgid "$ git clone gitosis at live.debian.net:/live-manual.git"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:143
+#: en/about_manual.ssi:140
 msgid ""
 "_* After editing the files in manual/en/, please call the 'commit' target in "
 "the top level directory to sanitize the files and update the translation "
@@ -493,12 +503,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:147
+#: en/about_manual.ssi:144
 msgid "$ make commit"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:151
+#: 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 "
@@ -507,16 +517,16 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:155
+#: en/about_manual.ssi:152
 msgid "$ git commit -a"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:159
+#: en/about_manual.ssi:156
 msgid "_* Push the commit to the server:"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:163
+#: 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 09f4a41..5e4edf1 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-10-16 11:30-0200\n"
+"POT-Creation-Date: 2010-10-22 07:52-0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -196,16 +196,11 @@ msgid ""
 "(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."
+"{Customization overview}#customization-overview."
 msgstr ""
 
 #. type: Plain text
 #: 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 "
@@ -214,12 +209,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/about_project.ssi:66
-msgid "2~ Contact"
+#: en/about_project.ssi:64
+msgid "2~contact Contact"
 msgstr ""
 
 #. type: Plain text
-#: en/about_project.ssi:68
+#: en/about_project.ssi:66
 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 "
@@ -228,7 +223,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/about_project.ssi:70
+#: en/about_project.ssi:68
 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,21 +232,16 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/about_project.ssi:72
+#: en/about_project.ssi:70
 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."
-msgstr ""
-
-#. type: Plain text
-#: en/about_project.ssi:74
-msgid "% FIXME: <xref linkend=\"bugs\"/>"
+"please see {Reporting bugs}#bugs."
 msgstr ""
 
 #. type: Plain text
-#: en/about_project.ssi:75
+#: en/about_project.ssi:71
 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/live-manual.ssm.pot b/manual/pot/live-manual.ssm.pot
index 2bea949..fa468b7 100644
--- a/manual/pot/live-manual.ssm.pot
+++ b/manual/pot/live-manual.ssm.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-22 00:01+0300\n"
+"POT-Creation-Date: 2010-10-22 07:52-0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -111,36 +111,41 @@ msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:41
-msgid "<< user_customization-packages.ssi"
+msgid "<< user_customization-overview.ssi"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:43
-msgid "<< user_customization-contents.ssi"
+msgid "<< user_customization-packages.ssi"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:45
-msgid "<< user_customization-internationalization.ssi"
+msgid "<< user_customization-contents.ssi"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:47
-msgid ":B~ Development ~#"
+msgid "<< user_customization-internationalization.ssi"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:49
-msgid ":B~ Project ~#"
+msgid ":B~ Development ~#"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:51
+msgid ":B~ Project ~#"
+msgstr ""
+
+#. type: Plain text
+#: en/live-manual.ssm:53
 msgid ":B~ Other ~#"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:57
+#: en/live-manual.ssm:59
 msgid ""
 "Other material that formerly appeared in this section is out of date and/or "
 "has not been approved for release. It has therefore been omitted, but can "
@@ -150,81 +155,81 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:59
+#: en/live-manual.ssm:61
 msgid "% << other_customization-bootup.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:61
+#: en/live-manual.ssm:63
 msgid "% << other_customization-binary.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:63
+#: en/live-manual.ssm:65
 msgid "% << other_customization-backports.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:65
+#: en/live-manual.ssm:67
 msgid "% << other_common-tasks.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:67
+#: en/live-manual.ssm:69
 msgid "% << other_live-environment.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:69
+#: en/live-manual.ssm:71
 msgid "% << other_faq.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:71
-msgid "% << other_reporting-bugs.ssi"
+#: en/live-manual.ssm:73
+msgid "<< other_reporting-bugs.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:73
+#: en/live-manual.ssm:75
 msgid "% << other_howtos.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:75
+#: en/live-manual.ssm:77
 msgid "% << other_coding-style.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:77
+#: en/live-manual.ssm:79
 msgid "% << other_procedures.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:79
+#: en/live-manual.ssm:81
 msgid "% << other_resources.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:81
+#: en/live-manual.ssm:83
 msgid "% << other_use-cases.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:83
+#: en/live-manual.ssm:85
 msgid "% << other_success-stories.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:85
+#: en/live-manual.ssm:87
 msgid "% << other_troubleshooting.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:87
+#: en/live-manual.ssm:89
 msgid "% << other_configuration-layout.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:88
+#: en/live-manual.ssm:90
 msgid "% << other_configuration-files.ssi"
 msgstr ""
diff --git a/manual/pot/other_reporting-bugs.ssi.pot b/manual/pot/other_reporting-bugs.ssi.pot
index a441fd8..21e9f00 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-10-03 20:30+0300\n"
+"POT-Creation-Date: 2010-10-22 07:52-0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -23,7 +23,7 @@ msgstr ""
 
 #. type: Plain text
 #: en/other_reporting-bugs.ssi:4
-msgid "1~ Reporting bugs"
+msgid "1~bugs Reporting bugs"
 msgstr ""
 
 #. type: Plain text
@@ -129,7 +129,7 @@ msgstr ""
 
 #. type: Plain text
 #: en/other_reporting-bugs.ssi:34
-msgid "2~ Collect information"
+msgid "2~collect-information Collect information"
 msgstr ""
 
 #. type: Plain text
@@ -281,35 +281,35 @@ msgid "3~ At boot-time"
 msgstr ""
 
 #. type: Plain text
-#: en/other_reporting-bugs.ssi:87
+#: en/other_reporting-bugs.ssi:86
 msgid ""
 "If your image does not boot, please report it to the mailing list together "
-"with the information requested in collect-information. Do not forget to "
-"mention, how/when the image failed, in Qemu, VMWare or real hardware. If you "
-"are using a virtualization technology of any kind, please always run it on "
-"real hardware before reporting a bug. Providing a screenshot of the failure "
-"is also very helpful.  % FIXME: <xref linkend=\"collect-information\"/>"
+"with the information requested in {Collect information}#collect-information. "
+"Do not forget to mention, how/when the image failed, in Qemu, VMWare or real "
+"hardware. If you are using a virtualization technology of any kind, please "
+"always run it on real hardware before reporting a bug. Providing a "
+"screenshot of the failure is also very helpful."
 msgstr ""
 
 #. type: Plain text
-#: en/other_reporting-bugs.ssi:89
+#: en/other_reporting-bugs.ssi:88
 msgid "3~ At run-time"
 msgstr ""
 
 #. type: Plain text
-#: en/other_reporting-bugs.ssi:91
+#: en/other_reporting-bugs.ssi:90
 msgid ""
 "If a package was successfully installed, but fails while actually running "
 "the Live system, this is probably a bug in Debian Live. However,"
 msgstr ""
 
 #. type: Plain text
-#: en/other_reporting-bugs.ssi:93
+#: en/other_reporting-bugs.ssi:92
 msgid "2~ Do the research"
 msgstr ""
 
 #. type: Plain text
-#: en/other_reporting-bugs.ssi:95
+#: en/other_reporting-bugs.ssi:94
 msgid ""
 "Before filing the bug, please search the web for the particular error "
 "message or symptom you are getting. As it is highly unlikely that you are "
@@ -319,7 +319,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/other_reporting-bugs.ssi:97
+#: en/other_reporting-bugs.ssi:96
 msgid ""
 "You should pay particular attention to the Debian Live mailing list, as well "
 "as the homepage, as these are likely to contain the most up-to-date "
@@ -328,7 +328,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/other_reporting-bugs.ssi:99
+#: en/other_reporting-bugs.ssi:98
 msgid ""
 "In addition, you should check the current bug list for live-helper and the "
 "current bug list for live-initramfs at to see whether something similar has "
@@ -336,12 +336,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/other_reporting-bugs.ssi:101
+#: en/other_reporting-bugs.ssi:100
 msgid "2~ Where to report bugs"
 msgstr ""
 
 #. type: Plain text
-#: en/other_reporting-bugs.ssi:103
+#: en/other_reporting-bugs.ssi:102
 msgid ""
 "The Debian Live project keeps track of all bugs in the Debian Bug Tracking "
 "System (BTS). For information on how to use the system, please see http://"
@@ -350,7 +350,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/other_reporting-bugs.ssi:105
+#: en/other_reporting-bugs.ssi:104
 msgid ""
 "In general, you should report build time errors against the live-helper "
 "package and run time errors against live-initramfs. If you are unsure of "
@@ -360,7 +360,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/other_reporting-bugs.ssi:106
+#: en/other_reporting-bugs.ssi:105
 msgid ""
 "Please note that bugs found in distributions derived from Debian (such as "
 "Ubuntu, Knoppix, Xandros, etc.) should *{not}* be reported to the Debian BTS "
diff --git a/manual/pot/user_customization-contents.ssi.pot b/manual/pot/user_customization-contents.ssi.pot
index b269ac0..5065c15 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-10-16 14:45-0200\n"
+"POT-Creation-Date: 2010-10-22 07:52-0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -17,9 +17,9 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. type: Plain text
-#: en/about_manual.ssi:83 en/about_manual.ssi:91 en/about_manual.ssi:99
-#: en/about_manual.ssi:111 en/about_manual.ssi:124 en/about_manual.ssi:137
-#: en/about_manual.ssi:145 en/about_manual.ssi:153 en/about_manual.ssi:161
+#: en/about_manual.ssi:80 en/about_manual.ssi:88 en/about_manual.ssi:96
+#: en/about_manual.ssi:108 en/about_manual.ssi:121 en/about_manual.ssi:134
+#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
 #: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
 #: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
 #: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
@@ -71,15 +71,15 @@ msgstr ""
 #: en/user_installation.ssi:120 en/user_installation.ssi:137
 #: en/user_managing_a_configuration.ssi:24
 #: en/user_managing_a_configuration.ssi:35
-#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:60
-#: en/user_overview.ssi:104 en/user_overview.ssi:112
+#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:46
+#: en/user_overview.ssi:90 en/user_overview.ssi:98
 msgid "code{"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:87 en/about_manual.ssi:95 en/about_manual.ssi:103
-#: en/about_manual.ssi:120 en/about_manual.ssi:133 en/about_manual.ssi:141
-#: en/about_manual.ssi:149 en/about_manual.ssi:157 en/about_manual.ssi:164
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
+#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
 #: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
 #: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
 #: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
@@ -107,8 +107,8 @@ msgstr ""
 #: en/user_basics.ssi:134 en/user_basics.ssi:144 en/user_basics.ssi:158
 #: en/user_basics.ssi:168 en/user_basics.ssi:176 en/user_basics.ssi:184
 #: en/user_basics.ssi:198 en/user_basics.ssi:206 en/user_basics.ssi:216
-#: en/user_basics.ssi:257 en/user_basics.ssi:285 en/user_basics.ssi:293
-#: en/user_basics.ssi:320 en/user_basics.ssi:359
+#: en/user_basics.ssi:257 en/user_basics.ssi:269 en/user_basics.ssi:285
+#: en/user_basics.ssi:293 en/user_basics.ssi:320 en/user_basics.ssi:359
 #: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
 #: en/user_customization-contents.ssi:70
 #: en/user_customization-internationalization.ssi:14
@@ -131,8 +131,8 @@ msgstr ""
 #: en/user_installation.ssi:125 en/user_installation.ssi:140
 #: en/user_managing_a_configuration.ssi:31
 #: en/user_managing_a_configuration.ssi:43
-#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:98
-#: en/user_overview.ssi:108 en/user_overview.ssi:116
+#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:84
+#: en/user_overview.ssi:94 en/user_overview.ssi:102
 msgid "}code"
 msgstr ""
 
@@ -143,13 +143,13 @@ msgid "% FIXME: <xref linkend=\"terms\"/>"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-contents.ssi:2
+#: en/user_customization-contents.ssi:2 en/user_customization-overview.ssi:2
 msgid "B~ Customizing contents"
 msgstr ""
 
 #. type: Plain text
 #: en/user_customization-contents.ssi:4
-msgid "1~ Customizing contents"
+msgid "1~customizing-contents Customizing contents"
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/pot/user_customization-overview.ssi.pot b/manual/pot/user_customization-overview.ssi.pot
new file mode 100644
index 0000000..1dfed62
--- /dev/null
+++ b/manual/pot/user_customization-overview.ssi.pot
@@ -0,0 +1,43 @@
+# 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-22 07:52-0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Plain text
+#: en/user_customization-contents.ssi:2 en/user_customization-overview.ssi:2
+msgid "B~ Customizing contents"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-overview.ssi:4
+msgid "1~customization-overview Customization overview"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-overview.ssi:7
+msgid ""
+"% FIXME: just a stub for now.  In conversational style, cover the different "
+"kinds of customization % and link to each section within the text."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-overview.ssi:9
+msgid ""
+"This chapter gives an overview of the various ways in which your Debian live "
+"systems may be customized.  See sections {Customizing contents}#customizing-"
+"contents, {Customizing packages}#customizing-packages} and {Customizing "
+"locale and language}#customizing-locale-and-language."
+msgstr ""
diff --git a/manual/pot/user_overview.ssi.pot b/manual/pot/user_overview.ssi.pot
index 7e8d757..cffecd5 100644
--- a/manual/pot/user_overview.ssi.pot
+++ b/manual/pot/user_overview.ssi.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-21 07:06-0200\n"
+"POT-Creation-Date: 2010-10-22 07:52-0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -17,9 +17,9 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. type: Plain text
-#: en/about_manual.ssi:83 en/about_manual.ssi:91 en/about_manual.ssi:99
-#: en/about_manual.ssi:111 en/about_manual.ssi:124 en/about_manual.ssi:137
-#: en/about_manual.ssi:145 en/about_manual.ssi:153 en/about_manual.ssi:161
+#: en/about_manual.ssi:80 en/about_manual.ssi:88 en/about_manual.ssi:96
+#: en/about_manual.ssi:108 en/about_manual.ssi:121 en/about_manual.ssi:134
+#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
 #: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
 #: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
 #: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
@@ -71,15 +71,15 @@ msgstr ""
 #: en/user_installation.ssi:120 en/user_installation.ssi:137
 #: en/user_managing_a_configuration.ssi:24
 #: en/user_managing_a_configuration.ssi:35
-#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:58
-#: en/user_overview.ssi:102 en/user_overview.ssi:110
+#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:46
+#: en/user_overview.ssi:90 en/user_overview.ssi:98
 msgid "code{"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:87 en/about_manual.ssi:95 en/about_manual.ssi:103
-#: en/about_manual.ssi:120 en/about_manual.ssi:133 en/about_manual.ssi:141
-#: en/about_manual.ssi:149 en/about_manual.ssi:157 en/about_manual.ssi:164
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
+#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
 #: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
 #: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
 #: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
@@ -131,22 +131,12 @@ msgstr ""
 #: en/user_installation.ssi:125 en/user_installation.ssi:140
 #: en/user_managing_a_configuration.ssi:31
 #: en/user_managing_a_configuration.ssi:43
-#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:96
-#: en/user_overview.ssi:106 en/user_overview.ssi:114
+#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:84
+#: en/user_overview.ssi:94 en/user_overview.ssi:102
 msgid "}code"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:44 en/user_overview.ssi:40
-msgid "% FIXME: <xref linkend=\"lb-config\"/>"
-msgstr ""
-
-#. type: Plain text
-#: en/user_basics.ssi:56 en/user_overview.ssi:44
-msgid "% FIXME: <xref linkend=\"lb-build\"/>"
-msgstr ""
-
-#. type: Plain text
 #: en/user_overview.ssi:2
 msgid ":B~ Overview of tools"
 msgstr ""
@@ -165,7 +155,7 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_overview.ssi:8
-msgid "2~ live-build"
+msgid "2~live-build live-build"
 msgstr ""
 
 #. type: Plain text
@@ -214,7 +204,7 @@ 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}#lb-config."
+"#, please see {The lb config command}#lb-config."
 msgstr ""
 
 #. type: Plain text
@@ -270,86 +260,67 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_overview.ssi:32
-msgid "Please see installation for information on how to install live-build."
-msgstr ""
-
-#. type: Plain text
-#: en/user_overview.ssi:34
-msgid "% FIXME: <xref linkend=\"installation\"/>"
-msgstr ""
-
-#. type: Plain text
-#: en/user_overview.ssi:36
 msgid ""
 "The remainder of this section discusses the three most important commands:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:38
+#: en/user_overview.ssi:34
 msgid ""
 "_* *{lb config}*: Responsible for initializing a Live system configuration "
-"directory. See lb-config for more information."
+"directory. See {The lb config command}#lb-config for more information."
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:42
+#: en/user_overview.ssi:36
 msgid ""
-"_* *{lb build}*: Responsible for starting a Live system build. See lb-build "
-"for more information."
+"_* *{lb build}*: Responsible for starting a Live system build. See {The lb "
+"build command}#lb-build for more information."
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:46
+#: en/user_overview.ssi:38
 msgid ""
 "_* *{lb clean}*: Responsible for removing parts of a Live system build. See "
-"lb-clean for more information."
+"{The lb clean command}#lb-clean for more information."
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:48
-msgid "% FIXME: <xref linkend=\"lb-clean\"/"
-msgstr ""
-
-#. type: Plain text
-#: en/user_overview.ssi:50
+#: en/user_overview.ssi:40
 msgid "3~lb-config The #{lb config}# command"
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:52
+#: en/user_overview.ssi:42
 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."
+"As discussed in {live-build}#live-build, the scripts that make up live-build "
+"source their configuration from a single directory named config/. As "
+"constructing this directory by hand would be time-consuming and error-prone, "
+"the #{lb config}# command can be used to create skeleton configuration "
+"folders."
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:54
-msgid "% FIXME: <xref linkend=\"live-build\"/>"
-msgstr ""
-
-#. type: Plain text
-#: en/user_overview.ssi:56
+#: en/user_overview.ssi:44
 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:61
+#: en/user_overview.ssi:49
 msgid "$ lb config P: Creating config tree"
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:66
+#: en/user_overview.ssi:54
 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:94
+#: en/user_overview.ssi:82
 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 "
@@ -374,7 +345,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:98
+#: en/user_overview.ssi:86
 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 "
@@ -382,7 +353,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:100
+#: en/user_overview.ssi:88
 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 "
@@ -390,38 +361,38 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:104
+#: en/user_overview.ssi:92
 msgid "$ lb config -p gnome"
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:108
+#: en/user_overview.ssi:96
 msgid ""
 "will build a config/ directory configured to include the 'gnome' package "
 "list. It is possible to specify many options:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:112
+#: en/user_overview.ssi:100
 msgid ""
 "$ lb config --binary-images net --hostname live-machine --username live-"
 "user ..."
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:116
+#: en/user_overview.ssi:104
 msgid ""
 "A full list of options is available in the #{lb_config}# man page. Most "
 "options have a parallel with an \"LB_\" prefixed variable."
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:118
-msgid "3~ The #{lb build}# command"
+#: en/user_overview.ssi:106
+msgid "3~lb-build The #{lb build}# command"
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:120
+#: en/user_overview.ssi:108
 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 "
@@ -429,24 +400,24 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:122
-msgid "3~ The #{lb clean}# command"
+#: en/user_overview.ssi:110
+msgid "3~lb-clean The #{lb clean}# command"
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:124
+#: en/user_overview.ssi:112
 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:126
-msgid "2~ The live-boot package"
+#: en/user_overview.ssi:114
+msgid "2~live-boot The live-boot package"
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:128
+#: en/user_overview.ssi:116
 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 "
@@ -455,7 +426,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:130
+#: en/user_overview.ssi:118
 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 "
@@ -464,7 +435,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:132
+#: en/user_overview.ssi:120
 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 "
@@ -472,12 +443,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:134
-msgid "2~ The live-config package"
+#: en/user_overview.ssi:122
+msgid "2~live-config The live-config package"
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:136
+#: en/user_overview.ssi:124
 msgid ""
 "live-config consists of the scripts that run at boot time after live-boot to "
 "configure the live system automatically. It handles such tasks as setting "

-- 
live-manual