[SCM] live-manual branch, debian, updated. debian/2.0_a10-1-2-gefb1de4

Ben Armstrong synrg at debian.org
Sun Nov 21 17:49:54 UTC 2010


The following commit has been merged in the debian branch:
commit efb1de42a14e7c6fcddb692d11a6df22735d67e9
Author: Ben Armstrong <synrg at debian.org>
Date:   Sun Nov 21 13:49:27 2010 -0400

    Adding more substance to package customization chapter.

diff --git a/manual/de/live-manual.ssm b/manual/de/live-manual.ssm
index c1594cc..b367e6d 100644
--- a/manual/de/live-manual.ssm
+++ b/manual/de/live-manual.ssm
@@ -9,7 +9,7 @@
  :license: This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.<br><br>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.<br><br>You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses/. <br><br>On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-3 file.
 
 @date:
- :published: 2010-11-15
+ :published: 2010-11-21
 
 @publisher: Debian Live Project <debian-live at lists.debian.org>
 
diff --git a/manual/de/user_customization-packages.ssi b/manual/de/user_customization-packages.ssi
index 1ae1289..7cff6f3 100644
--- a/manual/de/user_customization-packages.ssi
+++ b/manual/de/user_customization-packages.ssi
@@ -13,77 +13,67 @@ 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,
+or need to control which versions of packages are installed via APT pinning,
 to name a few possibilities.
 
 2~ Package sources
 
-3~ Debian repositories
+3~ Distribution mirrors
 
-To set a local mirror to be used to at build time:
+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.
 
-code{
-
-$ lb config --mirror-bootstrap http://localhost/debian/
-
-}code
+4~ Distribution mirrors used at build time
 
-The chroot repository, specified by --mirror-chroot, defaults to the same as
---mirror-bootstrap.
-
-Each of the --mirror-* options governs which repository is used at various
-stages of the build. Recall from {Stages of the build}#stages-of-the-build
-that the *bootstrap* stage is when the chroot is initially populated by
-debootstrap with a minimal system, and the *chroot* stage is when the chroot
-used to construct the live system's filesystem is built. Thus, the
-corresponding mirror switches are used for those stages, and later, when the
-binary image is constructed, the --mirror-binary value is used, superceding
-any earlier repositories.
-
-The generic mirror is added to the live system's /etc/apt/sources.list.
+To set the distribution mirrors used at build time to point at a local
+mirror, it is sufficient to set --mirror-bootstrap and
+--mirror-chroot-security as follows.
 
 code{
 
-$ lb config --mirror-binary http://ftp.debian.org/debian/
+$ lb config --mirror-bootstrap http://localhost/debian/ \
+            --mirror-chroot-security http://localhost/debian-security/
 
 }code
 
-Note: It is not used for building the live system but to install new
-software while using the live system.
+The chroot mirror, specified by --mirror-chroot, defaults to the
+--mirror-bootstrap value.
 
-It can be disabled by setting the binary mirror to the same value as the
-chroot mirror.
+4~ Distribution mirrors used at run time
 
-Note: the same applies for mirror chroot security and mirror binary security
+The --mirror-binary* options govern the distribution mirrors placed in the
+binary image. These may be used to install additional packages while running
+the live system. The default values employ cdn.debian.net, a service that
+chooses a geographically close mirror based on the user's IP number. This is
+a suitable choice when you cannot predict which mirror will be best for all
+of your users. Or you may specify your own values as shown in the example
+below. An image built from this configuration would only be suitable for
+users on a network where 'mirror' is reachable.
 
 code{
 
-$ lb config --mirror-chroot-security {URL} $ lb config
---mirror-binary-security {URL}
+$ lb config --mirror-binary http://mirror/debian/ \
+            --mirror-binary-security http://mirror/debian-security/
 
 }code
 
-If you don't want to include apt indices, you can skip those with:
-
-code{
-
-$ lb config --binary-indices false
-
-}code
-
-This will not influence the entries in /etc/apt/sources.list, but only if
-/var/lib/apt contains the indices files or not (and by that making the image
-smaller).
-
-3~ Own repository
+3~ Additional repositories
 
 To add more repositories (e.g. backports, experimental or custom packages,
 etc.), create #{config/chroot_sources/your-repository.{chroot,binary}}#
-files.
+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.
 
-e.g. #{config/chroot_sources/live.chroot}# allows you to install packages
-from the debian live snapshot repository at live system build time (you have
-to add the packages in your package list):
+For example, #{config/chroot_sources/live.chroot}# allows you to install
+packages from the debian live snapshot repository at live system build time.
 
 code{
 
@@ -92,12 +82,12 @@ deb http://live.debian.net/ sid-snapshots main contrib non-free
 }code
 
 If you add the line to #{config/chroot_sources/live.binary}# the repository
-will be added to your live-system's #{/etc/apt/sources.list}#.
+will be added to your live system's #{/etc/apt/sources.list.d/}# directory.
 
 If such files exist, they will be picked up automatically.
 
-You can also put the gpg-key used to sign the repository into
-config/chroot_sources/your-repository.{binary,chroot}.gpg
+You can also put the GPG key used to sign the repository into
+config/chroot_sources/your-repository.{binary,chroot}.gpg files.
 
 Note: some preconfigured package repositories are available for easy
 selection through the --repository switch, e.g. for enabling live snapshots,
@@ -109,26 +99,12 @@ $ lb config --repository live.debian.net
 
 }code
 
-3~ Package installation
-
-You can elect to use either #{apt}# or #{aptitude}# when installing
-packages. Which utility is used is governed by the #{LB_APT}# variable in
-#{config/chroot}# or by the #{--apt}# argument to #{lb config}#:
-
-_* #{apt}#: Specifying a missing package causes package installation to
-fail, which may not be the desired behaviour. This is the default setting
-for building images for Lenny or later.
-
-_* #{aptitude}#: Specifying a missing package causes package installation to
-succeed, which may not be the desired behaviour. This is the default setting
-for building images for Etch.
-
 2~ Installing additional packages
 
 live-helper has a number of mechanisms for indicating that additional
 packages should be installed, including:
 
-_* The #{LB_PACKAGES}# variable
+_* The #{--packages}# option
 
 _* Package lists
 
@@ -136,18 +112,9 @@ _* Local packages (#{chroot_local-packages/}#)
 
 _* Tasks
 
-3~ The #{LB_PACKAGES}# variable
+3~ The #{--packages}# option
 
-To install additional packages, simply add them to the #{LB_PACKAGES}#
-variable in #{config/chroot}#. For example:
-
-code{
-
-LB_PACKAGES="package1 package2 package3 ... "
-
-}code
-
-You can also specify initial values on the command line:
+To install additional packages, simply specify #{--packages}#. For example:
 
 code{
 
@@ -249,7 +216,8 @@ code{
 }code
 
 Any live-build configuration variable that begins with #{LB_}# can be tested
-in this way.
+in this way. (Generally, this means any #{lb config}# option uppercased and
+with dashes changed to underscores.)
 
 The nesting of conditionals is not supported.
 
@@ -332,8 +300,87 @@ apt-preferences for more information.
 
 % FIXME: <xref linkend="apt-preferences"/>
 
-3~ Altering APT preferences during Live system
+2~ Configuring APT at build time
+
+You can configure APT through a number of options applied only at build
+time. (APT configuration used in the running live system may be configured
+in the normal way for live system contents, that is, by including the
+appropriate configurations through #{config/chroot_local_includes/}#.) For a
+complete list, look for options starting with #{apt}# in the #{lb_config}#
+man page.
+
+3~ Choosing apt or aptitude
+
+You can elect to use either #{apt}# or #{aptitude}# when installing packages
+at build time. Which utility is used is governed by the #{--apt}# argument
+to #{lb config}#. Choose the method implementing the preferred behaviour for
+package installation, the notable difference being how missing packages are
+handled.
+
+_* #{apt}#: With this method, if a missing package is specified, the package
+installation will fail. This is the default setting.
+
+_* #{aptitude}#: With this method, if a missing package is specified, the
+package installation will succeed.
+
+3~ Using a proxy with APT
+
+One commonly required APT configuration is to deal with building an image
+behind a proxy. You may specify your APT proxy with the #{--apt-ftp-proxy}#
+or #{--apt-http-proxy}# options as needed, e.g.
+
+code{
+
+lb config --apt-http-proxy http://proxy/
+
+}code
+
+3~ Tweaking APT to save space
+
+You may find yourself needing to save some space on the image media, in
+which case one or the other or both of the following options may be of
+interest.
+
+If you don't want to include APT indices in the image, you can omit those
+with:
+
+code{
+
+$ lb config --binary-indices false
+
+}code
+
+This will not influence the entries in /etc/apt/sources.list, but merely
+whether /var/lib/apt contains the indices files or not. The tradeoff is that
+APT needs those indices in order to operate in the live system, so before
+performing #{apt-cache search}# or #{apt-get install}#, for instance, the
+user must #{apt-get update}# first to create those indices.
+
+If you find the installation of recommended packages bloats your image too
+much, you may disable that default option of APT with:
+
+code{
+
+$ lb config -apt-recommends false
+
+}code
+
+The tradeoff here is that recommended packages are defined as "packages that
+would be found together with this one in all but unusual installations"
+(Debian Policy Manual, §7.2). This may lead to some packages that you
+actually need being omitted, so we suggest you review the difference this
+makes to your packages list (see the #{binary.packages}# file generated by
+#{lb build}#) and re-include in your list any missing packages that you
+still want installed.
+
+3~ Passing options to apt or aptitude
+
+If there is not an #{lb config}# option to alter APT's behaviour in the way
+you need, use #{--apt-options}# or #{--aptitude-options}# to pass any
+options through to your configured APT tool. See the man pages for #{apt}#
+and #{aptitude}# for details.
+
+3~ APT pinning
+
+% FIXME: needs content
 
-Whilst it may seem unnecessary effort to create an APT repository to install
-custom packages, the infrastructure can be easily re-used at a later date to
-offer updates of the modified package.
diff --git a/manual/en/live-manual.ssm b/manual/en/live-manual.ssm
index 4e49b2f..e18c0bd 100644
--- a/manual/en/live-manual.ssm
+++ b/manual/en/live-manual.ssm
@@ -9,7 +9,7 @@
  :license: This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.<br><br>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.<br><br>You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses/. <br><br>On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-3 file.
 
 @date:
- :published: 2010-11-15
+ :published: 2010-11-21
 
 @publisher: Debian Live Project <debian-live at lists.debian.org>
 
diff --git a/manual/en/user_customization-packages.ssi b/manual/en/user_customization-packages.ssi
index 768c8a9..c4681bb 100644
--- a/manual/en/user_customization-packages.ssi
+++ b/manual/en/user_customization-packages.ssi
@@ -2,60 +2,43 @@
 
 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. We start with customization of the distribution mirror. You can also add your own repositories for backports, experimental or custom packages, or include packages directly as files. You can define your own lists of packages to include, use live-build's predefined lists, use #{tasksel}# tasks, or a combination of all three. Finally, a number of options give some control over apt, or if you prefer, aptitude, at build time when packages are installed. You may find these handy if you use a proxy, want to disable installation of recommended packages to save space, or need to control which versions of packages are installed via APT pinning, to name a few possibilities.
 
 2~ Package sources
 
-3~ Debian repositories
+3~ Distribution mirrors
 
-To set a local mirror to be used to at build time:
+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.
 
-code{
-
-$ lb config --mirror-bootstrap http://localhost/debian/
-
-}code
+4~ Distribution mirrors used at build time
 
-The chroot repository, specified by --mirror-chroot, defaults to the same as --mirror-bootstrap.
-
-Each of the --mirror-* options governs which repository is used at various stages of the build. Recall from {Stages of the build}#stages-of-the-build that the *bootstrap* stage is when the chroot is initially populated by debootstrap with a minimal system, and the *chroot* stage is when the chroot used to construct the live system's filesystem is built. Thus, the corresponding mirror switches are used for those stages, and later, when the binary image is constructed, the --mirror-binary value is used, superceding any earlier repositories.
-
-The generic mirror is added to the live system's /etc/apt/sources.list.
+To set the distribution mirrors used at build time to point at a local mirror, it is sufficient to set --mirror-bootstrap and --mirror-chroot-security as follows.
 
 code{
 
-$ lb config --mirror-binary http://ftp.debian.org/debian/
+$ lb config --mirror-bootstrap http://localhost/debian/ \
+            --mirror-chroot-security http://localhost/debian-security/
 
 }code
 
-Note: It is not used for building the live system but to install new software while using the live system.
+The chroot mirror, specified by --mirror-chroot, defaults to the --mirror-bootstrap value.
 
-It can be disabled by setting the binary mirror to the same value as the chroot mirror.
+4~ Distribution mirrors used at run time
 
-Note: the same applies for mirror chroot security and mirror binary security
+The --mirror-binary* options govern the distribution mirrors placed in the binary image. These may be used to install additional packages while running the live system. The default values employ cdn.debian.net, a service that chooses a geographically close mirror based on the user's IP number. This is a suitable choice when you cannot predict which mirror will be best for all of your users. Or you may specify your own values as shown in the example below. An image built from this configuration would only be suitable for users on a network where 'mirror' is reachable.
 
 code{
 
-$ lb config --mirror-chroot-security {URL}
-$ lb config --mirror-binary-security {URL}
+$ lb config --mirror-binary http://mirror/debian/ \
+            --mirror-binary-security http://mirror/debian-security/
 
 }code
 
-If you don't want to include apt indices, you can skip those with:
+3~ Additional repositories
 
-code{
+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.
 
-$ lb config --binary-indices false
-
-}code
-
-This will not influence the entries in /etc/apt/sources.list, but only if /var/lib/apt contains the indices files or not (and by that making the image smaller).
-
-3~ Own repository
-
-To add more repositories (e.g. backports, experimental or custom packages, etc.), create #{config/chroot_sources/your-repository.{chroot,binary}}# files.
-
-e.g. #{config/chroot_sources/live.chroot}# allows you to install packages from the debian live snapshot repository at live system build time (you have to add the packages in your package list):
+For example, #{config/chroot_sources/live.chroot}# allows you to install packages from the debian live snapshot repository at live system build time.
 
 code{
 
@@ -63,11 +46,11 @@ deb http://live.debian.net/ sid-snapshots main contrib non-free
 
 }code
 
-If you add the line to #{config/chroot_sources/live.binary}# the repository will be added to your live-system's #{/etc/apt/sources.list}#.
+If you add the line to #{config/chroot_sources/live.binary}# the repository will be added to your live system's #{/etc/apt/sources.list.d/}# directory.
 
 If such files exist, they will be picked up automatically.
 
-You can also put the gpg-key used to sign the repository into config/chroot_sources/your-repository.{binary,chroot}.gpg
+You can also put the GPG key used to sign the repository into config/chroot_sources/your-repository.{binary,chroot}.gpg files.
 
 Note: some preconfigured package repositories are available for easy selection through the --repository switch, e.g. for enabling live snapshots, a simple command is enough to enable it:
 
@@ -77,19 +60,11 @@ $ lb config --repository live.debian.net
 
 }code
 
-3~ Package installation
-
-You can elect to use either #{apt}# or #{aptitude}# when installing packages. Which utility is used is governed by the #{LB_APT}# variable in #{config/chroot}# or by the #{--apt}# argument to #{lb config}#:
-
-_* #{apt}#: Specifying a missing package causes package installation to fail, which may not be the desired behaviour. This is the default setting for building images for Lenny or later.
-
-_* #{aptitude}#: Specifying a missing package causes package installation to succeed, which may not be the desired behaviour. This is the default setting for building images for Etch.
-
 2~ Installing additional packages
 
 live-helper has a number of mechanisms for indicating that additional packages should be installed, including:
 
-_* The #{LB_PACKAGES}# variable
+_* The #{--packages}# option
 
 _* Package lists
 
@@ -97,17 +72,9 @@ _* Local packages (#{chroot_local-packages/}#)
 
 _* Tasks
 
-3~ The #{LB_PACKAGES}# variable
-
-To install additional packages, simply add them to the #{LB_PACKAGES}# variable in #{config/chroot}#. For example:
-
-code{
-
-LB_PACKAGES="package1 package2 package3 ... "
+3~ The #{--packages}# option
 
-}code
-
-You can also specify initial values on the command line:
+To install additional packages, simply specify #{--packages}#. For example:
 
 code{
 
@@ -202,7 +169,7 @@ code{
 
 }code
 
-Any live-build configuration variable that begins with #{LB_}# can be tested in this way.
+Any live-build configuration variable that begins with #{LB_}# can be tested in this way. (Generally, this means any #{lb config}# option uppercased and with dashes changed to underscores.)
 
 The nesting of conditionals is not supported.
 
@@ -254,6 +221,57 @@ Because of this, you may wish to increment the version number in your custom pac
 
 % FIXME: <xref linkend="apt-preferences"/>
 
-3~ Altering APT preferences during Live system
+2~ Configuring APT at build time
+
+You can configure APT through a number of options applied only at build time. (APT configuration used in the running live system may be configured in the normal way for live system contents, that is, by including the appropriate configurations through #{config/chroot_local_includes/}#.) For a complete list, look for options starting with #{apt}# in the #{lb_config}# man page.
+
+3~ Choosing apt or aptitude
+
+You can elect to use either #{apt}# or #{aptitude}# when installing packages at build time. Which utility is used is governed by the #{--apt}# argument to #{lb config}#. Choose the method implementing the preferred behaviour for package installation, the notable difference being how missing packages are handled.
+
+_* #{apt}#: With this method, if a missing package is specified, the package installation will fail. This is the default setting.
+
+_* #{aptitude}#: With this method, if a missing package is specified, the package installation will succeed.
+
+3~ Using a proxy with APT
+
+One commonly required APT configuration is to deal with building an image behind a proxy. You may specify your APT proxy with the #{--apt-ftp-proxy}# or #{--apt-http-proxy}# options as needed, e.g.
+
+code{
+
+lb config --apt-http-proxy http://proxy/
+
+}code
+
+3~ Tweaking APT to save space
+
+You may find yourself needing to save some space on the image media, in which case one or the other or both of the following options may be of interest.
+
+If you don't want to include APT indices in the image, you can omit those with:
+
+code{
+
+$ lb config --binary-indices false
+
+}code
+
+This will not influence the entries in /etc/apt/sources.list, but merely whether /var/lib/apt contains the indices files or not. The tradeoff is that APT needs those indices in order to operate in the live system, so before performing #{apt-cache search}# or #{apt-get install}#, for instance, the user must #{apt-get update}# first to create those indices.
+
+If you find the installation of recommended packages bloats your image too much, you may disable that default option of APT with:
+
+code{
+
+$ lb config -apt-recommends false
+
+}code
+
+The tradeoff here is that recommended packages are defined as "packages that would be found together with this one in all but unusual installations" (Debian Policy Manual, §7.2). This may lead to some packages that you actually need being omitted, so we suggest you review the difference this makes to your packages list (see the #{binary.packages}# file generated by #{lb build}#) and re-include in your list any missing packages that you still want installed.
+
+3~ Passing options to apt or aptitude
+
+If there is not an #{lb config}# option to alter APT's behaviour in the way you need, use #{--apt-options}# or #{--aptitude-options}# to pass any options through to your configured APT tool. See the man pages for #{apt}# and #{aptitude}# for details.
+
+3~ APT pinning
+
+% FIXME: needs content
 
-Whilst it may seem unnecessary effort to create an APT repository to install custom packages, the infrastructure can be easily re-used at a later date to offer updates of the modified package.
diff --git a/manual/fr/live-manual.ssm b/manual/fr/live-manual.ssm
index 0de60ab..cbe920d 100644
--- a/manual/fr/live-manual.ssm
+++ b/manual/fr/live-manual.ssm
@@ -9,7 +9,7 @@
  :license: This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.<br><br>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.<br><br>You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses/. <br><br>On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-3 file.
 
 @date:
- :published: 2010-11-15
+ :published: 2010-11-21
 
 @publisher: Debian Live Project <debian-live at lists.debian.org>
 
diff --git a/manual/fr/user_customization-packages.ssi b/manual/fr/user_customization-packages.ssi
index 1ae1289..7cff6f3 100644
--- a/manual/fr/user_customization-packages.ssi
+++ b/manual/fr/user_customization-packages.ssi
@@ -13,77 +13,67 @@ 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,
+or need to control which versions of packages are installed via APT pinning,
 to name a few possibilities.
 
 2~ Package sources
 
-3~ Debian repositories
+3~ Distribution mirrors
 
-To set a local mirror to be used to at build time:
+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.
 
-code{
-
-$ lb config --mirror-bootstrap http://localhost/debian/
-
-}code
+4~ Distribution mirrors used at build time
 
-The chroot repository, specified by --mirror-chroot, defaults to the same as
---mirror-bootstrap.
-
-Each of the --mirror-* options governs which repository is used at various
-stages of the build. Recall from {Stages of the build}#stages-of-the-build
-that the *bootstrap* stage is when the chroot is initially populated by
-debootstrap with a minimal system, and the *chroot* stage is when the chroot
-used to construct the live system's filesystem is built. Thus, the
-corresponding mirror switches are used for those stages, and later, when the
-binary image is constructed, the --mirror-binary value is used, superceding
-any earlier repositories.
-
-The generic mirror is added to the live system's /etc/apt/sources.list.
+To set the distribution mirrors used at build time to point at a local
+mirror, it is sufficient to set --mirror-bootstrap and
+--mirror-chroot-security as follows.
 
 code{
 
-$ lb config --mirror-binary http://ftp.debian.org/debian/
+$ lb config --mirror-bootstrap http://localhost/debian/ \
+            --mirror-chroot-security http://localhost/debian-security/
 
 }code
 
-Note: It is not used for building the live system but to install new
-software while using the live system.
+The chroot mirror, specified by --mirror-chroot, defaults to the
+--mirror-bootstrap value.
 
-It can be disabled by setting the binary mirror to the same value as the
-chroot mirror.
+4~ Distribution mirrors used at run time
 
-Note: the same applies for mirror chroot security and mirror binary security
+The --mirror-binary* options govern the distribution mirrors placed in the
+binary image. These may be used to install additional packages while running
+the live system. The default values employ cdn.debian.net, a service that
+chooses a geographically close mirror based on the user's IP number. This is
+a suitable choice when you cannot predict which mirror will be best for all
+of your users. Or you may specify your own values as shown in the example
+below. An image built from this configuration would only be suitable for
+users on a network where 'mirror' is reachable.
 
 code{
 
-$ lb config --mirror-chroot-security {URL} $ lb config
---mirror-binary-security {URL}
+$ lb config --mirror-binary http://mirror/debian/ \
+            --mirror-binary-security http://mirror/debian-security/
 
 }code
 
-If you don't want to include apt indices, you can skip those with:
-
-code{
-
-$ lb config --binary-indices false
-
-}code
-
-This will not influence the entries in /etc/apt/sources.list, but only if
-/var/lib/apt contains the indices files or not (and by that making the image
-smaller).
-
-3~ Own repository
+3~ Additional repositories
 
 To add more repositories (e.g. backports, experimental or custom packages,
 etc.), create #{config/chroot_sources/your-repository.{chroot,binary}}#
-files.
+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.
 
-e.g. #{config/chroot_sources/live.chroot}# allows you to install packages
-from the debian live snapshot repository at live system build time (you have
-to add the packages in your package list):
+For example, #{config/chroot_sources/live.chroot}# allows you to install
+packages from the debian live snapshot repository at live system build time.
 
 code{
 
@@ -92,12 +82,12 @@ deb http://live.debian.net/ sid-snapshots main contrib non-free
 }code
 
 If you add the line to #{config/chroot_sources/live.binary}# the repository
-will be added to your live-system's #{/etc/apt/sources.list}#.
+will be added to your live system's #{/etc/apt/sources.list.d/}# directory.
 
 If such files exist, they will be picked up automatically.
 
-You can also put the gpg-key used to sign the repository into
-config/chroot_sources/your-repository.{binary,chroot}.gpg
+You can also put the GPG key used to sign the repository into
+config/chroot_sources/your-repository.{binary,chroot}.gpg files.
 
 Note: some preconfigured package repositories are available for easy
 selection through the --repository switch, e.g. for enabling live snapshots,
@@ -109,26 +99,12 @@ $ lb config --repository live.debian.net
 
 }code
 
-3~ Package installation
-
-You can elect to use either #{apt}# or #{aptitude}# when installing
-packages. Which utility is used is governed by the #{LB_APT}# variable in
-#{config/chroot}# or by the #{--apt}# argument to #{lb config}#:
-
-_* #{apt}#: Specifying a missing package causes package installation to
-fail, which may not be the desired behaviour. This is the default setting
-for building images for Lenny or later.
-
-_* #{aptitude}#: Specifying a missing package causes package installation to
-succeed, which may not be the desired behaviour. This is the default setting
-for building images for Etch.
-
 2~ Installing additional packages
 
 live-helper has a number of mechanisms for indicating that additional
 packages should be installed, including:
 
-_* The #{LB_PACKAGES}# variable
+_* The #{--packages}# option
 
 _* Package lists
 
@@ -136,18 +112,9 @@ _* Local packages (#{chroot_local-packages/}#)
 
 _* Tasks
 
-3~ The #{LB_PACKAGES}# variable
+3~ The #{--packages}# option
 
-To install additional packages, simply add them to the #{LB_PACKAGES}#
-variable in #{config/chroot}#. For example:
-
-code{
-
-LB_PACKAGES="package1 package2 package3 ... "
-
-}code
-
-You can also specify initial values on the command line:
+To install additional packages, simply specify #{--packages}#. For example:
 
 code{
 
@@ -249,7 +216,8 @@ code{
 }code
 
 Any live-build configuration variable that begins with #{LB_}# can be tested
-in this way.
+in this way. (Generally, this means any #{lb config}# option uppercased and
+with dashes changed to underscores.)
 
 The nesting of conditionals is not supported.
 
@@ -332,8 +300,87 @@ apt-preferences for more information.
 
 % FIXME: <xref linkend="apt-preferences"/>
 
-3~ Altering APT preferences during Live system
+2~ Configuring APT at build time
+
+You can configure APT through a number of options applied only at build
+time. (APT configuration used in the running live system may be configured
+in the normal way for live system contents, that is, by including the
+appropriate configurations through #{config/chroot_local_includes/}#.) For a
+complete list, look for options starting with #{apt}# in the #{lb_config}#
+man page.
+
+3~ Choosing apt or aptitude
+
+You can elect to use either #{apt}# or #{aptitude}# when installing packages
+at build time. Which utility is used is governed by the #{--apt}# argument
+to #{lb config}#. Choose the method implementing the preferred behaviour for
+package installation, the notable difference being how missing packages are
+handled.
+
+_* #{apt}#: With this method, if a missing package is specified, the package
+installation will fail. This is the default setting.
+
+_* #{aptitude}#: With this method, if a missing package is specified, the
+package installation will succeed.
+
+3~ Using a proxy with APT
+
+One commonly required APT configuration is to deal with building an image
+behind a proxy. You may specify your APT proxy with the #{--apt-ftp-proxy}#
+or #{--apt-http-proxy}# options as needed, e.g.
+
+code{
+
+lb config --apt-http-proxy http://proxy/
+
+}code
+
+3~ Tweaking APT to save space
+
+You may find yourself needing to save some space on the image media, in
+which case one or the other or both of the following options may be of
+interest.
+
+If you don't want to include APT indices in the image, you can omit those
+with:
+
+code{
+
+$ lb config --binary-indices false
+
+}code
+
+This will not influence the entries in /etc/apt/sources.list, but merely
+whether /var/lib/apt contains the indices files or not. The tradeoff is that
+APT needs those indices in order to operate in the live system, so before
+performing #{apt-cache search}# or #{apt-get install}#, for instance, the
+user must #{apt-get update}# first to create those indices.
+
+If you find the installation of recommended packages bloats your image too
+much, you may disable that default option of APT with:
+
+code{
+
+$ lb config -apt-recommends false
+
+}code
+
+The tradeoff here is that recommended packages are defined as "packages that
+would be found together with this one in all but unusual installations"
+(Debian Policy Manual, §7.2). This may lead to some packages that you
+actually need being omitted, so we suggest you review the difference this
+makes to your packages list (see the #{binary.packages}# file generated by
+#{lb build}#) and re-include in your list any missing packages that you
+still want installed.
+
+3~ Passing options to apt or aptitude
+
+If there is not an #{lb config}# option to alter APT's behaviour in the way
+you need, use #{--apt-options}# or #{--aptitude-options}# to pass any
+options through to your configured APT tool. See the man pages for #{apt}#
+and #{aptitude}# for details.
+
+3~ APT pinning
+
+% FIXME: needs content
 
-Whilst it may seem unnecessary effort to create an APT repository to install
-custom packages, the infrastructure can be easily re-used at a later date to
-offer updates of the modified package.
diff --git a/manual/po/de/live-manual.ssm.po b/manual/po/de/live-manual.ssm.po
index 9844c0c..7c898e6 100644
--- a/manual/po/de/live-manual.ssm.po
+++ b/manual/po/de/live-manual.ssm.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-11-15 08:36-0400\n"
+"POT-Creation-Date: 2010-11-21 13:45-0400\n"
 "PO-Revision-Date: 2010-10-03 20:30+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -45,7 +45,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 "@date:\n"
-" :published: 2010-11-15\n"
+" :published: 2010-11-21\n"
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/po/de/user_customization-packages.ssi.po b/manual/po/de/user_customization-packages.ssi.po
index 8593d82..55a179f 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-11-12 16:21-0400\n"
+"POT-Creation-Date: 2010-11-21 13:45-0400\n"
 "PO-Revision-Date: 2010-10-03 20:30+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -53,16 +53,17 @@ msgstr ""
 #: en/user_customization-internationalization.ssi:18
 #: en/user_customization-internationalization.ssi:26
 #: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:26
-#: en/user_customization-packages.ssi:38 en/user_customization-packages.ssi:47
-#: en/user_customization-packages.ssi:61 en/user_customization-packages.ssi:75
-#: en/user_customization-packages.ssi:105
-#: en/user_customization-packages.ssi:113
-#: en/user_customization-packages.ssi:133
-#: en/user_customization-packages.ssi:168
-#: en/user_customization-packages.ssi:178
-#: en/user_customization-packages.ssi:188
-#: en/user_customization-packages.ssi:198 en/user_examples.ssi:24
+#: en/user_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:80
+#: en/user_customization-packages.ssi:100
+#: en/user_customization-packages.ssi:135
+#: en/user_customization-packages.ssi:145
+#: en/user_customization-packages.ssi:155
+#: en/user_customization-packages.ssi:165
+#: en/user_customization-packages.ssi:241
+#: en/user_customization-packages.ssi:253
+#: en/user_customization-packages.ssi:263 en/user_examples.ssi:24
 #: en/user_installation.ssi:38 en/user_installation.ssi:46
 #: en/user_installation.ssi:56 en/user_installation.ssi:64
 #: en/user_installation.ssi:76 en/user_installation.ssi:84
@@ -111,16 +112,17 @@ msgstr ""
 #: en/user_customization-internationalization.ssi:22
 #: en/user_customization-internationalization.ssi:30
 #: en/user_customization-internationalization.ssi:42
-#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:30
-#: en/user_customization-packages.ssi:43 en/user_customization-packages.ssi:51
-#: en/user_customization-packages.ssi:65 en/user_customization-packages.ssi:79
-#: en/user_customization-packages.ssi:109
-#: en/user_customization-packages.ssi:117
-#: en/user_customization-packages.ssi:137
-#: en/user_customization-packages.ssi:174
-#: en/user_customization-packages.ssi:184
-#: en/user_customization-packages.ssi:194
-#: en/user_customization-packages.ssi:204 en/user_examples.ssi:33
+#: en/user_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:84
+#: en/user_customization-packages.ssi:104
+#: en/user_customization-packages.ssi:141
+#: en/user_customization-packages.ssi:151
+#: en/user_customization-packages.ssi:161
+#: en/user_customization-packages.ssi:171
+#: en/user_customization-packages.ssi:245
+#: en/user_customization-packages.ssi:257
+#: en/user_customization-packages.ssi:267 en/user_examples.ssi:33
 #: en/user_installation.ssi:42 en/user_installation.ssi:50
 #: en/user_installation.ssi:60 en/user_installation.ssi:72
 #: en/user_installation.ssi:80 en/user_installation.ssi:88
@@ -133,7 +135,7 @@ msgid "}code"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:218 en/user_customization-packages.ssi:155
+#: en/user_basics.ssi:218 en/user_customization-packages.ssi:122
 msgid "% FIXME"
 msgstr ""
 
@@ -161,7 +163,7 @@ msgid ""
 "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, "
+"or need to control which versions of packages are installed via APT pinning, "
 "to name a few possibilities."
 msgstr ""
 
@@ -172,141 +174,124 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:10
-msgid "3~ Debian repositories"
+msgid "3~ Distribution mirrors"
 msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:12
-msgid "To set a local mirror to be used to at build time:"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:16
-msgid "$ lb config --mirror-bootstrap http://localhost/debian/"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:20
 msgid ""
-"The chroot repository, specified by --mirror-chroot, defaults to the same as "
-"--mirror-bootstrap."
+"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:22
-msgid ""
-"Each of the --mirror-* options governs which repository is used at various "
-"stages of the build. Recall from {Stages of the build}#stages-of-the-build "
-"that the *bootstrap* stage is when the chroot is initially populated by "
-"debootstrap with a minimal system, and the *chroot* stage is when the chroot "
-"used to construct the live system's filesystem is built. Thus, the "
-"corresponding mirror switches are used for those stages, and later, when the "
-"binary image is constructed, the --mirror-binary value is used, superceding "
-"any earlier repositories."
+#: en/user_customization-packages.ssi:14
+msgid "4~ Distribution mirrors used at build time"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:24
-msgid "The generic mirror is added to the live system's /etc/apt/sources.list."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:28
-msgid "$ lb config --mirror-binary http://ftp.debian.org/debian/"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:32
-msgid ""
-"Note: It is not used for building the live system but to install new "
-"software while using the live system."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:34
+#: en/user_customization-packages.ssi:16
 msgid ""
-"It can be disabled by setting the binary mirror to the same value as the "
-"chroot mirror."
+"To set the distribution mirrors used at build time to point at a local "
+"mirror, it is sufficient to set --mirror-bootstrap and --mirror-chroot-"
+"security as follows."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:36
+#: en/user_customization-packages.ssi:21
+#, no-wrap
 msgid ""
-"Note: the same applies for mirror chroot security and mirror binary security"
+"$ lb config --mirror-bootstrap http://localhost/debian/ \\\n"
+"            --mirror-chroot-security http://localhost/debian-security/\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:41
+#: en/user_customization-packages.ssi:25
 msgid ""
-"$ lb config --mirror-chroot-security {URL} $ lb config --mirror-binary-"
-"security {URL}"
+"The chroot mirror, specified by --mirror-chroot, defaults to the --mirror-"
+"bootstrap value."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:45
-msgid "If you don't want to include apt indices, you can skip those with:"
+#: en/user_customization-packages.ssi:27
+msgid "4~ Distribution mirrors used at run time"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:49
-msgid "$ lb config --binary-indices false"
+#: en/user_customization-packages.ssi:29
+msgid ""
+"The --mirror-binary* options govern the distribution mirrors placed in the "
+"binary image. These may be used to install additional packages while running "
+"the live system. The default values employ cdn.debian.net, a service that "
+"chooses a geographically close mirror based on the user's IP number. This is "
+"a suitable choice when you cannot predict which mirror will be best for all "
+"of your users. Or you may specify your own values as shown in the example "
+"below. An image built from this configuration would only be suitable for "
+"users on a network where 'mirror' is reachable."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:53
+#: en/user_customization-packages.ssi:34
+#, no-wrap
 msgid ""
-"This will not influence the entries in /etc/apt/sources.list, but only if /"
-"var/lib/apt contains the indices files or not (and by that making the image "
-"smaller)."
+"$ lb config --mirror-binary http://mirror/debian/ \\\n"
+"            --mirror-binary-security http://mirror/debian-security/\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:55
-msgid "3~ Own repository"
+#: en/user_customization-packages.ssi:38
+msgid "3~ Additional repositories"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:57
+#: en/user_customization-packages.ssi:40
 msgid ""
 "To add more repositories (e.g. backports, experimental or custom packages, "
 "etc.), create #{config/chroot_sources/your-repository.{chroot,binary}}# "
-"files."
+"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:59
+#: en/user_customization-packages.ssi:42
 msgid ""
-"e.g. #{config/chroot_sources/live.chroot}# allows you to install packages "
-"from the debian live snapshot repository at live system build time (you have "
-"to add the packages in your package list):"
+"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:63
+#: en/user_customization-packages.ssi:46
 msgid "deb http://live.debian.net/ sid-snapshots main contrib non-free"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:67
+#: en/user_customization-packages.ssi:50
 msgid ""
 "If you add the line to #{config/chroot_sources/live.binary}# the repository "
-"will be added to your live-system's #{/etc/apt/sources.list}#."
+"will be added to your live system's #{/etc/apt/sources.list.d/}# directory."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:69
+#: en/user_customization-packages.ssi:52
 msgid "If such files exist, they will be picked up automatically."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:71
+#: en/user_customization-packages.ssi:54
 msgid ""
-"You can also put the gpg-key used to sign the repository into config/"
-"chroot_sources/your-repository.{binary,chroot}.gpg"
+"You can 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:73
+#: en/user_customization-packages.ssi:56
 msgid ""
 "Note: some preconfigured package repositories are available for easy "
 "selection through the --repository switch, e.g. for enabling live snapshots, "
@@ -314,100 +299,60 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:77
+#: en/user_customization-packages.ssi:60
 msgid "$ lb config --repository live.debian.net"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:81
-msgid "3~ Package installation"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:83
-msgid ""
-"You can elect to use either #{apt}# or #{aptitude}# when installing "
-"packages. Which utility is used is governed by the #{LB_APT}# variable in #"
-"{config/chroot}# or by the #{--apt}# argument to #{lb config}#:"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:85
-msgid ""
-"_* #{apt}#: Specifying a missing package causes package installation to "
-"fail, which may not be the desired behaviour. This is the default setting "
-"for building images for Lenny or later."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:87
-msgid ""
-"_* #{aptitude}#: Specifying a missing package causes package installation to "
-"succeed, which may not be the desired behaviour. This is the default setting "
-"for building images for Etch."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:89
+#: en/user_customization-packages.ssi:64
 msgid "2~ Installing additional packages"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:91
+#: en/user_customization-packages.ssi:66
 msgid ""
 "live-helper has a number of mechanisms for indicating that additional "
 "packages should be installed, including:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:93
-msgid "_* The #{LB_PACKAGES}# variable"
+#: en/user_customization-packages.ssi:68
+msgid "_* The #{--packages}# option"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:95
+#: en/user_customization-packages.ssi:70
 msgid "_* Package lists"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:97
+#: en/user_customization-packages.ssi:72
 msgid "_* Local packages (#{chroot_local-packages/}#)"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:99
+#: en/user_customization-packages.ssi:74
 msgid "_* Tasks"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:101
-msgid "3~ The #{LB_PACKAGES}# variable"
+#: en/user_customization-packages.ssi:76
+msgid "3~ The #{--packages}# option"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:103
+#: en/user_customization-packages.ssi:78
 msgid ""
-"To install additional packages, simply add them to the #{LB_PACKAGES}# "
-"variable in #{config/chroot}#. For example:"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:107
-msgid "LB_PACKAGES=\"package1 package2 package3 ... \""
+"To install additional packages, simply specify #{--packages}#. For example:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:111
-msgid "You can also specify initial values on the command line:"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:115
+#: en/user_customization-packages.ssi:82
 msgid "$ lb config --packages \"package1 package2 package3\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:119
+#: en/user_customization-packages.ssi:86
 msgid ""
 "The behaviour of live-build when specifying a package that does not exist is "
 "determined by your choice of APT utility. See package-installation for more "
@@ -415,12 +360,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:121
+#: en/user_customization-packages.ssi:88
 msgid "% FIXME: <xref linkend=\"package-installation\"/>"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:123
+#: en/user_customization-packages.ssi:90
 msgid ""
 "If you need to specify a large number of packages to be installed or you "
 "need flexibility regarding which packages to install, you should probably be "
@@ -428,17 +373,17 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:125
+#: en/user_customization-packages.ssi:92
 msgid "% FIXME: <xref linkend=\"package-lists\"/>"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:94
 msgid "3~ Package lists"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:129
+#: en/user_customization-packages.ssi:96
 msgid ""
 "Package lists are a powerful way of expressing which packages should be "
 "installed. live-build ships with a number of predefined package lists which "
@@ -447,37 +392,37 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:131
+#: en/user_customization-packages.ssi:98
 msgid "To specify one or more package list, you can use:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:135
+#: en/user_customization-packages.ssi:102
 msgid "$ lb config --packages-lists \"list1 list2 list3\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:139
+#: en/user_customization-packages.ssi:106
 msgid ""
 "Note: Package lists that are distributed with live-build reside in the #{/"
 "usr/share/live/build/lists}# directory."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:141
+#: en/user_customization-packages.ssi:108
 #, no-wrap
 msgid "*{Local packages lists}*\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:143
+#: en/user_customization-packages.ssi:110
 msgid ""
 "You may supplement the supplied lists using local package lists stored in #"
 "{config/chroot_local-packageslists}#."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:145
+#: en/user_customization-packages.ssi:112
 msgid ""
 "Package lists that exist in this directory need to have a #{.list}# suffix "
 "in order to be processed. Local packages lists always override package lists "
@@ -486,13 +431,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:147
+#: en/user_customization-packages.ssi:114
 #, no-wrap
 msgid "*{Local binary packages lists}*\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:116
 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 "
@@ -502,25 +447,25 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:151
+#: en/user_customization-packages.ssi:118
 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:153
+#: en/user_customization-packages.ssi:120
 #, no-wrap
 msgid "*{Extending a provided package list using includes}*\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:162
+#: en/user_customization-packages.ssi:129
 msgid "% code{ % % #include <gnome> % iceweasel % % }code"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:164
+#: en/user_customization-packages.ssi:131
 msgid ""
 "The package lists that are included with live-build make extensive use of "
 "includes. They are available to view in the #{/usr/share/live/build/lists}# "
@@ -528,75 +473,76 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:133
 #, no-wrap
 msgid "*{Using conditionals inside packages lists}*\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:172
+#: en/user_customization-packages.ssi:139
 msgid "#if ARCHITECTURE amd64 ia32-libs #endif"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:143
 msgid "or if #{LB_ARCHITECTURE}# is set to #{i386}# or #{amd64}#:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:182
+#: en/user_customization-packages.ssi:149
 msgid "#if ARCHITECTURE i386 amd64 memtest86+ #endif"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:186
+#: en/user_customization-packages.ssi:153
 msgid "or if #{LB_ARCHIVE_AREAS}# contains either #{contrib}# or #{non-free}#:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:192
+#: en/user_customization-packages.ssi:159
 msgid "#if ARCHIVE_AREAS contrib non-free vrms #endif"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:196
+#: en/user_customization-packages.ssi:163
 msgid "A conditional may surround an #{#include}# directive:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:202
+#: en/user_customization-packages.ssi:169
 msgid "#if ARCHITECTURE amd64 #include <gnome-full> #endif"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:206
+#: en/user_customization-packages.ssi:173
 msgid ""
 "Any live-build configuration variable that begins with #{LB_}# can be tested "
-"in this way."
+"in this way. (Generally, this means any #{lb config}# option uppercased and "
+"with dashes changed to underscores.)"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:208
+#: en/user_customization-packages.ssi:175
 msgid "The nesting of conditionals is not supported."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:210
+#: en/user_customization-packages.ssi:177
 msgid "3~ Tasks"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:212
+#: en/user_customization-packages.ssi:179
 msgid "%FIXME"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:214
+#: en/user_customization-packages.ssi:181
 msgid "2~ Installing modified or third-party packages"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:183
 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 "
@@ -607,7 +553,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:218
+#: en/user_customization-packages.ssi:185
 msgid ""
 "This section does not cover advice regarding building or maintaining "
 "modified packages. Joachim Breitner's 'How to fork privately' method from "
@@ -618,22 +564,22 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:220
+#: en/user_customization-packages.ssi:187
 msgid "There are two ways of installing modified custom packages:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:222
+#: en/user_customization-packages.ssi:189
 msgid "_* #{chroot_local-packages}#"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:224
+#: en/user_customization-packages.ssi:191
 msgid "_* Using a custom APT repository"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:226
+#: en/user_customization-packages.ssi:193
 msgid ""
 "The #{chroot_local-packages}# is simpler to achieve and useful for \"one-off"
 "\" customizations but has a number of drawbacks, whilst using a custom APT "
@@ -641,12 +587,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:228
+#: en/user_customization-packages.ssi:195
 msgid "3~ Using #{chroot_local-packages}# to install custom packages"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:230
+#: en/user_customization-packages.ssi:197
 msgid ""
 "To install a custom package, simply copy it to the #{config/chroot_local-"
 "packages}# directory. Packages that are inside this directory will be "
@@ -655,45 +601,45 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:232
+#: en/user_customization-packages.ssi:199
 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:234
+#: en/user_customization-packages.ssi:201
 msgid ""
 "Using #{chroot_local-packages}# for installation of custom packages has "
 "disadvantages:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:236
+#: en/user_customization-packages.ssi:203
 msgid "_* It is not possible to use secure APT"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:238
+#: en/user_customization-packages.ssi:205
 msgid ""
 "_* You must install all appropriate packages in the #{config/chroot_local-"
 "packages}# directory"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:240
+#: en/user_customization-packages.ssi:207
 msgid ""
 "_* It does not lend itself to storing Debian Live configurations in revision "
 "control"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:242
+#: en/user_customization-packages.ssi:209
 msgid "3~ Using an APT repository to install custom packages"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:244
+#: en/user_customization-packages.ssi:211
 msgid ""
 "Unlike using #{chroot_local-packages}#, when using a custom APT repository "
 "you must ensure that you specify the packages elsewhere. See lb-packages for "
@@ -701,12 +647,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:246
+#: en/user_customization-packages.ssi:213
 msgid "% FIXME: <xref linkend=\"lb-packages\"/>"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:248
+#: en/user_customization-packages.ssi:215
 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 "
@@ -714,12 +660,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:250
+#: en/user_customization-packages.ssi:217
 msgid "3~ Custom packages and APT"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:252
+#: en/user_customization-packages.ssi:219
 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 "
@@ -729,7 +675,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:254
+#: en/user_customization-packages.ssi:221
 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 "
@@ -739,19 +685,152 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:256
+#: en/user_customization-packages.ssi:223
 msgid "% FIXME: <xref linkend=\"apt-preferences\"/>"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:258
-msgid "3~ Altering APT preferences during Live system"
+#: en/user_customization-packages.ssi:225
+msgid "2~ Configuring APT at build time"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:227
+msgid ""
+"You can configure APT through a number of options applied only at build "
+"time. (APT configuration used in the running live system may be configured "
+"in the normal way for live system contents, that is, by including the "
+"appropriate configurations through #{config/chroot_local_includes/}#.) For a "
+"complete list, look for options starting with #{apt}# in the #{lb_config}# "
+"man page."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:229
+msgid "3~ Choosing apt or aptitude"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:231
+msgid ""
+"You can elect to use either #{apt}# or #{aptitude}# when installing packages "
+"at build time. Which utility is used is governed by the #{--apt}# argument "
+"to #{lb config}#. Choose the method implementing the preferred behaviour for "
+"package installation, the notable difference being how missing packages are "
+"handled."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:233
+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:235
+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:237
+msgid "3~ Using a proxy with APT"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:239
+msgid ""
+"One commonly required APT configuration is to deal with building an image "
+"behind a proxy. You may specify your APT proxy with the #{--apt-ftp-proxy}# "
+"or #{--apt-http-proxy}# options as needed, e.g."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:243
+msgid "lb config --apt-http-proxy http://proxy/"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:247
+msgid "3~ Tweaking APT to save space"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:249
+msgid ""
+"You may find yourself needing to save some space on the image media, in "
+"which case one or the other or both of the following options may be of "
+"interest."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:251
+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:255
+msgid "$ lb config --binary-indices false"
 msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:259
 msgid ""
-"Whilst it may seem unnecessary effort to create an APT repository to install "
-"custom packages, the infrastructure can be easily re-used at a later date to "
-"offer updates of the modified package."
+"This will not influence the entries in /etc/apt/sources.list, but merely "
+"whether /var/lib/apt contains the indices files or not. The tradeoff is that "
+"APT needs those indices in order to operate in the live system, so before "
+"performing #{apt-cache search}# or #{apt-get install}#, for instance, the "
+"user must #{apt-get update}# first to create those indices."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:261
+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:265
+msgid "$ lb config -apt-recommends false"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:269
+msgid ""
+"The tradeoff here is that recommended packages are defined as \"packages "
+"that would be found together with this one in all but unusual installations"
+"\" (Debian Policy Manual, 7.2). This may lead to some packages that you "
+"actually need being omitted, so we suggest you review the difference this "
+"makes to your packages list (see the #{binary.packages}# file generated by #"
+"{lb build}#) and re-include in your list any missing packages that you still "
+"want installed."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:271
+msgid "3~ Passing options to apt or aptitude"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:273
+msgid ""
+"If there is not an #{lb config}# option to alter APT's behaviour in the way "
+"you need, use #{--apt-options}# or #{--aptitude-options}# to pass any "
+"options through to your configured APT tool. See the man pages for #{apt}# "
+"and #{aptitude}# for details."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:275
+msgid "3~ APT pinning"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:277
+msgid "% FIXME: needs content"
 msgstr ""
diff --git a/manual/po/fr/live-manual.ssm.po b/manual/po/fr/live-manual.ssm.po
index 40ed12b..f900fda 100644
--- a/manual/po/fr/live-manual.ssm.po
+++ b/manual/po/fr/live-manual.ssm.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-11-15 08:36-0400\n"
+"POT-Creation-Date: 2010-11-21 13:45-0400\n"
 "PO-Revision-Date: 2010-10-21 07:06-0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -45,7 +45,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 "@date:\n"
-" :published: 2010-11-15\n"
+" :published: 2010-11-21\n"
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/po/fr/user_customization-packages.ssi.po b/manual/po/fr/user_customization-packages.ssi.po
index e9e129d..4ec5382 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-11-12 16:21-0400\n"
+"POT-Creation-Date: 2010-11-21 13:45-0400\n"
 "PO-Revision-Date: 2010-10-16 14:45-0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -53,16 +53,17 @@ msgstr ""
 #: en/user_customization-internationalization.ssi:18
 #: en/user_customization-internationalization.ssi:26
 #: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:26
-#: en/user_customization-packages.ssi:38 en/user_customization-packages.ssi:47
-#: en/user_customization-packages.ssi:61 en/user_customization-packages.ssi:75
-#: en/user_customization-packages.ssi:105
-#: en/user_customization-packages.ssi:113
-#: en/user_customization-packages.ssi:133
-#: en/user_customization-packages.ssi:168
-#: en/user_customization-packages.ssi:178
-#: en/user_customization-packages.ssi:188
-#: en/user_customization-packages.ssi:198 en/user_examples.ssi:24
+#: en/user_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:80
+#: en/user_customization-packages.ssi:100
+#: en/user_customization-packages.ssi:135
+#: en/user_customization-packages.ssi:145
+#: en/user_customization-packages.ssi:155
+#: en/user_customization-packages.ssi:165
+#: en/user_customization-packages.ssi:241
+#: en/user_customization-packages.ssi:253
+#: en/user_customization-packages.ssi:263 en/user_examples.ssi:24
 #: en/user_installation.ssi:38 en/user_installation.ssi:46
 #: en/user_installation.ssi:56 en/user_installation.ssi:64
 #: en/user_installation.ssi:76 en/user_installation.ssi:84
@@ -111,16 +112,17 @@ 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:18 en/user_customization-packages.ssi:30
-#: en/user_customization-packages.ssi:43 en/user_customization-packages.ssi:51
-#: en/user_customization-packages.ssi:65 en/user_customization-packages.ssi:79
-#: en/user_customization-packages.ssi:109
-#: en/user_customization-packages.ssi:117
-#: en/user_customization-packages.ssi:137
-#: en/user_customization-packages.ssi:174
-#: en/user_customization-packages.ssi:184
-#: en/user_customization-packages.ssi:194
-#: en/user_customization-packages.ssi:204 en/user_examples.ssi:33
+#: en/user_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:84
+#: en/user_customization-packages.ssi:104
+#: en/user_customization-packages.ssi:141
+#: en/user_customization-packages.ssi:151
+#: en/user_customization-packages.ssi:161
+#: en/user_customization-packages.ssi:171
+#: en/user_customization-packages.ssi:245
+#: en/user_customization-packages.ssi:257
+#: en/user_customization-packages.ssi:267 en/user_examples.ssi:33
 #: en/user_installation.ssi:42 en/user_installation.ssi:50
 #: en/user_installation.ssi:60 en/user_installation.ssi:72
 #: en/user_installation.ssi:80 en/user_installation.ssi:88
@@ -133,7 +135,7 @@ msgid "}code"
 msgstr "}code"
 
 #. type: Plain text
-#: en/user_basics.ssi:218 en/user_customization-packages.ssi:155
+#: en/user_basics.ssi:218 en/user_customization-packages.ssi:122
 msgid "% FIXME"
 msgstr ""
 
@@ -161,7 +163,7 @@ msgid ""
 "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, "
+"or need to control which versions of packages are installed via APT pinning, "
 "to name a few possibilities."
 msgstr ""
 
@@ -172,141 +174,124 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:10
-msgid "3~ Debian repositories"
+msgid "3~ Distribution mirrors"
 msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:12
-msgid "To set a local mirror to be used to at build time:"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:16
-msgid "$ lb config --mirror-bootstrap http://localhost/debian/"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:20
 msgid ""
-"The chroot repository, specified by --mirror-chroot, defaults to the same as "
-"--mirror-bootstrap."
+"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:22
-msgid ""
-"Each of the --mirror-* options governs which repository is used at various "
-"stages of the build. Recall from {Stages of the build}#stages-of-the-build "
-"that the *bootstrap* stage is when the chroot is initially populated by "
-"debootstrap with a minimal system, and the *chroot* stage is when the chroot "
-"used to construct the live system's filesystem is built. Thus, the "
-"corresponding mirror switches are used for those stages, and later, when the "
-"binary image is constructed, the --mirror-binary value is used, superceding "
-"any earlier repositories."
+#: en/user_customization-packages.ssi:14
+msgid "4~ Distribution mirrors used at build time"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:24
-msgid "The generic mirror is added to the live system's /etc/apt/sources.list."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:28
-msgid "$ lb config --mirror-binary http://ftp.debian.org/debian/"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:32
-msgid ""
-"Note: It is not used for building the live system but to install new "
-"software while using the live system."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:34
+#: en/user_customization-packages.ssi:16
 msgid ""
-"It can be disabled by setting the binary mirror to the same value as the "
-"chroot mirror."
+"To set the distribution mirrors used at build time to point at a local "
+"mirror, it is sufficient to set --mirror-bootstrap and --mirror-chroot-"
+"security as follows."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:36
+#: en/user_customization-packages.ssi:21
+#, no-wrap
 msgid ""
-"Note: the same applies for mirror chroot security and mirror binary security"
+"$ lb config --mirror-bootstrap http://localhost/debian/ \\\n"
+"            --mirror-chroot-security http://localhost/debian-security/\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:41
+#: en/user_customization-packages.ssi:25
 msgid ""
-"$ lb config --mirror-chroot-security {URL} $ lb config --mirror-binary-"
-"security {URL}"
+"The chroot mirror, specified by --mirror-chroot, defaults to the --mirror-"
+"bootstrap value."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:45
-msgid "If you don't want to include apt indices, you can skip those with:"
+#: en/user_customization-packages.ssi:27
+msgid "4~ Distribution mirrors used at run time"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:49
-msgid "$ lb config --binary-indices false"
+#: en/user_customization-packages.ssi:29
+msgid ""
+"The --mirror-binary* options govern the distribution mirrors placed in the "
+"binary image. These may be used to install additional packages while running "
+"the live system. The default values employ cdn.debian.net, a service that "
+"chooses a geographically close mirror based on the user's IP number. This is "
+"a suitable choice when you cannot predict which mirror will be best for all "
+"of your users. Or you may specify your own values as shown in the example "
+"below. An image built from this configuration would only be suitable for "
+"users on a network where 'mirror' is reachable."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:53
+#: en/user_customization-packages.ssi:34
+#, no-wrap
 msgid ""
-"This will not influence the entries in /etc/apt/sources.list, but only if /"
-"var/lib/apt contains the indices files or not (and by that making the image "
-"smaller)."
+"$ lb config --mirror-binary http://mirror/debian/ \\\n"
+"            --mirror-binary-security http://mirror/debian-security/\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:55
-msgid "3~ Own repository"
+#: en/user_customization-packages.ssi:38
+msgid "3~ Additional repositories"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:57
+#: en/user_customization-packages.ssi:40
 msgid ""
 "To add more repositories (e.g. backports, experimental or custom packages, "
 "etc.), create #{config/chroot_sources/your-repository.{chroot,binary}}# "
-"files."
+"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:59
+#: en/user_customization-packages.ssi:42
 msgid ""
-"e.g. #{config/chroot_sources/live.chroot}# allows you to install packages "
-"from the debian live snapshot repository at live system build time (you have "
-"to add the packages in your package list):"
+"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:63
+#: en/user_customization-packages.ssi:46
 msgid "deb http://live.debian.net/ sid-snapshots main contrib non-free"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:67
+#: en/user_customization-packages.ssi:50
 msgid ""
 "If you add the line to #{config/chroot_sources/live.binary}# the repository "
-"will be added to your live-system's #{/etc/apt/sources.list}#."
+"will be added to your live system's #{/etc/apt/sources.list.d/}# directory."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:69
+#: en/user_customization-packages.ssi:52
 msgid "If such files exist, they will be picked up automatically."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:71
+#: en/user_customization-packages.ssi:54
 msgid ""
-"You can also put the gpg-key used to sign the repository into config/"
-"chroot_sources/your-repository.{binary,chroot}.gpg"
+"You can 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:73
+#: en/user_customization-packages.ssi:56
 msgid ""
 "Note: some preconfigured package repositories are available for easy "
 "selection through the --repository switch, e.g. for enabling live snapshots, "
@@ -314,100 +299,60 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:77
+#: en/user_customization-packages.ssi:60
 msgid "$ lb config --repository live.debian.net"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:81
-msgid "3~ Package installation"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:83
-msgid ""
-"You can elect to use either #{apt}# or #{aptitude}# when installing "
-"packages. Which utility is used is governed by the #{LB_APT}# variable in #"
-"{config/chroot}# or by the #{--apt}# argument to #{lb config}#:"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:85
-msgid ""
-"_* #{apt}#: Specifying a missing package causes package installation to "
-"fail, which may not be the desired behaviour. This is the default setting "
-"for building images for Lenny or later."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:87
-msgid ""
-"_* #{aptitude}#: Specifying a missing package causes package installation to "
-"succeed, which may not be the desired behaviour. This is the default setting "
-"for building images for Etch."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:89
+#: en/user_customization-packages.ssi:64
 msgid "2~ Installing additional packages"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:91
+#: en/user_customization-packages.ssi:66
 msgid ""
 "live-helper has a number of mechanisms for indicating that additional "
 "packages should be installed, including:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:93
-msgid "_* The #{LB_PACKAGES}# variable"
+#: en/user_customization-packages.ssi:68
+msgid "_* The #{--packages}# option"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:95
+#: en/user_customization-packages.ssi:70
 msgid "_* Package lists"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:97
+#: en/user_customization-packages.ssi:72
 msgid "_* Local packages (#{chroot_local-packages/}#)"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:99
+#: en/user_customization-packages.ssi:74
 msgid "_* Tasks"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:101
-msgid "3~ The #{LB_PACKAGES}# variable"
+#: en/user_customization-packages.ssi:76
+msgid "3~ The #{--packages}# option"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:103
+#: en/user_customization-packages.ssi:78
 msgid ""
-"To install additional packages, simply add them to the #{LB_PACKAGES}# "
-"variable in #{config/chroot}#. For example:"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:107
-msgid "LB_PACKAGES=\"package1 package2 package3 ... \""
+"To install additional packages, simply specify #{--packages}#. For example:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:111
-msgid "You can also specify initial values on the command line:"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:115
+#: en/user_customization-packages.ssi:82
 msgid "$ lb config --packages \"package1 package2 package3\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:119
+#: en/user_customization-packages.ssi:86
 msgid ""
 "The behaviour of live-build when specifying a package that does not exist is "
 "determined by your choice of APT utility. See package-installation for more "
@@ -415,12 +360,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:121
+#: en/user_customization-packages.ssi:88
 msgid "% FIXME: <xref linkend=\"package-installation\"/>"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:123
+#: en/user_customization-packages.ssi:90
 msgid ""
 "If you need to specify a large number of packages to be installed or you "
 "need flexibility regarding which packages to install, you should probably be "
@@ -428,17 +373,17 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:125
+#: en/user_customization-packages.ssi:92
 msgid "% FIXME: <xref linkend=\"package-lists\"/>"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:94
 msgid "3~ Package lists"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:129
+#: en/user_customization-packages.ssi:96
 msgid ""
 "Package lists are a powerful way of expressing which packages should be "
 "installed. live-build ships with a number of predefined package lists which "
@@ -447,37 +392,37 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:131
+#: en/user_customization-packages.ssi:98
 msgid "To specify one or more package list, you can use:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:135
+#: en/user_customization-packages.ssi:102
 msgid "$ lb config --packages-lists \"list1 list2 list3\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:139
+#: en/user_customization-packages.ssi:106
 msgid ""
 "Note: Package lists that are distributed with live-build reside in the #{/"
 "usr/share/live/build/lists}# directory."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:141
+#: en/user_customization-packages.ssi:108
 #, no-wrap
 msgid "*{Local packages lists}*\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:143
+#: en/user_customization-packages.ssi:110
 msgid ""
 "You may supplement the supplied lists using local package lists stored in #"
 "{config/chroot_local-packageslists}#."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:145
+#: en/user_customization-packages.ssi:112
 msgid ""
 "Package lists that exist in this directory need to have a #{.list}# suffix "
 "in order to be processed. Local packages lists always override package lists "
@@ -486,13 +431,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:147
+#: en/user_customization-packages.ssi:114
 #, no-wrap
 msgid "*{Local binary packages lists}*\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:116
 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 "
@@ -502,25 +447,25 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:151
+#: en/user_customization-packages.ssi:118
 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:153
+#: en/user_customization-packages.ssi:120
 #, no-wrap
 msgid "*{Extending a provided package list using includes}*\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:162
+#: en/user_customization-packages.ssi:129
 msgid "% code{ % % #include <gnome> % iceweasel % % }code"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:164
+#: en/user_customization-packages.ssi:131
 msgid ""
 "The package lists that are included with live-build make extensive use of "
 "includes. They are available to view in the #{/usr/share/live/build/lists}# "
@@ -528,75 +473,76 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:133
 #, no-wrap
 msgid "*{Using conditionals inside packages lists}*\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:172
+#: en/user_customization-packages.ssi:139
 msgid "#if ARCHITECTURE amd64 ia32-libs #endif"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:143
 msgid "or if #{LB_ARCHITECTURE}# is set to #{i386}# or #{amd64}#:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:182
+#: en/user_customization-packages.ssi:149
 msgid "#if ARCHITECTURE i386 amd64 memtest86+ #endif"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:186
+#: en/user_customization-packages.ssi:153
 msgid "or if #{LB_ARCHIVE_AREAS}# contains either #{contrib}# or #{non-free}#:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:192
+#: en/user_customization-packages.ssi:159
 msgid "#if ARCHIVE_AREAS contrib non-free vrms #endif"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:196
+#: en/user_customization-packages.ssi:163
 msgid "A conditional may surround an #{#include}# directive:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:202
+#: en/user_customization-packages.ssi:169
 msgid "#if ARCHITECTURE amd64 #include <gnome-full> #endif"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:206
+#: en/user_customization-packages.ssi:173
 msgid ""
 "Any live-build configuration variable that begins with #{LB_}# can be tested "
-"in this way."
+"in this way. (Generally, this means any #{lb config}# option uppercased and "
+"with dashes changed to underscores.)"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:208
+#: en/user_customization-packages.ssi:175
 msgid "The nesting of conditionals is not supported."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:210
+#: en/user_customization-packages.ssi:177
 msgid "3~ Tasks"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:212
+#: en/user_customization-packages.ssi:179
 msgid "%FIXME"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:214
+#: en/user_customization-packages.ssi:181
 msgid "2~ Installing modified or third-party packages"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:183
 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 "
@@ -607,7 +553,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:218
+#: en/user_customization-packages.ssi:185
 msgid ""
 "This section does not cover advice regarding building or maintaining "
 "modified packages. Joachim Breitner's 'How to fork privately' method from "
@@ -618,22 +564,22 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:220
+#: en/user_customization-packages.ssi:187
 msgid "There are two ways of installing modified custom packages:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:222
+#: en/user_customization-packages.ssi:189
 msgid "_* #{chroot_local-packages}#"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:224
+#: en/user_customization-packages.ssi:191
 msgid "_* Using a custom APT repository"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:226
+#: en/user_customization-packages.ssi:193
 msgid ""
 "The #{chroot_local-packages}# is simpler to achieve and useful for \"one-off"
 "\" customizations but has a number of drawbacks, whilst using a custom APT "
@@ -641,12 +587,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:228
+#: en/user_customization-packages.ssi:195
 msgid "3~ Using #{chroot_local-packages}# to install custom packages"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:230
+#: en/user_customization-packages.ssi:197
 msgid ""
 "To install a custom package, simply copy it to the #{config/chroot_local-"
 "packages}# directory. Packages that are inside this directory will be "
@@ -655,45 +601,45 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:232
+#: en/user_customization-packages.ssi:199
 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:234
+#: en/user_customization-packages.ssi:201
 msgid ""
 "Using #{chroot_local-packages}# for installation of custom packages has "
 "disadvantages:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:236
+#: en/user_customization-packages.ssi:203
 msgid "_* It is not possible to use secure APT"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:238
+#: en/user_customization-packages.ssi:205
 msgid ""
 "_* You must install all appropriate packages in the #{config/chroot_local-"
 "packages}# directory"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:240
+#: en/user_customization-packages.ssi:207
 msgid ""
 "_* It does not lend itself to storing Debian Live configurations in revision "
 "control"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:242
+#: en/user_customization-packages.ssi:209
 msgid "3~ Using an APT repository to install custom packages"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:244
+#: en/user_customization-packages.ssi:211
 msgid ""
 "Unlike using #{chroot_local-packages}#, when using a custom APT repository "
 "you must ensure that you specify the packages elsewhere. See lb-packages for "
@@ -701,12 +647,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:246
+#: en/user_customization-packages.ssi:213
 msgid "% FIXME: <xref linkend=\"lb-packages\"/>"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:248
+#: en/user_customization-packages.ssi:215
 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 "
@@ -714,12 +660,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:250
+#: en/user_customization-packages.ssi:217
 msgid "3~ Custom packages and APT"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:252
+#: en/user_customization-packages.ssi:219
 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 "
@@ -729,7 +675,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:254
+#: en/user_customization-packages.ssi:221
 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 "
@@ -739,19 +685,152 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:256
+#: en/user_customization-packages.ssi:223
 msgid "% FIXME: <xref linkend=\"apt-preferences\"/>"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:258
-msgid "3~ Altering APT preferences during Live system"
+#: en/user_customization-packages.ssi:225
+msgid "2~ Configuring APT at build time"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:227
+msgid ""
+"You can configure APT through a number of options applied only at build "
+"time. (APT configuration used in the running live system may be configured "
+"in the normal way for live system contents, that is, by including the "
+"appropriate configurations through #{config/chroot_local_includes/}#.) For a "
+"complete list, look for options starting with #{apt}# in the #{lb_config}# "
+"man page."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:229
+msgid "3~ Choosing apt or aptitude"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:231
+msgid ""
+"You can elect to use either #{apt}# or #{aptitude}# when installing packages "
+"at build time. Which utility is used is governed by the #{--apt}# argument "
+"to #{lb config}#. Choose the method implementing the preferred behaviour for "
+"package installation, the notable difference being how missing packages are "
+"handled."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:233
+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:235
+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:237
+msgid "3~ Using a proxy with APT"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:239
+msgid ""
+"One commonly required APT configuration is to deal with building an image "
+"behind a proxy. You may specify your APT proxy with the #{--apt-ftp-proxy}# "
+"or #{--apt-http-proxy}# options as needed, e.g."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:243
+msgid "lb config --apt-http-proxy http://proxy/"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:247
+msgid "3~ Tweaking APT to save space"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:249
+msgid ""
+"You may find yourself needing to save some space on the image media, in "
+"which case one or the other or both of the following options may be of "
+"interest."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:251
+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:255
+msgid "$ lb config --binary-indices false"
 msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:259
 msgid ""
-"Whilst it may seem unnecessary effort to create an APT repository to install "
-"custom packages, the infrastructure can be easily re-used at a later date to "
-"offer updates of the modified package."
+"This will not influence the entries in /etc/apt/sources.list, but merely "
+"whether /var/lib/apt contains the indices files or not. The tradeoff is that "
+"APT needs those indices in order to operate in the live system, so before "
+"performing #{apt-cache search}# or #{apt-get install}#, for instance, the "
+"user must #{apt-get update}# first to create those indices."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:261
+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:265
+msgid "$ lb config -apt-recommends false"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:269
+msgid ""
+"The tradeoff here is that recommended packages are defined as \"packages "
+"that would be found together with this one in all but unusual installations"
+"\" (Debian Policy Manual, 7.2). This may lead to some packages that you "
+"actually need being omitted, so we suggest you review the difference this "
+"makes to your packages list (see the #{binary.packages}# file generated by #"
+"{lb build}#) and re-include in your list any missing packages that you still "
+"want installed."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:271
+msgid "3~ Passing options to apt or aptitude"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:273
+msgid ""
+"If there is not an #{lb config}# option to alter APT's behaviour in the way "
+"you need, use #{--apt-options}# or #{--aptitude-options}# to pass any "
+"options through to your configured APT tool. See the man pages for #{apt}# "
+"and #{aptitude}# for details."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:275
+msgid "3~ APT pinning"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:277
+msgid "% FIXME: needs content"
 msgstr ""
diff --git a/manual/po/pt_BR/live-manual.ssm.po b/manual/po/pt_BR/live-manual.ssm.po
index 3d87bda..e6f17c4 100644
--- a/manual/po/pt_BR/live-manual.ssm.po
+++ b/manual/po/pt_BR/live-manual.ssm.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-11-15 08:36-0400\n"
+"POT-Creation-Date: 2010-11-21 13:45-0400\n"
 "PO-Revision-Date: 2010-10-22 07:52-0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -45,7 +45,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 "@date:\n"
-" :published: 2010-11-15\n"
+" :published: 2010-11-21\n"
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/po/pt_BR/user_customization-packages.ssi.po b/manual/po/pt_BR/user_customization-packages.ssi.po
index 241b965..97ecb77 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-11-12 16:21-0400\n"
+"POT-Creation-Date: 2010-11-21 13:45-0400\n"
 "PO-Revision-Date: 2010-10-22 08:58-0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -53,16 +53,17 @@ msgstr ""
 #: en/user_customization-internationalization.ssi:18
 #: en/user_customization-internationalization.ssi:26
 #: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:26
-#: en/user_customization-packages.ssi:38 en/user_customization-packages.ssi:47
-#: en/user_customization-packages.ssi:61 en/user_customization-packages.ssi:75
-#: en/user_customization-packages.ssi:105
-#: en/user_customization-packages.ssi:113
-#: en/user_customization-packages.ssi:133
-#: en/user_customization-packages.ssi:168
-#: en/user_customization-packages.ssi:178
-#: en/user_customization-packages.ssi:188
-#: en/user_customization-packages.ssi:198 en/user_examples.ssi:24
+#: en/user_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:80
+#: en/user_customization-packages.ssi:100
+#: en/user_customization-packages.ssi:135
+#: en/user_customization-packages.ssi:145
+#: en/user_customization-packages.ssi:155
+#: en/user_customization-packages.ssi:165
+#: en/user_customization-packages.ssi:241
+#: en/user_customization-packages.ssi:253
+#: en/user_customization-packages.ssi:263 en/user_examples.ssi:24
 #: en/user_installation.ssi:38 en/user_installation.ssi:46
 #: en/user_installation.ssi:56 en/user_installation.ssi:64
 #: en/user_installation.ssi:76 en/user_installation.ssi:84
@@ -111,16 +112,17 @@ 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:18 en/user_customization-packages.ssi:30
-#: en/user_customization-packages.ssi:43 en/user_customization-packages.ssi:51
-#: en/user_customization-packages.ssi:65 en/user_customization-packages.ssi:79
-#: en/user_customization-packages.ssi:109
-#: en/user_customization-packages.ssi:117
-#: en/user_customization-packages.ssi:137
-#: en/user_customization-packages.ssi:174
-#: en/user_customization-packages.ssi:184
-#: en/user_customization-packages.ssi:194
-#: en/user_customization-packages.ssi:204 en/user_examples.ssi:33
+#: en/user_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:84
+#: en/user_customization-packages.ssi:104
+#: en/user_customization-packages.ssi:141
+#: en/user_customization-packages.ssi:151
+#: en/user_customization-packages.ssi:161
+#: en/user_customization-packages.ssi:171
+#: en/user_customization-packages.ssi:245
+#: en/user_customization-packages.ssi:257
+#: en/user_customization-packages.ssi:267 en/user_examples.ssi:33
 #: en/user_installation.ssi:42 en/user_installation.ssi:50
 #: en/user_installation.ssi:60 en/user_installation.ssi:72
 #: en/user_installation.ssi:80 en/user_installation.ssi:88
@@ -133,7 +135,7 @@ msgid "}code"
 msgstr "}code"
 
 #. type: Plain text
-#: en/user_basics.ssi:218 en/user_customization-packages.ssi:155
+#: en/user_basics.ssi:218 en/user_customization-packages.ssi:122
 msgid "% FIXME"
 msgstr ""
 
@@ -161,7 +163,7 @@ msgid ""
 "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, "
+"or need to control which versions of packages are installed via APT pinning, "
 "to name a few possibilities."
 msgstr ""
 
@@ -172,141 +174,124 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:10
-msgid "3~ Debian repositories"
+msgid "3~ Distribution mirrors"
 msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:12
-msgid "To set a local mirror to be used to at build time:"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:16
-msgid "$ lb config --mirror-bootstrap http://localhost/debian/"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:20
 msgid ""
-"The chroot repository, specified by --mirror-chroot, defaults to the same as "
-"--mirror-bootstrap."
+"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:22
-msgid ""
-"Each of the --mirror-* options governs which repository is used at various "
-"stages of the build. Recall from {Stages of the build}#stages-of-the-build "
-"that the *bootstrap* stage is when the chroot is initially populated by "
-"debootstrap with a minimal system, and the *chroot* stage is when the chroot "
-"used to construct the live system's filesystem is built. Thus, the "
-"corresponding mirror switches are used for those stages, and later, when the "
-"binary image is constructed, the --mirror-binary value is used, superceding "
-"any earlier repositories."
+#: en/user_customization-packages.ssi:14
+msgid "4~ Distribution mirrors used at build time"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:24
-msgid "The generic mirror is added to the live system's /etc/apt/sources.list."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:28
-msgid "$ lb config --mirror-binary http://ftp.debian.org/debian/"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:32
-msgid ""
-"Note: It is not used for building the live system but to install new "
-"software while using the live system."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:34
+#: en/user_customization-packages.ssi:16
 msgid ""
-"It can be disabled by setting the binary mirror to the same value as the "
-"chroot mirror."
+"To set the distribution mirrors used at build time to point at a local "
+"mirror, it is sufficient to set --mirror-bootstrap and --mirror-chroot-"
+"security as follows."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:36
+#: en/user_customization-packages.ssi:21
+#, no-wrap
 msgid ""
-"Note: the same applies for mirror chroot security and mirror binary security"
+"$ lb config --mirror-bootstrap http://localhost/debian/ \\\n"
+"            --mirror-chroot-security http://localhost/debian-security/\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:41
+#: en/user_customization-packages.ssi:25
 msgid ""
-"$ lb config --mirror-chroot-security {URL} $ lb config --mirror-binary-"
-"security {URL}"
+"The chroot mirror, specified by --mirror-chroot, defaults to the --mirror-"
+"bootstrap value."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:45
-msgid "If you don't want to include apt indices, you can skip those with:"
+#: en/user_customization-packages.ssi:27
+msgid "4~ Distribution mirrors used at run time"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:49
-msgid "$ lb config --binary-indices false"
+#: en/user_customization-packages.ssi:29
+msgid ""
+"The --mirror-binary* options govern the distribution mirrors placed in the "
+"binary image. These may be used to install additional packages while running "
+"the live system. The default values employ cdn.debian.net, a service that "
+"chooses a geographically close mirror based on the user's IP number. This is "
+"a suitable choice when you cannot predict which mirror will be best for all "
+"of your users. Or you may specify your own values as shown in the example "
+"below. An image built from this configuration would only be suitable for "
+"users on a network where 'mirror' is reachable."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:53
+#: en/user_customization-packages.ssi:34
+#, no-wrap
 msgid ""
-"This will not influence the entries in /etc/apt/sources.list, but only if /"
-"var/lib/apt contains the indices files or not (and by that making the image "
-"smaller)."
+"$ lb config --mirror-binary http://mirror/debian/ \\\n"
+"            --mirror-binary-security http://mirror/debian-security/\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:55
-msgid "3~ Own repository"
+#: en/user_customization-packages.ssi:38
+msgid "3~ Additional repositories"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:57
+#: en/user_customization-packages.ssi:40
 msgid ""
 "To add more repositories (e.g. backports, experimental or custom packages, "
 "etc.), create #{config/chroot_sources/your-repository.{chroot,binary}}# "
-"files."
+"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:59
+#: en/user_customization-packages.ssi:42
 msgid ""
-"e.g. #{config/chroot_sources/live.chroot}# allows you to install packages "
-"from the debian live snapshot repository at live system build time (you have "
-"to add the packages in your package list):"
+"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:63
+#: en/user_customization-packages.ssi:46
 msgid "deb http://live.debian.net/ sid-snapshots main contrib non-free"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:67
+#: en/user_customization-packages.ssi:50
 msgid ""
 "If you add the line to #{config/chroot_sources/live.binary}# the repository "
-"will be added to your live-system's #{/etc/apt/sources.list}#."
+"will be added to your live system's #{/etc/apt/sources.list.d/}# directory."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:69
+#: en/user_customization-packages.ssi:52
 msgid "If such files exist, they will be picked up automatically."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:71
+#: en/user_customization-packages.ssi:54
 msgid ""
-"You can also put the gpg-key used to sign the repository into config/"
-"chroot_sources/your-repository.{binary,chroot}.gpg"
+"You can 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:73
+#: en/user_customization-packages.ssi:56
 msgid ""
 "Note: some preconfigured package repositories are available for easy "
 "selection through the --repository switch, e.g. for enabling live snapshots, "
@@ -314,100 +299,60 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:77
+#: en/user_customization-packages.ssi:60
 msgid "$ lb config --repository live.debian.net"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:81
-msgid "3~ Package installation"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:83
-msgid ""
-"You can elect to use either #{apt}# or #{aptitude}# when installing "
-"packages. Which utility is used is governed by the #{LB_APT}# variable in #"
-"{config/chroot}# or by the #{--apt}# argument to #{lb config}#:"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:85
-msgid ""
-"_* #{apt}#: Specifying a missing package causes package installation to "
-"fail, which may not be the desired behaviour. This is the default setting "
-"for building images for Lenny or later."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:87
-msgid ""
-"_* #{aptitude}#: Specifying a missing package causes package installation to "
-"succeed, which may not be the desired behaviour. This is the default setting "
-"for building images for Etch."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:89
+#: en/user_customization-packages.ssi:64
 msgid "2~ Installing additional packages"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:91
+#: en/user_customization-packages.ssi:66
 msgid ""
 "live-helper has a number of mechanisms for indicating that additional "
 "packages should be installed, including:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:93
-msgid "_* The #{LB_PACKAGES}# variable"
+#: en/user_customization-packages.ssi:68
+msgid "_* The #{--packages}# option"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:95
+#: en/user_customization-packages.ssi:70
 msgid "_* Package lists"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:97
+#: en/user_customization-packages.ssi:72
 msgid "_* Local packages (#{chroot_local-packages/}#)"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:99
+#: en/user_customization-packages.ssi:74
 msgid "_* Tasks"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:101
-msgid "3~ The #{LB_PACKAGES}# variable"
+#: en/user_customization-packages.ssi:76
+msgid "3~ The #{--packages}# option"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:103
+#: en/user_customization-packages.ssi:78
 msgid ""
-"To install additional packages, simply add them to the #{LB_PACKAGES}# "
-"variable in #{config/chroot}#. For example:"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:107
-msgid "LB_PACKAGES=\"package1 package2 package3 ... \""
+"To install additional packages, simply specify #{--packages}#. For example:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:111
-msgid "You can also specify initial values on the command line:"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:115
+#: en/user_customization-packages.ssi:82
 msgid "$ lb config --packages \"package1 package2 package3\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:119
+#: en/user_customization-packages.ssi:86
 msgid ""
 "The behaviour of live-build when specifying a package that does not exist is "
 "determined by your choice of APT utility. See package-installation for more "
@@ -415,12 +360,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:121
+#: en/user_customization-packages.ssi:88
 msgid "% FIXME: <xref linkend=\"package-installation\"/>"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:123
+#: en/user_customization-packages.ssi:90
 msgid ""
 "If you need to specify a large number of packages to be installed or you "
 "need flexibility regarding which packages to install, you should probably be "
@@ -428,17 +373,17 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:125
+#: en/user_customization-packages.ssi:92
 msgid "% FIXME: <xref linkend=\"package-lists\"/>"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:94
 msgid "3~ Package lists"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:129
+#: en/user_customization-packages.ssi:96
 msgid ""
 "Package lists are a powerful way of expressing which packages should be "
 "installed. live-build ships with a number of predefined package lists which "
@@ -447,37 +392,37 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:131
+#: en/user_customization-packages.ssi:98
 msgid "To specify one or more package list, you can use:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:135
+#: en/user_customization-packages.ssi:102
 msgid "$ lb config --packages-lists \"list1 list2 list3\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:139
+#: en/user_customization-packages.ssi:106
 msgid ""
 "Note: Package lists that are distributed with live-build reside in the #{/"
 "usr/share/live/build/lists}# directory."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:141
+#: en/user_customization-packages.ssi:108
 #, no-wrap
 msgid "*{Local packages lists}*\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:143
+#: en/user_customization-packages.ssi:110
 msgid ""
 "You may supplement the supplied lists using local package lists stored in #"
 "{config/chroot_local-packageslists}#."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:145
+#: en/user_customization-packages.ssi:112
 msgid ""
 "Package lists that exist in this directory need to have a #{.list}# suffix "
 "in order to be processed. Local packages lists always override package lists "
@@ -486,13 +431,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:147
+#: en/user_customization-packages.ssi:114
 #, no-wrap
 msgid "*{Local binary packages lists}*\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:116
 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 "
@@ -502,25 +447,25 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:151
+#: en/user_customization-packages.ssi:118
 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:153
+#: en/user_customization-packages.ssi:120
 #, no-wrap
 msgid "*{Extending a provided package list using includes}*\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:162
+#: en/user_customization-packages.ssi:129
 msgid "% code{ % % #include <gnome> % iceweasel % % }code"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:164
+#: en/user_customization-packages.ssi:131
 msgid ""
 "The package lists that are included with live-build make extensive use of "
 "includes. They are available to view in the #{/usr/share/live/build/lists}# "
@@ -528,75 +473,76 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:133
 #, no-wrap
 msgid "*{Using conditionals inside packages lists}*\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:172
+#: en/user_customization-packages.ssi:139
 msgid "#if ARCHITECTURE amd64 ia32-libs #endif"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:143
 msgid "or if #{LB_ARCHITECTURE}# is set to #{i386}# or #{amd64}#:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:182
+#: en/user_customization-packages.ssi:149
 msgid "#if ARCHITECTURE i386 amd64 memtest86+ #endif"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:186
+#: en/user_customization-packages.ssi:153
 msgid "or if #{LB_ARCHIVE_AREAS}# contains either #{contrib}# or #{non-free}#:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:192
+#: en/user_customization-packages.ssi:159
 msgid "#if ARCHIVE_AREAS contrib non-free vrms #endif"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:196
+#: en/user_customization-packages.ssi:163
 msgid "A conditional may surround an #{#include}# directive:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:202
+#: en/user_customization-packages.ssi:169
 msgid "#if ARCHITECTURE amd64 #include <gnome-full> #endif"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:206
+#: en/user_customization-packages.ssi:173
 msgid ""
 "Any live-build configuration variable that begins with #{LB_}# can be tested "
-"in this way."
+"in this way. (Generally, this means any #{lb config}# option uppercased and "
+"with dashes changed to underscores.)"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:208
+#: en/user_customization-packages.ssi:175
 msgid "The nesting of conditionals is not supported."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:210
+#: en/user_customization-packages.ssi:177
 msgid "3~ Tasks"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:212
+#: en/user_customization-packages.ssi:179
 msgid "%FIXME"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:214
+#: en/user_customization-packages.ssi:181
 msgid "2~ Installing modified or third-party packages"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:183
 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 "
@@ -607,7 +553,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:218
+#: en/user_customization-packages.ssi:185
 msgid ""
 "This section does not cover advice regarding building or maintaining "
 "modified packages. Joachim Breitner's 'How to fork privately' method from "
@@ -618,22 +564,22 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:220
+#: en/user_customization-packages.ssi:187
 msgid "There are two ways of installing modified custom packages:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:222
+#: en/user_customization-packages.ssi:189
 msgid "_* #{chroot_local-packages}#"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:224
+#: en/user_customization-packages.ssi:191
 msgid "_* Using a custom APT repository"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:226
+#: en/user_customization-packages.ssi:193
 msgid ""
 "The #{chroot_local-packages}# is simpler to achieve and useful for \"one-off"
 "\" customizations but has a number of drawbacks, whilst using a custom APT "
@@ -641,12 +587,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:228
+#: en/user_customization-packages.ssi:195
 msgid "3~ Using #{chroot_local-packages}# to install custom packages"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:230
+#: en/user_customization-packages.ssi:197
 msgid ""
 "To install a custom package, simply copy it to the #{config/chroot_local-"
 "packages}# directory. Packages that are inside this directory will be "
@@ -655,45 +601,45 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:232
+#: en/user_customization-packages.ssi:199
 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:234
+#: en/user_customization-packages.ssi:201
 msgid ""
 "Using #{chroot_local-packages}# for installation of custom packages has "
 "disadvantages:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:236
+#: en/user_customization-packages.ssi:203
 msgid "_* It is not possible to use secure APT"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:238
+#: en/user_customization-packages.ssi:205
 msgid ""
 "_* You must install all appropriate packages in the #{config/chroot_local-"
 "packages}# directory"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:240
+#: en/user_customization-packages.ssi:207
 msgid ""
 "_* It does not lend itself to storing Debian Live configurations in revision "
 "control"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:242
+#: en/user_customization-packages.ssi:209
 msgid "3~ Using an APT repository to install custom packages"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:244
+#: en/user_customization-packages.ssi:211
 msgid ""
 "Unlike using #{chroot_local-packages}#, when using a custom APT repository "
 "you must ensure that you specify the packages elsewhere. See lb-packages for "
@@ -701,12 +647,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:246
+#: en/user_customization-packages.ssi:213
 msgid "% FIXME: <xref linkend=\"lb-packages\"/>"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:248
+#: en/user_customization-packages.ssi:215
 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 "
@@ -714,12 +660,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:250
+#: en/user_customization-packages.ssi:217
 msgid "3~ Custom packages and APT"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:252
+#: en/user_customization-packages.ssi:219
 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 "
@@ -729,7 +675,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:254
+#: en/user_customization-packages.ssi:221
 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 "
@@ -739,19 +685,152 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:256
+#: en/user_customization-packages.ssi:223
 msgid "% FIXME: <xref linkend=\"apt-preferences\"/>"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:258
-msgid "3~ Altering APT preferences during Live system"
+#: en/user_customization-packages.ssi:225
+msgid "2~ Configuring APT at build time"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:227
+msgid ""
+"You can configure APT through a number of options applied only at build "
+"time. (APT configuration used in the running live system may be configured "
+"in the normal way for live system contents, that is, by including the "
+"appropriate configurations through #{config/chroot_local_includes/}#.) For a "
+"complete list, look for options starting with #{apt}# in the #{lb_config}# "
+"man page."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:229
+msgid "3~ Choosing apt or aptitude"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:231
+msgid ""
+"You can elect to use either #{apt}# or #{aptitude}# when installing packages "
+"at build time. Which utility is used is governed by the #{--apt}# argument "
+"to #{lb config}#. Choose the method implementing the preferred behaviour for "
+"package installation, the notable difference being how missing packages are "
+"handled."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:233
+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:235
+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:237
+msgid "3~ Using a proxy with APT"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:239
+msgid ""
+"One commonly required APT configuration is to deal with building an image "
+"behind a proxy. You may specify your APT proxy with the #{--apt-ftp-proxy}# "
+"or #{--apt-http-proxy}# options as needed, e.g."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:243
+msgid "lb config --apt-http-proxy http://proxy/"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:247
+msgid "3~ Tweaking APT to save space"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:249
+msgid ""
+"You may find yourself needing to save some space on the image media, in "
+"which case one or the other or both of the following options may be of "
+"interest."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:251
+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:255
+msgid "$ lb config --binary-indices false"
 msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:259
 msgid ""
-"Whilst it may seem unnecessary effort to create an APT repository to install "
-"custom packages, the infrastructure can be easily re-used at a later date to "
-"offer updates of the modified package."
+"This will not influence the entries in /etc/apt/sources.list, but merely "
+"whether /var/lib/apt contains the indices files or not. The tradeoff is that "
+"APT needs those indices in order to operate in the live system, so before "
+"performing #{apt-cache search}# or #{apt-get install}#, for instance, the "
+"user must #{apt-get update}# first to create those indices."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:261
+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:265
+msgid "$ lb config -apt-recommends false"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:269
+msgid ""
+"The tradeoff here is that recommended packages are defined as \"packages "
+"that would be found together with this one in all but unusual installations"
+"\" (Debian Policy Manual, 7.2). This may lead to some packages that you "
+"actually need being omitted, so we suggest you review the difference this "
+"makes to your packages list (see the #{binary.packages}# file generated by #"
+"{lb build}#) and re-include in your list any missing packages that you still "
+"want installed."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:271
+msgid "3~ Passing options to apt or aptitude"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:273
+msgid ""
+"If there is not an #{lb config}# option to alter APT's behaviour in the way "
+"you need, use #{--apt-options}# or #{--aptitude-options}# to pass any "
+"options through to your configured APT tool. See the man pages for #{apt}# "
+"and #{aptitude}# for details."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:275
+msgid "3~ APT pinning"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:277
+msgid "% FIXME: needs content"
 msgstr ""
diff --git a/manual/po/ro/live-manual.ssm.po b/manual/po/ro/live-manual.ssm.po
index dee9c23..81e1ebe 100644
--- a/manual/po/ro/live-manual.ssm.po
+++ b/manual/po/ro/live-manual.ssm.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-11-15 08:36-0400\n"
+"POT-Creation-Date: 2010-11-21 13:45-0400\n"
 "PO-Revision-Date: 2010-10-23 00:04+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -46,7 +46,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 "@date:\n"
-" :published: 2010-11-15\n"
+" :published: 2010-11-21\n"
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/po/ro/user_customization-packages.ssi.po b/manual/po/ro/user_customization-packages.ssi.po
index 6d90465..da74ccc 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-11-12 16:21-0400\n"
+"POT-Creation-Date: 2010-11-21 13:45-0400\n"
 "PO-Revision-Date: 2010-10-22 08:58-0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -54,16 +54,17 @@ msgstr ""
 #: en/user_customization-internationalization.ssi:18
 #: en/user_customization-internationalization.ssi:26
 #: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:26
-#: en/user_customization-packages.ssi:38 en/user_customization-packages.ssi:47
-#: en/user_customization-packages.ssi:61 en/user_customization-packages.ssi:75
-#: en/user_customization-packages.ssi:105
-#: en/user_customization-packages.ssi:113
-#: en/user_customization-packages.ssi:133
-#: en/user_customization-packages.ssi:168
-#: en/user_customization-packages.ssi:178
-#: en/user_customization-packages.ssi:188
-#: en/user_customization-packages.ssi:198 en/user_examples.ssi:24
+#: en/user_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:80
+#: en/user_customization-packages.ssi:100
+#: en/user_customization-packages.ssi:135
+#: en/user_customization-packages.ssi:145
+#: en/user_customization-packages.ssi:155
+#: en/user_customization-packages.ssi:165
+#: en/user_customization-packages.ssi:241
+#: en/user_customization-packages.ssi:253
+#: en/user_customization-packages.ssi:263 en/user_examples.ssi:24
 #: en/user_installation.ssi:38 en/user_installation.ssi:46
 #: en/user_installation.ssi:56 en/user_installation.ssi:64
 #: en/user_installation.ssi:76 en/user_installation.ssi:84
@@ -112,16 +113,17 @@ 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:18 en/user_customization-packages.ssi:30
-#: en/user_customization-packages.ssi:43 en/user_customization-packages.ssi:51
-#: en/user_customization-packages.ssi:65 en/user_customization-packages.ssi:79
-#: en/user_customization-packages.ssi:109
-#: en/user_customization-packages.ssi:117
-#: en/user_customization-packages.ssi:137
-#: en/user_customization-packages.ssi:174
-#: en/user_customization-packages.ssi:184
-#: en/user_customization-packages.ssi:194
-#: en/user_customization-packages.ssi:204 en/user_examples.ssi:33
+#: en/user_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:84
+#: en/user_customization-packages.ssi:104
+#: en/user_customization-packages.ssi:141
+#: en/user_customization-packages.ssi:151
+#: en/user_customization-packages.ssi:161
+#: en/user_customization-packages.ssi:171
+#: en/user_customization-packages.ssi:245
+#: en/user_customization-packages.ssi:257
+#: en/user_customization-packages.ssi:267 en/user_examples.ssi:33
 #: en/user_installation.ssi:42 en/user_installation.ssi:50
 #: en/user_installation.ssi:60 en/user_installation.ssi:72
 #: en/user_installation.ssi:80 en/user_installation.ssi:88
@@ -134,7 +136,7 @@ msgid "}code"
 msgstr "}code"
 
 #. type: Plain text
-#: en/user_basics.ssi:218 en/user_customization-packages.ssi:155
+#: en/user_basics.ssi:218 en/user_customization-packages.ssi:122
 msgid "% FIXME"
 msgstr ""
 
@@ -162,7 +164,7 @@ msgid ""
 "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, "
+"or need to control which versions of packages are installed via APT pinning, "
 "to name a few possibilities."
 msgstr ""
 
@@ -173,141 +175,124 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:10
-msgid "3~ Debian repositories"
+msgid "3~ Distribution mirrors"
 msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:12
-msgid "To set a local mirror to be used to at build time:"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:16
-msgid "$ lb config --mirror-bootstrap http://localhost/debian/"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:20
 msgid ""
-"The chroot repository, specified by --mirror-chroot, defaults to the same as "
-"--mirror-bootstrap."
+"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:22
-msgid ""
-"Each of the --mirror-* options governs which repository is used at various "
-"stages of the build. Recall from {Stages of the build}#stages-of-the-build "
-"that the *bootstrap* stage is when the chroot is initially populated by "
-"debootstrap with a minimal system, and the *chroot* stage is when the chroot "
-"used to construct the live system's filesystem is built. Thus, the "
-"corresponding mirror switches are used for those stages, and later, when the "
-"binary image is constructed, the --mirror-binary value is used, superceding "
-"any earlier repositories."
+#: en/user_customization-packages.ssi:14
+msgid "4~ Distribution mirrors used at build time"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:24
-msgid "The generic mirror is added to the live system's /etc/apt/sources.list."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:28
-msgid "$ lb config --mirror-binary http://ftp.debian.org/debian/"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:32
-msgid ""
-"Note: It is not used for building the live system but to install new "
-"software while using the live system."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:34
+#: en/user_customization-packages.ssi:16
 msgid ""
-"It can be disabled by setting the binary mirror to the same value as the "
-"chroot mirror."
+"To set the distribution mirrors used at build time to point at a local "
+"mirror, it is sufficient to set --mirror-bootstrap and --mirror-chroot-"
+"security as follows."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:36
+#: en/user_customization-packages.ssi:21
+#, no-wrap
 msgid ""
-"Note: the same applies for mirror chroot security and mirror binary security"
+"$ lb config --mirror-bootstrap http://localhost/debian/ \\\n"
+"            --mirror-chroot-security http://localhost/debian-security/\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:41
+#: en/user_customization-packages.ssi:25
 msgid ""
-"$ lb config --mirror-chroot-security {URL} $ lb config --mirror-binary-"
-"security {URL}"
+"The chroot mirror, specified by --mirror-chroot, defaults to the --mirror-"
+"bootstrap value."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:45
-msgid "If you don't want to include apt indices, you can skip those with:"
+#: en/user_customization-packages.ssi:27
+msgid "4~ Distribution mirrors used at run time"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:49
-msgid "$ lb config --binary-indices false"
+#: en/user_customization-packages.ssi:29
+msgid ""
+"The --mirror-binary* options govern the distribution mirrors placed in the "
+"binary image. These may be used to install additional packages while running "
+"the live system. The default values employ cdn.debian.net, a service that "
+"chooses a geographically close mirror based on the user's IP number. This is "
+"a suitable choice when you cannot predict which mirror will be best for all "
+"of your users. Or you may specify your own values as shown in the example "
+"below. An image built from this configuration would only be suitable for "
+"users on a network where 'mirror' is reachable."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:53
+#: en/user_customization-packages.ssi:34
+#, no-wrap
 msgid ""
-"This will not influence the entries in /etc/apt/sources.list, but only if /"
-"var/lib/apt contains the indices files or not (and by that making the image "
-"smaller)."
+"$ lb config --mirror-binary http://mirror/debian/ \\\n"
+"            --mirror-binary-security http://mirror/debian-security/\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:55
-msgid "3~ Own repository"
+#: en/user_customization-packages.ssi:38
+msgid "3~ Additional repositories"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:57
+#: en/user_customization-packages.ssi:40
 msgid ""
 "To add more repositories (e.g. backports, experimental or custom packages, "
 "etc.), create #{config/chroot_sources/your-repository.{chroot,binary}}# "
-"files."
+"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:59
+#: en/user_customization-packages.ssi:42
 msgid ""
-"e.g. #{config/chroot_sources/live.chroot}# allows you to install packages "
-"from the debian live snapshot repository at live system build time (you have "
-"to add the packages in your package list):"
+"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:63
+#: en/user_customization-packages.ssi:46
 msgid "deb http://live.debian.net/ sid-snapshots main contrib non-free"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:67
+#: en/user_customization-packages.ssi:50
 msgid ""
 "If you add the line to #{config/chroot_sources/live.binary}# the repository "
-"will be added to your live-system's #{/etc/apt/sources.list}#."
+"will be added to your live system's #{/etc/apt/sources.list.d/}# directory."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:69
+#: en/user_customization-packages.ssi:52
 msgid "If such files exist, they will be picked up automatically."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:71
+#: en/user_customization-packages.ssi:54
 msgid ""
-"You can also put the gpg-key used to sign the repository into config/"
-"chroot_sources/your-repository.{binary,chroot}.gpg"
+"You can 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:73
+#: en/user_customization-packages.ssi:56
 msgid ""
 "Note: some preconfigured package repositories are available for easy "
 "selection through the --repository switch, e.g. for enabling live snapshots, "
@@ -315,100 +300,60 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:77
+#: en/user_customization-packages.ssi:60
 msgid "$ lb config --repository live.debian.net"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:81
-msgid "3~ Package installation"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:83
-msgid ""
-"You can elect to use either #{apt}# or #{aptitude}# when installing "
-"packages. Which utility is used is governed by the #{LB_APT}# variable in #"
-"{config/chroot}# or by the #{--apt}# argument to #{lb config}#:"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:85
-msgid ""
-"_* #{apt}#: Specifying a missing package causes package installation to "
-"fail, which may not be the desired behaviour. This is the default setting "
-"for building images for Lenny or later."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:87
-msgid ""
-"_* #{aptitude}#: Specifying a missing package causes package installation to "
-"succeed, which may not be the desired behaviour. This is the default setting "
-"for building images for Etch."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:89
+#: en/user_customization-packages.ssi:64
 msgid "2~ Installing additional packages"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:91
+#: en/user_customization-packages.ssi:66
 msgid ""
 "live-helper has a number of mechanisms for indicating that additional "
 "packages should be installed, including:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:93
-msgid "_* The #{LB_PACKAGES}# variable"
+#: en/user_customization-packages.ssi:68
+msgid "_* The #{--packages}# option"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:95
+#: en/user_customization-packages.ssi:70
 msgid "_* Package lists"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:97
+#: en/user_customization-packages.ssi:72
 msgid "_* Local packages (#{chroot_local-packages/}#)"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:99
+#: en/user_customization-packages.ssi:74
 msgid "_* Tasks"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:101
-msgid "3~ The #{LB_PACKAGES}# variable"
+#: en/user_customization-packages.ssi:76
+msgid "3~ The #{--packages}# option"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:103
+#: en/user_customization-packages.ssi:78
 msgid ""
-"To install additional packages, simply add them to the #{LB_PACKAGES}# "
-"variable in #{config/chroot}#. For example:"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:107
-msgid "LB_PACKAGES=\"package1 package2 package3 ... \""
+"To install additional packages, simply specify #{--packages}#. For example:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:111
-msgid "You can also specify initial values on the command line:"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:115
+#: en/user_customization-packages.ssi:82
 msgid "$ lb config --packages \"package1 package2 package3\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:119
+#: en/user_customization-packages.ssi:86
 msgid ""
 "The behaviour of live-build when specifying a package that does not exist is "
 "determined by your choice of APT utility. See package-installation for more "
@@ -416,12 +361,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:121
+#: en/user_customization-packages.ssi:88
 msgid "% FIXME: <xref linkend=\"package-installation\"/>"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:123
+#: en/user_customization-packages.ssi:90
 msgid ""
 "If you need to specify a large number of packages to be installed or you "
 "need flexibility regarding which packages to install, you should probably be "
@@ -429,17 +374,17 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:125
+#: en/user_customization-packages.ssi:92
 msgid "% FIXME: <xref linkend=\"package-lists\"/>"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:94
 msgid "3~ Package lists"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:129
+#: en/user_customization-packages.ssi:96
 msgid ""
 "Package lists are a powerful way of expressing which packages should be "
 "installed. live-build ships with a number of predefined package lists which "
@@ -448,37 +393,37 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:131
+#: en/user_customization-packages.ssi:98
 msgid "To specify one or more package list, you can use:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:135
+#: en/user_customization-packages.ssi:102
 msgid "$ lb config --packages-lists \"list1 list2 list3\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:139
+#: en/user_customization-packages.ssi:106
 msgid ""
 "Note: Package lists that are distributed with live-build reside in the #{/"
 "usr/share/live/build/lists}# directory."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:141
+#: en/user_customization-packages.ssi:108
 #, no-wrap
 msgid "*{Local packages lists}*\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:143
+#: en/user_customization-packages.ssi:110
 msgid ""
 "You may supplement the supplied lists using local package lists stored in #"
 "{config/chroot_local-packageslists}#."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:145
+#: en/user_customization-packages.ssi:112
 msgid ""
 "Package lists that exist in this directory need to have a #{.list}# suffix "
 "in order to be processed. Local packages lists always override package lists "
@@ -487,13 +432,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:147
+#: en/user_customization-packages.ssi:114
 #, no-wrap
 msgid "*{Local binary packages lists}*\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:116
 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 "
@@ -503,25 +448,25 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:151
+#: en/user_customization-packages.ssi:118
 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:153
+#: en/user_customization-packages.ssi:120
 #, no-wrap
 msgid "*{Extending a provided package list using includes}*\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:162
+#: en/user_customization-packages.ssi:129
 msgid "% code{ % % #include <gnome> % iceweasel % % }code"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:164
+#: en/user_customization-packages.ssi:131
 msgid ""
 "The package lists that are included with live-build make extensive use of "
 "includes. They are available to view in the #{/usr/share/live/build/lists}# "
@@ -529,75 +474,76 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:133
 #, no-wrap
 msgid "*{Using conditionals inside packages lists}*\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:172
+#: en/user_customization-packages.ssi:139
 msgid "#if ARCHITECTURE amd64 ia32-libs #endif"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:143
 msgid "or if #{LB_ARCHITECTURE}# is set to #{i386}# or #{amd64}#:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:182
+#: en/user_customization-packages.ssi:149
 msgid "#if ARCHITECTURE i386 amd64 memtest86+ #endif"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:186
+#: en/user_customization-packages.ssi:153
 msgid "or if #{LB_ARCHIVE_AREAS}# contains either #{contrib}# or #{non-free}#:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:192
+#: en/user_customization-packages.ssi:159
 msgid "#if ARCHIVE_AREAS contrib non-free vrms #endif"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:196
+#: en/user_customization-packages.ssi:163
 msgid "A conditional may surround an #{#include}# directive:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:202
+#: en/user_customization-packages.ssi:169
 msgid "#if ARCHITECTURE amd64 #include <gnome-full> #endif"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:206
+#: en/user_customization-packages.ssi:173
 msgid ""
 "Any live-build configuration variable that begins with #{LB_}# can be tested "
-"in this way."
+"in this way. (Generally, this means any #{lb config}# option uppercased and "
+"with dashes changed to underscores.)"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:208
+#: en/user_customization-packages.ssi:175
 msgid "The nesting of conditionals is not supported."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:210
+#: en/user_customization-packages.ssi:177
 msgid "3~ Tasks"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:212
+#: en/user_customization-packages.ssi:179
 msgid "%FIXME"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:214
+#: en/user_customization-packages.ssi:181
 msgid "2~ Installing modified or third-party packages"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:183
 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 "
@@ -608,7 +554,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:218
+#: en/user_customization-packages.ssi:185
 msgid ""
 "This section does not cover advice regarding building or maintaining "
 "modified packages. Joachim Breitner's 'How to fork privately' method from "
@@ -619,22 +565,22 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:220
+#: en/user_customization-packages.ssi:187
 msgid "There are two ways of installing modified custom packages:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:222
+#: en/user_customization-packages.ssi:189
 msgid "_* #{chroot_local-packages}#"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:224
+#: en/user_customization-packages.ssi:191
 msgid "_* Using a custom APT repository"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:226
+#: en/user_customization-packages.ssi:193
 msgid ""
 "The #{chroot_local-packages}# is simpler to achieve and useful for \"one-off"
 "\" customizations but has a number of drawbacks, whilst using a custom APT "
@@ -642,12 +588,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:228
+#: en/user_customization-packages.ssi:195
 msgid "3~ Using #{chroot_local-packages}# to install custom packages"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:230
+#: en/user_customization-packages.ssi:197
 msgid ""
 "To install a custom package, simply copy it to the #{config/chroot_local-"
 "packages}# directory. Packages that are inside this directory will be "
@@ -656,45 +602,45 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:232
+#: en/user_customization-packages.ssi:199
 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:234
+#: en/user_customization-packages.ssi:201
 msgid ""
 "Using #{chroot_local-packages}# for installation of custom packages has "
 "disadvantages:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:236
+#: en/user_customization-packages.ssi:203
 msgid "_* It is not possible to use secure APT"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:238
+#: en/user_customization-packages.ssi:205
 msgid ""
 "_* You must install all appropriate packages in the #{config/chroot_local-"
 "packages}# directory"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:240
+#: en/user_customization-packages.ssi:207
 msgid ""
 "_* It does not lend itself to storing Debian Live configurations in revision "
 "control"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:242
+#: en/user_customization-packages.ssi:209
 msgid "3~ Using an APT repository to install custom packages"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:244
+#: en/user_customization-packages.ssi:211
 msgid ""
 "Unlike using #{chroot_local-packages}#, when using a custom APT repository "
 "you must ensure that you specify the packages elsewhere. See lb-packages for "
@@ -702,12 +648,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:246
+#: en/user_customization-packages.ssi:213
 msgid "% FIXME: <xref linkend=\"lb-packages\"/>"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:248
+#: en/user_customization-packages.ssi:215
 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 "
@@ -715,12 +661,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:250
+#: en/user_customization-packages.ssi:217
 msgid "3~ Custom packages and APT"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:252
+#: en/user_customization-packages.ssi:219
 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 "
@@ -730,7 +676,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:254
+#: en/user_customization-packages.ssi:221
 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 "
@@ -740,19 +686,152 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:256
+#: en/user_customization-packages.ssi:223
 msgid "% FIXME: <xref linkend=\"apt-preferences\"/>"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:258
-msgid "3~ Altering APT preferences during Live system"
+#: en/user_customization-packages.ssi:225
+msgid "2~ Configuring APT at build time"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:227
+msgid ""
+"You can configure APT through a number of options applied only at build "
+"time. (APT configuration used in the running live system may be configured "
+"in the normal way for live system contents, that is, by including the "
+"appropriate configurations through #{config/chroot_local_includes/}#.) For a "
+"complete list, look for options starting with #{apt}# in the #{lb_config}# "
+"man page."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:229
+msgid "3~ Choosing apt or aptitude"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:231
+msgid ""
+"You can elect to use either #{apt}# or #{aptitude}# when installing packages "
+"at build time. Which utility is used is governed by the #{--apt}# argument "
+"to #{lb config}#. Choose the method implementing the preferred behaviour for "
+"package installation, the notable difference being how missing packages are "
+"handled."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:233
+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:235
+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:237
+msgid "3~ Using a proxy with APT"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:239
+msgid ""
+"One commonly required APT configuration is to deal with building an image "
+"behind a proxy. You may specify your APT proxy with the #{--apt-ftp-proxy}# "
+"or #{--apt-http-proxy}# options as needed, e.g."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:243
+msgid "lb config --apt-http-proxy http://proxy/"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:247
+msgid "3~ Tweaking APT to save space"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:249
+msgid ""
+"You may find yourself needing to save some space on the image media, in "
+"which case one or the other or both of the following options may be of "
+"interest."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:251
+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:255
+msgid "$ lb config --binary-indices false"
 msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:259
 msgid ""
-"Whilst it may seem unnecessary effort to create an APT repository to install "
-"custom packages, the infrastructure can be easily re-used at a later date to "
-"offer updates of the modified package."
+"This will not influence the entries in /etc/apt/sources.list, but merely "
+"whether /var/lib/apt contains the indices files or not. The tradeoff is that "
+"APT needs those indices in order to operate in the live system, so before "
+"performing #{apt-cache search}# or #{apt-get install}#, for instance, the "
+"user must #{apt-get update}# first to create those indices."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:261
+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:265
+msgid "$ lb config -apt-recommends false"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:269
+msgid ""
+"The tradeoff here is that recommended packages are defined as \"packages "
+"that would be found together with this one in all but unusual installations"
+"\" (Debian Policy Manual, 7.2). This may lead to some packages that you "
+"actually need being omitted, so we suggest you review the difference this "
+"makes to your packages list (see the #{binary.packages}# file generated by #"
+"{lb build}#) and re-include in your list any missing packages that you still "
+"want installed."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:271
+msgid "3~ Passing options to apt or aptitude"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:273
+msgid ""
+"If there is not an #{lb config}# option to alter APT's behaviour in the way "
+"you need, use #{--apt-options}# or #{--aptitude-options}# to pass any "
+"options through to your configured APT tool. See the man pages for #{apt}# "
+"and #{aptitude}# for details."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:275
+msgid "3~ APT pinning"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:277
+msgid "% FIXME: needs content"
 msgstr ""
diff --git a/manual/pot/live-manual.ssm.pot b/manual/pot/live-manual.ssm.pot
index cdbac2d..620d7a0 100644
--- a/manual/pot/live-manual.ssm.pot
+++ b/manual/pot/live-manual.ssm.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-11-15 08:36-0400\n"
+"POT-Creation-Date: 2010-11-21 13:45-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"
@@ -45,7 +45,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 "@date:\n"
-" :published: 2010-11-15\n"
+" :published: 2010-11-21\n"
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/pot/user_customization-packages.ssi.pot b/manual/pot/user_customization-packages.ssi.pot
index 037382e..e03bd6e 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-11-12 16:21-0400\n"
+"POT-Creation-Date: 2010-11-21 13:45-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"
@@ -53,16 +53,17 @@ msgstr ""
 #: en/user_customization-internationalization.ssi:18
 #: en/user_customization-internationalization.ssi:26
 #: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:26
-#: en/user_customization-packages.ssi:38 en/user_customization-packages.ssi:47
-#: en/user_customization-packages.ssi:61 en/user_customization-packages.ssi:75
-#: en/user_customization-packages.ssi:105
-#: en/user_customization-packages.ssi:113
-#: en/user_customization-packages.ssi:133
-#: en/user_customization-packages.ssi:168
-#: en/user_customization-packages.ssi:178
-#: en/user_customization-packages.ssi:188
-#: en/user_customization-packages.ssi:198 en/user_examples.ssi:24
+#: en/user_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:80
+#: en/user_customization-packages.ssi:100
+#: en/user_customization-packages.ssi:135
+#: en/user_customization-packages.ssi:145
+#: en/user_customization-packages.ssi:155
+#: en/user_customization-packages.ssi:165
+#: en/user_customization-packages.ssi:241
+#: en/user_customization-packages.ssi:253
+#: en/user_customization-packages.ssi:263 en/user_examples.ssi:24
 #: en/user_installation.ssi:38 en/user_installation.ssi:46
 #: en/user_installation.ssi:56 en/user_installation.ssi:64
 #: en/user_installation.ssi:76 en/user_installation.ssi:84
@@ -111,16 +112,17 @@ msgstr ""
 #: en/user_customization-internationalization.ssi:22
 #: en/user_customization-internationalization.ssi:30
 #: en/user_customization-internationalization.ssi:42
-#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:30
-#: en/user_customization-packages.ssi:43 en/user_customization-packages.ssi:51
-#: en/user_customization-packages.ssi:65 en/user_customization-packages.ssi:79
-#: en/user_customization-packages.ssi:109
-#: en/user_customization-packages.ssi:117
-#: en/user_customization-packages.ssi:137
-#: en/user_customization-packages.ssi:174
-#: en/user_customization-packages.ssi:184
-#: en/user_customization-packages.ssi:194
-#: en/user_customization-packages.ssi:204 en/user_examples.ssi:33
+#: en/user_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:84
+#: en/user_customization-packages.ssi:104
+#: en/user_customization-packages.ssi:141
+#: en/user_customization-packages.ssi:151
+#: en/user_customization-packages.ssi:161
+#: en/user_customization-packages.ssi:171
+#: en/user_customization-packages.ssi:245
+#: en/user_customization-packages.ssi:257
+#: en/user_customization-packages.ssi:267 en/user_examples.ssi:33
 #: en/user_installation.ssi:42 en/user_installation.ssi:50
 #: en/user_installation.ssi:60 en/user_installation.ssi:72
 #: en/user_installation.ssi:80 en/user_installation.ssi:88
@@ -133,7 +135,7 @@ msgid "}code"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:218 en/user_customization-packages.ssi:155
+#: en/user_basics.ssi:218 en/user_customization-packages.ssi:122
 msgid "% FIXME"
 msgstr ""
 
@@ -161,7 +163,7 @@ msgid ""
 "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, "
+"or need to control which versions of packages are installed via APT pinning, "
 "to name a few possibilities."
 msgstr ""
 
@@ -172,141 +174,124 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:10
-msgid "3~ Debian repositories"
+msgid "3~ Distribution mirrors"
 msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:12
-msgid "To set a local mirror to be used to at build time:"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:16
-msgid "$ lb config --mirror-bootstrap http://localhost/debian/"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:20
 msgid ""
-"The chroot repository, specified by --mirror-chroot, defaults to the same as "
-"--mirror-bootstrap."
+"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:22
-msgid ""
-"Each of the --mirror-* options governs which repository is used at various "
-"stages of the build. Recall from {Stages of the build}#stages-of-the-build "
-"that the *bootstrap* stage is when the chroot is initially populated by "
-"debootstrap with a minimal system, and the *chroot* stage is when the chroot "
-"used to construct the live system's filesystem is built. Thus, the "
-"corresponding mirror switches are used for those stages, and later, when the "
-"binary image is constructed, the --mirror-binary value is used, superceding "
-"any earlier repositories."
+#: en/user_customization-packages.ssi:14
+msgid "4~ Distribution mirrors used at build time"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:24
-msgid "The generic mirror is added to the live system's /etc/apt/sources.list."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:28
-msgid "$ lb config --mirror-binary http://ftp.debian.org/debian/"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:32
-msgid ""
-"Note: It is not used for building the live system but to install new "
-"software while using the live system."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:34
+#: en/user_customization-packages.ssi:16
 msgid ""
-"It can be disabled by setting the binary mirror to the same value as the "
-"chroot mirror."
+"To set the distribution mirrors used at build time to point at a local "
+"mirror, it is sufficient to set --mirror-bootstrap and --mirror-chroot-"
+"security as follows."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:36
+#: en/user_customization-packages.ssi:21
+#, no-wrap
 msgid ""
-"Note: the same applies for mirror chroot security and mirror binary security"
+"$ lb config --mirror-bootstrap http://localhost/debian/ \\\n"
+"            --mirror-chroot-security http://localhost/debian-security/\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:41
+#: en/user_customization-packages.ssi:25
 msgid ""
-"$ lb config --mirror-chroot-security {URL} $ lb config --mirror-binary-"
-"security {URL}"
+"The chroot mirror, specified by --mirror-chroot, defaults to the --mirror-"
+"bootstrap value."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:45
-msgid "If you don't want to include apt indices, you can skip those with:"
+#: en/user_customization-packages.ssi:27
+msgid "4~ Distribution mirrors used at run time"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:49
-msgid "$ lb config --binary-indices false"
+#: en/user_customization-packages.ssi:29
+msgid ""
+"The --mirror-binary* options govern the distribution mirrors placed in the "
+"binary image. These may be used to install additional packages while running "
+"the live system. The default values employ cdn.debian.net, a service that "
+"chooses a geographically close mirror based on the user's IP number. This is "
+"a suitable choice when you cannot predict which mirror will be best for all "
+"of your users. Or you may specify your own values as shown in the example "
+"below. An image built from this configuration would only be suitable for "
+"users on a network where 'mirror' is reachable."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:53
+#: en/user_customization-packages.ssi:34
+#, no-wrap
 msgid ""
-"This will not influence the entries in /etc/apt/sources.list, but only if /"
-"var/lib/apt contains the indices files or not (and by that making the image "
-"smaller)."
+"$ lb config --mirror-binary http://mirror/debian/ \\\n"
+"            --mirror-binary-security http://mirror/debian-security/\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:55
-msgid "3~ Own repository"
+#: en/user_customization-packages.ssi:38
+msgid "3~ Additional repositories"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:57
+#: en/user_customization-packages.ssi:40
 msgid ""
 "To add more repositories (e.g. backports, experimental or custom packages, "
 "etc.), create #{config/chroot_sources/your-repository.{chroot,binary}}# "
-"files."
+"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:59
+#: en/user_customization-packages.ssi:42
 msgid ""
-"e.g. #{config/chroot_sources/live.chroot}# allows you to install packages "
-"from the debian live snapshot repository at live system build time (you have "
-"to add the packages in your package list):"
+"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:63
+#: en/user_customization-packages.ssi:46
 msgid "deb http://live.debian.net/ sid-snapshots main contrib non-free"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:67
+#: en/user_customization-packages.ssi:50
 msgid ""
 "If you add the line to #{config/chroot_sources/live.binary}# the repository "
-"will be added to your live-system's #{/etc/apt/sources.list}#."
+"will be added to your live system's #{/etc/apt/sources.list.d/}# directory."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:69
+#: en/user_customization-packages.ssi:52
 msgid "If such files exist, they will be picked up automatically."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:71
+#: en/user_customization-packages.ssi:54
 msgid ""
-"You can also put the gpg-key used to sign the repository into config/"
-"chroot_sources/your-repository.{binary,chroot}.gpg"
+"You can 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:73
+#: en/user_customization-packages.ssi:56
 msgid ""
 "Note: some preconfigured package repositories are available for easy "
 "selection through the --repository switch, e.g. for enabling live snapshots, "
@@ -314,100 +299,60 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:77
+#: en/user_customization-packages.ssi:60
 msgid "$ lb config --repository live.debian.net"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:81
-msgid "3~ Package installation"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:83
-msgid ""
-"You can elect to use either #{apt}# or #{aptitude}# when installing "
-"packages. Which utility is used is governed by the #{LB_APT}# variable in #"
-"{config/chroot}# or by the #{--apt}# argument to #{lb config}#:"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:85
-msgid ""
-"_* #{apt}#: Specifying a missing package causes package installation to "
-"fail, which may not be the desired behaviour. This is the default setting "
-"for building images for Lenny or later."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:87
-msgid ""
-"_* #{aptitude}#: Specifying a missing package causes package installation to "
-"succeed, which may not be the desired behaviour. This is the default setting "
-"for building images for Etch."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:89
+#: en/user_customization-packages.ssi:64
 msgid "2~ Installing additional packages"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:91
+#: en/user_customization-packages.ssi:66
 msgid ""
 "live-helper has a number of mechanisms for indicating that additional "
 "packages should be installed, including:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:93
-msgid "_* The #{LB_PACKAGES}# variable"
+#: en/user_customization-packages.ssi:68
+msgid "_* The #{--packages}# option"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:95
+#: en/user_customization-packages.ssi:70
 msgid "_* Package lists"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:97
+#: en/user_customization-packages.ssi:72
 msgid "_* Local packages (#{chroot_local-packages/}#)"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:99
+#: en/user_customization-packages.ssi:74
 msgid "_* Tasks"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:101
-msgid "3~ The #{LB_PACKAGES}# variable"
+#: en/user_customization-packages.ssi:76
+msgid "3~ The #{--packages}# option"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:103
+#: en/user_customization-packages.ssi:78
 msgid ""
-"To install additional packages, simply add them to the #{LB_PACKAGES}# "
-"variable in #{config/chroot}#. For example:"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:107
-msgid "LB_PACKAGES=\"package1 package2 package3 ... \""
+"To install additional packages, simply specify #{--packages}#. For example:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:111
-msgid "You can also specify initial values on the command line:"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:115
+#: en/user_customization-packages.ssi:82
 msgid "$ lb config --packages \"package1 package2 package3\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:119
+#: en/user_customization-packages.ssi:86
 msgid ""
 "The behaviour of live-build when specifying a package that does not exist is "
 "determined by your choice of APT utility. See package-installation for more "
@@ -415,12 +360,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:121
+#: en/user_customization-packages.ssi:88
 msgid "% FIXME: <xref linkend=\"package-installation\"/>"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:123
+#: en/user_customization-packages.ssi:90
 msgid ""
 "If you need to specify a large number of packages to be installed or you "
 "need flexibility regarding which packages to install, you should probably be "
@@ -428,17 +373,17 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:125
+#: en/user_customization-packages.ssi:92
 msgid "% FIXME: <xref linkend=\"package-lists\"/>"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:94
 msgid "3~ Package lists"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:129
+#: en/user_customization-packages.ssi:96
 msgid ""
 "Package lists are a powerful way of expressing which packages should be "
 "installed. live-build ships with a number of predefined package lists which "
@@ -447,37 +392,37 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:131
+#: en/user_customization-packages.ssi:98
 msgid "To specify one or more package list, you can use:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:135
+#: en/user_customization-packages.ssi:102
 msgid "$ lb config --packages-lists \"list1 list2 list3\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:139
+#: en/user_customization-packages.ssi:106
 msgid ""
 "Note: Package lists that are distributed with live-build reside in the #{/"
 "usr/share/live/build/lists}# directory."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:141
+#: en/user_customization-packages.ssi:108
 #, no-wrap
 msgid "*{Local packages lists}*\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:143
+#: en/user_customization-packages.ssi:110
 msgid ""
 "You may supplement the supplied lists using local package lists stored in #"
 "{config/chroot_local-packageslists}#."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:145
+#: en/user_customization-packages.ssi:112
 msgid ""
 "Package lists that exist in this directory need to have a #{.list}# suffix "
 "in order to be processed. Local packages lists always override package lists "
@@ -486,13 +431,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:147
+#: en/user_customization-packages.ssi:114
 #, no-wrap
 msgid "*{Local binary packages lists}*\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:116
 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 "
@@ -502,25 +447,25 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:151
+#: en/user_customization-packages.ssi:118
 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:153
+#: en/user_customization-packages.ssi:120
 #, no-wrap
 msgid "*{Extending a provided package list using includes}*\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:162
+#: en/user_customization-packages.ssi:129
 msgid "% code{ % % #include <gnome> % iceweasel % % }code"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:164
+#: en/user_customization-packages.ssi:131
 msgid ""
 "The package lists that are included with live-build make extensive use of "
 "includes. They are available to view in the #{/usr/share/live/build/lists}# "
@@ -528,75 +473,76 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:133
 #, no-wrap
 msgid "*{Using conditionals inside packages lists}*\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:172
+#: en/user_customization-packages.ssi:139
 msgid "#if ARCHITECTURE amd64 ia32-libs #endif"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:143
 msgid "or if #{LB_ARCHITECTURE}# is set to #{i386}# or #{amd64}#:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:182
+#: en/user_customization-packages.ssi:149
 msgid "#if ARCHITECTURE i386 amd64 memtest86+ #endif"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:186
+#: en/user_customization-packages.ssi:153
 msgid "or if #{LB_ARCHIVE_AREAS}# contains either #{contrib}# or #{non-free}#:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:192
+#: en/user_customization-packages.ssi:159
 msgid "#if ARCHIVE_AREAS contrib non-free vrms #endif"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:196
+#: en/user_customization-packages.ssi:163
 msgid "A conditional may surround an #{#include}# directive:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:202
+#: en/user_customization-packages.ssi:169
 msgid "#if ARCHITECTURE amd64 #include <gnome-full> #endif"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:206
+#: en/user_customization-packages.ssi:173
 msgid ""
 "Any live-build configuration variable that begins with #{LB_}# can be tested "
-"in this way."
+"in this way. (Generally, this means any #{lb config}# option uppercased and "
+"with dashes changed to underscores.)"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:208
+#: en/user_customization-packages.ssi:175
 msgid "The nesting of conditionals is not supported."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:210
+#: en/user_customization-packages.ssi:177
 msgid "3~ Tasks"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:212
+#: en/user_customization-packages.ssi:179
 msgid "%FIXME"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:214
+#: en/user_customization-packages.ssi:181
 msgid "2~ Installing modified or third-party packages"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:183
 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 "
@@ -607,7 +553,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:218
+#: en/user_customization-packages.ssi:185
 msgid ""
 "This section does not cover advice regarding building or maintaining "
 "modified packages. Joachim Breitner's 'How to fork privately' method from "
@@ -618,22 +564,22 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:220
+#: en/user_customization-packages.ssi:187
 msgid "There are two ways of installing modified custom packages:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:222
+#: en/user_customization-packages.ssi:189
 msgid "_* #{chroot_local-packages}#"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:224
+#: en/user_customization-packages.ssi:191
 msgid "_* Using a custom APT repository"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:226
+#: en/user_customization-packages.ssi:193
 msgid ""
 "The #{chroot_local-packages}# is simpler to achieve and useful for \"one-off"
 "\" customizations but has a number of drawbacks, whilst using a custom APT "
@@ -641,12 +587,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:228
+#: en/user_customization-packages.ssi:195
 msgid "3~ Using #{chroot_local-packages}# to install custom packages"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:230
+#: en/user_customization-packages.ssi:197
 msgid ""
 "To install a custom package, simply copy it to the #{config/chroot_local-"
 "packages}# directory. Packages that are inside this directory will be "
@@ -655,45 +601,45 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:232
+#: en/user_customization-packages.ssi:199
 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:234
+#: en/user_customization-packages.ssi:201
 msgid ""
 "Using #{chroot_local-packages}# for installation of custom packages has "
 "disadvantages:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:236
+#: en/user_customization-packages.ssi:203
 msgid "_* It is not possible to use secure APT"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:238
+#: en/user_customization-packages.ssi:205
 msgid ""
 "_* You must install all appropriate packages in the #{config/chroot_local-"
 "packages}# directory"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:240
+#: en/user_customization-packages.ssi:207
 msgid ""
 "_* It does not lend itself to storing Debian Live configurations in revision "
 "control"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:242
+#: en/user_customization-packages.ssi:209
 msgid "3~ Using an APT repository to install custom packages"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:244
+#: en/user_customization-packages.ssi:211
 msgid ""
 "Unlike using #{chroot_local-packages}#, when using a custom APT repository "
 "you must ensure that you specify the packages elsewhere. See lb-packages for "
@@ -701,12 +647,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:246
+#: en/user_customization-packages.ssi:213
 msgid "% FIXME: <xref linkend=\"lb-packages\"/>"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:248
+#: en/user_customization-packages.ssi:215
 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 "
@@ -714,12 +660,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:250
+#: en/user_customization-packages.ssi:217
 msgid "3~ Custom packages and APT"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:252
+#: en/user_customization-packages.ssi:219
 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 "
@@ -729,7 +675,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:254
+#: en/user_customization-packages.ssi:221
 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 "
@@ -739,19 +685,152 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:256
+#: en/user_customization-packages.ssi:223
 msgid "% FIXME: <xref linkend=\"apt-preferences\"/>"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:258
-msgid "3~ Altering APT preferences during Live system"
+#: en/user_customization-packages.ssi:225
+msgid "2~ Configuring APT at build time"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:227
+msgid ""
+"You can configure APT through a number of options applied only at build "
+"time. (APT configuration used in the running live system may be configured "
+"in the normal way for live system contents, that is, by including the "
+"appropriate configurations through #{config/chroot_local_includes/}#.) For a "
+"complete list, look for options starting with #{apt}# in the #{lb_config}# "
+"man page."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:229
+msgid "3~ Choosing apt or aptitude"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:231
+msgid ""
+"You can elect to use either #{apt}# or #{aptitude}# when installing packages "
+"at build time. Which utility is used is governed by the #{--apt}# argument "
+"to #{lb config}#. Choose the method implementing the preferred behaviour for "
+"package installation, the notable difference being how missing packages are "
+"handled."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:233
+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:235
+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:237
+msgid "3~ Using a proxy with APT"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:239
+msgid ""
+"One commonly required APT configuration is to deal with building an image "
+"behind a proxy. You may specify your APT proxy with the #{--apt-ftp-proxy}# "
+"or #{--apt-http-proxy}# options as needed, e.g."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:243
+msgid "lb config --apt-http-proxy http://proxy/"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:247
+msgid "3~ Tweaking APT to save space"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:249
+msgid ""
+"You may find yourself needing to save some space on the image media, in "
+"which case one or the other or both of the following options may be of "
+"interest."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:251
+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:255
+msgid "$ lb config --binary-indices false"
 msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:259
 msgid ""
-"Whilst it may seem unnecessary effort to create an APT repository to install "
-"custom packages, the infrastructure can be easily re-used at a later date to "
-"offer updates of the modified package."
+"This will not influence the entries in /etc/apt/sources.list, but merely "
+"whether /var/lib/apt contains the indices files or not. The tradeoff is that "
+"APT needs those indices in order to operate in the live system, so before "
+"performing #{apt-cache search}# or #{apt-get install}#, for instance, the "
+"user must #{apt-get update}# first to create those indices."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:261
+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:265
+msgid "$ lb config -apt-recommends false"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:269
+msgid ""
+"The tradeoff here is that recommended packages are defined as \"packages "
+"that would be found together with this one in all but unusual installations"
+"\" (Debian Policy Manual, 7.2). This may lead to some packages that you "
+"actually need being omitted, so we suggest you review the difference this "
+"makes to your packages list (see the #{binary.packages}# file generated by #"
+"{lb build}#) and re-include in your list any missing packages that you still "
+"want installed."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:271
+msgid "3~ Passing options to apt or aptitude"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:273
+msgid ""
+"If there is not an #{lb config}# option to alter APT's behaviour in the way "
+"you need, use #{--apt-options}# or #{--aptitude-options}# to pass any "
+"options through to your configured APT tool. See the man pages for #{apt}# "
+"and #{aptitude}# for details."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:275
+msgid "3~ APT pinning"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:277
+msgid "% FIXME: needs content"
 msgstr ""
diff --git a/manual/pt_BR/live-manual.ssm b/manual/pt_BR/live-manual.ssm
index 0de60ab..cbe920d 100644
--- a/manual/pt_BR/live-manual.ssm
+++ b/manual/pt_BR/live-manual.ssm
@@ -9,7 +9,7 @@
  :license: This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.<br><br>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.<br><br>You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses/. <br><br>On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-3 file.
 
 @date:
- :published: 2010-11-15
+ :published: 2010-11-21
 
 @publisher: Debian Live Project <debian-live at lists.debian.org>
 
diff --git a/manual/pt_BR/user_customization-packages.ssi b/manual/pt_BR/user_customization-packages.ssi
index 1ae1289..7cff6f3 100644
--- a/manual/pt_BR/user_customization-packages.ssi
+++ b/manual/pt_BR/user_customization-packages.ssi
@@ -13,77 +13,67 @@ 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,
+or need to control which versions of packages are installed via APT pinning,
 to name a few possibilities.
 
 2~ Package sources
 
-3~ Debian repositories
+3~ Distribution mirrors
 
-To set a local mirror to be used to at build time:
+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.
 
-code{
-
-$ lb config --mirror-bootstrap http://localhost/debian/
-
-}code
+4~ Distribution mirrors used at build time
 
-The chroot repository, specified by --mirror-chroot, defaults to the same as
---mirror-bootstrap.
-
-Each of the --mirror-* options governs which repository is used at various
-stages of the build. Recall from {Stages of the build}#stages-of-the-build
-that the *bootstrap* stage is when the chroot is initially populated by
-debootstrap with a minimal system, and the *chroot* stage is when the chroot
-used to construct the live system's filesystem is built. Thus, the
-corresponding mirror switches are used for those stages, and later, when the
-binary image is constructed, the --mirror-binary value is used, superceding
-any earlier repositories.
-
-The generic mirror is added to the live system's /etc/apt/sources.list.
+To set the distribution mirrors used at build time to point at a local
+mirror, it is sufficient to set --mirror-bootstrap and
+--mirror-chroot-security as follows.
 
 code{
 
-$ lb config --mirror-binary http://ftp.debian.org/debian/
+$ lb config --mirror-bootstrap http://localhost/debian/ \
+            --mirror-chroot-security http://localhost/debian-security/
 
 }code
 
-Note: It is not used for building the live system but to install new
-software while using the live system.
+The chroot mirror, specified by --mirror-chroot, defaults to the
+--mirror-bootstrap value.
 
-It can be disabled by setting the binary mirror to the same value as the
-chroot mirror.
+4~ Distribution mirrors used at run time
 
-Note: the same applies for mirror chroot security and mirror binary security
+The --mirror-binary* options govern the distribution mirrors placed in the
+binary image. These may be used to install additional packages while running
+the live system. The default values employ cdn.debian.net, a service that
+chooses a geographically close mirror based on the user's IP number. This is
+a suitable choice when you cannot predict which mirror will be best for all
+of your users. Or you may specify your own values as shown in the example
+below. An image built from this configuration would only be suitable for
+users on a network where 'mirror' is reachable.
 
 code{
 
-$ lb config --mirror-chroot-security {URL} $ lb config
---mirror-binary-security {URL}
+$ lb config --mirror-binary http://mirror/debian/ \
+            --mirror-binary-security http://mirror/debian-security/
 
 }code
 
-If you don't want to include apt indices, you can skip those with:
-
-code{
-
-$ lb config --binary-indices false
-
-}code
-
-This will not influence the entries in /etc/apt/sources.list, but only if
-/var/lib/apt contains the indices files or not (and by that making the image
-smaller).
-
-3~ Own repository
+3~ Additional repositories
 
 To add more repositories (e.g. backports, experimental or custom packages,
 etc.), create #{config/chroot_sources/your-repository.{chroot,binary}}#
-files.
+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.
 
-e.g. #{config/chroot_sources/live.chroot}# allows you to install packages
-from the debian live snapshot repository at live system build time (you have
-to add the packages in your package list):
+For example, #{config/chroot_sources/live.chroot}# allows you to install
+packages from the debian live snapshot repository at live system build time.
 
 code{
 
@@ -92,12 +82,12 @@ deb http://live.debian.net/ sid-snapshots main contrib non-free
 }code
 
 If you add the line to #{config/chroot_sources/live.binary}# the repository
-will be added to your live-system's #{/etc/apt/sources.list}#.
+will be added to your live system's #{/etc/apt/sources.list.d/}# directory.
 
 If such files exist, they will be picked up automatically.
 
-You can also put the gpg-key used to sign the repository into
-config/chroot_sources/your-repository.{binary,chroot}.gpg
+You can also put the GPG key used to sign the repository into
+config/chroot_sources/your-repository.{binary,chroot}.gpg files.
 
 Note: some preconfigured package repositories are available for easy
 selection through the --repository switch, e.g. for enabling live snapshots,
@@ -109,26 +99,12 @@ $ lb config --repository live.debian.net
 
 }code
 
-3~ Package installation
-
-You can elect to use either #{apt}# or #{aptitude}# when installing
-packages. Which utility is used is governed by the #{LB_APT}# variable in
-#{config/chroot}# or by the #{--apt}# argument to #{lb config}#:
-
-_* #{apt}#: Specifying a missing package causes package installation to
-fail, which may not be the desired behaviour. This is the default setting
-for building images for Lenny or later.
-
-_* #{aptitude}#: Specifying a missing package causes package installation to
-succeed, which may not be the desired behaviour. This is the default setting
-for building images for Etch.
-
 2~ Installing additional packages
 
 live-helper has a number of mechanisms for indicating that additional
 packages should be installed, including:
 
-_* The #{LB_PACKAGES}# variable
+_* The #{--packages}# option
 
 _* Package lists
 
@@ -136,18 +112,9 @@ _* Local packages (#{chroot_local-packages/}#)
 
 _* Tasks
 
-3~ The #{LB_PACKAGES}# variable
+3~ The #{--packages}# option
 
-To install additional packages, simply add them to the #{LB_PACKAGES}#
-variable in #{config/chroot}#. For example:
-
-code{
-
-LB_PACKAGES="package1 package2 package3 ... "
-
-}code
-
-You can also specify initial values on the command line:
+To install additional packages, simply specify #{--packages}#. For example:
 
 code{
 
@@ -249,7 +216,8 @@ code{
 }code
 
 Any live-build configuration variable that begins with #{LB_}# can be tested
-in this way.
+in this way. (Generally, this means any #{lb config}# option uppercased and
+with dashes changed to underscores.)
 
 The nesting of conditionals is not supported.
 
@@ -332,8 +300,87 @@ apt-preferences for more information.
 
 % FIXME: <xref linkend="apt-preferences"/>
 
-3~ Altering APT preferences during Live system
+2~ Configuring APT at build time
+
+You can configure APT through a number of options applied only at build
+time. (APT configuration used in the running live system may be configured
+in the normal way for live system contents, that is, by including the
+appropriate configurations through #{config/chroot_local_includes/}#.) For a
+complete list, look for options starting with #{apt}# in the #{lb_config}#
+man page.
+
+3~ Choosing apt or aptitude
+
+You can elect to use either #{apt}# or #{aptitude}# when installing packages
+at build time. Which utility is used is governed by the #{--apt}# argument
+to #{lb config}#. Choose the method implementing the preferred behaviour for
+package installation, the notable difference being how missing packages are
+handled.
+
+_* #{apt}#: With this method, if a missing package is specified, the package
+installation will fail. This is the default setting.
+
+_* #{aptitude}#: With this method, if a missing package is specified, the
+package installation will succeed.
+
+3~ Using a proxy with APT
+
+One commonly required APT configuration is to deal with building an image
+behind a proxy. You may specify your APT proxy with the #{--apt-ftp-proxy}#
+or #{--apt-http-proxy}# options as needed, e.g.
+
+code{
+
+lb config --apt-http-proxy http://proxy/
+
+}code
+
+3~ Tweaking APT to save space
+
+You may find yourself needing to save some space on the image media, in
+which case one or the other or both of the following options may be of
+interest.
+
+If you don't want to include APT indices in the image, you can omit those
+with:
+
+code{
+
+$ lb config --binary-indices false
+
+}code
+
+This will not influence the entries in /etc/apt/sources.list, but merely
+whether /var/lib/apt contains the indices files or not. The tradeoff is that
+APT needs those indices in order to operate in the live system, so before
+performing #{apt-cache search}# or #{apt-get install}#, for instance, the
+user must #{apt-get update}# first to create those indices.
+
+If you find the installation of recommended packages bloats your image too
+much, you may disable that default option of APT with:
+
+code{
+
+$ lb config -apt-recommends false
+
+}code
+
+The tradeoff here is that recommended packages are defined as "packages that
+would be found together with this one in all but unusual installations"
+(Debian Policy Manual, §7.2). This may lead to some packages that you
+actually need being omitted, so we suggest you review the difference this
+makes to your packages list (see the #{binary.packages}# file generated by
+#{lb build}#) and re-include in your list any missing packages that you
+still want installed.
+
+3~ Passing options to apt or aptitude
+
+If there is not an #{lb config}# option to alter APT's behaviour in the way
+you need, use #{--apt-options}# or #{--aptitude-options}# to pass any
+options through to your configured APT tool. See the man pages for #{apt}#
+and #{aptitude}# for details.
+
+3~ APT pinning
+
+% FIXME: needs content
 
-Whilst it may seem unnecessary effort to create an APT repository to install
-custom packages, the infrastructure can be easily re-used at a later date to
-offer updates of the modified package.
diff --git a/manual/ro/live-manual.ssm b/manual/ro/live-manual.ssm
index 0de60ab..cbe920d 100644
--- a/manual/ro/live-manual.ssm
+++ b/manual/ro/live-manual.ssm
@@ -9,7 +9,7 @@
  :license: This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.<br><br>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.<br><br>You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses/. <br><br>On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-3 file.
 
 @date:
- :published: 2010-11-15
+ :published: 2010-11-21
 
 @publisher: Debian Live Project <debian-live at lists.debian.org>
 
diff --git a/manual/ro/user_customization-packages.ssi b/manual/ro/user_customization-packages.ssi
index 1ae1289..7cff6f3 100644
--- a/manual/ro/user_customization-packages.ssi
+++ b/manual/ro/user_customization-packages.ssi
@@ -13,77 +13,67 @@ 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,
+or need to control which versions of packages are installed via APT pinning,
 to name a few possibilities.
 
 2~ Package sources
 
-3~ Debian repositories
+3~ Distribution mirrors
 
-To set a local mirror to be used to at build time:
+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.
 
-code{
-
-$ lb config --mirror-bootstrap http://localhost/debian/
-
-}code
+4~ Distribution mirrors used at build time
 
-The chroot repository, specified by --mirror-chroot, defaults to the same as
---mirror-bootstrap.
-
-Each of the --mirror-* options governs which repository is used at various
-stages of the build. Recall from {Stages of the build}#stages-of-the-build
-that the *bootstrap* stage is when the chroot is initially populated by
-debootstrap with a minimal system, and the *chroot* stage is when the chroot
-used to construct the live system's filesystem is built. Thus, the
-corresponding mirror switches are used for those stages, and later, when the
-binary image is constructed, the --mirror-binary value is used, superceding
-any earlier repositories.
-
-The generic mirror is added to the live system's /etc/apt/sources.list.
+To set the distribution mirrors used at build time to point at a local
+mirror, it is sufficient to set --mirror-bootstrap and
+--mirror-chroot-security as follows.
 
 code{
 
-$ lb config --mirror-binary http://ftp.debian.org/debian/
+$ lb config --mirror-bootstrap http://localhost/debian/ \
+            --mirror-chroot-security http://localhost/debian-security/
 
 }code
 
-Note: It is not used for building the live system but to install new
-software while using the live system.
+The chroot mirror, specified by --mirror-chroot, defaults to the
+--mirror-bootstrap value.
 
-It can be disabled by setting the binary mirror to the same value as the
-chroot mirror.
+4~ Distribution mirrors used at run time
 
-Note: the same applies for mirror chroot security and mirror binary security
+The --mirror-binary* options govern the distribution mirrors placed in the
+binary image. These may be used to install additional packages while running
+the live system. The default values employ cdn.debian.net, a service that
+chooses a geographically close mirror based on the user's IP number. This is
+a suitable choice when you cannot predict which mirror will be best for all
+of your users. Or you may specify your own values as shown in the example
+below. An image built from this configuration would only be suitable for
+users on a network where 'mirror' is reachable.
 
 code{
 
-$ lb config --mirror-chroot-security {URL} $ lb config
---mirror-binary-security {URL}
+$ lb config --mirror-binary http://mirror/debian/ \
+            --mirror-binary-security http://mirror/debian-security/
 
 }code
 
-If you don't want to include apt indices, you can skip those with:
-
-code{
-
-$ lb config --binary-indices false
-
-}code
-
-This will not influence the entries in /etc/apt/sources.list, but only if
-/var/lib/apt contains the indices files or not (and by that making the image
-smaller).
-
-3~ Own repository
+3~ Additional repositories
 
 To add more repositories (e.g. backports, experimental or custom packages,
 etc.), create #{config/chroot_sources/your-repository.{chroot,binary}}#
-files.
+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.
 
-e.g. #{config/chroot_sources/live.chroot}# allows you to install packages
-from the debian live snapshot repository at live system build time (you have
-to add the packages in your package list):
+For example, #{config/chroot_sources/live.chroot}# allows you to install
+packages from the debian live snapshot repository at live system build time.
 
 code{
 
@@ -92,12 +82,12 @@ deb http://live.debian.net/ sid-snapshots main contrib non-free
 }code
 
 If you add the line to #{config/chroot_sources/live.binary}# the repository
-will be added to your live-system's #{/etc/apt/sources.list}#.
+will be added to your live system's #{/etc/apt/sources.list.d/}# directory.
 
 If such files exist, they will be picked up automatically.
 
-You can also put the gpg-key used to sign the repository into
-config/chroot_sources/your-repository.{binary,chroot}.gpg
+You can also put the GPG key used to sign the repository into
+config/chroot_sources/your-repository.{binary,chroot}.gpg files.
 
 Note: some preconfigured package repositories are available for easy
 selection through the --repository switch, e.g. for enabling live snapshots,
@@ -109,26 +99,12 @@ $ lb config --repository live.debian.net
 
 }code
 
-3~ Package installation
-
-You can elect to use either #{apt}# or #{aptitude}# when installing
-packages. Which utility is used is governed by the #{LB_APT}# variable in
-#{config/chroot}# or by the #{--apt}# argument to #{lb config}#:
-
-_* #{apt}#: Specifying a missing package causes package installation to
-fail, which may not be the desired behaviour. This is the default setting
-for building images for Lenny or later.
-
-_* #{aptitude}#: Specifying a missing package causes package installation to
-succeed, which may not be the desired behaviour. This is the default setting
-for building images for Etch.
-
 2~ Installing additional packages
 
 live-helper has a number of mechanisms for indicating that additional
 packages should be installed, including:
 
-_* The #{LB_PACKAGES}# variable
+_* The #{--packages}# option
 
 _* Package lists
 
@@ -136,18 +112,9 @@ _* Local packages (#{chroot_local-packages/}#)
 
 _* Tasks
 
-3~ The #{LB_PACKAGES}# variable
+3~ The #{--packages}# option
 
-To install additional packages, simply add them to the #{LB_PACKAGES}#
-variable in #{config/chroot}#. For example:
-
-code{
-
-LB_PACKAGES="package1 package2 package3 ... "
-
-}code
-
-You can also specify initial values on the command line:
+To install additional packages, simply specify #{--packages}#. For example:
 
 code{
 
@@ -249,7 +216,8 @@ code{
 }code
 
 Any live-build configuration variable that begins with #{LB_}# can be tested
-in this way.
+in this way. (Generally, this means any #{lb config}# option uppercased and
+with dashes changed to underscores.)
 
 The nesting of conditionals is not supported.
 
@@ -332,8 +300,87 @@ apt-preferences for more information.
 
 % FIXME: <xref linkend="apt-preferences"/>
 
-3~ Altering APT preferences during Live system
+2~ Configuring APT at build time
+
+You can configure APT through a number of options applied only at build
+time. (APT configuration used in the running live system may be configured
+in the normal way for live system contents, that is, by including the
+appropriate configurations through #{config/chroot_local_includes/}#.) For a
+complete list, look for options starting with #{apt}# in the #{lb_config}#
+man page.
+
+3~ Choosing apt or aptitude
+
+You can elect to use either #{apt}# or #{aptitude}# when installing packages
+at build time. Which utility is used is governed by the #{--apt}# argument
+to #{lb config}#. Choose the method implementing the preferred behaviour for
+package installation, the notable difference being how missing packages are
+handled.
+
+_* #{apt}#: With this method, if a missing package is specified, the package
+installation will fail. This is the default setting.
+
+_* #{aptitude}#: With this method, if a missing package is specified, the
+package installation will succeed.
+
+3~ Using a proxy with APT
+
+One commonly required APT configuration is to deal with building an image
+behind a proxy. You may specify your APT proxy with the #{--apt-ftp-proxy}#
+or #{--apt-http-proxy}# options as needed, e.g.
+
+code{
+
+lb config --apt-http-proxy http://proxy/
+
+}code
+
+3~ Tweaking APT to save space
+
+You may find yourself needing to save some space on the image media, in
+which case one or the other or both of the following options may be of
+interest.
+
+If you don't want to include APT indices in the image, you can omit those
+with:
+
+code{
+
+$ lb config --binary-indices false
+
+}code
+
+This will not influence the entries in /etc/apt/sources.list, but merely
+whether /var/lib/apt contains the indices files or not. The tradeoff is that
+APT needs those indices in order to operate in the live system, so before
+performing #{apt-cache search}# or #{apt-get install}#, for instance, the
+user must #{apt-get update}# first to create those indices.
+
+If you find the installation of recommended packages bloats your image too
+much, you may disable that default option of APT with:
+
+code{
+
+$ lb config -apt-recommends false
+
+}code
+
+The tradeoff here is that recommended packages are defined as "packages that
+would be found together with this one in all but unusual installations"
+(Debian Policy Manual, §7.2). This may lead to some packages that you
+actually need being omitted, so we suggest you review the difference this
+makes to your packages list (see the #{binary.packages}# file generated by
+#{lb build}#) and re-include in your list any missing packages that you
+still want installed.
+
+3~ Passing options to apt or aptitude
+
+If there is not an #{lb config}# option to alter APT's behaviour in the way
+you need, use #{--apt-options}# or #{--aptitude-options}# to pass any
+options through to your configured APT tool. See the man pages for #{apt}#
+and #{aptitude}# for details.
+
+3~ APT pinning
+
+% FIXME: needs content
 
-Whilst it may seem unnecessary effort to create an APT repository to install
-custom packages, the infrastructure can be easily re-used at a later date to
-offer updates of the modified package.

-- 
live-manual



More information about the debian-live-changes mailing list