[SCM] live-manual branch, debian, updated. debian/2.0_a11-1-18-g971eb6b

Ben Armstrong synrg at debian.org
Thu Dec 2 01:13:43 UTC 2010


The following commit has been merged in the debian branch:
commit 971eb6b792312040665946fb74e1a795d0deddc8
Author: Ben Armstrong <synrg at debian.org>
Date:   Wed Dec 1 21:13:07 2010 -0400

    Adding distribution, archive areas and mode.

diff --git a/manual/de/user_customization-packages.ssi b/manual/de/user_customization-packages.ssi
index 8ea25a6..b4153a1 100644
--- a/manual/de/user_customization-packages.ssi
+++ b/manual/de/user_customization-packages.ssi
@@ -5,28 +5,71 @@
 Perhaps the most basic customization of a Debian live system is the
 selection of packages to be included in the image. This chapter guides you
 through the various build-time options to customize live-build's
-installation of packages. We start with customization of the distribution
-mirror. You can also add your own repositories for backports, experimental
-or custom packages, or include packages directly as files. You can define
-your own lists of packages to include, use live-build's predefined lists,
-use #{tasksel}# tasks, or a combination of all three. Finally, a number of
-options give some control over apt, or if you prefer, aptitude, at build
-time when packages are installed. You may find these handy if you use a
-proxy, want to disable installation of recommended packages to save space,
-or need to control which versions of packages are installed via APT pinning,
-to name a few possibilities.
+installation of packages. The broadest choices influencing which packages
+are available to install in the image are the distribution and archive
+areas. To ensure decent download speeds, you should choose a nearby
+distribution mirror. You can also add your own repositories for backports,
+experimental or custom packages, or include packages directly as files. You
+can define your own lists of packages to include, use live-build's
+predefined lists, use #{tasksel}# tasks, or a combination of all
+three. Finally, a number of options give some control over apt, or if you
+prefer, aptitude, at build time when packages are installed. You may find
+these handy if you use a proxy, want to disable installation of recommended
+packages to save space, or need to control which versions of packages are
+installed via APT pinning, to name a few possibilities.
 
 2~ Package sources
 
+3~ Distribution, archive areas and mode
+
+The distribution you choose has the broadest impact on which packages are
+available to include in your live image. Specify the codename, which
+defaults to #{squeeze}# for the Squeeze version of live-build. Any current
+distribution carried in the Debian archive may be specified by its codename
+here. (See {Terms}#terms for more details.) The #{--distribution}# option
+not only influences the source of packages within the archive, but also
+instructs #{live-build}# to behave as needed to build each supported
+distribution. For example, to build against the *unstable* release, Sid,
+specify:
+
+code{
+
+$ lb config --distribution sid
+
+}code
+
+Within the distribution archive, archive areas are major divisions of the
+archive. In Debian, these are #{main}#, #{contrib}# and #{non-free}#. Only
+#{main}# contains software that is official a part of the Debian
+distribution, hence that is the default. One or more values may be
+specified, e.g.
+
+code{
+
+$ lb config --archive-areas "main contrib"
+
+}code
+
+Experimental support is available for some Debian derivatives through a
+#{--mode}# option. By default, this option is set to #{debian}#, even if you
+are building on a non-Debian system. If you specify #{--mode ubuntu}# or
+#{--mode emdebian}#, the distribution names and archive areas for the
+specified derivative are supported instead of the ones for Debian. The mode
+also modifies live-build behaviour to suit the derivatives.
+
+*Note:* The projects for whom these modes were added are primarily responsible for supporting users of these options. The Debian live project, in turn, provides development support on a best-effort basis only, based on feedback from the derivative projects as we do not develop or support these derivatives ourselves.
+
 3~ Distribution mirrors
 
-Each of the #{--mirror-*}# options governs which distribution mirror is used
-at various stages of the build. Recall from {Stages of the
-build}#stages-of-the-build that the *bootstrap* stage is when the chroot is
-initially populated by debootstrap with a minimal system, and the *chroot*
-stage is when the chroot used to construct the live system's filesystem is
-built. Thus, the corresponding mirror switches are used for those stages,
-and later, in the *binary* stage, the #{--mirror-binary}# and
+The Debian archive is replicated across a large network of mirrors around
+the world so that people in each region can choose a nearby mirror for best
+download speed. Each of the #{--mirror-*}# options governs which
+distribution mirror is used at various stages of the build. Recall from
+{Stages of the build}#stages-of-the-build that the *bootstrap* stage is when
+the chroot is initially populated by debootstrap with a minimal system, and
+the *chroot* stage is when the chroot used to construct the live system's
+filesystem is built. Thus, the corresponding mirror switches are used for
+those stages, and later, in the *binary* stage, the #{--mirror-binary}# and
 #{--mirror-binary-security}# values are used, superceding any mirrors used
 in an earlier stage.
 
@@ -66,11 +109,14 @@ $ lb config --mirror-binary http://mirror/debian/ \
 
 3~additional-repositories Additional repositories
 
-To add more repositories (e.g. backports, experimental or custom packages,
-etc.), create #{config/chroot_sources/your-repository.{chroot,binary}}#
-files. As with the #{--mirror-*}# options, these govern the repositories
-used in the *chroot* stage when building the image, and in the *binary*
-stage, i.e. for use when running the live system.
+You may add more repositories, broadening your package choices beyond what
+is available in your target distribution. These may be, for example, for
+backports, experimental or custom packages. To configure additional
+repositories, create #{config/chroot_sources/your-repository.chroot}#,
+and/or #{config/chroot_sources/your-repository.binary}# files. As with the
+#{--mirror-*}# options, these govern the repositories used in the *chroot*
+stage when building the image, and in the *binary* stage, i.e. for use when
+running the live system.
 
 For example, #{config/chroot_sources/live.chroot}# allows you to install
 packages from the debian live snapshot repository at live system build time.
@@ -468,7 +514,7 @@ and #{aptitude}# for details.
 For background, please first read the #{apt_preferences(5)}# man page. APT
 pinning can be configured either for build time, or else for run time. For
 the former, create #{config/chroot_apt/preferences}#. For the latter, create
-#{config/chroot_local-includes/etc/preferences}#.
+#{config/chroot_local-includes/etc/apt/preferences}#.
 
 Let's say you are building a Squeeze live system but need all #{live-*}#
 packages to be installed from Sid at build time. You need to add Sid to your
diff --git a/manual/en/user_customization-packages.ssi b/manual/en/user_customization-packages.ssi
index 0693b58..0df68e2 100644
--- a/manual/en/user_customization-packages.ssi
+++ b/manual/en/user_customization-packages.ssi
@@ -2,13 +2,35 @@
 
 1~customizing-package-installation Customizing package installation
 
-Perhaps the most basic customization of a Debian live system is the selection of packages to be included in the image. This chapter guides you through the various build-time options to customize live-build's installation of packages. We start with customization of the distribution mirror. You can also add your own repositories for backports, experimental or custom packages, or include packages directly as files. You can define your own lists of packages to include, use live-build's predefined lists, use #{tasksel}# tasks, or a combination of all three. Finally, a number of options give some control over apt, or if you prefer, aptitude, at build time when packages are installed. You may find these handy if you use a proxy, want to disable installation of recommended packages to save space, or need to control which versions of packages are installed via APT pinning, to name a few possibilities.
+Perhaps the most basic customization of a Debian live system is the selection of packages to be included in the image. This chapter guides you through the various build-time options to customize live-build's installation of packages. The broadest choices influencing which packages are available to install in the image are the distribution and archive areas. To ensure decent download speeds, you should choose a nearby distribution mirror. You can also add your own repositories for backports, experimental or custom packages, or include packages directly as files. You can define your own lists of packages to include, use live-build's predefined lists, use #{tasksel}# tasks, or a combination of all three. Finally, a number of options give some control over apt, or if you prefer, aptitude, at build time when packages are installed. You may find these handy if you use a proxy, want to disable installation of recommended packages to save space, or need to control which versions of 
 packages are installed via APT pinning, to name a few possibilities.
 
 2~ Package sources
 
+3~ Distribution, archive areas and mode
+
+The distribution you choose has the broadest impact on which packages are available to include in your live image. Specify the codename, which defaults to #{squeeze}# for the Squeeze version of live-build. Any current distribution carried in the Debian archive may be specified by its codename here. (See {Terms}#terms for more details.) The #{--distribution}# option not only influences the source of packages within the archive, but also instructs #{live-build}# to behave as needed to build each supported distribution. For example, to build against the *unstable* release, Sid, specify:
+
+code{
+
+$ lb config --distribution sid
+
+}code
+
+Within the distribution archive, archive areas are major divisions of the archive. In Debian, these are #{main}#, #{contrib}# and #{non-free}#. Only #{main}# contains software that is official a part of the Debian distribution, hence that is the default. One or more values may be specified, e.g.
+
+code{
+
+$ lb config --archive-areas "main contrib"
+
+}code
+
+Experimental support is available for some Debian derivatives through a #{--mode}# option. By default, this option is set to #{debian}#, even if you are building on a non-Debian system. If you specify #{--mode ubuntu}# or #{--mode emdebian}#, the distribution names and archive areas for the specified derivative are supported instead of the ones for Debian. The mode also modifies live-build behaviour to suit the derivatives.
+
+*Note:* The projects for whom these modes were added are primarily responsible for supporting users of these options. The Debian live project, in turn, provides development support on a best-effort basis only, based on feedback from the derivative projects as we do not develop or support these derivatives ourselves.
+
 3~ Distribution mirrors
 
-Each of the #{--mirror-*}# options governs which distribution mirror is used at various stages of the build. Recall from {Stages of the build}#stages-of-the-build that the *bootstrap* stage is when the chroot is initially populated by debootstrap with a minimal system, and the *chroot* stage is when the chroot used to construct the live system's filesystem is built. Thus, the corresponding mirror switches are used for those stages, and later, in the *binary* stage, the #{--mirror-binary}# and #{--mirror-binary-security}# values are used, superceding any mirrors used in an earlier stage.
+The Debian archive is replicated across a large network of mirrors around the world so that people in each region can choose a nearby mirror for best download speed. Each of the #{--mirror-*}# options governs which distribution mirror is used at various stages of the build. Recall from {Stages of the build}#stages-of-the-build that the *bootstrap* stage is when the chroot is initially populated by debootstrap with a minimal system, and the *chroot* stage is when the chroot used to construct the live system's filesystem is built. Thus, the corresponding mirror switches are used for those stages, and later, in the *binary* stage, the #{--mirror-binary}# and #{--mirror-binary-security}# values are used, superceding any mirrors used in an earlier stage.
 
 3~distribution-mirrors-build-time Distribution mirrors used at build time
 
@@ -36,7 +58,7 @@ $ lb config --mirror-binary http://mirror/debian/ \
 
 3~additional-repositories Additional repositories
 
-To add more repositories (e.g. backports, experimental or custom packages, etc.), create #{config/chroot_sources/your-repository.{chroot,binary}}# files. As with the #{--mirror-*}# options, these govern the repositories used in the *chroot* stage when building the image, and in the *binary* stage, i.e. for use when running the live system.
+You may add more repositories, broadening your package choices beyond what is available in your target distribution. These may be, for example, for backports, experimental or custom packages. To configure additional repositories, create #{config/chroot_sources/your-repository.chroot}#, and/or #{config/chroot_sources/your-repository.binary}# files. As with the #{--mirror-*}# options, these govern the repositories used in the *chroot* stage when building the image, and in the *binary* stage, i.e. for use when running the live system.
 
 For example, #{config/chroot_sources/live.chroot}# allows you to install packages from the debian live snapshot repository at live system build time.
 
@@ -291,7 +313,7 @@ If there is not an #{lb config}# option to alter APT's behaviour in the way you
 
 3~apt-pinning APT pinning
 
-For background, please first read the #{apt_preferences(5)}# man page. APT pinning can be configured either for build time, or else for run time. For the former, create #{config/chroot_apt/preferences}#. For the latter, create #{config/chroot_local-includes/etc/preferences}#.
+For background, please first read the #{apt_preferences(5)}# man page. APT pinning can be configured either for build time, or else for run time. For the former, create #{config/chroot_apt/preferences}#. For the latter, create #{config/chroot_local-includes/etc/apt/preferences}#.
 
 Let's say you are building a Squeeze live system but need all #{live-*}# packages to be installed from Sid at build time. You need to add Sid to your APT sources and pin it so that only the packages you want are installed from it at build time and all others are taken from the target system distribution, Squeeze. The following will accomplish this:
 
diff --git a/manual/fr/user_customization-packages.ssi b/manual/fr/user_customization-packages.ssi
index 8ea25a6..b4153a1 100644
--- a/manual/fr/user_customization-packages.ssi
+++ b/manual/fr/user_customization-packages.ssi
@@ -5,28 +5,71 @@
 Perhaps the most basic customization of a Debian live system is the
 selection of packages to be included in the image. This chapter guides you
 through the various build-time options to customize live-build's
-installation of packages. We start with customization of the distribution
-mirror. You can also add your own repositories for backports, experimental
-or custom packages, or include packages directly as files. You can define
-your own lists of packages to include, use live-build's predefined lists,
-use #{tasksel}# tasks, or a combination of all three. Finally, a number of
-options give some control over apt, or if you prefer, aptitude, at build
-time when packages are installed. You may find these handy if you use a
-proxy, want to disable installation of recommended packages to save space,
-or need to control which versions of packages are installed via APT pinning,
-to name a few possibilities.
+installation of packages. The broadest choices influencing which packages
+are available to install in the image are the distribution and archive
+areas. To ensure decent download speeds, you should choose a nearby
+distribution mirror. You can also add your own repositories for backports,
+experimental or custom packages, or include packages directly as files. You
+can define your own lists of packages to include, use live-build's
+predefined lists, use #{tasksel}# tasks, or a combination of all
+three. Finally, a number of options give some control over apt, or if you
+prefer, aptitude, at build time when packages are installed. You may find
+these handy if you use a proxy, want to disable installation of recommended
+packages to save space, or need to control which versions of packages are
+installed via APT pinning, to name a few possibilities.
 
 2~ Package sources
 
+3~ Distribution, archive areas and mode
+
+The distribution you choose has the broadest impact on which packages are
+available to include in your live image. Specify the codename, which
+defaults to #{squeeze}# for the Squeeze version of live-build. Any current
+distribution carried in the Debian archive may be specified by its codename
+here. (See {Terms}#terms for more details.) The #{--distribution}# option
+not only influences the source of packages within the archive, but also
+instructs #{live-build}# to behave as needed to build each supported
+distribution. For example, to build against the *unstable* release, Sid,
+specify:
+
+code{
+
+$ lb config --distribution sid
+
+}code
+
+Within the distribution archive, archive areas are major divisions of the
+archive. In Debian, these are #{main}#, #{contrib}# and #{non-free}#. Only
+#{main}# contains software that is official a part of the Debian
+distribution, hence that is the default. One or more values may be
+specified, e.g.
+
+code{
+
+$ lb config --archive-areas "main contrib"
+
+}code
+
+Experimental support is available for some Debian derivatives through a
+#{--mode}# option. By default, this option is set to #{debian}#, even if you
+are building on a non-Debian system. If you specify #{--mode ubuntu}# or
+#{--mode emdebian}#, the distribution names and archive areas for the
+specified derivative are supported instead of the ones for Debian. The mode
+also modifies live-build behaviour to suit the derivatives.
+
+*Note:* The projects for whom these modes were added are primarily responsible for supporting users of these options. The Debian live project, in turn, provides development support on a best-effort basis only, based on feedback from the derivative projects as we do not develop or support these derivatives ourselves.
+
 3~ Distribution mirrors
 
-Each of the #{--mirror-*}# options governs which distribution mirror is used
-at various stages of the build. Recall from {Stages of the
-build}#stages-of-the-build that the *bootstrap* stage is when the chroot is
-initially populated by debootstrap with a minimal system, and the *chroot*
-stage is when the chroot used to construct the live system's filesystem is
-built. Thus, the corresponding mirror switches are used for those stages,
-and later, in the *binary* stage, the #{--mirror-binary}# and
+The Debian archive is replicated across a large network of mirrors around
+the world so that people in each region can choose a nearby mirror for best
+download speed. Each of the #{--mirror-*}# options governs which
+distribution mirror is used at various stages of the build. Recall from
+{Stages of the build}#stages-of-the-build that the *bootstrap* stage is when
+the chroot is initially populated by debootstrap with a minimal system, and
+the *chroot* stage is when the chroot used to construct the live system's
+filesystem is built. Thus, the corresponding mirror switches are used for
+those stages, and later, in the *binary* stage, the #{--mirror-binary}# and
 #{--mirror-binary-security}# values are used, superceding any mirrors used
 in an earlier stage.
 
@@ -66,11 +109,14 @@ $ lb config --mirror-binary http://mirror/debian/ \
 
 3~additional-repositories Additional repositories
 
-To add more repositories (e.g. backports, experimental or custom packages,
-etc.), create #{config/chroot_sources/your-repository.{chroot,binary}}#
-files. As with the #{--mirror-*}# options, these govern the repositories
-used in the *chroot* stage when building the image, and in the *binary*
-stage, i.e. for use when running the live system.
+You may add more repositories, broadening your package choices beyond what
+is available in your target distribution. These may be, for example, for
+backports, experimental or custom packages. To configure additional
+repositories, create #{config/chroot_sources/your-repository.chroot}#,
+and/or #{config/chroot_sources/your-repository.binary}# files. As with the
+#{--mirror-*}# options, these govern the repositories used in the *chroot*
+stage when building the image, and in the *binary* stage, i.e. for use when
+running the live system.
 
 For example, #{config/chroot_sources/live.chroot}# allows you to install
 packages from the debian live snapshot repository at live system build time.
@@ -468,7 +514,7 @@ and #{aptitude}# for details.
 For background, please first read the #{apt_preferences(5)}# man page. APT
 pinning can be configured either for build time, or else for run time. For
 the former, create #{config/chroot_apt/preferences}#. For the latter, create
-#{config/chroot_local-includes/etc/preferences}#.
+#{config/chroot_local-includes/etc/apt/preferences}#.
 
 Let's say you are building a Squeeze live system but need all #{live-*}#
 packages to be installed from Sid at build time. You need to add Sid to your
diff --git a/manual/po/de/user_customization-packages.ssi.po b/manual/po/de/user_customization-packages.ssi.po
index b8ce97b..46c157f 100644
--- a/manual/po/de/user_customization-packages.ssi.po
+++ b/manual/po/de/user_customization-packages.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-12-01 06:49-0400\n"
+"POT-Creation-Date: 2010-12-01 21:10-0400\n"
 "PO-Revision-Date: 2010-10-03 20:30+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -46,20 +46,22 @@ msgstr ""
 #: en/user_customization-internationalization.ssi:18
 #: en/user_customization-internationalization.ssi:26
 #: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
-#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:90
-#: en/user_customization-packages.ssi:120
-#: en/user_customization-packages.ssi:133
-#: en/user_customization-packages.ssi:143
-#: en/user_customization-packages.ssi:153
-#: en/user_customization-packages.ssi:163
-#: en/user_customization-packages.ssi:177
-#: en/user_customization-packages.ssi:193
-#: en/user_customization-packages.ssi:259
-#: en/user_customization-packages.ssi:271
+#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
+#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:53
+#: en/user_customization-packages.ssi:66 en/user_customization-packages.ssi:80
+#: en/user_customization-packages.ssi:94
+#: en/user_customization-packages.ssi:112
+#: en/user_customization-packages.ssi:142
+#: en/user_customization-packages.ssi:155
+#: en/user_customization-packages.ssi:165
+#: en/user_customization-packages.ssi:175
+#: en/user_customization-packages.ssi:185
+#: en/user_customization-packages.ssi:199
+#: en/user_customization-packages.ssi:215
 #: en/user_customization-packages.ssi:281
-#: en/user_customization-packages.ssi:299 en/user_customization-runtime.ssi:12
+#: en/user_customization-packages.ssi:293
+#: en/user_customization-packages.ssi:303
+#: en/user_customization-packages.ssi:321 en/user_customization-runtime.ssi:12
 #: en/user_customization-runtime.ssi:30 en/user_customization-runtime.ssi:40
 #: en/user_customization-runtime.ssi:48 en/user_customization-runtime.ssi:56
 #: en/user_customization-runtime.ssi:64 en/user_customization-runtime.ssi:84
@@ -112,20 +114,22 @@ msgstr ""
 #: en/user_customization-internationalization.ssi:22
 #: en/user_customization-internationalization.ssi:30
 #: en/user_customization-internationalization.ssi:42
-#: en/user_customization-packages.ssi:23 en/user_customization-packages.ssi:36
-#: en/user_customization-packages.ssi:48 en/user_customization-packages.ssi:62
-#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:125
-#: en/user_customization-packages.ssi:139
-#: en/user_customization-packages.ssi:149
-#: en/user_customization-packages.ssi:159
-#: en/user_customization-packages.ssi:169
+#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
+#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:58
+#: en/user_customization-packages.ssi:70 en/user_customization-packages.ssi:84
+#: en/user_customization-packages.ssi:98
+#: en/user_customization-packages.ssi:116
+#: en/user_customization-packages.ssi:147
+#: en/user_customization-packages.ssi:161
+#: en/user_customization-packages.ssi:171
 #: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:197
-#: en/user_customization-packages.ssi:263
-#: en/user_customization-packages.ssi:275
+#: en/user_customization-packages.ssi:191
+#: en/user_customization-packages.ssi:203
+#: en/user_customization-packages.ssi:219
 #: en/user_customization-packages.ssi:285
-#: en/user_customization-packages.ssi:312 en/user_customization-runtime.ssi:16
+#: en/user_customization-packages.ssi:297
+#: en/user_customization-packages.ssi:307
+#: en/user_customization-packages.ssi:334 en/user_customization-runtime.ssi:16
 #: en/user_customization-runtime.ssi:34 en/user_customization-runtime.ssi:44
 #: en/user_customization-runtime.ssi:52 en/user_customization-runtime.ssi:60
 #: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:88
@@ -164,16 +168,18 @@ msgid ""
 "Perhaps the most basic customization of a Debian live system is the "
 "selection of packages to be included in the image. This chapter guides you "
 "through the various build-time options to customize live-build's "
-"installation of packages. We start with customization of the distribution "
-"mirror. You can also add your own repositories for backports, experimental "
-"or custom packages, or include packages directly as files. You can define "
-"your own lists of packages to include, use live-build's predefined lists, "
-"use #{tasksel}# tasks, or a combination of all three. Finally, a number of "
-"options give some control over apt, or if you prefer, aptitude, at build "
-"time when packages are installed. You may find these handy if you use a "
-"proxy, want to disable installation of recommended packages to save space, "
-"or need to control which versions of packages are installed via APT pinning, "
-"to name a few possibilities."
+"installation of packages. The broadest choices influencing which packages "
+"are available to install in the image are the distribution and archive "
+"areas. To ensure decent download speeds, you should choose a nearby "
+"distribution mirror. You can also add your own repositories for backports, "
+"experimental or custom packages, or include packages directly as files. You "
+"can define your own lists of packages to include, use live-build's "
+"predefined lists, use #{tasksel}# tasks, or a combination of all three. "
+"Finally, a number of options give some control over apt, or if you prefer, "
+"aptitude, at build time when packages are installed. You may find these "
+"handy if you use a proxy, want to disable installation of recommended "
+"packages to save space, or need to control which versions of packages are "
+"installed via APT pinning, to name a few possibilities."
 msgstr ""
 
 #. type: Plain text
@@ -183,30 +189,89 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:10
-msgid "3~ Distribution mirrors"
+msgid "3~ Distribution, archive areas and mode"
 msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:12
 msgid ""
-"Each of the #{--mirror-*}# options governs which distribution mirror is used "
-"at various stages of the build. Recall from {Stages of the build}#stages-of-"
-"the-build that the *bootstrap* stage is when the chroot is initially "
-"populated by debootstrap with a minimal system, and the *chroot* stage is "
-"when the chroot used to construct the live system's filesystem is built. "
-"Thus, the corresponding mirror switches are used for those stages, and "
-"later, in the *binary* stage, the #{--mirror-binary}# and #{--mirror-binary-"
-"security}# values are used, superceding any mirrors used in an earlier stage."
+"The distribution you choose has the broadest impact on which packages are "
+"available to include in your live image. Specify the codename, which "
+"defaults to #{squeeze}# for the Squeeze version of live-build. Any current "
+"distribution carried in the Debian archive may be specified by its codename "
+"here. (See {Terms}#terms for more details.) The #{--distribution}# option "
+"not only influences the source of packages within the archive, but also "
+"instructs #{live-build}# to behave as needed to build each supported "
+"distribution. For example, to build against the *unstable* release, Sid, "
+"specify:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:16
+msgid "$ lb config --distribution sid"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:20
+msgid ""
+"Within the distribution archive, archive areas are major divisions of the "
+"archive. In Debian, these are #{main}#, #{contrib}# and #{non-free}#. Only #"
+"{main}# contains software that is official a part of the Debian "
+"distribution, hence that is the default. One or more values may be "
+"specified, e.g."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:24
+msgid "$ lb config --archive-areas \"main contrib\""
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:28
+msgid ""
+"Experimental support is available for some Debian derivatives through a #{--"
+"mode}# option. By default, this option is set to #{debian}#, even if you are "
+"building on a non-Debian system. If you specify #{--mode ubuntu}# or #{--"
+"mode emdebian}#, the distribution names and archive areas for the specified "
+"derivative are supported instead of the ones for Debian. The mode also "
+"modifies live-build behaviour to suit the derivatives."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:30
+#, no-wrap
+msgid "*Note:* The projects for whom these modes were added are primarily responsible for supporting users of these options. The Debian live project, in turn, provides development support on a best-effort basis only, based on feedback from the derivative projects as we do not develop or support these derivatives ourselves.\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:32
+msgid "3~ Distribution mirrors"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:34
+msgid ""
+"The Debian archive is replicated across a large network of mirrors around "
+"the world so that people in each region can choose a nearby mirror for best "
+"download speed. Each of the #{--mirror-*}# options governs which "
+"distribution mirror is used at various stages of the build. Recall from "
+"{Stages of the build}#stages-of-the-build that the *bootstrap* stage is when "
+"the chroot is initially populated by debootstrap with a minimal system, and "
+"the *chroot* stage is when the chroot used to construct the live system's "
+"filesystem is built. Thus, the corresponding mirror switches are used for "
+"those stages, and later, in the *binary* stage, the #{--mirror-binary}# and #"
+"{--mirror-binary-security}# values are used, superceding any mirrors used in "
+"an earlier stage."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:14
+#: en/user_customization-packages.ssi:36
 msgid ""
 "3~distribution-mirrors-build-time Distribution mirrors used at build time"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:16
+#: en/user_customization-packages.ssi:38
 msgid ""
 "To set the distribution mirrors used at build time to point at a local "
 "mirror, it is sufficient to set #{--mirror-bootstrap}# and #{--mirror-chroot-"
@@ -214,7 +279,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:21
+#: en/user_customization-packages.ssi:43
 #, no-wrap
 msgid ""
 "$ lb config --mirror-bootstrap http://localhost/debian/ \\\n"
@@ -222,19 +287,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:25
+#: en/user_customization-packages.ssi:47
 msgid ""
 "The chroot mirror, specified by #{--mirror-chroot}#, defaults to the #{--"
 "mirror-bootstrap}# value."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:27
+#: en/user_customization-packages.ssi:49
 msgid "3~ Distribution mirrors used at run time"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:29
+#: en/user_customization-packages.ssi:51
 msgid ""
 "The #{--mirror-binary*}# options govern the distribution mirrors placed in "
 "the binary image. These may be used to install additional packages while "
@@ -247,7 +312,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:34
+#: en/user_customization-packages.ssi:56
 #, no-wrap
 msgid ""
 "$ lb config --mirror-binary http://mirror/debian/ \\\n"
@@ -255,34 +320,37 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:38
+#: en/user_customization-packages.ssi:60
 msgid "3~additional-repositories Additional repositories"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:40
+#: en/user_customization-packages.ssi:62
 msgid ""
-"To add more repositories (e.g. backports, experimental or custom packages, "
-"etc.), create #{config/chroot_sources/your-repository.{chroot,binary}}# "
-"files. As with the #{--mirror-*}# options, these govern the repositories "
-"used in the *chroot* stage when building the image, and in the *binary* "
-"stage, i.e. for use when running the live system."
+"You may add more repositories, broadening your package choices beyond what "
+"is available in your target distribution. These may be, for example, for "
+"backports, experimental or custom packages. To configure additional "
+"repositories, create #{config/chroot_sources/your-repository.chroot}#, and/"
+"or #{config/chroot_sources/your-repository.binary}# files. As with the #{--"
+"mirror-*}# options, these govern the repositories used in the *chroot* stage "
+"when building the image, and in the *binary* stage, i.e. for use when "
+"running the live system."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:42
+#: en/user_customization-packages.ssi:64
 msgid ""
 "For example, #{config/chroot_sources/live.chroot}# allows you to install "
 "packages from the debian live snapshot repository at live system build time."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:46
+#: en/user_customization-packages.ssi:68
 msgid "deb http://live.debian.net/ sid-snapshots main contrib non-free"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:50
+#: en/user_customization-packages.ssi:72
 msgid ""
 "If you add the same line to #{config/chroot_sources/live.binary}#, the "
 "repository will be added to your live system's #{/etc/apt/sources.list.d/}# "
@@ -290,19 +358,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:52
+#: en/user_customization-packages.ssi:74
 msgid "If such files exist, they will be picked up automatically."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:54
+#: en/user_customization-packages.ssi:76
 msgid ""
 "You should also put the GPG key used to sign the repository into #{config/"
 "chroot_sources/your-repository.{binary,chroot}.gpg}# files."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:56
+#: en/user_customization-packages.ssi:78
 msgid ""
 "Note: some preconfigured package repositories are available for easy "
 "selection through the #{--repository}# option, e.g. for enabling live "
@@ -310,17 +378,17 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:60
+#: en/user_customization-packages.ssi:82
 msgid "$ lb config --repository live.debian.net"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:64
+#: en/user_customization-packages.ssi:86
 msgid "2~choosing-packages-to-install Choosing packages to install"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:66
+#: en/user_customization-packages.ssi:88
 msgid ""
 "There are a number of ways to choose which packages live-build will install "
 "in your image, covering a variety of different needs. You can simply name "
@@ -333,24 +401,24 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:68
+#: en/user_customization-packages.ssi:90
 msgid "3~ Choosing a few packages"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:70
+#: en/user_customization-packages.ssi:92
 msgid ""
 "When the number of packages added is small, simply specify #{--packages}#. "
 "For example:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:74
+#: en/user_customization-packages.ssi:96
 msgid "$ lb config --packages \"package1 package2 package3\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:78
+#: en/user_customization-packages.ssi:100
 msgid ""
 "The behaviour of live-build when specifying a package that does not exist is "
 "determined by your choice of APT utility. See {Choosing apt or aptitude}"
@@ -358,7 +426,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:80
+#: en/user_customization-packages.ssi:102
 msgid ""
 "If you need to specify a large number of packages to be installed or you "
 "need flexibility regarding which packages to install, use package lists as "
@@ -366,12 +434,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:82
+#: en/user_customization-packages.ssi:104
 msgid "3~package-lists Package lists"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:84
+#: en/user_customization-packages.ssi:106
 msgid ""
 "Package lists are a powerful way of expressing which packages should be "
 "installed. The list syntax supports included files and conditional sections "
@@ -384,24 +452,24 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:86
+#: en/user_customization-packages.ssi:108
 msgid "3~ Predefined package lists"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:88
+#: en/user_customization-packages.ssi:110
 msgid ""
 "The simplest way to use lists is to specify one or more predefined lists "
 "with the #{--packages-lists}# option. For example:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:92
+#: en/user_customization-packages.ssi:114
 msgid "$ lb config --packages-lists \"gnome-core rescue\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:96
+#: en/user_customization-packages.ssi:118
 msgid ""
 "In addition to these lists, live-build supports four virtual package lists: #"
 "{gnome-desktop}#, #{kde-desktop}#, #{lxde-desktop}# and #{xfce-desktop}#, "
@@ -411,7 +479,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:98
+#: en/user_customization-packages.ssi:120
 msgid ""
 "Note: The prebuilt GNOME, KDE, LXDE and XFCE images available for download "
 "at http://live.debian.net are built using the corresponding virtual #{*-"
@@ -419,7 +487,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:100
+#: en/user_customization-packages.ssi:122
 msgid ""
 "The default location for the list files on your system is #{/usr/share/live/"
 "build/lists/}#. To determine the packages in a given list, read the "
@@ -428,19 +496,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:102
+#: en/user_customization-packages.ssi:124
 msgid "3~ Local package lists"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:104
+#: en/user_customization-packages.ssi:126
 msgid ""
 "You may supplement or replace entirely the supplied lists using local "
 "package lists stored in #{config/chroot_local-packageslists/}#."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:106
+#: en/user_customization-packages.ssi:128
 msgid ""
 "Package lists that exist in this directory need to have a #{.list}# suffix "
 "in order to be processed. Local package lists always override package lists "
@@ -449,12 +517,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:108
+#: en/user_customization-packages.ssi:130
 msgid "3~ Local binary package lists"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:110
+#: en/user_customization-packages.ssi:132
 msgid ""
 "In case you want to include some required .deb packages to live media's #"
 "{pool/}# (without installing them onto the live image) you may need to use "
@@ -464,19 +532,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:112
+#: en/user_customization-packages.ssi:134
 msgid ""
 "Package lists that exist in this directory need to have a #{.list}# suffix "
 "in order to be processed."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:114
+#: en/user_customization-packages.ssi:136
 msgid "3~ Extending a provided package list using includes"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:116
+#: en/user_customization-packages.ssi:138
 msgid ""
 "The package lists that are included with live-build make extensive use of "
 "includes. Refer to these in the #{/usr/share/live/build/lists/}# directory, "
@@ -484,7 +552,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:118
+#: en/user_customization-packages.ssi:140
 msgid ""
 "For example, to make a list that includes the predefined #{gnome}# list plus "
 "iceweasel, create #{config/chroot_local-packageslists/mygnome.list}# with "
@@ -492,17 +560,17 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:123
+#: en/user_customization-packages.ssi:145
 msgid "#include <gnome> iceweasel"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:149
 msgid "3~ Using conditionals inside package lists"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:129
+#: en/user_customization-packages.ssi:151
 msgid ""
 "Any of the live-build configuration variables stored in #{config/*}# (minus "
 "the #{LB_}# prefix) may be used in conditional statements in package lists. "
@@ -513,19 +581,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:131
+#: en/user_customization-packages.ssi:153
 msgid ""
 "For example, to install #{ia32-libs}# if the #{--architecture amd64}# is "
 "specified:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:137
+#: en/user_customization-packages.ssi:159
 msgid "#if ARCHITECTURE amd64 ia32-libs #endif"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:141
+#: en/user_customization-packages.ssi:163
 msgid ""
 "You may test for any one of a number of values, e.g. to install #"
 "{memtest86+ }# if either #{--architecture i386}# or #{--architecture amd64}# "
@@ -533,12 +601,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:147
+#: en/user_customization-packages.ssi:169
 msgid "#if ARCHITECTURE i386 amd64 memtest86+ #endif"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:151
+#: en/user_customization-packages.ssi:173
 msgid ""
 "You may also test against variables that may contain more than one value, e."
 "g. to install #{vrms}# if either #{contrib}# or #{non-free}# is specified "
@@ -546,32 +614,32 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:157
+#: en/user_customization-packages.ssi:179
 msgid "#if ARCHIVE_AREAS contrib non-free vrms #endif"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:161
+#: en/user_customization-packages.ssi:183
 msgid "A conditional may surround an #{#include}# directive:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:167
+#: en/user_customization-packages.ssi:189
 msgid "#if ARCHITECTURE amd64 #include <gnome-full> #endif"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:171
+#: en/user_customization-packages.ssi:193
 msgid "The nesting of conditionals is not supported."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:173
+#: en/user_customization-packages.ssi:195
 msgid "3~ Tasks"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:175
+#: en/user_customization-packages.ssi:197
 msgid ""
 "The Debian Installer offers the user choices of a number of preselected "
 "lists of packages, each one focused on a particular kind of system, or task "
@@ -582,12 +650,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:179
+#: en/user_customization-packages.ssi:201
 msgid "$ lb config --tasks \"mail-server file-server\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:183
+#: en/user_customization-packages.ssi:205
 msgid ""
 "The primary tasks available in the Debian Installer can be listed with #"
 "{tasksel --list-tasks}# in the live system. The contents of any task, "
@@ -596,12 +664,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:185
+#: en/user_customization-packages.ssi:207
 msgid "3~desktop-and-language-tasks Desktop and language tasks"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:187
+#: en/user_customization-packages.ssi:209
 msgid ""
 "Desktop and language tasks are special cases. In the Debian Installer, if "
 "the medium was prepared for a particular desktop environment flavour, the "
@@ -613,14 +681,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:211
 msgid ""
 "In live-build, therefore, these special cases are also given special "
 "consideration, but with three notable differences at the time of writing."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:191
+#: en/user_customization-packages.ssi:213
 msgid ""
 "First, there is no provision made yet automatically for language tasks, "
 "although a subset of those packages are included if you specify #{lb config "
@@ -630,13 +698,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:195
+#: en/user_customization-packages.ssi:217
 msgid ""
 "$ lb config --tasks \"japanese japanese-desktop japanese-gnome-desktop\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:199
+#: en/user_customization-packages.ssi:221
 msgid ""
 "Second, live-build supports #{*-desktop}# virtual package lists for each of "
 "the desktop flavours mentioned above, which select the #{standard-x11}# "
@@ -647,7 +715,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:223
 msgid ""
 "Third, if any of the tasks for these desktop flavours are selected, either "
 "explicitly through #{--tasks}# or implicitly by #{--packages}#, live-build "
@@ -657,12 +725,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:203
+#: en/user_customization-packages.ssi:225
 msgid "2~ Installing modified or third-party packages"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:205
+#: en/user_customization-packages.ssi:227
 msgid ""
 "Whilst it is against the philosophy of Debian Live, it may sometimes be "
 "necessary to build a Live system with modified versions of packages that are "
@@ -673,7 +741,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:229
 msgid ""
 "This section does not cover advice regarding building or maintaining "
 "modified packages. Joachim Breitner's 'How to fork privately' method from "
@@ -684,22 +752,22 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:209
+#: en/user_customization-packages.ssi:231
 msgid "There are two ways of installing modified custom packages:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:233
 msgid "_* #{chroot_local-packages}#"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:213
+#: en/user_customization-packages.ssi:235
 msgid "_* Using a custom APT repository"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:215
+#: en/user_customization-packages.ssi:237
 msgid ""
 "Using #{chroot_local-packages}# is simpler to achieve and useful for \"one-"
 "off\" customizations but has a number of drawbacks, whilst using a custom "
@@ -707,12 +775,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:217
+#: en/user_customization-packages.ssi:239
 msgid "3~ Using #{chroot_local-packages}# to install custom packages"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:219
+#: en/user_customization-packages.ssi:241
 msgid ""
 "To install a custom package, simply copy it to the #{config/chroot_local-"
 "packages/}# directory. Packages that are inside this directory will be "
@@ -721,45 +789,45 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:221
+#: en/user_customization-packages.ssi:243
 msgid ""
 "Packages *{must}* be named in the prescribed way. One simple way to do this "
 "is to use #{dpkg-name}#."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:223
+#: en/user_customization-packages.ssi:245
 msgid ""
 "Using #{chroot_local-packages}# for installation of custom packages has "
 "disadvantages:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:225
+#: en/user_customization-packages.ssi:247
 msgid "_* It is not possible to use secure APT."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:227
+#: en/user_customization-packages.ssi:249
 msgid ""
 "_* You must install all appropriate packages in the #{config/chroot_local-"
 "packages/}# directory."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:229
+#: en/user_customization-packages.ssi:251
 msgid ""
 "_* It does not lend itself to storing Debian Live configurations in revision "
 "control."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:231
+#: en/user_customization-packages.ssi:253
 msgid "3~ Using an APT repository to install custom packages"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:233
+#: en/user_customization-packages.ssi:255
 msgid ""
 "Unlike using #{chroot_local-packages}#, when using a custom APT repository "
 "you must ensure that you specify the packages elsewhere. See {Choosing "
@@ -767,7 +835,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:235
+#: en/user_customization-packages.ssi:257
 msgid ""
 "Whilst it may seem unnecessary effort to create an APT repository to install "
 "custom packages, the infrastructure can be easily re-used at a later date to "
@@ -775,12 +843,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:237
+#: en/user_customization-packages.ssi:259
 msgid "3~ Custom packages and APT"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:239
+#: en/user_customization-packages.ssi:261
 msgid ""
 "live-build uses APT to install all packages into the live system so will "
 "therefore inherit behaviours from this program. One relevant example is that "
@@ -790,7 +858,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:241
+#: en/user_customization-packages.ssi:263
 msgid ""
 "Because of this, you may wish to increment the version number in your custom "
 "packages' #{debian/changelog}# files to ensure that your modified version is "
@@ -800,12 +868,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:243
+#: en/user_customization-packages.ssi:265
 msgid "2~ Configuring APT at build time"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:245
+#: en/user_customization-packages.ssi:267
 msgid ""
 "You can configure APT through a number of options applied only at build "
 "time. (APT configuration used in the running live system may be configured "
@@ -816,12 +884,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:247
+#: en/user_customization-packages.ssi:269
 msgid "3~choosing-apt-or-aptitude Choosing apt or aptitude"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:249
+#: en/user_customization-packages.ssi:271
 msgid ""
 "You can elect to use either #{apt}# or #{aptitude}# when installing packages "
 "at build time. Which utility is used is governed by the #{--apt}# argument "
@@ -831,26 +899,26 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:251
+#: en/user_customization-packages.ssi:273
 msgid ""
 "_* #{apt}#: With this method, if a missing package is specified, the package "
 "installation will fail. This is the default setting."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:253
+#: en/user_customization-packages.ssi:275
 msgid ""
 "_* #{aptitude}#: With this method, if a missing package is specified, the "
 "package installation will succeed."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:255
+#: en/user_customization-packages.ssi:277
 msgid "3~ Using a proxy with APT"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:257
+#: en/user_customization-packages.ssi:279
 msgid ""
 "One commonly required APT configuration is to deal with building an image "
 "behind a proxy. You may specify your APT proxy with the #{--apt-ftp-proxy}# "
@@ -858,17 +926,17 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:261
+#: en/user_customization-packages.ssi:283
 msgid "lb config --apt-http-proxy http://proxy/"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:265
+#: en/user_customization-packages.ssi:287
 msgid "3~ Tweaking APT to save space"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:267
+#: en/user_customization-packages.ssi:289
 msgid ""
 "You may find yourself needing to save some space on the image media, in "
 "which case one or the other or both of the following options may be of "
@@ -876,19 +944,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:269
+#: en/user_customization-packages.ssi:291
 msgid ""
 "If you don't want to include APT indices in the image, you can omit those "
 "with:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:273
+#: en/user_customization-packages.ssi:295
 msgid "$ lb config --binary-indices false"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:277
+#: en/user_customization-packages.ssi:299
 msgid ""
 "This will not influence the entries in /etc/apt/sources.list, but merely "
 "whether /var/lib/apt contains the indices files or not. The tradeoff is that "
@@ -898,19 +966,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:279
+#: en/user_customization-packages.ssi:301
 msgid ""
 "If you find the installation of recommended packages bloats your image too "
 "much, you may disable that default option of APT with:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:283
+#: en/user_customization-packages.ssi:305
 msgid "$ lb config --apt-recommends false"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:287
+#: en/user_customization-packages.ssi:309
 msgid ""
 "The tradeoff here is that recommended packages are defined as \"packages "
 "that would be found together with this one in all but unusual installations"
@@ -922,12 +990,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:289
+#: en/user_customization-packages.ssi:311
 msgid "3~ Passing options to apt or aptitude"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:291
+#: en/user_customization-packages.ssi:313
 msgid ""
 "If there is not an #{lb config}# option to alter APT's behaviour in the way "
 "you need, use #{--apt-options}# or #{--aptitude-options}# to pass any "
@@ -936,21 +1004,21 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:293
+#: en/user_customization-packages.ssi:315
 msgid "3~apt-pinning APT pinning"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:295
+#: en/user_customization-packages.ssi:317
 msgid ""
 "For background, please first read the #{apt_preferences(5)}# man page. APT "
 "pinning can be configured either for build time, or else for run time. For "
 "the former, create #{config/chroot_apt/preferences}#. For the latter, create "
-"#{config/chroot_local-includes/etc/preferences}#."
+"#{config/chroot_local-includes/etc/apt/preferences}#."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:297
+#: en/user_customization-packages.ssi:319
 msgid ""
 "Let's say you are building a Squeeze live system but need all #{live-*}# "
 "packages to be installed from Sid at build time. You need to add Sid to your "
@@ -960,7 +1028,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:305
+#: en/user_customization-packages.ssi:327
 msgid ""
 "$ echo \"deb http://mirror/debian sid main\" > config/chroot_sources/sid."
 "chroot $ cat >>config/chroot_apt/preferences <<END Package: live-* Pin: "
@@ -968,6 +1036,6 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:310
+#: en/user_customization-packages.ssi:332
 msgid "Package: * Pin: release n=sid Pin-Priority: 1 END"
 msgstr ""
diff --git a/manual/po/fr/user_customization-packages.ssi.po b/manual/po/fr/user_customization-packages.ssi.po
index ef4183a..0c8077a 100644
--- a/manual/po/fr/user_customization-packages.ssi.po
+++ b/manual/po/fr/user_customization-packages.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-12-01 06:49-0400\n"
+"POT-Creation-Date: 2010-12-01 21:10-0400\n"
 "PO-Revision-Date: 2010-10-16 14:45-0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -46,20 +46,22 @@ msgstr ""
 #: en/user_customization-internationalization.ssi:18
 #: en/user_customization-internationalization.ssi:26
 #: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
-#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:90
-#: en/user_customization-packages.ssi:120
-#: en/user_customization-packages.ssi:133
-#: en/user_customization-packages.ssi:143
-#: en/user_customization-packages.ssi:153
-#: en/user_customization-packages.ssi:163
-#: en/user_customization-packages.ssi:177
-#: en/user_customization-packages.ssi:193
-#: en/user_customization-packages.ssi:259
-#: en/user_customization-packages.ssi:271
+#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
+#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:53
+#: en/user_customization-packages.ssi:66 en/user_customization-packages.ssi:80
+#: en/user_customization-packages.ssi:94
+#: en/user_customization-packages.ssi:112
+#: en/user_customization-packages.ssi:142
+#: en/user_customization-packages.ssi:155
+#: en/user_customization-packages.ssi:165
+#: en/user_customization-packages.ssi:175
+#: en/user_customization-packages.ssi:185
+#: en/user_customization-packages.ssi:199
+#: en/user_customization-packages.ssi:215
 #: en/user_customization-packages.ssi:281
-#: en/user_customization-packages.ssi:299 en/user_customization-runtime.ssi:12
+#: en/user_customization-packages.ssi:293
+#: en/user_customization-packages.ssi:303
+#: en/user_customization-packages.ssi:321 en/user_customization-runtime.ssi:12
 #: en/user_customization-runtime.ssi:30 en/user_customization-runtime.ssi:40
 #: en/user_customization-runtime.ssi:48 en/user_customization-runtime.ssi:56
 #: en/user_customization-runtime.ssi:64 en/user_customization-runtime.ssi:84
@@ -112,20 +114,22 @@ msgstr "code{"
 #: en/user_customization-internationalization.ssi:22
 #: en/user_customization-internationalization.ssi:30
 #: en/user_customization-internationalization.ssi:42
-#: en/user_customization-packages.ssi:23 en/user_customization-packages.ssi:36
-#: en/user_customization-packages.ssi:48 en/user_customization-packages.ssi:62
-#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:125
-#: en/user_customization-packages.ssi:139
-#: en/user_customization-packages.ssi:149
-#: en/user_customization-packages.ssi:159
-#: en/user_customization-packages.ssi:169
+#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
+#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:58
+#: en/user_customization-packages.ssi:70 en/user_customization-packages.ssi:84
+#: en/user_customization-packages.ssi:98
+#: en/user_customization-packages.ssi:116
+#: en/user_customization-packages.ssi:147
+#: en/user_customization-packages.ssi:161
+#: en/user_customization-packages.ssi:171
 #: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:197
-#: en/user_customization-packages.ssi:263
-#: en/user_customization-packages.ssi:275
+#: en/user_customization-packages.ssi:191
+#: en/user_customization-packages.ssi:203
+#: en/user_customization-packages.ssi:219
 #: en/user_customization-packages.ssi:285
-#: en/user_customization-packages.ssi:312 en/user_customization-runtime.ssi:16
+#: en/user_customization-packages.ssi:297
+#: en/user_customization-packages.ssi:307
+#: en/user_customization-packages.ssi:334 en/user_customization-runtime.ssi:16
 #: en/user_customization-runtime.ssi:34 en/user_customization-runtime.ssi:44
 #: en/user_customization-runtime.ssi:52 en/user_customization-runtime.ssi:60
 #: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:88
@@ -164,16 +168,18 @@ msgid ""
 "Perhaps the most basic customization of a Debian live system is the "
 "selection of packages to be included in the image. This chapter guides you "
 "through the various build-time options to customize live-build's "
-"installation of packages. We start with customization of the distribution "
-"mirror. You can also add your own repositories for backports, experimental "
-"or custom packages, or include packages directly as files. You can define "
-"your own lists of packages to include, use live-build's predefined lists, "
-"use #{tasksel}# tasks, or a combination of all three. Finally, a number of "
-"options give some control over apt, or if you prefer, aptitude, at build "
-"time when packages are installed. You may find these handy if you use a "
-"proxy, want to disable installation of recommended packages to save space, "
-"or need to control which versions of packages are installed via APT pinning, "
-"to name a few possibilities."
+"installation of packages. The broadest choices influencing which packages "
+"are available to install in the image are the distribution and archive "
+"areas. To ensure decent download speeds, you should choose a nearby "
+"distribution mirror. You can also add your own repositories for backports, "
+"experimental or custom packages, or include packages directly as files. You "
+"can define your own lists of packages to include, use live-build's "
+"predefined lists, use #{tasksel}# tasks, or a combination of all three. "
+"Finally, a number of options give some control over apt, or if you prefer, "
+"aptitude, at build time when packages are installed. You may find these "
+"handy if you use a proxy, want to disable installation of recommended "
+"packages to save space, or need to control which versions of packages are "
+"installed via APT pinning, to name a few possibilities."
 msgstr ""
 
 #. type: Plain text
@@ -183,30 +189,89 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:10
-msgid "3~ Distribution mirrors"
+msgid "3~ Distribution, archive areas and mode"
 msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:12
 msgid ""
-"Each of the #{--mirror-*}# options governs which distribution mirror is used "
-"at various stages of the build. Recall from {Stages of the build}#stages-of-"
-"the-build that the *bootstrap* stage is when the chroot is initially "
-"populated by debootstrap with a minimal system, and the *chroot* stage is "
-"when the chroot used to construct the live system's filesystem is built. "
-"Thus, the corresponding mirror switches are used for those stages, and "
-"later, in the *binary* stage, the #{--mirror-binary}# and #{--mirror-binary-"
-"security}# values are used, superceding any mirrors used in an earlier stage."
+"The distribution you choose has the broadest impact on which packages are "
+"available to include in your live image. Specify the codename, which "
+"defaults to #{squeeze}# for the Squeeze version of live-build. Any current "
+"distribution carried in the Debian archive may be specified by its codename "
+"here. (See {Terms}#terms for more details.) The #{--distribution}# option "
+"not only influences the source of packages within the archive, but also "
+"instructs #{live-build}# to behave as needed to build each supported "
+"distribution. For example, to build against the *unstable* release, Sid, "
+"specify:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:16
+msgid "$ lb config --distribution sid"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:20
+msgid ""
+"Within the distribution archive, archive areas are major divisions of the "
+"archive. In Debian, these are #{main}#, #{contrib}# and #{non-free}#. Only #"
+"{main}# contains software that is official a part of the Debian "
+"distribution, hence that is the default. One or more values may be "
+"specified, e.g."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:24
+msgid "$ lb config --archive-areas \"main contrib\""
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:28
+msgid ""
+"Experimental support is available for some Debian derivatives through a #{--"
+"mode}# option. By default, this option is set to #{debian}#, even if you are "
+"building on a non-Debian system. If you specify #{--mode ubuntu}# or #{--"
+"mode emdebian}#, the distribution names and archive areas for the specified "
+"derivative are supported instead of the ones for Debian. The mode also "
+"modifies live-build behaviour to suit the derivatives."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:30
+#, no-wrap
+msgid "*Note:* The projects for whom these modes were added are primarily responsible for supporting users of these options. The Debian live project, in turn, provides development support on a best-effort basis only, based on feedback from the derivative projects as we do not develop or support these derivatives ourselves.\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:32
+msgid "3~ Distribution mirrors"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:34
+msgid ""
+"The Debian archive is replicated across a large network of mirrors around "
+"the world so that people in each region can choose a nearby mirror for best "
+"download speed. Each of the #{--mirror-*}# options governs which "
+"distribution mirror is used at various stages of the build. Recall from "
+"{Stages of the build}#stages-of-the-build that the *bootstrap* stage is when "
+"the chroot is initially populated by debootstrap with a minimal system, and "
+"the *chroot* stage is when the chroot used to construct the live system's "
+"filesystem is built. Thus, the corresponding mirror switches are used for "
+"those stages, and later, in the *binary* stage, the #{--mirror-binary}# and #"
+"{--mirror-binary-security}# values are used, superceding any mirrors used in "
+"an earlier stage."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:14
+#: en/user_customization-packages.ssi:36
 msgid ""
 "3~distribution-mirrors-build-time Distribution mirrors used at build time"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:16
+#: en/user_customization-packages.ssi:38
 msgid ""
 "To set the distribution mirrors used at build time to point at a local "
 "mirror, it is sufficient to set #{--mirror-bootstrap}# and #{--mirror-chroot-"
@@ -214,7 +279,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:21
+#: en/user_customization-packages.ssi:43
 #, no-wrap
 msgid ""
 "$ lb config --mirror-bootstrap http://localhost/debian/ \\\n"
@@ -222,19 +287,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:25
+#: en/user_customization-packages.ssi:47
 msgid ""
 "The chroot mirror, specified by #{--mirror-chroot}#, defaults to the #{--"
 "mirror-bootstrap}# value."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:27
+#: en/user_customization-packages.ssi:49
 msgid "3~ Distribution mirrors used at run time"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:29
+#: en/user_customization-packages.ssi:51
 msgid ""
 "The #{--mirror-binary*}# options govern the distribution mirrors placed in "
 "the binary image. These may be used to install additional packages while "
@@ -247,7 +312,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:34
+#: en/user_customization-packages.ssi:56
 #, no-wrap
 msgid ""
 "$ lb config --mirror-binary http://mirror/debian/ \\\n"
@@ -255,34 +320,37 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:38
+#: en/user_customization-packages.ssi:60
 msgid "3~additional-repositories Additional repositories"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:40
+#: en/user_customization-packages.ssi:62
 msgid ""
-"To add more repositories (e.g. backports, experimental or custom packages, "
-"etc.), create #{config/chroot_sources/your-repository.{chroot,binary}}# "
-"files. As with the #{--mirror-*}# options, these govern the repositories "
-"used in the *chroot* stage when building the image, and in the *binary* "
-"stage, i.e. for use when running the live system."
+"You may add more repositories, broadening your package choices beyond what "
+"is available in your target distribution. These may be, for example, for "
+"backports, experimental or custom packages. To configure additional "
+"repositories, create #{config/chroot_sources/your-repository.chroot}#, and/"
+"or #{config/chroot_sources/your-repository.binary}# files. As with the #{--"
+"mirror-*}# options, these govern the repositories used in the *chroot* stage "
+"when building the image, and in the *binary* stage, i.e. for use when "
+"running the live system."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:42
+#: en/user_customization-packages.ssi:64
 msgid ""
 "For example, #{config/chroot_sources/live.chroot}# allows you to install "
 "packages from the debian live snapshot repository at live system build time."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:46
+#: en/user_customization-packages.ssi:68
 msgid "deb http://live.debian.net/ sid-snapshots main contrib non-free"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:50
+#: en/user_customization-packages.ssi:72
 msgid ""
 "If you add the same line to #{config/chroot_sources/live.binary}#, the "
 "repository will be added to your live system's #{/etc/apt/sources.list.d/}# "
@@ -290,19 +358,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:52
+#: en/user_customization-packages.ssi:74
 msgid "If such files exist, they will be picked up automatically."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:54
+#: en/user_customization-packages.ssi:76
 msgid ""
 "You should also put the GPG key used to sign the repository into #{config/"
 "chroot_sources/your-repository.{binary,chroot}.gpg}# files."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:56
+#: en/user_customization-packages.ssi:78
 msgid ""
 "Note: some preconfigured package repositories are available for easy "
 "selection through the #{--repository}# option, e.g. for enabling live "
@@ -310,17 +378,17 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:60
+#: en/user_customization-packages.ssi:82
 msgid "$ lb config --repository live.debian.net"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:64
+#: en/user_customization-packages.ssi:86
 msgid "2~choosing-packages-to-install Choosing packages to install"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:66
+#: en/user_customization-packages.ssi:88
 msgid ""
 "There are a number of ways to choose which packages live-build will install "
 "in your image, covering a variety of different needs. You can simply name "
@@ -333,24 +401,24 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:68
+#: en/user_customization-packages.ssi:90
 msgid "3~ Choosing a few packages"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:70
+#: en/user_customization-packages.ssi:92
 msgid ""
 "When the number of packages added is small, simply specify #{--packages}#. "
 "For example:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:74
+#: en/user_customization-packages.ssi:96
 msgid "$ lb config --packages \"package1 package2 package3\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:78
+#: en/user_customization-packages.ssi:100
 msgid ""
 "The behaviour of live-build when specifying a package that does not exist is "
 "determined by your choice of APT utility. See {Choosing apt or aptitude}"
@@ -358,7 +426,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:80
+#: en/user_customization-packages.ssi:102
 msgid ""
 "If you need to specify a large number of packages to be installed or you "
 "need flexibility regarding which packages to install, use package lists as "
@@ -366,12 +434,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:82
+#: en/user_customization-packages.ssi:104
 msgid "3~package-lists Package lists"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:84
+#: en/user_customization-packages.ssi:106
 msgid ""
 "Package lists are a powerful way of expressing which packages should be "
 "installed. The list syntax supports included files and conditional sections "
@@ -384,24 +452,24 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:86
+#: en/user_customization-packages.ssi:108
 msgid "3~ Predefined package lists"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:88
+#: en/user_customization-packages.ssi:110
 msgid ""
 "The simplest way to use lists is to specify one or more predefined lists "
 "with the #{--packages-lists}# option. For example:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:92
+#: en/user_customization-packages.ssi:114
 msgid "$ lb config --packages-lists \"gnome-core rescue\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:96
+#: en/user_customization-packages.ssi:118
 msgid ""
 "In addition to these lists, live-build supports four virtual package lists: #"
 "{gnome-desktop}#, #{kde-desktop}#, #{lxde-desktop}# and #{xfce-desktop}#, "
@@ -411,7 +479,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:98
+#: en/user_customization-packages.ssi:120
 msgid ""
 "Note: The prebuilt GNOME, KDE, LXDE and XFCE images available for download "
 "at http://live.debian.net are built using the corresponding virtual #{*-"
@@ -419,7 +487,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:100
+#: en/user_customization-packages.ssi:122
 msgid ""
 "The default location for the list files on your system is #{/usr/share/live/"
 "build/lists/}#. To determine the packages in a given list, read the "
@@ -428,19 +496,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:102
+#: en/user_customization-packages.ssi:124
 msgid "3~ Local package lists"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:104
+#: en/user_customization-packages.ssi:126
 msgid ""
 "You may supplement or replace entirely the supplied lists using local "
 "package lists stored in #{config/chroot_local-packageslists/}#."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:106
+#: en/user_customization-packages.ssi:128
 msgid ""
 "Package lists that exist in this directory need to have a #{.list}# suffix "
 "in order to be processed. Local package lists always override package lists "
@@ -449,12 +517,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:108
+#: en/user_customization-packages.ssi:130
 msgid "3~ Local binary package lists"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:110
+#: en/user_customization-packages.ssi:132
 msgid ""
 "In case you want to include some required .deb packages to live media's #"
 "{pool/}# (without installing them onto the live image) you may need to use "
@@ -464,19 +532,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:112
+#: en/user_customization-packages.ssi:134
 msgid ""
 "Package lists that exist in this directory need to have a #{.list}# suffix "
 "in order to be processed."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:114
+#: en/user_customization-packages.ssi:136
 msgid "3~ Extending a provided package list using includes"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:116
+#: en/user_customization-packages.ssi:138
 msgid ""
 "The package lists that are included with live-build make extensive use of "
 "includes. Refer to these in the #{/usr/share/live/build/lists/}# directory, "
@@ -484,7 +552,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:118
+#: en/user_customization-packages.ssi:140
 msgid ""
 "For example, to make a list that includes the predefined #{gnome}# list plus "
 "iceweasel, create #{config/chroot_local-packageslists/mygnome.list}# with "
@@ -492,17 +560,17 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:123
+#: en/user_customization-packages.ssi:145
 msgid "#include <gnome> iceweasel"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:149
 msgid "3~ Using conditionals inside package lists"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:129
+#: en/user_customization-packages.ssi:151
 msgid ""
 "Any of the live-build configuration variables stored in #{config/*}# (minus "
 "the #{LB_}# prefix) may be used in conditional statements in package lists. "
@@ -513,19 +581,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:131
+#: en/user_customization-packages.ssi:153
 msgid ""
 "For example, to install #{ia32-libs}# if the #{--architecture amd64}# is "
 "specified:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:137
+#: en/user_customization-packages.ssi:159
 msgid "#if ARCHITECTURE amd64 ia32-libs #endif"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:141
+#: en/user_customization-packages.ssi:163
 msgid ""
 "You may test for any one of a number of values, e.g. to install #"
 "{memtest86+ }# if either #{--architecture i386}# or #{--architecture amd64}# "
@@ -533,12 +601,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:147
+#: en/user_customization-packages.ssi:169
 msgid "#if ARCHITECTURE i386 amd64 memtest86+ #endif"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:151
+#: en/user_customization-packages.ssi:173
 msgid ""
 "You may also test against variables that may contain more than one value, e."
 "g. to install #{vrms}# if either #{contrib}# or #{non-free}# is specified "
@@ -546,32 +614,32 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:157
+#: en/user_customization-packages.ssi:179
 msgid "#if ARCHIVE_AREAS contrib non-free vrms #endif"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:161
+#: en/user_customization-packages.ssi:183
 msgid "A conditional may surround an #{#include}# directive:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:167
+#: en/user_customization-packages.ssi:189
 msgid "#if ARCHITECTURE amd64 #include <gnome-full> #endif"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:171
+#: en/user_customization-packages.ssi:193
 msgid "The nesting of conditionals is not supported."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:173
+#: en/user_customization-packages.ssi:195
 msgid "3~ Tasks"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:175
+#: en/user_customization-packages.ssi:197
 msgid ""
 "The Debian Installer offers the user choices of a number of preselected "
 "lists of packages, each one focused on a particular kind of system, or task "
@@ -582,12 +650,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:179
+#: en/user_customization-packages.ssi:201
 msgid "$ lb config --tasks \"mail-server file-server\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:183
+#: en/user_customization-packages.ssi:205
 msgid ""
 "The primary tasks available in the Debian Installer can be listed with #"
 "{tasksel --list-tasks}# in the live system. The contents of any task, "
@@ -596,12 +664,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:185
+#: en/user_customization-packages.ssi:207
 msgid "3~desktop-and-language-tasks Desktop and language tasks"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:187
+#: en/user_customization-packages.ssi:209
 msgid ""
 "Desktop and language tasks are special cases. In the Debian Installer, if "
 "the medium was prepared for a particular desktop environment flavour, the "
@@ -613,14 +681,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:211
 msgid ""
 "In live-build, therefore, these special cases are also given special "
 "consideration, but with three notable differences at the time of writing."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:191
+#: en/user_customization-packages.ssi:213
 msgid ""
 "First, there is no provision made yet automatically for language tasks, "
 "although a subset of those packages are included if you specify #{lb config "
@@ -630,13 +698,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:195
+#: en/user_customization-packages.ssi:217
 msgid ""
 "$ lb config --tasks \"japanese japanese-desktop japanese-gnome-desktop\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:199
+#: en/user_customization-packages.ssi:221
 msgid ""
 "Second, live-build supports #{*-desktop}# virtual package lists for each of "
 "the desktop flavours mentioned above, which select the #{standard-x11}# "
@@ -647,7 +715,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:223
 msgid ""
 "Third, if any of the tasks for these desktop flavours are selected, either "
 "explicitly through #{--tasks}# or implicitly by #{--packages}#, live-build "
@@ -657,12 +725,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:203
+#: en/user_customization-packages.ssi:225
 msgid "2~ Installing modified or third-party packages"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:205
+#: en/user_customization-packages.ssi:227
 msgid ""
 "Whilst it is against the philosophy of Debian Live, it may sometimes be "
 "necessary to build a Live system with modified versions of packages that are "
@@ -673,7 +741,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:229
 msgid ""
 "This section does not cover advice regarding building or maintaining "
 "modified packages. Joachim Breitner's 'How to fork privately' method from "
@@ -684,22 +752,22 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:209
+#: en/user_customization-packages.ssi:231
 msgid "There are two ways of installing modified custom packages:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:233
 msgid "_* #{chroot_local-packages}#"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:213
+#: en/user_customization-packages.ssi:235
 msgid "_* Using a custom APT repository"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:215
+#: en/user_customization-packages.ssi:237
 msgid ""
 "Using #{chroot_local-packages}# is simpler to achieve and useful for \"one-"
 "off\" customizations but has a number of drawbacks, whilst using a custom "
@@ -707,12 +775,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:217
+#: en/user_customization-packages.ssi:239
 msgid "3~ Using #{chroot_local-packages}# to install custom packages"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:219
+#: en/user_customization-packages.ssi:241
 msgid ""
 "To install a custom package, simply copy it to the #{config/chroot_local-"
 "packages/}# directory. Packages that are inside this directory will be "
@@ -721,45 +789,45 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:221
+#: en/user_customization-packages.ssi:243
 msgid ""
 "Packages *{must}* be named in the prescribed way. One simple way to do this "
 "is to use #{dpkg-name}#."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:223
+#: en/user_customization-packages.ssi:245
 msgid ""
 "Using #{chroot_local-packages}# for installation of custom packages has "
 "disadvantages:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:225
+#: en/user_customization-packages.ssi:247
 msgid "_* It is not possible to use secure APT."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:227
+#: en/user_customization-packages.ssi:249
 msgid ""
 "_* You must install all appropriate packages in the #{config/chroot_local-"
 "packages/}# directory."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:229
+#: en/user_customization-packages.ssi:251
 msgid ""
 "_* It does not lend itself to storing Debian Live configurations in revision "
 "control."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:231
+#: en/user_customization-packages.ssi:253
 msgid "3~ Using an APT repository to install custom packages"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:233
+#: en/user_customization-packages.ssi:255
 msgid ""
 "Unlike using #{chroot_local-packages}#, when using a custom APT repository "
 "you must ensure that you specify the packages elsewhere. See {Choosing "
@@ -767,7 +835,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:235
+#: en/user_customization-packages.ssi:257
 msgid ""
 "Whilst it may seem unnecessary effort to create an APT repository to install "
 "custom packages, the infrastructure can be easily re-used at a later date to "
@@ -775,12 +843,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:237
+#: en/user_customization-packages.ssi:259
 msgid "3~ Custom packages and APT"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:239
+#: en/user_customization-packages.ssi:261
 msgid ""
 "live-build uses APT to install all packages into the live system so will "
 "therefore inherit behaviours from this program. One relevant example is that "
@@ -790,7 +858,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:241
+#: en/user_customization-packages.ssi:263
 msgid ""
 "Because of this, you may wish to increment the version number in your custom "
 "packages' #{debian/changelog}# files to ensure that your modified version is "
@@ -800,12 +868,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:243
+#: en/user_customization-packages.ssi:265
 msgid "2~ Configuring APT at build time"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:245
+#: en/user_customization-packages.ssi:267
 msgid ""
 "You can configure APT through a number of options applied only at build "
 "time. (APT configuration used in the running live system may be configured "
@@ -816,12 +884,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:247
+#: en/user_customization-packages.ssi:269
 msgid "3~choosing-apt-or-aptitude Choosing apt or aptitude"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:249
+#: en/user_customization-packages.ssi:271
 msgid ""
 "You can elect to use either #{apt}# or #{aptitude}# when installing packages "
 "at build time. Which utility is used is governed by the #{--apt}# argument "
@@ -831,26 +899,26 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:251
+#: en/user_customization-packages.ssi:273
 msgid ""
 "_* #{apt}#: With this method, if a missing package is specified, the package "
 "installation will fail. This is the default setting."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:253
+#: en/user_customization-packages.ssi:275
 msgid ""
 "_* #{aptitude}#: With this method, if a missing package is specified, the "
 "package installation will succeed."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:255
+#: en/user_customization-packages.ssi:277
 msgid "3~ Using a proxy with APT"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:257
+#: en/user_customization-packages.ssi:279
 msgid ""
 "One commonly required APT configuration is to deal with building an image "
 "behind a proxy. You may specify your APT proxy with the #{--apt-ftp-proxy}# "
@@ -858,17 +926,17 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:261
+#: en/user_customization-packages.ssi:283
 msgid "lb config --apt-http-proxy http://proxy/"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:265
+#: en/user_customization-packages.ssi:287
 msgid "3~ Tweaking APT to save space"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:267
+#: en/user_customization-packages.ssi:289
 msgid ""
 "You may find yourself needing to save some space on the image media, in "
 "which case one or the other or both of the following options may be of "
@@ -876,19 +944,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:269
+#: en/user_customization-packages.ssi:291
 msgid ""
 "If you don't want to include APT indices in the image, you can omit those "
 "with:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:273
+#: en/user_customization-packages.ssi:295
 msgid "$ lb config --binary-indices false"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:277
+#: en/user_customization-packages.ssi:299
 msgid ""
 "This will not influence the entries in /etc/apt/sources.list, but merely "
 "whether /var/lib/apt contains the indices files or not. The tradeoff is that "
@@ -898,19 +966,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:279
+#: en/user_customization-packages.ssi:301
 msgid ""
 "If you find the installation of recommended packages bloats your image too "
 "much, you may disable that default option of APT with:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:283
+#: en/user_customization-packages.ssi:305
 msgid "$ lb config --apt-recommends false"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:287
+#: en/user_customization-packages.ssi:309
 msgid ""
 "The tradeoff here is that recommended packages are defined as \"packages "
 "that would be found together with this one in all but unusual installations"
@@ -922,12 +990,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:289
+#: en/user_customization-packages.ssi:311
 msgid "3~ Passing options to apt or aptitude"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:291
+#: en/user_customization-packages.ssi:313
 msgid ""
 "If there is not an #{lb config}# option to alter APT's behaviour in the way "
 "you need, use #{--apt-options}# or #{--aptitude-options}# to pass any "
@@ -936,21 +1004,21 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:293
+#: en/user_customization-packages.ssi:315
 msgid "3~apt-pinning APT pinning"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:295
+#: en/user_customization-packages.ssi:317
 msgid ""
 "For background, please first read the #{apt_preferences(5)}# man page. APT "
 "pinning can be configured either for build time, or else for run time. For "
 "the former, create #{config/chroot_apt/preferences}#. For the latter, create "
-"#{config/chroot_local-includes/etc/preferences}#."
+"#{config/chroot_local-includes/etc/apt/preferences}#."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:297
+#: en/user_customization-packages.ssi:319
 msgid ""
 "Let's say you are building a Squeeze live system but need all #{live-*}# "
 "packages to be installed from Sid at build time. You need to add Sid to your "
@@ -960,7 +1028,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:305
+#: en/user_customization-packages.ssi:327
 msgid ""
 "$ echo \"deb http://mirror/debian sid main\" > config/chroot_sources/sid."
 "chroot $ cat >>config/chroot_apt/preferences <<END Package: live-* Pin: "
@@ -968,6 +1036,6 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:310
+#: en/user_customization-packages.ssi:332
 msgid "Package: * Pin: release n=sid Pin-Priority: 1 END"
 msgstr ""
diff --git a/manual/po/pt_BR/user_customization-packages.ssi.po b/manual/po/pt_BR/user_customization-packages.ssi.po
index 6b3ab61..f41b5a9 100644
--- a/manual/po/pt_BR/user_customization-packages.ssi.po
+++ b/manual/po/pt_BR/user_customization-packages.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-12-01 06:49-0400\n"
+"POT-Creation-Date: 2010-12-01 21:10-0400\n"
 "PO-Revision-Date: 2010-10-22 08:58-0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -46,20 +46,22 @@ msgstr ""
 #: en/user_customization-internationalization.ssi:18
 #: en/user_customization-internationalization.ssi:26
 #: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
-#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:90
-#: en/user_customization-packages.ssi:120
-#: en/user_customization-packages.ssi:133
-#: en/user_customization-packages.ssi:143
-#: en/user_customization-packages.ssi:153
-#: en/user_customization-packages.ssi:163
-#: en/user_customization-packages.ssi:177
-#: en/user_customization-packages.ssi:193
-#: en/user_customization-packages.ssi:259
-#: en/user_customization-packages.ssi:271
+#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
+#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:53
+#: en/user_customization-packages.ssi:66 en/user_customization-packages.ssi:80
+#: en/user_customization-packages.ssi:94
+#: en/user_customization-packages.ssi:112
+#: en/user_customization-packages.ssi:142
+#: en/user_customization-packages.ssi:155
+#: en/user_customization-packages.ssi:165
+#: en/user_customization-packages.ssi:175
+#: en/user_customization-packages.ssi:185
+#: en/user_customization-packages.ssi:199
+#: en/user_customization-packages.ssi:215
 #: en/user_customization-packages.ssi:281
-#: en/user_customization-packages.ssi:299 en/user_customization-runtime.ssi:12
+#: en/user_customization-packages.ssi:293
+#: en/user_customization-packages.ssi:303
+#: en/user_customization-packages.ssi:321 en/user_customization-runtime.ssi:12
 #: en/user_customization-runtime.ssi:30 en/user_customization-runtime.ssi:40
 #: en/user_customization-runtime.ssi:48 en/user_customization-runtime.ssi:56
 #: en/user_customization-runtime.ssi:64 en/user_customization-runtime.ssi:84
@@ -112,20 +114,22 @@ msgstr "code{"
 #: en/user_customization-internationalization.ssi:22
 #: en/user_customization-internationalization.ssi:30
 #: en/user_customization-internationalization.ssi:42
-#: en/user_customization-packages.ssi:23 en/user_customization-packages.ssi:36
-#: en/user_customization-packages.ssi:48 en/user_customization-packages.ssi:62
-#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:125
-#: en/user_customization-packages.ssi:139
-#: en/user_customization-packages.ssi:149
-#: en/user_customization-packages.ssi:159
-#: en/user_customization-packages.ssi:169
+#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
+#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:58
+#: en/user_customization-packages.ssi:70 en/user_customization-packages.ssi:84
+#: en/user_customization-packages.ssi:98
+#: en/user_customization-packages.ssi:116
+#: en/user_customization-packages.ssi:147
+#: en/user_customization-packages.ssi:161
+#: en/user_customization-packages.ssi:171
 #: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:197
-#: en/user_customization-packages.ssi:263
-#: en/user_customization-packages.ssi:275
+#: en/user_customization-packages.ssi:191
+#: en/user_customization-packages.ssi:203
+#: en/user_customization-packages.ssi:219
 #: en/user_customization-packages.ssi:285
-#: en/user_customization-packages.ssi:312 en/user_customization-runtime.ssi:16
+#: en/user_customization-packages.ssi:297
+#: en/user_customization-packages.ssi:307
+#: en/user_customization-packages.ssi:334 en/user_customization-runtime.ssi:16
 #: en/user_customization-runtime.ssi:34 en/user_customization-runtime.ssi:44
 #: en/user_customization-runtime.ssi:52 en/user_customization-runtime.ssi:60
 #: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:88
@@ -164,16 +168,18 @@ msgid ""
 "Perhaps the most basic customization of a Debian live system is the "
 "selection of packages to be included in the image. This chapter guides you "
 "through the various build-time options to customize live-build's "
-"installation of packages. We start with customization of the distribution "
-"mirror. You can also add your own repositories for backports, experimental "
-"or custom packages, or include packages directly as files. You can define "
-"your own lists of packages to include, use live-build's predefined lists, "
-"use #{tasksel}# tasks, or a combination of all three. Finally, a number of "
-"options give some control over apt, or if you prefer, aptitude, at build "
-"time when packages are installed. You may find these handy if you use a "
-"proxy, want to disable installation of recommended packages to save space, "
-"or need to control which versions of packages are installed via APT pinning, "
-"to name a few possibilities."
+"installation of packages. The broadest choices influencing which packages "
+"are available to install in the image are the distribution and archive "
+"areas. To ensure decent download speeds, you should choose a nearby "
+"distribution mirror. You can also add your own repositories for backports, "
+"experimental or custom packages, or include packages directly as files. You "
+"can define your own lists of packages to include, use live-build's "
+"predefined lists, use #{tasksel}# tasks, or a combination of all three. "
+"Finally, a number of options give some control over apt, or if you prefer, "
+"aptitude, at build time when packages are installed. You may find these "
+"handy if you use a proxy, want to disable installation of recommended "
+"packages to save space, or need to control which versions of packages are "
+"installed via APT pinning, to name a few possibilities."
 msgstr ""
 
 #. type: Plain text
@@ -183,30 +189,89 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:10
-msgid "3~ Distribution mirrors"
+msgid "3~ Distribution, archive areas and mode"
 msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:12
 msgid ""
-"Each of the #{--mirror-*}# options governs which distribution mirror is used "
-"at various stages of the build. Recall from {Stages of the build}#stages-of-"
-"the-build that the *bootstrap* stage is when the chroot is initially "
-"populated by debootstrap with a minimal system, and the *chroot* stage is "
-"when the chroot used to construct the live system's filesystem is built. "
-"Thus, the corresponding mirror switches are used for those stages, and "
-"later, in the *binary* stage, the #{--mirror-binary}# and #{--mirror-binary-"
-"security}# values are used, superceding any mirrors used in an earlier stage."
+"The distribution you choose has the broadest impact on which packages are "
+"available to include in your live image. Specify the codename, which "
+"defaults to #{squeeze}# for the Squeeze version of live-build. Any current "
+"distribution carried in the Debian archive may be specified by its codename "
+"here. (See {Terms}#terms for more details.) The #{--distribution}# option "
+"not only influences the source of packages within the archive, but also "
+"instructs #{live-build}# to behave as needed to build each supported "
+"distribution. For example, to build against the *unstable* release, Sid, "
+"specify:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:16
+msgid "$ lb config --distribution sid"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:20
+msgid ""
+"Within the distribution archive, archive areas are major divisions of the "
+"archive. In Debian, these are #{main}#, #{contrib}# and #{non-free}#. Only #"
+"{main}# contains software that is official a part of the Debian "
+"distribution, hence that is the default. One or more values may be "
+"specified, e.g."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:24
+msgid "$ lb config --archive-areas \"main contrib\""
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:28
+msgid ""
+"Experimental support is available for some Debian derivatives through a #{--"
+"mode}# option. By default, this option is set to #{debian}#, even if you are "
+"building on a non-Debian system. If you specify #{--mode ubuntu}# or #{--"
+"mode emdebian}#, the distribution names and archive areas for the specified "
+"derivative are supported instead of the ones for Debian. The mode also "
+"modifies live-build behaviour to suit the derivatives."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:30
+#, no-wrap
+msgid "*Note:* The projects for whom these modes were added are primarily responsible for supporting users of these options. The Debian live project, in turn, provides development support on a best-effort basis only, based on feedback from the derivative projects as we do not develop or support these derivatives ourselves.\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:32
+msgid "3~ Distribution mirrors"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:34
+msgid ""
+"The Debian archive is replicated across a large network of mirrors around "
+"the world so that people in each region can choose a nearby mirror for best "
+"download speed. Each of the #{--mirror-*}# options governs which "
+"distribution mirror is used at various stages of the build. Recall from "
+"{Stages of the build}#stages-of-the-build that the *bootstrap* stage is when "
+"the chroot is initially populated by debootstrap with a minimal system, and "
+"the *chroot* stage is when the chroot used to construct the live system's "
+"filesystem is built. Thus, the corresponding mirror switches are used for "
+"those stages, and later, in the *binary* stage, the #{--mirror-binary}# and #"
+"{--mirror-binary-security}# values are used, superceding any mirrors used in "
+"an earlier stage."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:14
+#: en/user_customization-packages.ssi:36
 msgid ""
 "3~distribution-mirrors-build-time Distribution mirrors used at build time"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:16
+#: en/user_customization-packages.ssi:38
 msgid ""
 "To set the distribution mirrors used at build time to point at a local "
 "mirror, it is sufficient to set #{--mirror-bootstrap}# and #{--mirror-chroot-"
@@ -214,7 +279,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:21
+#: en/user_customization-packages.ssi:43
 #, no-wrap
 msgid ""
 "$ lb config --mirror-bootstrap http://localhost/debian/ \\\n"
@@ -222,19 +287,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:25
+#: en/user_customization-packages.ssi:47
 msgid ""
 "The chroot mirror, specified by #{--mirror-chroot}#, defaults to the #{--"
 "mirror-bootstrap}# value."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:27
+#: en/user_customization-packages.ssi:49
 msgid "3~ Distribution mirrors used at run time"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:29
+#: en/user_customization-packages.ssi:51
 msgid ""
 "The #{--mirror-binary*}# options govern the distribution mirrors placed in "
 "the binary image. These may be used to install additional packages while "
@@ -247,7 +312,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:34
+#: en/user_customization-packages.ssi:56
 #, no-wrap
 msgid ""
 "$ lb config --mirror-binary http://mirror/debian/ \\\n"
@@ -255,34 +320,37 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:38
+#: en/user_customization-packages.ssi:60
 msgid "3~additional-repositories Additional repositories"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:40
+#: en/user_customization-packages.ssi:62
 msgid ""
-"To add more repositories (e.g. backports, experimental or custom packages, "
-"etc.), create #{config/chroot_sources/your-repository.{chroot,binary}}# "
-"files. As with the #{--mirror-*}# options, these govern the repositories "
-"used in the *chroot* stage when building the image, and in the *binary* "
-"stage, i.e. for use when running the live system."
+"You may add more repositories, broadening your package choices beyond what "
+"is available in your target distribution. These may be, for example, for "
+"backports, experimental or custom packages. To configure additional "
+"repositories, create #{config/chroot_sources/your-repository.chroot}#, and/"
+"or #{config/chroot_sources/your-repository.binary}# files. As with the #{--"
+"mirror-*}# options, these govern the repositories used in the *chroot* stage "
+"when building the image, and in the *binary* stage, i.e. for use when "
+"running the live system."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:42
+#: en/user_customization-packages.ssi:64
 msgid ""
 "For example, #{config/chroot_sources/live.chroot}# allows you to install "
 "packages from the debian live snapshot repository at live system build time."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:46
+#: en/user_customization-packages.ssi:68
 msgid "deb http://live.debian.net/ sid-snapshots main contrib non-free"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:50
+#: en/user_customization-packages.ssi:72
 msgid ""
 "If you add the same line to #{config/chroot_sources/live.binary}#, the "
 "repository will be added to your live system's #{/etc/apt/sources.list.d/}# "
@@ -290,19 +358,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:52
+#: en/user_customization-packages.ssi:74
 msgid "If such files exist, they will be picked up automatically."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:54
+#: en/user_customization-packages.ssi:76
 msgid ""
 "You should also put the GPG key used to sign the repository into #{config/"
 "chroot_sources/your-repository.{binary,chroot}.gpg}# files."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:56
+#: en/user_customization-packages.ssi:78
 msgid ""
 "Note: some preconfigured package repositories are available for easy "
 "selection through the #{--repository}# option, e.g. for enabling live "
@@ -310,17 +378,17 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:60
+#: en/user_customization-packages.ssi:82
 msgid "$ lb config --repository live.debian.net"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:64
+#: en/user_customization-packages.ssi:86
 msgid "2~choosing-packages-to-install Choosing packages to install"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:66
+#: en/user_customization-packages.ssi:88
 msgid ""
 "There are a number of ways to choose which packages live-build will install "
 "in your image, covering a variety of different needs. You can simply name "
@@ -333,24 +401,24 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:68
+#: en/user_customization-packages.ssi:90
 msgid "3~ Choosing a few packages"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:70
+#: en/user_customization-packages.ssi:92
 msgid ""
 "When the number of packages added is small, simply specify #{--packages}#. "
 "For example:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:74
+#: en/user_customization-packages.ssi:96
 msgid "$ lb config --packages \"package1 package2 package3\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:78
+#: en/user_customization-packages.ssi:100
 msgid ""
 "The behaviour of live-build when specifying a package that does not exist is "
 "determined by your choice of APT utility. See {Choosing apt or aptitude}"
@@ -358,7 +426,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:80
+#: en/user_customization-packages.ssi:102
 msgid ""
 "If you need to specify a large number of packages to be installed or you "
 "need flexibility regarding which packages to install, use package lists as "
@@ -366,12 +434,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:82
+#: en/user_customization-packages.ssi:104
 msgid "3~package-lists Package lists"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:84
+#: en/user_customization-packages.ssi:106
 msgid ""
 "Package lists are a powerful way of expressing which packages should be "
 "installed. The list syntax supports included files and conditional sections "
@@ -384,24 +452,24 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:86
+#: en/user_customization-packages.ssi:108
 msgid "3~ Predefined package lists"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:88
+#: en/user_customization-packages.ssi:110
 msgid ""
 "The simplest way to use lists is to specify one or more predefined lists "
 "with the #{--packages-lists}# option. For example:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:92
+#: en/user_customization-packages.ssi:114
 msgid "$ lb config --packages-lists \"gnome-core rescue\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:96
+#: en/user_customization-packages.ssi:118
 msgid ""
 "In addition to these lists, live-build supports four virtual package lists: #"
 "{gnome-desktop}#, #{kde-desktop}#, #{lxde-desktop}# and #{xfce-desktop}#, "
@@ -411,7 +479,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:98
+#: en/user_customization-packages.ssi:120
 msgid ""
 "Note: The prebuilt GNOME, KDE, LXDE and XFCE images available for download "
 "at http://live.debian.net are built using the corresponding virtual #{*-"
@@ -419,7 +487,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:100
+#: en/user_customization-packages.ssi:122
 msgid ""
 "The default location for the list files on your system is #{/usr/share/live/"
 "build/lists/}#. To determine the packages in a given list, read the "
@@ -428,19 +496,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:102
+#: en/user_customization-packages.ssi:124
 msgid "3~ Local package lists"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:104
+#: en/user_customization-packages.ssi:126
 msgid ""
 "You may supplement or replace entirely the supplied lists using local "
 "package lists stored in #{config/chroot_local-packageslists/}#."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:106
+#: en/user_customization-packages.ssi:128
 msgid ""
 "Package lists that exist in this directory need to have a #{.list}# suffix "
 "in order to be processed. Local package lists always override package lists "
@@ -449,12 +517,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:108
+#: en/user_customization-packages.ssi:130
 msgid "3~ Local binary package lists"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:110
+#: en/user_customization-packages.ssi:132
 msgid ""
 "In case you want to include some required .deb packages to live media's #"
 "{pool/}# (without installing them onto the live image) you may need to use "
@@ -464,19 +532,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:112
+#: en/user_customization-packages.ssi:134
 msgid ""
 "Package lists that exist in this directory need to have a #{.list}# suffix "
 "in order to be processed."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:114
+#: en/user_customization-packages.ssi:136
 msgid "3~ Extending a provided package list using includes"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:116
+#: en/user_customization-packages.ssi:138
 msgid ""
 "The package lists that are included with live-build make extensive use of "
 "includes. Refer to these in the #{/usr/share/live/build/lists/}# directory, "
@@ -484,7 +552,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:118
+#: en/user_customization-packages.ssi:140
 msgid ""
 "For example, to make a list that includes the predefined #{gnome}# list plus "
 "iceweasel, create #{config/chroot_local-packageslists/mygnome.list}# with "
@@ -492,17 +560,17 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:123
+#: en/user_customization-packages.ssi:145
 msgid "#include <gnome> iceweasel"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:149
 msgid "3~ Using conditionals inside package lists"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:129
+#: en/user_customization-packages.ssi:151
 msgid ""
 "Any of the live-build configuration variables stored in #{config/*}# (minus "
 "the #{LB_}# prefix) may be used in conditional statements in package lists. "
@@ -513,19 +581,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:131
+#: en/user_customization-packages.ssi:153
 msgid ""
 "For example, to install #{ia32-libs}# if the #{--architecture amd64}# is "
 "specified:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:137
+#: en/user_customization-packages.ssi:159
 msgid "#if ARCHITECTURE amd64 ia32-libs #endif"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:141
+#: en/user_customization-packages.ssi:163
 msgid ""
 "You may test for any one of a number of values, e.g. to install #"
 "{memtest86+ }# if either #{--architecture i386}# or #{--architecture amd64}# "
@@ -533,12 +601,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:147
+#: en/user_customization-packages.ssi:169
 msgid "#if ARCHITECTURE i386 amd64 memtest86+ #endif"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:151
+#: en/user_customization-packages.ssi:173
 msgid ""
 "You may also test against variables that may contain more than one value, e."
 "g. to install #{vrms}# if either #{contrib}# or #{non-free}# is specified "
@@ -546,32 +614,32 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:157
+#: en/user_customization-packages.ssi:179
 msgid "#if ARCHIVE_AREAS contrib non-free vrms #endif"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:161
+#: en/user_customization-packages.ssi:183
 msgid "A conditional may surround an #{#include}# directive:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:167
+#: en/user_customization-packages.ssi:189
 msgid "#if ARCHITECTURE amd64 #include <gnome-full> #endif"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:171
+#: en/user_customization-packages.ssi:193
 msgid "The nesting of conditionals is not supported."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:173
+#: en/user_customization-packages.ssi:195
 msgid "3~ Tasks"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:175
+#: en/user_customization-packages.ssi:197
 msgid ""
 "The Debian Installer offers the user choices of a number of preselected "
 "lists of packages, each one focused on a particular kind of system, or task "
@@ -582,12 +650,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:179
+#: en/user_customization-packages.ssi:201
 msgid "$ lb config --tasks \"mail-server file-server\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:183
+#: en/user_customization-packages.ssi:205
 msgid ""
 "The primary tasks available in the Debian Installer can be listed with #"
 "{tasksel --list-tasks}# in the live system. The contents of any task, "
@@ -596,12 +664,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:185
+#: en/user_customization-packages.ssi:207
 msgid "3~desktop-and-language-tasks Desktop and language tasks"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:187
+#: en/user_customization-packages.ssi:209
 msgid ""
 "Desktop and language tasks are special cases. In the Debian Installer, if "
 "the medium was prepared for a particular desktop environment flavour, the "
@@ -613,14 +681,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:211
 msgid ""
 "In live-build, therefore, these special cases are also given special "
 "consideration, but with three notable differences at the time of writing."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:191
+#: en/user_customization-packages.ssi:213
 msgid ""
 "First, there is no provision made yet automatically for language tasks, "
 "although a subset of those packages are included if you specify #{lb config "
@@ -630,13 +698,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:195
+#: en/user_customization-packages.ssi:217
 msgid ""
 "$ lb config --tasks \"japanese japanese-desktop japanese-gnome-desktop\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:199
+#: en/user_customization-packages.ssi:221
 msgid ""
 "Second, live-build supports #{*-desktop}# virtual package lists for each of "
 "the desktop flavours mentioned above, which select the #{standard-x11}# "
@@ -647,7 +715,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:223
 msgid ""
 "Third, if any of the tasks for these desktop flavours are selected, either "
 "explicitly through #{--tasks}# or implicitly by #{--packages}#, live-build "
@@ -657,12 +725,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:203
+#: en/user_customization-packages.ssi:225
 msgid "2~ Installing modified or third-party packages"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:205
+#: en/user_customization-packages.ssi:227
 msgid ""
 "Whilst it is against the philosophy of Debian Live, it may sometimes be "
 "necessary to build a Live system with modified versions of packages that are "
@@ -673,7 +741,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:229
 msgid ""
 "This section does not cover advice regarding building or maintaining "
 "modified packages. Joachim Breitner's 'How to fork privately' method from "
@@ -684,22 +752,22 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:209
+#: en/user_customization-packages.ssi:231
 msgid "There are two ways of installing modified custom packages:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:233
 msgid "_* #{chroot_local-packages}#"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:213
+#: en/user_customization-packages.ssi:235
 msgid "_* Using a custom APT repository"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:215
+#: en/user_customization-packages.ssi:237
 msgid ""
 "Using #{chroot_local-packages}# is simpler to achieve and useful for \"one-"
 "off\" customizations but has a number of drawbacks, whilst using a custom "
@@ -707,12 +775,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:217
+#: en/user_customization-packages.ssi:239
 msgid "3~ Using #{chroot_local-packages}# to install custom packages"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:219
+#: en/user_customization-packages.ssi:241
 msgid ""
 "To install a custom package, simply copy it to the #{config/chroot_local-"
 "packages/}# directory. Packages that are inside this directory will be "
@@ -721,45 +789,45 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:221
+#: en/user_customization-packages.ssi:243
 msgid ""
 "Packages *{must}* be named in the prescribed way. One simple way to do this "
 "is to use #{dpkg-name}#."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:223
+#: en/user_customization-packages.ssi:245
 msgid ""
 "Using #{chroot_local-packages}# for installation of custom packages has "
 "disadvantages:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:225
+#: en/user_customization-packages.ssi:247
 msgid "_* It is not possible to use secure APT."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:227
+#: en/user_customization-packages.ssi:249
 msgid ""
 "_* You must install all appropriate packages in the #{config/chroot_local-"
 "packages/}# directory."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:229
+#: en/user_customization-packages.ssi:251
 msgid ""
 "_* It does not lend itself to storing Debian Live configurations in revision "
 "control."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:231
+#: en/user_customization-packages.ssi:253
 msgid "3~ Using an APT repository to install custom packages"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:233
+#: en/user_customization-packages.ssi:255
 msgid ""
 "Unlike using #{chroot_local-packages}#, when using a custom APT repository "
 "you must ensure that you specify the packages elsewhere. See {Choosing "
@@ -767,7 +835,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:235
+#: en/user_customization-packages.ssi:257
 msgid ""
 "Whilst it may seem unnecessary effort to create an APT repository to install "
 "custom packages, the infrastructure can be easily re-used at a later date to "
@@ -775,12 +843,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:237
+#: en/user_customization-packages.ssi:259
 msgid "3~ Custom packages and APT"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:239
+#: en/user_customization-packages.ssi:261
 msgid ""
 "live-build uses APT to install all packages into the live system so will "
 "therefore inherit behaviours from this program. One relevant example is that "
@@ -790,7 +858,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:241
+#: en/user_customization-packages.ssi:263
 msgid ""
 "Because of this, you may wish to increment the version number in your custom "
 "packages' #{debian/changelog}# files to ensure that your modified version is "
@@ -800,12 +868,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:243
+#: en/user_customization-packages.ssi:265
 msgid "2~ Configuring APT at build time"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:245
+#: en/user_customization-packages.ssi:267
 msgid ""
 "You can configure APT through a number of options applied only at build "
 "time. (APT configuration used in the running live system may be configured "
@@ -816,12 +884,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:247
+#: en/user_customization-packages.ssi:269
 msgid "3~choosing-apt-or-aptitude Choosing apt or aptitude"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:249
+#: en/user_customization-packages.ssi:271
 msgid ""
 "You can elect to use either #{apt}# or #{aptitude}# when installing packages "
 "at build time. Which utility is used is governed by the #{--apt}# argument "
@@ -831,26 +899,26 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:251
+#: en/user_customization-packages.ssi:273
 msgid ""
 "_* #{apt}#: With this method, if a missing package is specified, the package "
 "installation will fail. This is the default setting."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:253
+#: en/user_customization-packages.ssi:275
 msgid ""
 "_* #{aptitude}#: With this method, if a missing package is specified, the "
 "package installation will succeed."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:255
+#: en/user_customization-packages.ssi:277
 msgid "3~ Using a proxy with APT"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:257
+#: en/user_customization-packages.ssi:279
 msgid ""
 "One commonly required APT configuration is to deal with building an image "
 "behind a proxy. You may specify your APT proxy with the #{--apt-ftp-proxy}# "
@@ -858,17 +926,17 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:261
+#: en/user_customization-packages.ssi:283
 msgid "lb config --apt-http-proxy http://proxy/"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:265
+#: en/user_customization-packages.ssi:287
 msgid "3~ Tweaking APT to save space"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:267
+#: en/user_customization-packages.ssi:289
 msgid ""
 "You may find yourself needing to save some space on the image media, in "
 "which case one or the other or both of the following options may be of "
@@ -876,19 +944,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:269
+#: en/user_customization-packages.ssi:291
 msgid ""
 "If you don't want to include APT indices in the image, you can omit those "
 "with:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:273
+#: en/user_customization-packages.ssi:295
 msgid "$ lb config --binary-indices false"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:277
+#: en/user_customization-packages.ssi:299
 msgid ""
 "This will not influence the entries in /etc/apt/sources.list, but merely "
 "whether /var/lib/apt contains the indices files or not. The tradeoff is that "
@@ -898,19 +966,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:279
+#: en/user_customization-packages.ssi:301
 msgid ""
 "If you find the installation of recommended packages bloats your image too "
 "much, you may disable that default option of APT with:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:283
+#: en/user_customization-packages.ssi:305
 msgid "$ lb config --apt-recommends false"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:287
+#: en/user_customization-packages.ssi:309
 msgid ""
 "The tradeoff here is that recommended packages are defined as \"packages "
 "that would be found together with this one in all but unusual installations"
@@ -922,12 +990,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:289
+#: en/user_customization-packages.ssi:311
 msgid "3~ Passing options to apt or aptitude"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:291
+#: en/user_customization-packages.ssi:313
 msgid ""
 "If there is not an #{lb config}# option to alter APT's behaviour in the way "
 "you need, use #{--apt-options}# or #{--aptitude-options}# to pass any "
@@ -936,21 +1004,21 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:293
+#: en/user_customization-packages.ssi:315
 msgid "3~apt-pinning APT pinning"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:295
+#: en/user_customization-packages.ssi:317
 msgid ""
 "For background, please first read the #{apt_preferences(5)}# man page. APT "
 "pinning can be configured either for build time, or else for run time. For "
 "the former, create #{config/chroot_apt/preferences}#. For the latter, create "
-"#{config/chroot_local-includes/etc/preferences}#."
+"#{config/chroot_local-includes/etc/apt/preferences}#."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:297
+#: en/user_customization-packages.ssi:319
 msgid ""
 "Let's say you are building a Squeeze live system but need all #{live-*}# "
 "packages to be installed from Sid at build time. You need to add Sid to your "
@@ -960,7 +1028,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:305
+#: en/user_customization-packages.ssi:327
 msgid ""
 "$ echo \"deb http://mirror/debian sid main\" > config/chroot_sources/sid."
 "chroot $ cat >>config/chroot_apt/preferences <<END Package: live-* Pin: "
@@ -968,6 +1036,6 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:310
+#: en/user_customization-packages.ssi:332
 msgid "Package: * Pin: release n=sid Pin-Priority: 1 END"
 msgstr ""
diff --git a/manual/po/ro/user_customization-packages.ssi.po b/manual/po/ro/user_customization-packages.ssi.po
index c386b18..9eed661 100644
--- a/manual/po/ro/user_customization-packages.ssi.po
+++ b/manual/po/ro/user_customization-packages.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-12-01 06:49-0400\n"
+"POT-Creation-Date: 2010-12-01 21:10-0400\n"
 "PO-Revision-Date: 2010-10-22 08:58-0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -47,20 +47,22 @@ msgstr ""
 #: en/user_customization-internationalization.ssi:18
 #: en/user_customization-internationalization.ssi:26
 #: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
-#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:90
-#: en/user_customization-packages.ssi:120
-#: en/user_customization-packages.ssi:133
-#: en/user_customization-packages.ssi:143
-#: en/user_customization-packages.ssi:153
-#: en/user_customization-packages.ssi:163
-#: en/user_customization-packages.ssi:177
-#: en/user_customization-packages.ssi:193
-#: en/user_customization-packages.ssi:259
-#: en/user_customization-packages.ssi:271
+#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
+#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:53
+#: en/user_customization-packages.ssi:66 en/user_customization-packages.ssi:80
+#: en/user_customization-packages.ssi:94
+#: en/user_customization-packages.ssi:112
+#: en/user_customization-packages.ssi:142
+#: en/user_customization-packages.ssi:155
+#: en/user_customization-packages.ssi:165
+#: en/user_customization-packages.ssi:175
+#: en/user_customization-packages.ssi:185
+#: en/user_customization-packages.ssi:199
+#: en/user_customization-packages.ssi:215
 #: en/user_customization-packages.ssi:281
-#: en/user_customization-packages.ssi:299 en/user_customization-runtime.ssi:12
+#: en/user_customization-packages.ssi:293
+#: en/user_customization-packages.ssi:303
+#: en/user_customization-packages.ssi:321 en/user_customization-runtime.ssi:12
 #: en/user_customization-runtime.ssi:30 en/user_customization-runtime.ssi:40
 #: en/user_customization-runtime.ssi:48 en/user_customization-runtime.ssi:56
 #: en/user_customization-runtime.ssi:64 en/user_customization-runtime.ssi:84
@@ -113,20 +115,22 @@ msgstr "code{"
 #: en/user_customization-internationalization.ssi:22
 #: en/user_customization-internationalization.ssi:30
 #: en/user_customization-internationalization.ssi:42
-#: en/user_customization-packages.ssi:23 en/user_customization-packages.ssi:36
-#: en/user_customization-packages.ssi:48 en/user_customization-packages.ssi:62
-#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:125
-#: en/user_customization-packages.ssi:139
-#: en/user_customization-packages.ssi:149
-#: en/user_customization-packages.ssi:159
-#: en/user_customization-packages.ssi:169
+#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
+#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:58
+#: en/user_customization-packages.ssi:70 en/user_customization-packages.ssi:84
+#: en/user_customization-packages.ssi:98
+#: en/user_customization-packages.ssi:116
+#: en/user_customization-packages.ssi:147
+#: en/user_customization-packages.ssi:161
+#: en/user_customization-packages.ssi:171
 #: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:197
-#: en/user_customization-packages.ssi:263
-#: en/user_customization-packages.ssi:275
+#: en/user_customization-packages.ssi:191
+#: en/user_customization-packages.ssi:203
+#: en/user_customization-packages.ssi:219
 #: en/user_customization-packages.ssi:285
-#: en/user_customization-packages.ssi:312 en/user_customization-runtime.ssi:16
+#: en/user_customization-packages.ssi:297
+#: en/user_customization-packages.ssi:307
+#: en/user_customization-packages.ssi:334 en/user_customization-runtime.ssi:16
 #: en/user_customization-runtime.ssi:34 en/user_customization-runtime.ssi:44
 #: en/user_customization-runtime.ssi:52 en/user_customization-runtime.ssi:60
 #: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:88
@@ -165,16 +169,18 @@ msgid ""
 "Perhaps the most basic customization of a Debian live system is the "
 "selection of packages to be included in the image. This chapter guides you "
 "through the various build-time options to customize live-build's "
-"installation of packages. We start with customization of the distribution "
-"mirror. You can also add your own repositories for backports, experimental "
-"or custom packages, or include packages directly as files. You can define "
-"your own lists of packages to include, use live-build's predefined lists, "
-"use #{tasksel}# tasks, or a combination of all three. Finally, a number of "
-"options give some control over apt, or if you prefer, aptitude, at build "
-"time when packages are installed. You may find these handy if you use a "
-"proxy, want to disable installation of recommended packages to save space, "
-"or need to control which versions of packages are installed via APT pinning, "
-"to name a few possibilities."
+"installation of packages. The broadest choices influencing which packages "
+"are available to install in the image are the distribution and archive "
+"areas. To ensure decent download speeds, you should choose a nearby "
+"distribution mirror. You can also add your own repositories for backports, "
+"experimental or custom packages, or include packages directly as files. You "
+"can define your own lists of packages to include, use live-build's "
+"predefined lists, use #{tasksel}# tasks, or a combination of all three. "
+"Finally, a number of options give some control over apt, or if you prefer, "
+"aptitude, at build time when packages are installed. You may find these "
+"handy if you use a proxy, want to disable installation of recommended "
+"packages to save space, or need to control which versions of packages are "
+"installed via APT pinning, to name a few possibilities."
 msgstr ""
 
 #. type: Plain text
@@ -184,30 +190,89 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:10
-msgid "3~ Distribution mirrors"
+msgid "3~ Distribution, archive areas and mode"
 msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:12
 msgid ""
-"Each of the #{--mirror-*}# options governs which distribution mirror is used "
-"at various stages of the build. Recall from {Stages of the build}#stages-of-"
-"the-build that the *bootstrap* stage is when the chroot is initially "
-"populated by debootstrap with a minimal system, and the *chroot* stage is "
-"when the chroot used to construct the live system's filesystem is built. "
-"Thus, the corresponding mirror switches are used for those stages, and "
-"later, in the *binary* stage, the #{--mirror-binary}# and #{--mirror-binary-"
-"security}# values are used, superceding any mirrors used in an earlier stage."
+"The distribution you choose has the broadest impact on which packages are "
+"available to include in your live image. Specify the codename, which "
+"defaults to #{squeeze}# for the Squeeze version of live-build. Any current "
+"distribution carried in the Debian archive may be specified by its codename "
+"here. (See {Terms}#terms for more details.) The #{--distribution}# option "
+"not only influences the source of packages within the archive, but also "
+"instructs #{live-build}# to behave as needed to build each supported "
+"distribution. For example, to build against the *unstable* release, Sid, "
+"specify:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:16
+msgid "$ lb config --distribution sid"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:20
+msgid ""
+"Within the distribution archive, archive areas are major divisions of the "
+"archive. In Debian, these are #{main}#, #{contrib}# and #{non-free}#. Only #"
+"{main}# contains software that is official a part of the Debian "
+"distribution, hence that is the default. One or more values may be "
+"specified, e.g."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:24
+msgid "$ lb config --archive-areas \"main contrib\""
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:28
+msgid ""
+"Experimental support is available for some Debian derivatives through a #{--"
+"mode}# option. By default, this option is set to #{debian}#, even if you are "
+"building on a non-Debian system. If you specify #{--mode ubuntu}# or #{--"
+"mode emdebian}#, the distribution names and archive areas for the specified "
+"derivative are supported instead of the ones for Debian. The mode also "
+"modifies live-build behaviour to suit the derivatives."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:30
+#, no-wrap
+msgid "*Note:* The projects for whom these modes were added are primarily responsible for supporting users of these options. The Debian live project, in turn, provides development support on a best-effort basis only, based on feedback from the derivative projects as we do not develop or support these derivatives ourselves.\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:32
+msgid "3~ Distribution mirrors"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:34
+msgid ""
+"The Debian archive is replicated across a large network of mirrors around "
+"the world so that people in each region can choose a nearby mirror for best "
+"download speed. Each of the #{--mirror-*}# options governs which "
+"distribution mirror is used at various stages of the build. Recall from "
+"{Stages of the build}#stages-of-the-build that the *bootstrap* stage is when "
+"the chroot is initially populated by debootstrap with a minimal system, and "
+"the *chroot* stage is when the chroot used to construct the live system's "
+"filesystem is built. Thus, the corresponding mirror switches are used for "
+"those stages, and later, in the *binary* stage, the #{--mirror-binary}# and #"
+"{--mirror-binary-security}# values are used, superceding any mirrors used in "
+"an earlier stage."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:14
+#: en/user_customization-packages.ssi:36
 msgid ""
 "3~distribution-mirrors-build-time Distribution mirrors used at build time"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:16
+#: en/user_customization-packages.ssi:38
 msgid ""
 "To set the distribution mirrors used at build time to point at a local "
 "mirror, it is sufficient to set #{--mirror-bootstrap}# and #{--mirror-chroot-"
@@ -215,7 +280,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:21
+#: en/user_customization-packages.ssi:43
 #, no-wrap
 msgid ""
 "$ lb config --mirror-bootstrap http://localhost/debian/ \\\n"
@@ -223,19 +288,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:25
+#: en/user_customization-packages.ssi:47
 msgid ""
 "The chroot mirror, specified by #{--mirror-chroot}#, defaults to the #{--"
 "mirror-bootstrap}# value."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:27
+#: en/user_customization-packages.ssi:49
 msgid "3~ Distribution mirrors used at run time"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:29
+#: en/user_customization-packages.ssi:51
 msgid ""
 "The #{--mirror-binary*}# options govern the distribution mirrors placed in "
 "the binary image. These may be used to install additional packages while "
@@ -248,7 +313,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:34
+#: en/user_customization-packages.ssi:56
 #, no-wrap
 msgid ""
 "$ lb config --mirror-binary http://mirror/debian/ \\\n"
@@ -256,34 +321,37 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:38
+#: en/user_customization-packages.ssi:60
 msgid "3~additional-repositories Additional repositories"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:40
+#: en/user_customization-packages.ssi:62
 msgid ""
-"To add more repositories (e.g. backports, experimental or custom packages, "
-"etc.), create #{config/chroot_sources/your-repository.{chroot,binary}}# "
-"files. As with the #{--mirror-*}# options, these govern the repositories "
-"used in the *chroot* stage when building the image, and in the *binary* "
-"stage, i.e. for use when running the live system."
+"You may add more repositories, broadening your package choices beyond what "
+"is available in your target distribution. These may be, for example, for "
+"backports, experimental or custom packages. To configure additional "
+"repositories, create #{config/chroot_sources/your-repository.chroot}#, and/"
+"or #{config/chroot_sources/your-repository.binary}# files. As with the #{--"
+"mirror-*}# options, these govern the repositories used in the *chroot* stage "
+"when building the image, and in the *binary* stage, i.e. for use when "
+"running the live system."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:42
+#: en/user_customization-packages.ssi:64
 msgid ""
 "For example, #{config/chroot_sources/live.chroot}# allows you to install "
 "packages from the debian live snapshot repository at live system build time."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:46
+#: en/user_customization-packages.ssi:68
 msgid "deb http://live.debian.net/ sid-snapshots main contrib non-free"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:50
+#: en/user_customization-packages.ssi:72
 msgid ""
 "If you add the same line to #{config/chroot_sources/live.binary}#, the "
 "repository will be added to your live system's #{/etc/apt/sources.list.d/}# "
@@ -291,19 +359,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:52
+#: en/user_customization-packages.ssi:74
 msgid "If such files exist, they will be picked up automatically."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:54
+#: en/user_customization-packages.ssi:76
 msgid ""
 "You should also put the GPG key used to sign the repository into #{config/"
 "chroot_sources/your-repository.{binary,chroot}.gpg}# files."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:56
+#: en/user_customization-packages.ssi:78
 msgid ""
 "Note: some preconfigured package repositories are available for easy "
 "selection through the #{--repository}# option, e.g. for enabling live "
@@ -311,17 +379,17 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:60
+#: en/user_customization-packages.ssi:82
 msgid "$ lb config --repository live.debian.net"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:64
+#: en/user_customization-packages.ssi:86
 msgid "2~choosing-packages-to-install Choosing packages to install"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:66
+#: en/user_customization-packages.ssi:88
 msgid ""
 "There are a number of ways to choose which packages live-build will install "
 "in your image, covering a variety of different needs. You can simply name "
@@ -334,24 +402,24 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:68
+#: en/user_customization-packages.ssi:90
 msgid "3~ Choosing a few packages"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:70
+#: en/user_customization-packages.ssi:92
 msgid ""
 "When the number of packages added is small, simply specify #{--packages}#. "
 "For example:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:74
+#: en/user_customization-packages.ssi:96
 msgid "$ lb config --packages \"package1 package2 package3\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:78
+#: en/user_customization-packages.ssi:100
 msgid ""
 "The behaviour of live-build when specifying a package that does not exist is "
 "determined by your choice of APT utility. See {Choosing apt or aptitude}"
@@ -359,7 +427,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:80
+#: en/user_customization-packages.ssi:102
 msgid ""
 "If you need to specify a large number of packages to be installed or you "
 "need flexibility regarding which packages to install, use package lists as "
@@ -367,12 +435,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:82
+#: en/user_customization-packages.ssi:104
 msgid "3~package-lists Package lists"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:84
+#: en/user_customization-packages.ssi:106
 msgid ""
 "Package lists are a powerful way of expressing which packages should be "
 "installed. The list syntax supports included files and conditional sections "
@@ -385,24 +453,24 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:86
+#: en/user_customization-packages.ssi:108
 msgid "3~ Predefined package lists"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:88
+#: en/user_customization-packages.ssi:110
 msgid ""
 "The simplest way to use lists is to specify one or more predefined lists "
 "with the #{--packages-lists}# option. For example:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:92
+#: en/user_customization-packages.ssi:114
 msgid "$ lb config --packages-lists \"gnome-core rescue\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:96
+#: en/user_customization-packages.ssi:118
 msgid ""
 "In addition to these lists, live-build supports four virtual package lists: #"
 "{gnome-desktop}#, #{kde-desktop}#, #{lxde-desktop}# and #{xfce-desktop}#, "
@@ -412,7 +480,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:98
+#: en/user_customization-packages.ssi:120
 msgid ""
 "Note: The prebuilt GNOME, KDE, LXDE and XFCE images available for download "
 "at http://live.debian.net are built using the corresponding virtual #{*-"
@@ -420,7 +488,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:100
+#: en/user_customization-packages.ssi:122
 msgid ""
 "The default location for the list files on your system is #{/usr/share/live/"
 "build/lists/}#. To determine the packages in a given list, read the "
@@ -429,19 +497,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:102
+#: en/user_customization-packages.ssi:124
 msgid "3~ Local package lists"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:104
+#: en/user_customization-packages.ssi:126
 msgid ""
 "You may supplement or replace entirely the supplied lists using local "
 "package lists stored in #{config/chroot_local-packageslists/}#."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:106
+#: en/user_customization-packages.ssi:128
 msgid ""
 "Package lists that exist in this directory need to have a #{.list}# suffix "
 "in order to be processed. Local package lists always override package lists "
@@ -450,12 +518,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:108
+#: en/user_customization-packages.ssi:130
 msgid "3~ Local binary package lists"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:110
+#: en/user_customization-packages.ssi:132
 msgid ""
 "In case you want to include some required .deb packages to live media's #"
 "{pool/}# (without installing them onto the live image) you may need to use "
@@ -465,19 +533,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:112
+#: en/user_customization-packages.ssi:134
 msgid ""
 "Package lists that exist in this directory need to have a #{.list}# suffix "
 "in order to be processed."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:114
+#: en/user_customization-packages.ssi:136
 msgid "3~ Extending a provided package list using includes"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:116
+#: en/user_customization-packages.ssi:138
 msgid ""
 "The package lists that are included with live-build make extensive use of "
 "includes. Refer to these in the #{/usr/share/live/build/lists/}# directory, "
@@ -485,7 +553,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:118
+#: en/user_customization-packages.ssi:140
 msgid ""
 "For example, to make a list that includes the predefined #{gnome}# list plus "
 "iceweasel, create #{config/chroot_local-packageslists/mygnome.list}# with "
@@ -493,17 +561,17 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:123
+#: en/user_customization-packages.ssi:145
 msgid "#include <gnome> iceweasel"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:149
 msgid "3~ Using conditionals inside package lists"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:129
+#: en/user_customization-packages.ssi:151
 msgid ""
 "Any of the live-build configuration variables stored in #{config/*}# (minus "
 "the #{LB_}# prefix) may be used in conditional statements in package lists. "
@@ -514,19 +582,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:131
+#: en/user_customization-packages.ssi:153
 msgid ""
 "For example, to install #{ia32-libs}# if the #{--architecture amd64}# is "
 "specified:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:137
+#: en/user_customization-packages.ssi:159
 msgid "#if ARCHITECTURE amd64 ia32-libs #endif"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:141
+#: en/user_customization-packages.ssi:163
 msgid ""
 "You may test for any one of a number of values, e.g. to install #"
 "{memtest86+ }# if either #{--architecture i386}# or #{--architecture amd64}# "
@@ -534,12 +602,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:147
+#: en/user_customization-packages.ssi:169
 msgid "#if ARCHITECTURE i386 amd64 memtest86+ #endif"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:151
+#: en/user_customization-packages.ssi:173
 msgid ""
 "You may also test against variables that may contain more than one value, e."
 "g. to install #{vrms}# if either #{contrib}# or #{non-free}# is specified "
@@ -547,32 +615,32 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:157
+#: en/user_customization-packages.ssi:179
 msgid "#if ARCHIVE_AREAS contrib non-free vrms #endif"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:161
+#: en/user_customization-packages.ssi:183
 msgid "A conditional may surround an #{#include}# directive:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:167
+#: en/user_customization-packages.ssi:189
 msgid "#if ARCHITECTURE amd64 #include <gnome-full> #endif"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:171
+#: en/user_customization-packages.ssi:193
 msgid "The nesting of conditionals is not supported."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:173
+#: en/user_customization-packages.ssi:195
 msgid "3~ Tasks"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:175
+#: en/user_customization-packages.ssi:197
 msgid ""
 "The Debian Installer offers the user choices of a number of preselected "
 "lists of packages, each one focused on a particular kind of system, or task "
@@ -583,12 +651,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:179
+#: en/user_customization-packages.ssi:201
 msgid "$ lb config --tasks \"mail-server file-server\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:183
+#: en/user_customization-packages.ssi:205
 msgid ""
 "The primary tasks available in the Debian Installer can be listed with #"
 "{tasksel --list-tasks}# in the live system. The contents of any task, "
@@ -597,12 +665,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:185
+#: en/user_customization-packages.ssi:207
 msgid "3~desktop-and-language-tasks Desktop and language tasks"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:187
+#: en/user_customization-packages.ssi:209
 msgid ""
 "Desktop and language tasks are special cases. In the Debian Installer, if "
 "the medium was prepared for a particular desktop environment flavour, the "
@@ -614,14 +682,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:211
 msgid ""
 "In live-build, therefore, these special cases are also given special "
 "consideration, but with three notable differences at the time of writing."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:191
+#: en/user_customization-packages.ssi:213
 msgid ""
 "First, there is no provision made yet automatically for language tasks, "
 "although a subset of those packages are included if you specify #{lb config "
@@ -631,13 +699,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:195
+#: en/user_customization-packages.ssi:217
 msgid ""
 "$ lb config --tasks \"japanese japanese-desktop japanese-gnome-desktop\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:199
+#: en/user_customization-packages.ssi:221
 msgid ""
 "Second, live-build supports #{*-desktop}# virtual package lists for each of "
 "the desktop flavours mentioned above, which select the #{standard-x11}# "
@@ -648,7 +716,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:223
 msgid ""
 "Third, if any of the tasks for these desktop flavours are selected, either "
 "explicitly through #{--tasks}# or implicitly by #{--packages}#, live-build "
@@ -658,12 +726,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:203
+#: en/user_customization-packages.ssi:225
 msgid "2~ Installing modified or third-party packages"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:205
+#: en/user_customization-packages.ssi:227
 msgid ""
 "Whilst it is against the philosophy of Debian Live, it may sometimes be "
 "necessary to build a Live system with modified versions of packages that are "
@@ -674,7 +742,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:229
 msgid ""
 "This section does not cover advice regarding building or maintaining "
 "modified packages. Joachim Breitner's 'How to fork privately' method from "
@@ -685,22 +753,22 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:209
+#: en/user_customization-packages.ssi:231
 msgid "There are two ways of installing modified custom packages:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:233
 msgid "_* #{chroot_local-packages}#"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:213
+#: en/user_customization-packages.ssi:235
 msgid "_* Using a custom APT repository"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:215
+#: en/user_customization-packages.ssi:237
 msgid ""
 "Using #{chroot_local-packages}# is simpler to achieve and useful for \"one-"
 "off\" customizations but has a number of drawbacks, whilst using a custom "
@@ -708,12 +776,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:217
+#: en/user_customization-packages.ssi:239
 msgid "3~ Using #{chroot_local-packages}# to install custom packages"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:219
+#: en/user_customization-packages.ssi:241
 msgid ""
 "To install a custom package, simply copy it to the #{config/chroot_local-"
 "packages/}# directory. Packages that are inside this directory will be "
@@ -722,45 +790,45 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:221
+#: en/user_customization-packages.ssi:243
 msgid ""
 "Packages *{must}* be named in the prescribed way. One simple way to do this "
 "is to use #{dpkg-name}#."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:223
+#: en/user_customization-packages.ssi:245
 msgid ""
 "Using #{chroot_local-packages}# for installation of custom packages has "
 "disadvantages:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:225
+#: en/user_customization-packages.ssi:247
 msgid "_* It is not possible to use secure APT."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:227
+#: en/user_customization-packages.ssi:249
 msgid ""
 "_* You must install all appropriate packages in the #{config/chroot_local-"
 "packages/}# directory."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:229
+#: en/user_customization-packages.ssi:251
 msgid ""
 "_* It does not lend itself to storing Debian Live configurations in revision "
 "control."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:231
+#: en/user_customization-packages.ssi:253
 msgid "3~ Using an APT repository to install custom packages"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:233
+#: en/user_customization-packages.ssi:255
 msgid ""
 "Unlike using #{chroot_local-packages}#, when using a custom APT repository "
 "you must ensure that you specify the packages elsewhere. See {Choosing "
@@ -768,7 +836,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:235
+#: en/user_customization-packages.ssi:257
 msgid ""
 "Whilst it may seem unnecessary effort to create an APT repository to install "
 "custom packages, the infrastructure can be easily re-used at a later date to "
@@ -776,12 +844,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:237
+#: en/user_customization-packages.ssi:259
 msgid "3~ Custom packages and APT"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:239
+#: en/user_customization-packages.ssi:261
 msgid ""
 "live-build uses APT to install all packages into the live system so will "
 "therefore inherit behaviours from this program. One relevant example is that "
@@ -791,7 +859,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:241
+#: en/user_customization-packages.ssi:263
 msgid ""
 "Because of this, you may wish to increment the version number in your custom "
 "packages' #{debian/changelog}# files to ensure that your modified version is "
@@ -801,12 +869,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:243
+#: en/user_customization-packages.ssi:265
 msgid "2~ Configuring APT at build time"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:245
+#: en/user_customization-packages.ssi:267
 msgid ""
 "You can configure APT through a number of options applied only at build "
 "time. (APT configuration used in the running live system may be configured "
@@ -817,12 +885,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:247
+#: en/user_customization-packages.ssi:269
 msgid "3~choosing-apt-or-aptitude Choosing apt or aptitude"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:249
+#: en/user_customization-packages.ssi:271
 msgid ""
 "You can elect to use either #{apt}# or #{aptitude}# when installing packages "
 "at build time. Which utility is used is governed by the #{--apt}# argument "
@@ -832,26 +900,26 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:251
+#: en/user_customization-packages.ssi:273
 msgid ""
 "_* #{apt}#: With this method, if a missing package is specified, the package "
 "installation will fail. This is the default setting."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:253
+#: en/user_customization-packages.ssi:275
 msgid ""
 "_* #{aptitude}#: With this method, if a missing package is specified, the "
 "package installation will succeed."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:255
+#: en/user_customization-packages.ssi:277
 msgid "3~ Using a proxy with APT"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:257
+#: en/user_customization-packages.ssi:279
 msgid ""
 "One commonly required APT configuration is to deal with building an image "
 "behind a proxy. You may specify your APT proxy with the #{--apt-ftp-proxy}# "
@@ -859,17 +927,17 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:261
+#: en/user_customization-packages.ssi:283
 msgid "lb config --apt-http-proxy http://proxy/"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:265
+#: en/user_customization-packages.ssi:287
 msgid "3~ Tweaking APT to save space"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:267
+#: en/user_customization-packages.ssi:289
 msgid ""
 "You may find yourself needing to save some space on the image media, in "
 "which case one or the other or both of the following options may be of "
@@ -877,19 +945,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:269
+#: en/user_customization-packages.ssi:291
 msgid ""
 "If you don't want to include APT indices in the image, you can omit those "
 "with:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:273
+#: en/user_customization-packages.ssi:295
 msgid "$ lb config --binary-indices false"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:277
+#: en/user_customization-packages.ssi:299
 msgid ""
 "This will not influence the entries in /etc/apt/sources.list, but merely "
 "whether /var/lib/apt contains the indices files or not. The tradeoff is that "
@@ -899,19 +967,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:279
+#: en/user_customization-packages.ssi:301
 msgid ""
 "If you find the installation of recommended packages bloats your image too "
 "much, you may disable that default option of APT with:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:283
+#: en/user_customization-packages.ssi:305
 msgid "$ lb config --apt-recommends false"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:287
+#: en/user_customization-packages.ssi:309
 msgid ""
 "The tradeoff here is that recommended packages are defined as \"packages "
 "that would be found together with this one in all but unusual installations"
@@ -923,12 +991,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:289
+#: en/user_customization-packages.ssi:311
 msgid "3~ Passing options to apt or aptitude"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:291
+#: en/user_customization-packages.ssi:313
 msgid ""
 "If there is not an #{lb config}# option to alter APT's behaviour in the way "
 "you need, use #{--apt-options}# or #{--aptitude-options}# to pass any "
@@ -937,21 +1005,21 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:293
+#: en/user_customization-packages.ssi:315
 msgid "3~apt-pinning APT pinning"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:295
+#: en/user_customization-packages.ssi:317
 msgid ""
 "For background, please first read the #{apt_preferences(5)}# man page. APT "
 "pinning can be configured either for build time, or else for run time. For "
 "the former, create #{config/chroot_apt/preferences}#. For the latter, create "
-"#{config/chroot_local-includes/etc/preferences}#."
+"#{config/chroot_local-includes/etc/apt/preferences}#."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:297
+#: en/user_customization-packages.ssi:319
 msgid ""
 "Let's say you are building a Squeeze live system but need all #{live-*}# "
 "packages to be installed from Sid at build time. You need to add Sid to your "
@@ -961,7 +1029,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:305
+#: en/user_customization-packages.ssi:327
 msgid ""
 "$ echo \"deb http://mirror/debian sid main\" > config/chroot_sources/sid."
 "chroot $ cat >>config/chroot_apt/preferences <<END Package: live-* Pin: "
@@ -969,6 +1037,6 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:310
+#: en/user_customization-packages.ssi:332
 msgid "Package: * Pin: release n=sid Pin-Priority: 1 END"
 msgstr ""
diff --git a/manual/pot/user_customization-packages.ssi.pot b/manual/pot/user_customization-packages.ssi.pot
index e0cb41e..9765937 100644
--- a/manual/pot/user_customization-packages.ssi.pot
+++ b/manual/pot/user_customization-packages.ssi.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-12-01 06:49-0400\n"
+"POT-Creation-Date: 2010-12-01 21:10-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -46,20 +46,22 @@ msgstr ""
 #: en/user_customization-internationalization.ssi:18
 #: en/user_customization-internationalization.ssi:26
 #: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
-#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:90
-#: en/user_customization-packages.ssi:120
-#: en/user_customization-packages.ssi:133
-#: en/user_customization-packages.ssi:143
-#: en/user_customization-packages.ssi:153
-#: en/user_customization-packages.ssi:163
-#: en/user_customization-packages.ssi:177
-#: en/user_customization-packages.ssi:193
-#: en/user_customization-packages.ssi:259
-#: en/user_customization-packages.ssi:271
+#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
+#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:53
+#: en/user_customization-packages.ssi:66 en/user_customization-packages.ssi:80
+#: en/user_customization-packages.ssi:94
+#: en/user_customization-packages.ssi:112
+#: en/user_customization-packages.ssi:142
+#: en/user_customization-packages.ssi:155
+#: en/user_customization-packages.ssi:165
+#: en/user_customization-packages.ssi:175
+#: en/user_customization-packages.ssi:185
+#: en/user_customization-packages.ssi:199
+#: en/user_customization-packages.ssi:215
 #: en/user_customization-packages.ssi:281
-#: en/user_customization-packages.ssi:299 en/user_customization-runtime.ssi:12
+#: en/user_customization-packages.ssi:293
+#: en/user_customization-packages.ssi:303
+#: en/user_customization-packages.ssi:321 en/user_customization-runtime.ssi:12
 #: en/user_customization-runtime.ssi:30 en/user_customization-runtime.ssi:40
 #: en/user_customization-runtime.ssi:48 en/user_customization-runtime.ssi:56
 #: en/user_customization-runtime.ssi:64 en/user_customization-runtime.ssi:84
@@ -112,20 +114,22 @@ msgstr ""
 #: en/user_customization-internationalization.ssi:22
 #: en/user_customization-internationalization.ssi:30
 #: en/user_customization-internationalization.ssi:42
-#: en/user_customization-packages.ssi:23 en/user_customization-packages.ssi:36
-#: en/user_customization-packages.ssi:48 en/user_customization-packages.ssi:62
-#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:125
-#: en/user_customization-packages.ssi:139
-#: en/user_customization-packages.ssi:149
-#: en/user_customization-packages.ssi:159
-#: en/user_customization-packages.ssi:169
+#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
+#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:58
+#: en/user_customization-packages.ssi:70 en/user_customization-packages.ssi:84
+#: en/user_customization-packages.ssi:98
+#: en/user_customization-packages.ssi:116
+#: en/user_customization-packages.ssi:147
+#: en/user_customization-packages.ssi:161
+#: en/user_customization-packages.ssi:171
 #: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:197
-#: en/user_customization-packages.ssi:263
-#: en/user_customization-packages.ssi:275
+#: en/user_customization-packages.ssi:191
+#: en/user_customization-packages.ssi:203
+#: en/user_customization-packages.ssi:219
 #: en/user_customization-packages.ssi:285
-#: en/user_customization-packages.ssi:312 en/user_customization-runtime.ssi:16
+#: en/user_customization-packages.ssi:297
+#: en/user_customization-packages.ssi:307
+#: en/user_customization-packages.ssi:334 en/user_customization-runtime.ssi:16
 #: en/user_customization-runtime.ssi:34 en/user_customization-runtime.ssi:44
 #: en/user_customization-runtime.ssi:52 en/user_customization-runtime.ssi:60
 #: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:88
@@ -164,16 +168,18 @@ msgid ""
 "Perhaps the most basic customization of a Debian live system is the "
 "selection of packages to be included in the image. This chapter guides you "
 "through the various build-time options to customize live-build's "
-"installation of packages. We start with customization of the distribution "
-"mirror. You can also add your own repositories for backports, experimental "
-"or custom packages, or include packages directly as files. You can define "
-"your own lists of packages to include, use live-build's predefined lists, "
-"use #{tasksel}# tasks, or a combination of all three. Finally, a number of "
-"options give some control over apt, or if you prefer, aptitude, at build "
-"time when packages are installed. You may find these handy if you use a "
-"proxy, want to disable installation of recommended packages to save space, "
-"or need to control which versions of packages are installed via APT pinning, "
-"to name a few possibilities."
+"installation of packages. The broadest choices influencing which packages "
+"are available to install in the image are the distribution and archive "
+"areas. To ensure decent download speeds, you should choose a nearby "
+"distribution mirror. You can also add your own repositories for backports, "
+"experimental or custom packages, or include packages directly as files. You "
+"can define your own lists of packages to include, use live-build's "
+"predefined lists, use #{tasksel}# tasks, or a combination of all three. "
+"Finally, a number of options give some control over apt, or if you prefer, "
+"aptitude, at build time when packages are installed. You may find these "
+"handy if you use a proxy, want to disable installation of recommended "
+"packages to save space, or need to control which versions of packages are "
+"installed via APT pinning, to name a few possibilities."
 msgstr ""
 
 #. type: Plain text
@@ -183,30 +189,89 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:10
-msgid "3~ Distribution mirrors"
+msgid "3~ Distribution, archive areas and mode"
 msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:12
 msgid ""
-"Each of the #{--mirror-*}# options governs which distribution mirror is used "
-"at various stages of the build. Recall from {Stages of the build}#stages-of-"
-"the-build that the *bootstrap* stage is when the chroot is initially "
-"populated by debootstrap with a minimal system, and the *chroot* stage is "
-"when the chroot used to construct the live system's filesystem is built. "
-"Thus, the corresponding mirror switches are used for those stages, and "
-"later, in the *binary* stage, the #{--mirror-binary}# and #{--mirror-binary-"
-"security}# values are used, superceding any mirrors used in an earlier stage."
+"The distribution you choose has the broadest impact on which packages are "
+"available to include in your live image. Specify the codename, which "
+"defaults to #{squeeze}# for the Squeeze version of live-build. Any current "
+"distribution carried in the Debian archive may be specified by its codename "
+"here. (See {Terms}#terms for more details.) The #{--distribution}# option "
+"not only influences the source of packages within the archive, but also "
+"instructs #{live-build}# to behave as needed to build each supported "
+"distribution. For example, to build against the *unstable* release, Sid, "
+"specify:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:16
+msgid "$ lb config --distribution sid"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:20
+msgid ""
+"Within the distribution archive, archive areas are major divisions of the "
+"archive. In Debian, these are #{main}#, #{contrib}# and #{non-free}#. Only #"
+"{main}# contains software that is official a part of the Debian "
+"distribution, hence that is the default. One or more values may be "
+"specified, e.g."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:24
+msgid "$ lb config --archive-areas \"main contrib\""
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:28
+msgid ""
+"Experimental support is available for some Debian derivatives through a #{--"
+"mode}# option. By default, this option is set to #{debian}#, even if you are "
+"building on a non-Debian system. If you specify #{--mode ubuntu}# or #{--"
+"mode emdebian}#, the distribution names and archive areas for the specified "
+"derivative are supported instead of the ones for Debian. The mode also "
+"modifies live-build behaviour to suit the derivatives."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:30
+#, no-wrap
+msgid "*Note:* The projects for whom these modes were added are primarily responsible for supporting users of these options. The Debian live project, in turn, provides development support on a best-effort basis only, based on feedback from the derivative projects as we do not develop or support these derivatives ourselves.\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:32
+msgid "3~ Distribution mirrors"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:34
+msgid ""
+"The Debian archive is replicated across a large network of mirrors around "
+"the world so that people in each region can choose a nearby mirror for best "
+"download speed. Each of the #{--mirror-*}# options governs which "
+"distribution mirror is used at various stages of the build. Recall from "
+"{Stages of the build}#stages-of-the-build that the *bootstrap* stage is when "
+"the chroot is initially populated by debootstrap with a minimal system, and "
+"the *chroot* stage is when the chroot used to construct the live system's "
+"filesystem is built. Thus, the corresponding mirror switches are used for "
+"those stages, and later, in the *binary* stage, the #{--mirror-binary}# and #"
+"{--mirror-binary-security}# values are used, superceding any mirrors used in "
+"an earlier stage."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:14
+#: en/user_customization-packages.ssi:36
 msgid ""
 "3~distribution-mirrors-build-time Distribution mirrors used at build time"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:16
+#: en/user_customization-packages.ssi:38
 msgid ""
 "To set the distribution mirrors used at build time to point at a local "
 "mirror, it is sufficient to set #{--mirror-bootstrap}# and #{--mirror-chroot-"
@@ -214,7 +279,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:21
+#: en/user_customization-packages.ssi:43
 #, no-wrap
 msgid ""
 "$ lb config --mirror-bootstrap http://localhost/debian/ \\\n"
@@ -222,19 +287,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:25
+#: en/user_customization-packages.ssi:47
 msgid ""
 "The chroot mirror, specified by #{--mirror-chroot}#, defaults to the #{--"
 "mirror-bootstrap}# value."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:27
+#: en/user_customization-packages.ssi:49
 msgid "3~ Distribution mirrors used at run time"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:29
+#: en/user_customization-packages.ssi:51
 msgid ""
 "The #{--mirror-binary*}# options govern the distribution mirrors placed in "
 "the binary image. These may be used to install additional packages while "
@@ -247,7 +312,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:34
+#: en/user_customization-packages.ssi:56
 #, no-wrap
 msgid ""
 "$ lb config --mirror-binary http://mirror/debian/ \\\n"
@@ -255,34 +320,37 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:38
+#: en/user_customization-packages.ssi:60
 msgid "3~additional-repositories Additional repositories"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:40
+#: en/user_customization-packages.ssi:62
 msgid ""
-"To add more repositories (e.g. backports, experimental or custom packages, "
-"etc.), create #{config/chroot_sources/your-repository.{chroot,binary}}# "
-"files. As with the #{--mirror-*}# options, these govern the repositories "
-"used in the *chroot* stage when building the image, and in the *binary* "
-"stage, i.e. for use when running the live system."
+"You may add more repositories, broadening your package choices beyond what "
+"is available in your target distribution. These may be, for example, for "
+"backports, experimental or custom packages. To configure additional "
+"repositories, create #{config/chroot_sources/your-repository.chroot}#, and/"
+"or #{config/chroot_sources/your-repository.binary}# files. As with the #{--"
+"mirror-*}# options, these govern the repositories used in the *chroot* stage "
+"when building the image, and in the *binary* stage, i.e. for use when "
+"running the live system."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:42
+#: en/user_customization-packages.ssi:64
 msgid ""
 "For example, #{config/chroot_sources/live.chroot}# allows you to install "
 "packages from the debian live snapshot repository at live system build time."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:46
+#: en/user_customization-packages.ssi:68
 msgid "deb http://live.debian.net/ sid-snapshots main contrib non-free"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:50
+#: en/user_customization-packages.ssi:72
 msgid ""
 "If you add the same line to #{config/chroot_sources/live.binary}#, the "
 "repository will be added to your live system's #{/etc/apt/sources.list.d/}# "
@@ -290,19 +358,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:52
+#: en/user_customization-packages.ssi:74
 msgid "If such files exist, they will be picked up automatically."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:54
+#: en/user_customization-packages.ssi:76
 msgid ""
 "You should also put the GPG key used to sign the repository into #{config/"
 "chroot_sources/your-repository.{binary,chroot}.gpg}# files."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:56
+#: en/user_customization-packages.ssi:78
 msgid ""
 "Note: some preconfigured package repositories are available for easy "
 "selection through the #{--repository}# option, e.g. for enabling live "
@@ -310,17 +378,17 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:60
+#: en/user_customization-packages.ssi:82
 msgid "$ lb config --repository live.debian.net"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:64
+#: en/user_customization-packages.ssi:86
 msgid "2~choosing-packages-to-install Choosing packages to install"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:66
+#: en/user_customization-packages.ssi:88
 msgid ""
 "There are a number of ways to choose which packages live-build will install "
 "in your image, covering a variety of different needs. You can simply name "
@@ -333,24 +401,24 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:68
+#: en/user_customization-packages.ssi:90
 msgid "3~ Choosing a few packages"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:70
+#: en/user_customization-packages.ssi:92
 msgid ""
 "When the number of packages added is small, simply specify #{--packages}#. "
 "For example:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:74
+#: en/user_customization-packages.ssi:96
 msgid "$ lb config --packages \"package1 package2 package3\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:78
+#: en/user_customization-packages.ssi:100
 msgid ""
 "The behaviour of live-build when specifying a package that does not exist is "
 "determined by your choice of APT utility. See {Choosing apt or aptitude}"
@@ -358,7 +426,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:80
+#: en/user_customization-packages.ssi:102
 msgid ""
 "If you need to specify a large number of packages to be installed or you "
 "need flexibility regarding which packages to install, use package lists as "
@@ -366,12 +434,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:82
+#: en/user_customization-packages.ssi:104
 msgid "3~package-lists Package lists"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:84
+#: en/user_customization-packages.ssi:106
 msgid ""
 "Package lists are a powerful way of expressing which packages should be "
 "installed. The list syntax supports included files and conditional sections "
@@ -384,24 +452,24 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:86
+#: en/user_customization-packages.ssi:108
 msgid "3~ Predefined package lists"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:88
+#: en/user_customization-packages.ssi:110
 msgid ""
 "The simplest way to use lists is to specify one or more predefined lists "
 "with the #{--packages-lists}# option. For example:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:92
+#: en/user_customization-packages.ssi:114
 msgid "$ lb config --packages-lists \"gnome-core rescue\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:96
+#: en/user_customization-packages.ssi:118
 msgid ""
 "In addition to these lists, live-build supports four virtual package lists: #"
 "{gnome-desktop}#, #{kde-desktop}#, #{lxde-desktop}# and #{xfce-desktop}#, "
@@ -411,7 +479,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:98
+#: en/user_customization-packages.ssi:120
 msgid ""
 "Note: The prebuilt GNOME, KDE, LXDE and XFCE images available for download "
 "at http://live.debian.net are built using the corresponding virtual #{*-"
@@ -419,7 +487,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:100
+#: en/user_customization-packages.ssi:122
 msgid ""
 "The default location for the list files on your system is #{/usr/share/live/"
 "build/lists/}#. To determine the packages in a given list, read the "
@@ -428,19 +496,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:102
+#: en/user_customization-packages.ssi:124
 msgid "3~ Local package lists"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:104
+#: en/user_customization-packages.ssi:126
 msgid ""
 "You may supplement or replace entirely the supplied lists using local "
 "package lists stored in #{config/chroot_local-packageslists/}#."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:106
+#: en/user_customization-packages.ssi:128
 msgid ""
 "Package lists that exist in this directory need to have a #{.list}# suffix "
 "in order to be processed. Local package lists always override package lists "
@@ -449,12 +517,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:108
+#: en/user_customization-packages.ssi:130
 msgid "3~ Local binary package lists"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:110
+#: en/user_customization-packages.ssi:132
 msgid ""
 "In case you want to include some required .deb packages to live media's #"
 "{pool/}# (without installing them onto the live image) you may need to use "
@@ -464,19 +532,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:112
+#: en/user_customization-packages.ssi:134
 msgid ""
 "Package lists that exist in this directory need to have a #{.list}# suffix "
 "in order to be processed."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:114
+#: en/user_customization-packages.ssi:136
 msgid "3~ Extending a provided package list using includes"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:116
+#: en/user_customization-packages.ssi:138
 msgid ""
 "The package lists that are included with live-build make extensive use of "
 "includes. Refer to these in the #{/usr/share/live/build/lists/}# directory, "
@@ -484,7 +552,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:118
+#: en/user_customization-packages.ssi:140
 msgid ""
 "For example, to make a list that includes the predefined #{gnome}# list plus "
 "iceweasel, create #{config/chroot_local-packageslists/mygnome.list}# with "
@@ -492,17 +560,17 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:123
+#: en/user_customization-packages.ssi:145
 msgid "#include <gnome> iceweasel"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:149
 msgid "3~ Using conditionals inside package lists"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:129
+#: en/user_customization-packages.ssi:151
 msgid ""
 "Any of the live-build configuration variables stored in #{config/*}# (minus "
 "the #{LB_}# prefix) may be used in conditional statements in package lists. "
@@ -513,19 +581,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:131
+#: en/user_customization-packages.ssi:153
 msgid ""
 "For example, to install #{ia32-libs}# if the #{--architecture amd64}# is "
 "specified:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:137
+#: en/user_customization-packages.ssi:159
 msgid "#if ARCHITECTURE amd64 ia32-libs #endif"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:141
+#: en/user_customization-packages.ssi:163
 msgid ""
 "You may test for any one of a number of values, e.g. to install #"
 "{memtest86+ }# if either #{--architecture i386}# or #{--architecture amd64}# "
@@ -533,12 +601,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:147
+#: en/user_customization-packages.ssi:169
 msgid "#if ARCHITECTURE i386 amd64 memtest86+ #endif"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:151
+#: en/user_customization-packages.ssi:173
 msgid ""
 "You may also test against variables that may contain more than one value, e."
 "g. to install #{vrms}# if either #{contrib}# or #{non-free}# is specified "
@@ -546,32 +614,32 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:157
+#: en/user_customization-packages.ssi:179
 msgid "#if ARCHIVE_AREAS contrib non-free vrms #endif"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:161
+#: en/user_customization-packages.ssi:183
 msgid "A conditional may surround an #{#include}# directive:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:167
+#: en/user_customization-packages.ssi:189
 msgid "#if ARCHITECTURE amd64 #include <gnome-full> #endif"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:171
+#: en/user_customization-packages.ssi:193
 msgid "The nesting of conditionals is not supported."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:173
+#: en/user_customization-packages.ssi:195
 msgid "3~ Tasks"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:175
+#: en/user_customization-packages.ssi:197
 msgid ""
 "The Debian Installer offers the user choices of a number of preselected "
 "lists of packages, each one focused on a particular kind of system, or task "
@@ -582,12 +650,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:179
+#: en/user_customization-packages.ssi:201
 msgid "$ lb config --tasks \"mail-server file-server\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:183
+#: en/user_customization-packages.ssi:205
 msgid ""
 "The primary tasks available in the Debian Installer can be listed with #"
 "{tasksel --list-tasks}# in the live system. The contents of any task, "
@@ -596,12 +664,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:185
+#: en/user_customization-packages.ssi:207
 msgid "3~desktop-and-language-tasks Desktop and language tasks"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:187
+#: en/user_customization-packages.ssi:209
 msgid ""
 "Desktop and language tasks are special cases. In the Debian Installer, if "
 "the medium was prepared for a particular desktop environment flavour, the "
@@ -613,14 +681,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:211
 msgid ""
 "In live-build, therefore, these special cases are also given special "
 "consideration, but with three notable differences at the time of writing."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:191
+#: en/user_customization-packages.ssi:213
 msgid ""
 "First, there is no provision made yet automatically for language tasks, "
 "although a subset of those packages are included if you specify #{lb config "
@@ -630,13 +698,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:195
+#: en/user_customization-packages.ssi:217
 msgid ""
 "$ lb config --tasks \"japanese japanese-desktop japanese-gnome-desktop\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:199
+#: en/user_customization-packages.ssi:221
 msgid ""
 "Second, live-build supports #{*-desktop}# virtual package lists for each of "
 "the desktop flavours mentioned above, which select the #{standard-x11}# "
@@ -647,7 +715,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:223
 msgid ""
 "Third, if any of the tasks for these desktop flavours are selected, either "
 "explicitly through #{--tasks}# or implicitly by #{--packages}#, live-build "
@@ -657,12 +725,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:203
+#: en/user_customization-packages.ssi:225
 msgid "2~ Installing modified or third-party packages"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:205
+#: en/user_customization-packages.ssi:227
 msgid ""
 "Whilst it is against the philosophy of Debian Live, it may sometimes be "
 "necessary to build a Live system with modified versions of packages that are "
@@ -673,7 +741,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:229
 msgid ""
 "This section does not cover advice regarding building or maintaining "
 "modified packages. Joachim Breitner's 'How to fork privately' method from "
@@ -684,22 +752,22 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:209
+#: en/user_customization-packages.ssi:231
 msgid "There are two ways of installing modified custom packages:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:233
 msgid "_* #{chroot_local-packages}#"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:213
+#: en/user_customization-packages.ssi:235
 msgid "_* Using a custom APT repository"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:215
+#: en/user_customization-packages.ssi:237
 msgid ""
 "Using #{chroot_local-packages}# is simpler to achieve and useful for \"one-"
 "off\" customizations but has a number of drawbacks, whilst using a custom "
@@ -707,12 +775,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:217
+#: en/user_customization-packages.ssi:239
 msgid "3~ Using #{chroot_local-packages}# to install custom packages"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:219
+#: en/user_customization-packages.ssi:241
 msgid ""
 "To install a custom package, simply copy it to the #{config/chroot_local-"
 "packages/}# directory. Packages that are inside this directory will be "
@@ -721,45 +789,45 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:221
+#: en/user_customization-packages.ssi:243
 msgid ""
 "Packages *{must}* be named in the prescribed way. One simple way to do this "
 "is to use #{dpkg-name}#."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:223
+#: en/user_customization-packages.ssi:245
 msgid ""
 "Using #{chroot_local-packages}# for installation of custom packages has "
 "disadvantages:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:225
+#: en/user_customization-packages.ssi:247
 msgid "_* It is not possible to use secure APT."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:227
+#: en/user_customization-packages.ssi:249
 msgid ""
 "_* You must install all appropriate packages in the #{config/chroot_local-"
 "packages/}# directory."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:229
+#: en/user_customization-packages.ssi:251
 msgid ""
 "_* It does not lend itself to storing Debian Live configurations in revision "
 "control."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:231
+#: en/user_customization-packages.ssi:253
 msgid "3~ Using an APT repository to install custom packages"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:233
+#: en/user_customization-packages.ssi:255
 msgid ""
 "Unlike using #{chroot_local-packages}#, when using a custom APT repository "
 "you must ensure that you specify the packages elsewhere. See {Choosing "
@@ -767,7 +835,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:235
+#: en/user_customization-packages.ssi:257
 msgid ""
 "Whilst it may seem unnecessary effort to create an APT repository to install "
 "custom packages, the infrastructure can be easily re-used at a later date to "
@@ -775,12 +843,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:237
+#: en/user_customization-packages.ssi:259
 msgid "3~ Custom packages and APT"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:239
+#: en/user_customization-packages.ssi:261
 msgid ""
 "live-build uses APT to install all packages into the live system so will "
 "therefore inherit behaviours from this program. One relevant example is that "
@@ -790,7 +858,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:241
+#: en/user_customization-packages.ssi:263
 msgid ""
 "Because of this, you may wish to increment the version number in your custom "
 "packages' #{debian/changelog}# files to ensure that your modified version is "
@@ -800,12 +868,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:243
+#: en/user_customization-packages.ssi:265
 msgid "2~ Configuring APT at build time"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:245
+#: en/user_customization-packages.ssi:267
 msgid ""
 "You can configure APT through a number of options applied only at build "
 "time. (APT configuration used in the running live system may be configured "
@@ -816,12 +884,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:247
+#: en/user_customization-packages.ssi:269
 msgid "3~choosing-apt-or-aptitude Choosing apt or aptitude"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:249
+#: en/user_customization-packages.ssi:271
 msgid ""
 "You can elect to use either #{apt}# or #{aptitude}# when installing packages "
 "at build time. Which utility is used is governed by the #{--apt}# argument "
@@ -831,26 +899,26 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:251
+#: en/user_customization-packages.ssi:273
 msgid ""
 "_* #{apt}#: With this method, if a missing package is specified, the package "
 "installation will fail. This is the default setting."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:253
+#: en/user_customization-packages.ssi:275
 msgid ""
 "_* #{aptitude}#: With this method, if a missing package is specified, the "
 "package installation will succeed."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:255
+#: en/user_customization-packages.ssi:277
 msgid "3~ Using a proxy with APT"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:257
+#: en/user_customization-packages.ssi:279
 msgid ""
 "One commonly required APT configuration is to deal with building an image "
 "behind a proxy. You may specify your APT proxy with the #{--apt-ftp-proxy}# "
@@ -858,17 +926,17 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:261
+#: en/user_customization-packages.ssi:283
 msgid "lb config --apt-http-proxy http://proxy/"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:265
+#: en/user_customization-packages.ssi:287
 msgid "3~ Tweaking APT to save space"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:267
+#: en/user_customization-packages.ssi:289
 msgid ""
 "You may find yourself needing to save some space on the image media, in "
 "which case one or the other or both of the following options may be of "
@@ -876,19 +944,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:269
+#: en/user_customization-packages.ssi:291
 msgid ""
 "If you don't want to include APT indices in the image, you can omit those "
 "with:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:273
+#: en/user_customization-packages.ssi:295
 msgid "$ lb config --binary-indices false"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:277
+#: en/user_customization-packages.ssi:299
 msgid ""
 "This will not influence the entries in /etc/apt/sources.list, but merely "
 "whether /var/lib/apt contains the indices files or not. The tradeoff is that "
@@ -898,19 +966,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:279
+#: en/user_customization-packages.ssi:301
 msgid ""
 "If you find the installation of recommended packages bloats your image too "
 "much, you may disable that default option of APT with:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:283
+#: en/user_customization-packages.ssi:305
 msgid "$ lb config --apt-recommends false"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:287
+#: en/user_customization-packages.ssi:309
 msgid ""
 "The tradeoff here is that recommended packages are defined as \"packages "
 "that would be found together with this one in all but unusual installations"
@@ -922,12 +990,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:289
+#: en/user_customization-packages.ssi:311
 msgid "3~ Passing options to apt or aptitude"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:291
+#: en/user_customization-packages.ssi:313
 msgid ""
 "If there is not an #{lb config}# option to alter APT's behaviour in the way "
 "you need, use #{--apt-options}# or #{--aptitude-options}# to pass any "
@@ -936,21 +1004,21 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:293
+#: en/user_customization-packages.ssi:315
 msgid "3~apt-pinning APT pinning"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:295
+#: en/user_customization-packages.ssi:317
 msgid ""
 "For background, please first read the #{apt_preferences(5)}# man page. APT "
 "pinning can be configured either for build time, or else for run time. For "
 "the former, create #{config/chroot_apt/preferences}#. For the latter, create "
-"#{config/chroot_local-includes/etc/preferences}#."
+"#{config/chroot_local-includes/etc/apt/preferences}#."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:297
+#: en/user_customization-packages.ssi:319
 msgid ""
 "Let's say you are building a Squeeze live system but need all #{live-*}# "
 "packages to be installed from Sid at build time. You need to add Sid to your "
@@ -960,7 +1028,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:305
+#: en/user_customization-packages.ssi:327
 msgid ""
 "$ echo \"deb http://mirror/debian sid main\" > config/chroot_sources/sid."
 "chroot $ cat >>config/chroot_apt/preferences <<END Package: live-* Pin: "
@@ -968,6 +1036,6 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:310
+#: en/user_customization-packages.ssi:332
 msgid "Package: * Pin: release n=sid Pin-Priority: 1 END"
 msgstr ""
diff --git a/manual/pt_BR/user_customization-packages.ssi b/manual/pt_BR/user_customization-packages.ssi
index 8ea25a6..b4153a1 100644
--- a/manual/pt_BR/user_customization-packages.ssi
+++ b/manual/pt_BR/user_customization-packages.ssi
@@ -5,28 +5,71 @@
 Perhaps the most basic customization of a Debian live system is the
 selection of packages to be included in the image. This chapter guides you
 through the various build-time options to customize live-build's
-installation of packages. We start with customization of the distribution
-mirror. You can also add your own repositories for backports, experimental
-or custom packages, or include packages directly as files. You can define
-your own lists of packages to include, use live-build's predefined lists,
-use #{tasksel}# tasks, or a combination of all three. Finally, a number of
-options give some control over apt, or if you prefer, aptitude, at build
-time when packages are installed. You may find these handy if you use a
-proxy, want to disable installation of recommended packages to save space,
-or need to control which versions of packages are installed via APT pinning,
-to name a few possibilities.
+installation of packages. The broadest choices influencing which packages
+are available to install in the image are the distribution and archive
+areas. To ensure decent download speeds, you should choose a nearby
+distribution mirror. You can also add your own repositories for backports,
+experimental or custom packages, or include packages directly as files. You
+can define your own lists of packages to include, use live-build's
+predefined lists, use #{tasksel}# tasks, or a combination of all
+three. Finally, a number of options give some control over apt, or if you
+prefer, aptitude, at build time when packages are installed. You may find
+these handy if you use a proxy, want to disable installation of recommended
+packages to save space, or need to control which versions of packages are
+installed via APT pinning, to name a few possibilities.
 
 2~ Package sources
 
+3~ Distribution, archive areas and mode
+
+The distribution you choose has the broadest impact on which packages are
+available to include in your live image. Specify the codename, which
+defaults to #{squeeze}# for the Squeeze version of live-build. Any current
+distribution carried in the Debian archive may be specified by its codename
+here. (See {Terms}#terms for more details.) The #{--distribution}# option
+not only influences the source of packages within the archive, but also
+instructs #{live-build}# to behave as needed to build each supported
+distribution. For example, to build against the *unstable* release, Sid,
+specify:
+
+code{
+
+$ lb config --distribution sid
+
+}code
+
+Within the distribution archive, archive areas are major divisions of the
+archive. In Debian, these are #{main}#, #{contrib}# and #{non-free}#. Only
+#{main}# contains software that is official a part of the Debian
+distribution, hence that is the default. One or more values may be
+specified, e.g.
+
+code{
+
+$ lb config --archive-areas "main contrib"
+
+}code
+
+Experimental support is available for some Debian derivatives through a
+#{--mode}# option. By default, this option is set to #{debian}#, even if you
+are building on a non-Debian system. If you specify #{--mode ubuntu}# or
+#{--mode emdebian}#, the distribution names and archive areas for the
+specified derivative are supported instead of the ones for Debian. The mode
+also modifies live-build behaviour to suit the derivatives.
+
+*Note:* The projects for whom these modes were added are primarily responsible for supporting users of these options. The Debian live project, in turn, provides development support on a best-effort basis only, based on feedback from the derivative projects as we do not develop or support these derivatives ourselves.
+
 3~ Distribution mirrors
 
-Each of the #{--mirror-*}# options governs which distribution mirror is used
-at various stages of the build. Recall from {Stages of the
-build}#stages-of-the-build that the *bootstrap* stage is when the chroot is
-initially populated by debootstrap with a minimal system, and the *chroot*
-stage is when the chroot used to construct the live system's filesystem is
-built. Thus, the corresponding mirror switches are used for those stages,
-and later, in the *binary* stage, the #{--mirror-binary}# and
+The Debian archive is replicated across a large network of mirrors around
+the world so that people in each region can choose a nearby mirror for best
+download speed. Each of the #{--mirror-*}# options governs which
+distribution mirror is used at various stages of the build. Recall from
+{Stages of the build}#stages-of-the-build that the *bootstrap* stage is when
+the chroot is initially populated by debootstrap with a minimal system, and
+the *chroot* stage is when the chroot used to construct the live system's
+filesystem is built. Thus, the corresponding mirror switches are used for
+those stages, and later, in the *binary* stage, the #{--mirror-binary}# and
 #{--mirror-binary-security}# values are used, superceding any mirrors used
 in an earlier stage.
 
@@ -66,11 +109,14 @@ $ lb config --mirror-binary http://mirror/debian/ \
 
 3~additional-repositories Additional repositories
 
-To add more repositories (e.g. backports, experimental or custom packages,
-etc.), create #{config/chroot_sources/your-repository.{chroot,binary}}#
-files. As with the #{--mirror-*}# options, these govern the repositories
-used in the *chroot* stage when building the image, and in the *binary*
-stage, i.e. for use when running the live system.
+You may add more repositories, broadening your package choices beyond what
+is available in your target distribution. These may be, for example, for
+backports, experimental or custom packages. To configure additional
+repositories, create #{config/chroot_sources/your-repository.chroot}#,
+and/or #{config/chroot_sources/your-repository.binary}# files. As with the
+#{--mirror-*}# options, these govern the repositories used in the *chroot*
+stage when building the image, and in the *binary* stage, i.e. for use when
+running the live system.
 
 For example, #{config/chroot_sources/live.chroot}# allows you to install
 packages from the debian live snapshot repository at live system build time.
@@ -468,7 +514,7 @@ and #{aptitude}# for details.
 For background, please first read the #{apt_preferences(5)}# man page. APT
 pinning can be configured either for build time, or else for run time. For
 the former, create #{config/chroot_apt/preferences}#. For the latter, create
-#{config/chroot_local-includes/etc/preferences}#.
+#{config/chroot_local-includes/etc/apt/preferences}#.
 
 Let's say you are building a Squeeze live system but need all #{live-*}#
 packages to be installed from Sid at build time. You need to add Sid to your
diff --git a/manual/ro/user_customization-packages.ssi b/manual/ro/user_customization-packages.ssi
index 8ea25a6..b4153a1 100644
--- a/manual/ro/user_customization-packages.ssi
+++ b/manual/ro/user_customization-packages.ssi
@@ -5,28 +5,71 @@
 Perhaps the most basic customization of a Debian live system is the
 selection of packages to be included in the image. This chapter guides you
 through the various build-time options to customize live-build's
-installation of packages. We start with customization of the distribution
-mirror. You can also add your own repositories for backports, experimental
-or custom packages, or include packages directly as files. You can define
-your own lists of packages to include, use live-build's predefined lists,
-use #{tasksel}# tasks, or a combination of all three. Finally, a number of
-options give some control over apt, or if you prefer, aptitude, at build
-time when packages are installed. You may find these handy if you use a
-proxy, want to disable installation of recommended packages to save space,
-or need to control which versions of packages are installed via APT pinning,
-to name a few possibilities.
+installation of packages. The broadest choices influencing which packages
+are available to install in the image are the distribution and archive
+areas. To ensure decent download speeds, you should choose a nearby
+distribution mirror. You can also add your own repositories for backports,
+experimental or custom packages, or include packages directly as files. You
+can define your own lists of packages to include, use live-build's
+predefined lists, use #{tasksel}# tasks, or a combination of all
+three. Finally, a number of options give some control over apt, or if you
+prefer, aptitude, at build time when packages are installed. You may find
+these handy if you use a proxy, want to disable installation of recommended
+packages to save space, or need to control which versions of packages are
+installed via APT pinning, to name a few possibilities.
 
 2~ Package sources
 
+3~ Distribution, archive areas and mode
+
+The distribution you choose has the broadest impact on which packages are
+available to include in your live image. Specify the codename, which
+defaults to #{squeeze}# for the Squeeze version of live-build. Any current
+distribution carried in the Debian archive may be specified by its codename
+here. (See {Terms}#terms for more details.) The #{--distribution}# option
+not only influences the source of packages within the archive, but also
+instructs #{live-build}# to behave as needed to build each supported
+distribution. For example, to build against the *unstable* release, Sid,
+specify:
+
+code{
+
+$ lb config --distribution sid
+
+}code
+
+Within the distribution archive, archive areas are major divisions of the
+archive. In Debian, these are #{main}#, #{contrib}# and #{non-free}#. Only
+#{main}# contains software that is official a part of the Debian
+distribution, hence that is the default. One or more values may be
+specified, e.g.
+
+code{
+
+$ lb config --archive-areas "main contrib"
+
+}code
+
+Experimental support is available for some Debian derivatives through a
+#{--mode}# option. By default, this option is set to #{debian}#, even if you
+are building on a non-Debian system. If you specify #{--mode ubuntu}# or
+#{--mode emdebian}#, the distribution names and archive areas for the
+specified derivative are supported instead of the ones for Debian. The mode
+also modifies live-build behaviour to suit the derivatives.
+
+*Note:* The projects for whom these modes were added are primarily responsible for supporting users of these options. The Debian live project, in turn, provides development support on a best-effort basis only, based on feedback from the derivative projects as we do not develop or support these derivatives ourselves.
+
 3~ Distribution mirrors
 
-Each of the #{--mirror-*}# options governs which distribution mirror is used
-at various stages of the build. Recall from {Stages of the
-build}#stages-of-the-build that the *bootstrap* stage is when the chroot is
-initially populated by debootstrap with a minimal system, and the *chroot*
-stage is when the chroot used to construct the live system's filesystem is
-built. Thus, the corresponding mirror switches are used for those stages,
-and later, in the *binary* stage, the #{--mirror-binary}# and
+The Debian archive is replicated across a large network of mirrors around
+the world so that people in each region can choose a nearby mirror for best
+download speed. Each of the #{--mirror-*}# options governs which
+distribution mirror is used at various stages of the build. Recall from
+{Stages of the build}#stages-of-the-build that the *bootstrap* stage is when
+the chroot is initially populated by debootstrap with a minimal system, and
+the *chroot* stage is when the chroot used to construct the live system's
+filesystem is built. Thus, the corresponding mirror switches are used for
+those stages, and later, in the *binary* stage, the #{--mirror-binary}# and
 #{--mirror-binary-security}# values are used, superceding any mirrors used
 in an earlier stage.
 
@@ -66,11 +109,14 @@ $ lb config --mirror-binary http://mirror/debian/ \
 
 3~additional-repositories Additional repositories
 
-To add more repositories (e.g. backports, experimental or custom packages,
-etc.), create #{config/chroot_sources/your-repository.{chroot,binary}}#
-files. As with the #{--mirror-*}# options, these govern the repositories
-used in the *chroot* stage when building the image, and in the *binary*
-stage, i.e. for use when running the live system.
+You may add more repositories, broadening your package choices beyond what
+is available in your target distribution. These may be, for example, for
+backports, experimental or custom packages. To configure additional
+repositories, create #{config/chroot_sources/your-repository.chroot}#,
+and/or #{config/chroot_sources/your-repository.binary}# files. As with the
+#{--mirror-*}# options, these govern the repositories used in the *chroot*
+stage when building the image, and in the *binary* stage, i.e. for use when
+running the live system.
 
 For example, #{config/chroot_sources/live.chroot}# allows you to install
 packages from the debian live snapshot repository at live system build time.
@@ -468,7 +514,7 @@ and #{aptitude}# for details.
 For background, please first read the #{apt_preferences(5)}# man page. APT
 pinning can be configured either for build time, or else for run time. For
 the former, create #{config/chroot_apt/preferences}#. For the latter, create
-#{config/chroot_local-includes/etc/preferences}#.
+#{config/chroot_local-includes/etc/apt/preferences}#.
 
 Let's say you are building a Squeeze live system but need all #{live-*}#
 packages to be installed from Sid at build time. You need to add Sid to your

-- 
live-manual



More information about the debian-live-changes mailing list