[SCM] live-manual branch, debian, updated. debian/2.0_a10-1-3-g5935678
Ben Armstrong
synrg at debian.org
Mon Nov 22 00:13:34 UTC 2010
The following commit has been merged in the debian branch:
commit 59356785c46d2604272a25e3bc454bd8a7885735
Author: Ben Armstrong <synrg at debian.org>
Date: Sun Nov 21 20:13:08 2010 -0400
Fixing consistency; clarifying usage of conditionals in package lists.
diff --git a/manual/de/user_customization-packages.ssi b/manual/de/user_customization-packages.ssi
index 7cff6f3..4848216 100644
--- a/manual/de/user_customization-packages.ssi
+++ b/manual/de/user_customization-packages.ssi
@@ -20,21 +20,21 @@ to name a few possibilities.
3~ Distribution mirrors
-Each of the --mirror-* options governs which distribution mirror is used at
-various stages of the build. Recall from {Stages of the
+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.
+and later, in the *binary* stage, the #{--mirror-binary}# and
+#{--mirror-binary-security}# values are used, superceding any mirrors used
+in an earlier stage.
4~ Distribution mirrors used at build time
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.
+mirror, it is sufficient to set #{--mirror-bootstrap}# and
+#{--mirror-chroot-security}# as follows.
code{
@@ -43,19 +43,19 @@ $ lb config --mirror-bootstrap http://localhost/debian/ \
}code
-The chroot mirror, specified by --mirror-chroot, defaults to the
---mirror-bootstrap value.
+The chroot mirror, specified by #{--mirror-chroot}#, defaults to the
+#{--mirror-bootstrap}# value.
4~ Distribution mirrors used at run time
-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.
+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 defaults 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{
@@ -81,17 +81,17 @@ 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
+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 files.
+#{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:
+selection through the #{--repository}# option, e.g. for enabling live
+snapshots, a simple command is enough to enable it:
code{
@@ -99,16 +99,16 @@ $ lb config --repository live.debian.net
}code
-2~ Installing additional packages
+2~installing-additional-packages Installing additional packages
-live-helper has a number of mechanisms for indicating that additional
+live-build has a number of mechanisms for indicating that additional
packages should be installed, including:
_* The #{--packages}# option
_* Package lists
-_* Local packages (#{chroot_local-packages/}#)
+_* Local packages (#{config/chroot_local-packages/}#)
_* Tasks
@@ -123,18 +123,14 @@ $ lb config --packages "package1 package2 package3"
}code
The behaviour of live-build when specifying a package that does not exist is
-determined by your choice of APT utility. See package-installation for more
-details.
-
-% FIXME: <xref linkend="package-installation"/>
+determined by your choice of APT utility. See {Choosing apt or
+aptitude}#choosing-apt-or-aptitude for more details.
If you need to specify a large number of packages to be installed or you
need flexibility regarding which packages to install, you should probably be
-using package lists. See package-lists for more information.
-
-% FIXME: <xref linkend="package-lists"/>
+using package lists. See {Package lists}#package-lists for more information.
-3~ Package lists
+3~package-lists Package lists
Package lists are a powerful way of expressing which packages should be
installed. live-build ships with a number of predefined package lists which
@@ -150,40 +146,50 @@ $ lb config --packages-lists "list1 list2 list3"
}code
Note: Package lists that are distributed with live-build reside in the
-#{/usr/share/live/build/lists}# directory.
+#{/usr/share/live/build/lists/}# directory.
-*{Local packages lists}*
+4~ Local package lists
You may supplement the supplied lists using local package lists stored in
-#{config/chroot_local-packageslists}#.
+#{config/chroot_local-packageslists/}#.
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
+in order to be processed. Local package lists always override package lists
distributed with live-build. This can cause undesired effects, we therefore
-recommend to use unique names for local packages lists.
+recommend to use unique names for local package lists.
-*{Local binary packages lists}*
+4~ Local binary package lists
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
+#{pool/}# (without installing them onto the live image) you may need to use
lists using binary local package lists stored in
-#{config/binary_local-packageslists}#. Such media can be used as a
-customized debian install image for offline installations.
+#{config/binary_local-packageslists/}#. Such media can be used as a
+customized Debian install image for offline installations.
-Package lists that exist in this directory need to have a .list suffix in
-order to be processed.
+Package lists that exist in this directory need to have a #{.list}# suffix
+in order to be processed.
-*{Extending a provided package list using includes}*
+4~ Extending a provided package list using includes
% FIXME
% code{ % % #include <gnome> % iceweasel % % }code
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}#
+includes. They are available to view in the #{/usr/share/live/build/lists/}#
directory.
-*{Using conditionals inside packages lists}*
+4~ Using conditionals inside package lists
+
+Any of the live-build configuration variables stored in #{config/*}# (minus
+the #{LB_}# prefix) may be used in conditional statements in package
+lists. Generally, this means any #{lb config}# option uppercased and with
+dashes changed to underscores. But in practice, it is only the ones that
+influence package selection that make sense, such as #{DISTRIBUTION}#,
+#{ARCHITECTURE}# or #{ARCHIVE_AREAS}#.
+
+For example, to install #{ia32-libs}# if the #{--architecture amd64}# is
+specified:
code{
@@ -191,7 +197,9 @@ code{
}code
-or if #{LB_ARCHITECTURE}# is set to #{i386}# or #{amd64}#:
+You may test for any one of a number of values, e.g. to install
+#{memtest86+} if either #{--architecture i386}# or #{--architecture amd64}#
+is specified:
code{
@@ -199,7 +207,9 @@ code{
}code
-or if #{LB_ARCHIVE_AREAS}# contains either #{contrib}# or #{non-free}#:
+You may also test against variables that may contain more than one value,
+e.g. to install #{vrms}# if either #{contrib}# or #{non-free}# is specified
+via #{--archive-areas}#:
code{
@@ -215,10 +225,6 @@ code{
}code
-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.
3~ Tasks
@@ -247,14 +253,14 @@ _* #{chroot_local-packages}#
_* Using a custom APT repository
-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
-repository is more time-consuming to set up.
+Using #{chroot_local-packages}# is simpler to achieve and useful for
+"one-off" customizations but has a number of drawbacks, whilst using a
+custom APT repository is more time-consuming to set up.
3~ Using #{chroot_local-packages}# to install custom packages
To install a custom package, simply copy it to the
-#{config/chroot_local-packages}# directory. Packages that are inside this
+#{config/chroot_local-packages/}# directory. Packages that are inside this
directory will be automatically installed into the live system during build
- you do not need to specify them elsewhere.
@@ -264,21 +270,19 @@ is to use #{dpkg-name}#.
Using #{chroot_local-packages}# for installation of custom packages has
disadvantages:
-_* It is not possible to use secure APT
+_* It is not possible to use secure APT.
_* You must install all appropriate packages in the
-#{config/chroot_local-packages}# directory
+#{config/chroot_local-packages/}# directory.
_* It does not lend itself to storing Debian Live configurations in revision
-control
+control.
3~ Using an APT repository to install custom packages
Unlike using #{chroot_local-packages}#, when using a custom APT repository
-you must ensure that you specify the packages elsewhere. See lb-packages for
-details.
-
-% FIXME: <xref linkend="lb-packages"/>
+you must ensure that you specify the packages elsewhere. See #{Installing
+additional packages}#installing-additional-packages for details.
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
@@ -309,7 +313,7 @@ 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
+3~choosing-apt-or-aptitude 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
diff --git a/manual/en/user_customization-packages.ssi b/manual/en/user_customization-packages.ssi
index c4681bb..dcce549 100644
--- a/manual/en/user_customization-packages.ssi
+++ b/manual/en/user_customization-packages.ssi
@@ -8,11 +8,11 @@ Perhaps the most basic customization of a Debian live system is the selection of
3~ Distribution mirrors
-Each of the --mirror-* options governs which distribution mirror is used at various stages of the build. Recall from {Stages of the build}#stages-of-the-build that the *bootstrap* stage is when the chroot is initially populated by debootstrap with a minimal system, and the *chroot* stage is when the chroot used to construct the live system's filesystem is built. Thus, the corresponding mirror switches are used for those stages, and later, in the *binary* stage, the --mirror-binary and --mirror-binary-security values are used, superceding any mirrors used in an earlier stage.
+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.
4~ Distribution mirrors used at build time
-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.
+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{
@@ -21,11 +21,11 @@ $ lb config --mirror-bootstrap http://localhost/debian/ \
}code
-The chroot mirror, specified by --mirror-chroot, defaults to the --mirror-bootstrap value.
+The chroot mirror, specified by #{--mirror-chroot}#, defaults to the #{--mirror-bootstrap}# value.
4~ Distribution mirrors used at run time
-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.
+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 defaults 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{
@@ -46,13 +46,13 @@ 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.d/}# directory.
+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 files.
+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:
+Note: some preconfigured package repositories are available for easy selection through the #{--repository}# option, e.g. for enabling live snapshots, a simple command is enough to enable it:
code{
@@ -60,15 +60,15 @@ $ lb config --repository live.debian.net
}code
-2~ Installing additional packages
+2~installing-additional-packages Installing additional packages
-live-helper has a number of mechanisms for indicating that additional packages should be installed, including:
+live-build has a number of mechanisms for indicating that additional packages should be installed, including:
_* The #{--packages}# option
_* Package lists
-_* Local packages (#{chroot_local-packages/}#)
+_* Local packages (#{config/chroot_local-packages/}#)
_* Tasks
@@ -82,15 +82,11 @@ $ lb config --packages "package1 package2 package3"
}code
-The behaviour of live-build when specifying a package that does not exist is determined by your choice of APT utility. See package-installation for more details.
+The behaviour of live-build when specifying a package that does not exist is determined by your choice of APT utility. See {Choosing apt or aptitude}#choosing-apt-or-aptitude for more details.
-% FIXME: <xref linkend="package-installation"/>
+If you need to specify a large number of packages to be installed or you need flexibility regarding which packages to install, you should probably be using package lists. See {Package lists}#package-lists for more information.
-If you need to specify a large number of packages to be installed or you need flexibility regarding which packages to install, you should probably be using package lists. See package-lists for more information.
-
-% FIXME: <xref linkend="package-lists"/>
-
-3~ Package lists
+3~package-lists Package lists
Package lists are a powerful way of expressing which packages should be installed. live-build ships with a number of predefined package lists which provide sensible default package selections for the major desktop environments, as well as standard systems.
@@ -102,21 +98,21 @@ $ lb config --packages-lists "list1 list2 list3"
}code
-Note: Package lists that are distributed with live-build reside in the #{/usr/share/live/build/lists}# directory.
+Note: Package lists that are distributed with live-build reside in the #{/usr/share/live/build/lists/}# directory.
-*{Local packages lists}*
+4~ Local package lists
-You may supplement the supplied lists using local package lists stored in #{config/chroot_local-packageslists}#.
+You may supplement the supplied lists using local package lists stored in #{config/chroot_local-packageslists/}#.
-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 distributed with live-build. This can cause undesired effects, we therefore recommend to use unique names for local packages lists.
+Package lists that exist in this directory need to have a #{.list}# suffix in order to be processed. Local package lists always override package lists distributed with live-build. This can cause undesired effects, we therefore recommend to use unique names for local package lists.
-*{Local binary packages lists}*
+4~ Local binary package lists
-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 lists using binary local package lists stored in #{config/binary_local-packageslists}#. Such media can be used as a customized debian install image for offline installations.
+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 lists using binary local package lists stored in #{config/binary_local-packageslists/}#. Such media can be used as a customized Debian install image for offline installations.
-Package lists that exist in this directory need to have a .list suffix in order to be processed.
+Package lists that exist in this directory need to have a #{.list}# suffix in order to be processed.
-*{Extending a provided package list using includes}*
+4~ Extending a provided package list using includes
% FIXME
@@ -127,9 +123,13 @@ Package lists that exist in this directory need to have a .list suffix in order
%
% }code
-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}# directory.
+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/}# directory.
+
+4~ Using conditionals inside package lists
-*{Using conditionals inside packages lists}*
+Any of the live-build configuration variables stored in #{config/*}# (minus the #{LB_}# prefix) may be used in conditional statements in package lists. Generally, this means any #{lb config}# option uppercased and with dashes changed to underscores. But in practice, it is only the ones that influence package selection that make sense, such as #{DISTRIBUTION}#, #{ARCHITECTURE}# or #{ARCHIVE_AREAS}#.
+
+For example, to install #{ia32-libs}# if the #{--architecture amd64}# is specified:
code{
@@ -139,7 +139,7 @@ ia32-libs
}code
-or if #{LB_ARCHITECTURE}# is set to #{i386}# or #{amd64}#:
+You may test for any one of a number of values, e.g. to install #{memtest86+} if either #{--architecture i386}# or #{--architecture amd64}# is specified:
code{
@@ -149,7 +149,7 @@ memtest86+
}code
-or if #{LB_ARCHIVE_AREAS}# contains either #{contrib}# or #{non-free}#:
+You may also test against variables that may contain more than one value, e.g. to install #{vrms}# if either #{contrib}# or #{non-free}# is specified via #{--archive-areas}#:
code{
@@ -169,8 +169,6 @@ code{
}code
-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.
3~ Tasks
@@ -189,27 +187,25 @@ _* #{chroot_local-packages}#
_* Using a custom APT repository
-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 repository is more time-consuming to set up.
+Using #{chroot_local-packages}# is simpler to achieve and useful for "one-off" customizations but has a number of drawbacks, whilst using a custom APT repository is more time-consuming to set up.
3~ Using #{chroot_local-packages}# to install custom packages
-To install a custom package, simply copy it to the #{config/chroot_local-packages}# directory. Packages that are inside this directory will be automatically installed into the live system during build - you do not need to specify them elsewhere.
+To install a custom package, simply copy it to the #{config/chroot_local-packages/}# directory. Packages that are inside this directory will be automatically installed into the live system during build - you do not need to specify them elsewhere.
Packages *{must}* be named in the prescribed way. One simple way to do this is to use #{dpkg-name}#.
Using #{chroot_local-packages}# for installation of custom packages has disadvantages:
-_* It is not possible to use secure APT
+_* It is not possible to use secure APT.
-_* You must install all appropriate packages in the #{config/chroot_local-packages}# directory
+_* You must install all appropriate packages in the #{config/chroot_local-packages/}# directory.
-_* It does not lend itself to storing Debian Live configurations in revision control
+_* It does not lend itself to storing Debian Live configurations in revision control.
3~ Using an APT repository to install custom packages
-Unlike using #{chroot_local-packages}#, when using a custom APT repository you must ensure that you specify the packages elsewhere. See lb-packages for details.
-
-% FIXME: <xref linkend="lb-packages"/>
+Unlike using #{chroot_local-packages}#, when using a custom APT repository you must ensure that you specify the packages elsewhere. See #{Installing additional packages}#installing-additional-packages for details.
Whilst it may seem unnecessary effort to create an APT repository to install custom packages, the infrastructure can be easily re-used at a later date to offer updates of the modified packages.
@@ -225,7 +221,7 @@ Because of this, you may wish to increment the version number in your custom pac
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
+3~choosing-apt-or-aptitude 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.
diff --git a/manual/fr/user_customization-packages.ssi b/manual/fr/user_customization-packages.ssi
index 7cff6f3..4848216 100644
--- a/manual/fr/user_customization-packages.ssi
+++ b/manual/fr/user_customization-packages.ssi
@@ -20,21 +20,21 @@ to name a few possibilities.
3~ Distribution mirrors
-Each of the --mirror-* options governs which distribution mirror is used at
-various stages of the build. Recall from {Stages of the
+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.
+and later, in the *binary* stage, the #{--mirror-binary}# and
+#{--mirror-binary-security}# values are used, superceding any mirrors used
+in an earlier stage.
4~ Distribution mirrors used at build time
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.
+mirror, it is sufficient to set #{--mirror-bootstrap}# and
+#{--mirror-chroot-security}# as follows.
code{
@@ -43,19 +43,19 @@ $ lb config --mirror-bootstrap http://localhost/debian/ \
}code
-The chroot mirror, specified by --mirror-chroot, defaults to the
---mirror-bootstrap value.
+The chroot mirror, specified by #{--mirror-chroot}#, defaults to the
+#{--mirror-bootstrap}# value.
4~ Distribution mirrors used at run time
-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.
+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 defaults 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{
@@ -81,17 +81,17 @@ 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
+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 files.
+#{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:
+selection through the #{--repository}# option, e.g. for enabling live
+snapshots, a simple command is enough to enable it:
code{
@@ -99,16 +99,16 @@ $ lb config --repository live.debian.net
}code
-2~ Installing additional packages
+2~installing-additional-packages Installing additional packages
-live-helper has a number of mechanisms for indicating that additional
+live-build has a number of mechanisms for indicating that additional
packages should be installed, including:
_* The #{--packages}# option
_* Package lists
-_* Local packages (#{chroot_local-packages/}#)
+_* Local packages (#{config/chroot_local-packages/}#)
_* Tasks
@@ -123,18 +123,14 @@ $ lb config --packages "package1 package2 package3"
}code
The behaviour of live-build when specifying a package that does not exist is
-determined by your choice of APT utility. See package-installation for more
-details.
-
-% FIXME: <xref linkend="package-installation"/>
+determined by your choice of APT utility. See {Choosing apt or
+aptitude}#choosing-apt-or-aptitude for more details.
If you need to specify a large number of packages to be installed or you
need flexibility regarding which packages to install, you should probably be
-using package lists. See package-lists for more information.
-
-% FIXME: <xref linkend="package-lists"/>
+using package lists. See {Package lists}#package-lists for more information.
-3~ Package lists
+3~package-lists Package lists
Package lists are a powerful way of expressing which packages should be
installed. live-build ships with a number of predefined package lists which
@@ -150,40 +146,50 @@ $ lb config --packages-lists "list1 list2 list3"
}code
Note: Package lists that are distributed with live-build reside in the
-#{/usr/share/live/build/lists}# directory.
+#{/usr/share/live/build/lists/}# directory.
-*{Local packages lists}*
+4~ Local package lists
You may supplement the supplied lists using local package lists stored in
-#{config/chroot_local-packageslists}#.
+#{config/chroot_local-packageslists/}#.
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
+in order to be processed. Local package lists always override package lists
distributed with live-build. This can cause undesired effects, we therefore
-recommend to use unique names for local packages lists.
+recommend to use unique names for local package lists.
-*{Local binary packages lists}*
+4~ Local binary package lists
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
+#{pool/}# (without installing them onto the live image) you may need to use
lists using binary local package lists stored in
-#{config/binary_local-packageslists}#. Such media can be used as a
-customized debian install image for offline installations.
+#{config/binary_local-packageslists/}#. Such media can be used as a
+customized Debian install image for offline installations.
-Package lists that exist in this directory need to have a .list suffix in
-order to be processed.
+Package lists that exist in this directory need to have a #{.list}# suffix
+in order to be processed.
-*{Extending a provided package list using includes}*
+4~ Extending a provided package list using includes
% FIXME
% code{ % % #include <gnome> % iceweasel % % }code
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}#
+includes. They are available to view in the #{/usr/share/live/build/lists/}#
directory.
-*{Using conditionals inside packages lists}*
+4~ Using conditionals inside package lists
+
+Any of the live-build configuration variables stored in #{config/*}# (minus
+the #{LB_}# prefix) may be used in conditional statements in package
+lists. Generally, this means any #{lb config}# option uppercased and with
+dashes changed to underscores. But in practice, it is only the ones that
+influence package selection that make sense, such as #{DISTRIBUTION}#,
+#{ARCHITECTURE}# or #{ARCHIVE_AREAS}#.
+
+For example, to install #{ia32-libs}# if the #{--architecture amd64}# is
+specified:
code{
@@ -191,7 +197,9 @@ code{
}code
-or if #{LB_ARCHITECTURE}# is set to #{i386}# or #{amd64}#:
+You may test for any one of a number of values, e.g. to install
+#{memtest86+} if either #{--architecture i386}# or #{--architecture amd64}#
+is specified:
code{
@@ -199,7 +207,9 @@ code{
}code
-or if #{LB_ARCHIVE_AREAS}# contains either #{contrib}# or #{non-free}#:
+You may also test against variables that may contain more than one value,
+e.g. to install #{vrms}# if either #{contrib}# or #{non-free}# is specified
+via #{--archive-areas}#:
code{
@@ -215,10 +225,6 @@ code{
}code
-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.
3~ Tasks
@@ -247,14 +253,14 @@ _* #{chroot_local-packages}#
_* Using a custom APT repository
-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
-repository is more time-consuming to set up.
+Using #{chroot_local-packages}# is simpler to achieve and useful for
+"one-off" customizations but has a number of drawbacks, whilst using a
+custom APT repository is more time-consuming to set up.
3~ Using #{chroot_local-packages}# to install custom packages
To install a custom package, simply copy it to the
-#{config/chroot_local-packages}# directory. Packages that are inside this
+#{config/chroot_local-packages/}# directory. Packages that are inside this
directory will be automatically installed into the live system during build
- you do not need to specify them elsewhere.
@@ -264,21 +270,19 @@ is to use #{dpkg-name}#.
Using #{chroot_local-packages}# for installation of custom packages has
disadvantages:
-_* It is not possible to use secure APT
+_* It is not possible to use secure APT.
_* You must install all appropriate packages in the
-#{config/chroot_local-packages}# directory
+#{config/chroot_local-packages/}# directory.
_* It does not lend itself to storing Debian Live configurations in revision
-control
+control.
3~ Using an APT repository to install custom packages
Unlike using #{chroot_local-packages}#, when using a custom APT repository
-you must ensure that you specify the packages elsewhere. See lb-packages for
-details.
-
-% FIXME: <xref linkend="lb-packages"/>
+you must ensure that you specify the packages elsewhere. See #{Installing
+additional packages}#installing-additional-packages for details.
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
@@ -309,7 +313,7 @@ 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
+3~choosing-apt-or-aptitude 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
diff --git a/manual/po/de/user_customization-packages.ssi.po b/manual/po/de/user_customization-packages.ssi.po
index 55a179f..68fc921 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-21 13:45-0400\n"
+"POT-Creation-Date: 2010-11-21 20:09-0400\n"
"PO-Revision-Date: 2010-10-03 20:30+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -55,15 +55,14 @@ msgstr ""
#: en/user_customization-internationalization.ssi:38
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:80
-#: en/user_customization-packages.ssi:100
+#: en/user_customization-packages.ssi:80 en/user_customization-packages.ssi:96
#: 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_customization-packages.ssi:237
+#: en/user_customization-packages.ssi:249
+#: en/user_customization-packages.ssi:259 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
@@ -115,14 +114,14 @@ msgstr ""
#: 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:100
#: 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_customization-packages.ssi:241
+#: en/user_customization-packages.ssi:253
+#: en/user_customization-packages.ssi:263 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
@@ -135,7 +134,7 @@ msgid "}code"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:218 en/user_customization-packages.ssi:122
+#: en/user_basics.ssi:218 en/user_customization-packages.ssi:118
msgid "% FIXME"
msgstr ""
@@ -180,14 +179,14 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:12
msgid ""
-"Each of the --mirror-* options governs which distribution mirror is used at "
-"various stages of the build. Recall from {Stages of the build}#stages-of-the-"
-"build that the *bootstrap* stage is when the chroot is initially populated "
-"by debootstrap with a minimal system, and the *chroot* stage is when the "
-"chroot used to construct the live system's filesystem is built. Thus, the "
-"corresponding mirror switches are used for those stages, and later, in the "
-"*binary* stage, the --mirror-binary and --mirror-binary-security values are "
-"used, superceding any mirrors used in an earlier stage."
+"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
@@ -199,8 +198,8 @@ msgstr ""
#: en/user_customization-packages.ssi:16
msgid ""
"To set the distribution mirrors used at build time to point at a local "
-"mirror, it is sufficient to set --mirror-bootstrap and --mirror-chroot-"
-"security as follows."
+"mirror, it is sufficient to set #{--mirror-bootstrap}# and #{--mirror-chroot-"
+"security}# as follows."
msgstr ""
#. type: Plain text
@@ -214,8 +213,8 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:25
msgid ""
-"The chroot mirror, specified by --mirror-chroot, defaults to the --mirror-"
-"bootstrap value."
+"The chroot mirror, specified by #{--mirror-chroot}#, defaults to the #{--"
+"mirror-bootstrap}# value."
msgstr ""
#. type: Plain text
@@ -226,14 +225,14 @@ msgstr ""
#. type: Plain text
#: 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."
+"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 defaults 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
@@ -274,7 +273,7 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:50
msgid ""
-"If you add the line to #{config/chroot_sources/live.binary}# the repository "
+"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."
msgstr ""
@@ -286,16 +285,16 @@ msgstr ""
#. type: Plain text
#: 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 files."
+"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:56
msgid ""
"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:"
+"selection through the #{--repository}# option, e.g. for enabling live "
+"snapshots, a simple command is enough to enable it:"
msgstr ""
#. type: Plain text
@@ -305,13 +304,13 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:64
-msgid "2~ Installing additional packages"
+msgid "2~installing-additional-packages Installing additional packages"
msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:66
msgid ""
-"live-helper has a number of mechanisms for indicating that additional "
+"live-build has a number of mechanisms for indicating that additional "
"packages should be installed, including:"
msgstr ""
@@ -327,7 +326,7 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:72
-msgid "_* Local packages (#{chroot_local-packages/}#)"
+msgid "_* Local packages (#{config/chroot_local-packages/}#)"
msgstr ""
#. type: Plain text
@@ -355,35 +354,25 @@ msgstr ""
#: 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 "
-"details."
+"determined by your choice of APT utility. See {Choosing apt or aptitude}"
+"#choosing-apt-or-aptitude for more details."
msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:88
-msgid "% FIXME: <xref linkend=\"package-installation\"/>"
-msgstr ""
-
-#. type: Plain text
-#: 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 "
-"using package lists. See package-lists for more information."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:92
-msgid "% FIXME: <xref linkend=\"package-lists\"/>"
+"using package lists. See {Package lists}#package-lists for more information."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:94
-msgid "3~ Package lists"
+#: en/user_customization-packages.ssi:90
+msgid "3~package-lists Package lists"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:96
+#: en/user_customization-packages.ssi:92
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 "
@@ -392,90 +381,104 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:98
+#: en/user_customization-packages.ssi:94
msgid "To specify one or more package list, you can use:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:102
+#: en/user_customization-packages.ssi:98
msgid "$ lb config --packages-lists \"list1 list2 list3\""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:106
+#: en/user_customization-packages.ssi:102
msgid ""
"Note: Package lists that are distributed with live-build reside in the #{/"
-"usr/share/live/build/lists}# directory."
+"usr/share/live/build/lists/}# directory."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:108
-#, no-wrap
-msgid "*{Local packages lists}*\n"
+#: en/user_customization-packages.ssi:104
+msgid "4~ Local package lists"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:110
+#: en/user_customization-packages.ssi:106
msgid ""
"You may supplement the supplied lists using local package lists stored in #"
-"{config/chroot_local-packageslists}#."
+"{config/chroot_local-packageslists/}#."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:112
+#: en/user_customization-packages.ssi:108
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 "
+"in order to be processed. Local package lists always override package lists "
"distributed with live-build. This can cause undesired effects, we therefore "
-"recommend to use unique names for local packages lists."
+"recommend to use unique names for local package lists."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:114
-#, no-wrap
-msgid "*{Local binary packages lists}*\n"
+#: en/user_customization-packages.ssi:110
+msgid "4~ Local binary package lists"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:116
+#: en/user_customization-packages.ssi:112
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 "
+"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 "
"lists using binary local package lists stored in #{config/binary_local-"
-"packageslists}#. Such media can be used as a customized debian install image "
-"for offline installations."
+"packageslists/}#. Such media can be used as a customized Debian install "
+"image for offline installations."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:118
+#: en/user_customization-packages.ssi:114
msgid ""
-"Package lists that exist in this directory need to have a .list suffix in "
-"order to be processed."
+"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:120
-#, no-wrap
-msgid "*{Extending a provided package list using includes}*\n"
+#: en/user_customization-packages.ssi:116
+msgid "4~ Extending a provided package list using includes"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:129
+#: en/user_customization-packages.ssi:125
msgid "% code{ % % #include <gnome> % iceweasel % % }code"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:131
+#: en/user_customization-packages.ssi:127
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}# "
+"includes. They are available to view in the #{/usr/share/live/build/lists/}# "
"directory."
msgstr ""
#. type: Plain text
+#: en/user_customization-packages.ssi:129
+msgid "4~ Using conditionals inside package lists"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:131
+msgid ""
+"Any of the live-build configuration variables stored in #{config/*}# (minus "
+"the #{LB_}# prefix) may be used in conditional statements in package lists. "
+"Generally, this means any #{lb config}# option uppercased and with dashes "
+"changed to underscores. But in practice, it is only the ones that influence "
+"package selection that make sense, such as #{DISTRIBUTION}#, #{ARCHITECTURE}"
+"# or #{ARCHIVE_AREAS}#."
+msgstr ""
+
+#. type: Plain text
#: en/user_customization-packages.ssi:133
-#, no-wrap
-msgid "*{Using conditionals inside packages lists}*\n"
+msgid ""
+"For example, to install #{ia32-libs}# if the #{--architecture amd64}# is "
+"specified:"
msgstr ""
#. type: Plain text
@@ -485,7 +488,10 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:143
-msgid "or if #{LB_ARCHITECTURE}# is set to #{i386}# or #{amd64}#:"
+msgid ""
+"You may test for any one of a number of values, e.g. to install #"
+"{memtest86+} if either #{--architecture i386}# or #{--architecture amd64}# "
+"is specified:"
msgstr ""
#. type: Plain text
@@ -495,7 +501,10 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:153
-msgid "or if #{LB_ARCHIVE_AREAS}# contains either #{contrib}# or #{non-free}#:"
+msgid ""
+"You may also test against variables that may contain more than one value, e."
+"g. to install #{vrms}# if either #{contrib}# or #{non-free}# is specified "
+"via #{--archive-areas}#:"
msgstr ""
#. type: Plain text
@@ -515,34 +524,26 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:173
-msgid ""
-"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.)"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:175
msgid "The nesting of conditionals is not supported."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:175
msgid "3~ Tasks"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:179
+#: en/user_customization-packages.ssi:177
msgid "%FIXME"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:181
+#: en/user_customization-packages.ssi:179
msgid "2~ Installing modified or third-party packages"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:183
+#: en/user_customization-packages.ssi:181
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 "
@@ -553,7 +554,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:185
+#: en/user_customization-packages.ssi:183
msgid ""
"This section does not cover advice regarding building or maintaining "
"modified packages. Joachim Breitner's 'How to fork privately' method from "
@@ -564,95 +565,90 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:187
+#: en/user_customization-packages.ssi:185
msgid "There are two ways of installing modified custom packages:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:187
msgid "_* #{chroot_local-packages}#"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:191
+#: en/user_customization-packages.ssi:189
msgid "_* Using a custom APT repository"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:191
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 "
-"repository is more time-consuming to set up."
+"Using #{chroot_local-packages}# is simpler to achieve and useful for \"one-"
+"off\" customizations but has a number of drawbacks, whilst using a custom "
+"APT repository is more time-consuming to set up."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:195
+#: en/user_customization-packages.ssi:193
msgid "3~ Using #{chroot_local-packages}# to install custom packages"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:197
+#: en/user_customization-packages.ssi:195
msgid ""
"To install a custom package, simply copy it to the #{config/chroot_local-"
-"packages}# directory. Packages that are inside this directory will be "
+"packages/}# directory. Packages that are inside this directory will be "
"automatically installed into the live system during build - you do not need "
"to specify them elsewhere."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:199
+#: en/user_customization-packages.ssi:197
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:201
+#: en/user_customization-packages.ssi:199
msgid ""
"Using #{chroot_local-packages}# for installation of custom packages has "
"disadvantages:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:203
-msgid "_* It is not possible to use secure APT"
+#: en/user_customization-packages.ssi:201
+msgid "_* It is not possible to use secure APT."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:205
+#: en/user_customization-packages.ssi:203
msgid ""
"_* You must install all appropriate packages in the #{config/chroot_local-"
-"packages}# directory"
+"packages/}# directory."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:205
msgid ""
"_* It does not lend itself to storing Debian Live configurations in revision "
-"control"
+"control."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:209
+#: en/user_customization-packages.ssi:207
msgid "3~ Using an APT repository to install custom packages"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:209
msgid ""
"Unlike using #{chroot_local-packages}#, when using a custom APT repository "
-"you must ensure that you specify the packages elsewhere. See lb-packages for "
-"details."
+"you must ensure that you specify the packages elsewhere. See #{Installing "
+"additional packages}#installing-additional-packages for details."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:213
-msgid "% FIXME: <xref linkend=\"lb-packages\"/>"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:215
+#: en/user_customization-packages.ssi:211
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 "
@@ -660,12 +656,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:217
+#: en/user_customization-packages.ssi:213
msgid "3~ Custom packages and APT"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:219
+#: en/user_customization-packages.ssi:215
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 "
@@ -675,7 +671,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:221
+#: en/user_customization-packages.ssi:217
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 "
@@ -685,17 +681,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:223
+#: en/user_customization-packages.ssi:219
msgid "% FIXME: <xref linkend=\"apt-preferences\"/>"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:225
+#: en/user_customization-packages.ssi:221
msgid "2~ Configuring APT at build time"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:227
+#: en/user_customization-packages.ssi:223
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 "
@@ -706,12 +702,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:229
-msgid "3~ Choosing apt or aptitude"
+#: en/user_customization-packages.ssi:225
+msgid "3~choosing-apt-or-aptitude Choosing apt or aptitude"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:231
+#: en/user_customization-packages.ssi:227
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 "
@@ -721,26 +717,26 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:233
+#: en/user_customization-packages.ssi:229
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
+#: en/user_customization-packages.ssi:231
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
+#: en/user_customization-packages.ssi:233
msgid "3~ Using a proxy with APT"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:239
+#: en/user_customization-packages.ssi:235
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}# "
@@ -748,17 +744,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:243
+#: en/user_customization-packages.ssi:239
msgid "lb config --apt-http-proxy http://proxy/"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:247
+#: en/user_customization-packages.ssi:243
msgid "3~ Tweaking APT to save space"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:249
+#: en/user_customization-packages.ssi:245
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 "
@@ -766,19 +762,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:251
+#: en/user_customization-packages.ssi:247
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
+#: en/user_customization-packages.ssi:251
msgid "$ lb config --binary-indices false"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:259
+#: en/user_customization-packages.ssi:255
msgid ""
"This will not influence the entries in /etc/apt/sources.list, but merely "
"whether /var/lib/apt contains the indices files or not. The tradeoff is that "
@@ -788,19 +784,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:261
+#: en/user_customization-packages.ssi:257
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
+#: en/user_customization-packages.ssi:261
msgid "$ lb config -apt-recommends false"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:269
+#: en/user_customization-packages.ssi:265
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"
@@ -812,12 +808,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:271
+#: en/user_customization-packages.ssi:267
msgid "3~ Passing options to apt or aptitude"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:273
+#: en/user_customization-packages.ssi:269
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 "
@@ -826,11 +822,11 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:275
+#: en/user_customization-packages.ssi:271
msgid "3~ APT pinning"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:277
+#: en/user_customization-packages.ssi:273
msgid "% FIXME: needs content"
msgstr ""
diff --git a/manual/po/fr/user_customization-packages.ssi.po b/manual/po/fr/user_customization-packages.ssi.po
index 4ec5382..82f9f3a 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-21 13:45-0400\n"
+"POT-Creation-Date: 2010-11-21 20:09-0400\n"
"PO-Revision-Date: 2010-10-16 14:45-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -55,15 +55,14 @@ msgstr ""
#: en/user_customization-internationalization.ssi:38
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:80
-#: en/user_customization-packages.ssi:100
+#: en/user_customization-packages.ssi:80 en/user_customization-packages.ssi:96
#: 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_customization-packages.ssi:237
+#: en/user_customization-packages.ssi:249
+#: en/user_customization-packages.ssi:259 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
@@ -115,14 +114,14 @@ msgstr "code{"
#: 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:100
#: 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_customization-packages.ssi:241
+#: en/user_customization-packages.ssi:253
+#: en/user_customization-packages.ssi:263 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
@@ -135,7 +134,7 @@ msgid "}code"
msgstr "}code"
#. type: Plain text
-#: en/user_basics.ssi:218 en/user_customization-packages.ssi:122
+#: en/user_basics.ssi:218 en/user_customization-packages.ssi:118
msgid "% FIXME"
msgstr ""
@@ -180,14 +179,14 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:12
msgid ""
-"Each of the --mirror-* options governs which distribution mirror is used at "
-"various stages of the build. Recall from {Stages of the build}#stages-of-the-"
-"build that the *bootstrap* stage is when the chroot is initially populated "
-"by debootstrap with a minimal system, and the *chroot* stage is when the "
-"chroot used to construct the live system's filesystem is built. Thus, the "
-"corresponding mirror switches are used for those stages, and later, in the "
-"*binary* stage, the --mirror-binary and --mirror-binary-security values are "
-"used, superceding any mirrors used in an earlier stage."
+"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
@@ -199,8 +198,8 @@ msgstr ""
#: en/user_customization-packages.ssi:16
msgid ""
"To set the distribution mirrors used at build time to point at a local "
-"mirror, it is sufficient to set --mirror-bootstrap and --mirror-chroot-"
-"security as follows."
+"mirror, it is sufficient to set #{--mirror-bootstrap}# and #{--mirror-chroot-"
+"security}# as follows."
msgstr ""
#. type: Plain text
@@ -214,8 +213,8 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:25
msgid ""
-"The chroot mirror, specified by --mirror-chroot, defaults to the --mirror-"
-"bootstrap value."
+"The chroot mirror, specified by #{--mirror-chroot}#, defaults to the #{--"
+"mirror-bootstrap}# value."
msgstr ""
#. type: Plain text
@@ -226,14 +225,14 @@ msgstr ""
#. type: Plain text
#: 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."
+"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 defaults 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
@@ -274,7 +273,7 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:50
msgid ""
-"If you add the line to #{config/chroot_sources/live.binary}# the repository "
+"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."
msgstr ""
@@ -286,16 +285,16 @@ msgstr ""
#. type: Plain text
#: 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 files."
+"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:56
msgid ""
"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:"
+"selection through the #{--repository}# option, e.g. for enabling live "
+"snapshots, a simple command is enough to enable it:"
msgstr ""
#. type: Plain text
@@ -305,13 +304,13 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:64
-msgid "2~ Installing additional packages"
+msgid "2~installing-additional-packages Installing additional packages"
msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:66
msgid ""
-"live-helper has a number of mechanisms for indicating that additional "
+"live-build has a number of mechanisms for indicating that additional "
"packages should be installed, including:"
msgstr ""
@@ -327,7 +326,7 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:72
-msgid "_* Local packages (#{chroot_local-packages/}#)"
+msgid "_* Local packages (#{config/chroot_local-packages/}#)"
msgstr ""
#. type: Plain text
@@ -355,35 +354,25 @@ msgstr ""
#: 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 "
-"details."
+"determined by your choice of APT utility. See {Choosing apt or aptitude}"
+"#choosing-apt-or-aptitude for more details."
msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:88
-msgid "% FIXME: <xref linkend=\"package-installation\"/>"
-msgstr ""
-
-#. type: Plain text
-#: 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 "
-"using package lists. See package-lists for more information."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:92
-msgid "% FIXME: <xref linkend=\"package-lists\"/>"
+"using package lists. See {Package lists}#package-lists for more information."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:94
-msgid "3~ Package lists"
+#: en/user_customization-packages.ssi:90
+msgid "3~package-lists Package lists"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:96
+#: en/user_customization-packages.ssi:92
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 "
@@ -392,90 +381,104 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:98
+#: en/user_customization-packages.ssi:94
msgid "To specify one or more package list, you can use:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:102
+#: en/user_customization-packages.ssi:98
msgid "$ lb config --packages-lists \"list1 list2 list3\""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:106
+#: en/user_customization-packages.ssi:102
msgid ""
"Note: Package lists that are distributed with live-build reside in the #{/"
-"usr/share/live/build/lists}# directory."
+"usr/share/live/build/lists/}# directory."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:108
-#, no-wrap
-msgid "*{Local packages lists}*\n"
+#: en/user_customization-packages.ssi:104
+msgid "4~ Local package lists"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:110
+#: en/user_customization-packages.ssi:106
msgid ""
"You may supplement the supplied lists using local package lists stored in #"
-"{config/chroot_local-packageslists}#."
+"{config/chroot_local-packageslists/}#."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:112
+#: en/user_customization-packages.ssi:108
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 "
+"in order to be processed. Local package lists always override package lists "
"distributed with live-build. This can cause undesired effects, we therefore "
-"recommend to use unique names for local packages lists."
+"recommend to use unique names for local package lists."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:114
-#, no-wrap
-msgid "*{Local binary packages lists}*\n"
+#: en/user_customization-packages.ssi:110
+msgid "4~ Local binary package lists"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:116
+#: en/user_customization-packages.ssi:112
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 "
+"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 "
"lists using binary local package lists stored in #{config/binary_local-"
-"packageslists}#. Such media can be used as a customized debian install image "
-"for offline installations."
+"packageslists/}#. Such media can be used as a customized Debian install "
+"image for offline installations."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:118
+#: en/user_customization-packages.ssi:114
msgid ""
-"Package lists that exist in this directory need to have a .list suffix in "
-"order to be processed."
+"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:120
-#, no-wrap
-msgid "*{Extending a provided package list using includes}*\n"
+#: en/user_customization-packages.ssi:116
+msgid "4~ Extending a provided package list using includes"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:129
+#: en/user_customization-packages.ssi:125
msgid "% code{ % % #include <gnome> % iceweasel % % }code"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:131
+#: en/user_customization-packages.ssi:127
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}# "
+"includes. They are available to view in the #{/usr/share/live/build/lists/}# "
"directory."
msgstr ""
#. type: Plain text
+#: en/user_customization-packages.ssi:129
+msgid "4~ Using conditionals inside package lists"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:131
+msgid ""
+"Any of the live-build configuration variables stored in #{config/*}# (minus "
+"the #{LB_}# prefix) may be used in conditional statements in package lists. "
+"Generally, this means any #{lb config}# option uppercased and with dashes "
+"changed to underscores. But in practice, it is only the ones that influence "
+"package selection that make sense, such as #{DISTRIBUTION}#, #{ARCHITECTURE}"
+"# or #{ARCHIVE_AREAS}#."
+msgstr ""
+
+#. type: Plain text
#: en/user_customization-packages.ssi:133
-#, no-wrap
-msgid "*{Using conditionals inside packages lists}*\n"
+msgid ""
+"For example, to install #{ia32-libs}# if the #{--architecture amd64}# is "
+"specified:"
msgstr ""
#. type: Plain text
@@ -485,7 +488,10 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:143
-msgid "or if #{LB_ARCHITECTURE}# is set to #{i386}# or #{amd64}#:"
+msgid ""
+"You may test for any one of a number of values, e.g. to install #"
+"{memtest86+} if either #{--architecture i386}# or #{--architecture amd64}# "
+"is specified:"
msgstr ""
#. type: Plain text
@@ -495,7 +501,10 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:153
-msgid "or if #{LB_ARCHIVE_AREAS}# contains either #{contrib}# or #{non-free}#:"
+msgid ""
+"You may also test against variables that may contain more than one value, e."
+"g. to install #{vrms}# if either #{contrib}# or #{non-free}# is specified "
+"via #{--archive-areas}#:"
msgstr ""
#. type: Plain text
@@ -515,34 +524,26 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:173
-msgid ""
-"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.)"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:175
msgid "The nesting of conditionals is not supported."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:175
msgid "3~ Tasks"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:179
+#: en/user_customization-packages.ssi:177
msgid "%FIXME"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:181
+#: en/user_customization-packages.ssi:179
msgid "2~ Installing modified or third-party packages"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:183
+#: en/user_customization-packages.ssi:181
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 "
@@ -553,7 +554,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:185
+#: en/user_customization-packages.ssi:183
msgid ""
"This section does not cover advice regarding building or maintaining "
"modified packages. Joachim Breitner's 'How to fork privately' method from "
@@ -564,95 +565,90 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:187
+#: en/user_customization-packages.ssi:185
msgid "There are two ways of installing modified custom packages:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:187
msgid "_* #{chroot_local-packages}#"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:191
+#: en/user_customization-packages.ssi:189
msgid "_* Using a custom APT repository"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:191
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 "
-"repository is more time-consuming to set up."
+"Using #{chroot_local-packages}# is simpler to achieve and useful for \"one-"
+"off\" customizations but has a number of drawbacks, whilst using a custom "
+"APT repository is more time-consuming to set up."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:195
+#: en/user_customization-packages.ssi:193
msgid "3~ Using #{chroot_local-packages}# to install custom packages"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:197
+#: en/user_customization-packages.ssi:195
msgid ""
"To install a custom package, simply copy it to the #{config/chroot_local-"
-"packages}# directory. Packages that are inside this directory will be "
+"packages/}# directory. Packages that are inside this directory will be "
"automatically installed into the live system during build - you do not need "
"to specify them elsewhere."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:199
+#: en/user_customization-packages.ssi:197
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:201
+#: en/user_customization-packages.ssi:199
msgid ""
"Using #{chroot_local-packages}# for installation of custom packages has "
"disadvantages:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:203
-msgid "_* It is not possible to use secure APT"
+#: en/user_customization-packages.ssi:201
+msgid "_* It is not possible to use secure APT."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:205
+#: en/user_customization-packages.ssi:203
msgid ""
"_* You must install all appropriate packages in the #{config/chroot_local-"
-"packages}# directory"
+"packages/}# directory."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:205
msgid ""
"_* It does not lend itself to storing Debian Live configurations in revision "
-"control"
+"control."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:209
+#: en/user_customization-packages.ssi:207
msgid "3~ Using an APT repository to install custom packages"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:209
msgid ""
"Unlike using #{chroot_local-packages}#, when using a custom APT repository "
-"you must ensure that you specify the packages elsewhere. See lb-packages for "
-"details."
+"you must ensure that you specify the packages elsewhere. See #{Installing "
+"additional packages}#installing-additional-packages for details."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:213
-msgid "% FIXME: <xref linkend=\"lb-packages\"/>"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:215
+#: en/user_customization-packages.ssi:211
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 "
@@ -660,12 +656,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:217
+#: en/user_customization-packages.ssi:213
msgid "3~ Custom packages and APT"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:219
+#: en/user_customization-packages.ssi:215
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 "
@@ -675,7 +671,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:221
+#: en/user_customization-packages.ssi:217
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 "
@@ -685,17 +681,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:223
+#: en/user_customization-packages.ssi:219
msgid "% FIXME: <xref linkend=\"apt-preferences\"/>"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:225
+#: en/user_customization-packages.ssi:221
msgid "2~ Configuring APT at build time"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:227
+#: en/user_customization-packages.ssi:223
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 "
@@ -706,12 +702,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:229
-msgid "3~ Choosing apt or aptitude"
+#: en/user_customization-packages.ssi:225
+msgid "3~choosing-apt-or-aptitude Choosing apt or aptitude"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:231
+#: en/user_customization-packages.ssi:227
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 "
@@ -721,26 +717,26 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:233
+#: en/user_customization-packages.ssi:229
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
+#: en/user_customization-packages.ssi:231
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
+#: en/user_customization-packages.ssi:233
msgid "3~ Using a proxy with APT"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:239
+#: en/user_customization-packages.ssi:235
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}# "
@@ -748,17 +744,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:243
+#: en/user_customization-packages.ssi:239
msgid "lb config --apt-http-proxy http://proxy/"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:247
+#: en/user_customization-packages.ssi:243
msgid "3~ Tweaking APT to save space"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:249
+#: en/user_customization-packages.ssi:245
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 "
@@ -766,19 +762,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:251
+#: en/user_customization-packages.ssi:247
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
+#: en/user_customization-packages.ssi:251
msgid "$ lb config --binary-indices false"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:259
+#: en/user_customization-packages.ssi:255
msgid ""
"This will not influence the entries in /etc/apt/sources.list, but merely "
"whether /var/lib/apt contains the indices files or not. The tradeoff is that "
@@ -788,19 +784,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:261
+#: en/user_customization-packages.ssi:257
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
+#: en/user_customization-packages.ssi:261
msgid "$ lb config -apt-recommends false"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:269
+#: en/user_customization-packages.ssi:265
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"
@@ -812,12 +808,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:271
+#: en/user_customization-packages.ssi:267
msgid "3~ Passing options to apt or aptitude"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:273
+#: en/user_customization-packages.ssi:269
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 "
@@ -826,11 +822,11 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:275
+#: en/user_customization-packages.ssi:271
msgid "3~ APT pinning"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:277
+#: en/user_customization-packages.ssi:273
msgid "% FIXME: needs content"
msgstr ""
diff --git a/manual/po/pt_BR/user_customization-packages.ssi.po b/manual/po/pt_BR/user_customization-packages.ssi.po
index 97ecb77..e9a7efa 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-21 13:45-0400\n"
+"POT-Creation-Date: 2010-11-21 20:09-0400\n"
"PO-Revision-Date: 2010-10-22 08:58-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -55,15 +55,14 @@ msgstr ""
#: en/user_customization-internationalization.ssi:38
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:80
-#: en/user_customization-packages.ssi:100
+#: en/user_customization-packages.ssi:80 en/user_customization-packages.ssi:96
#: 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_customization-packages.ssi:237
+#: en/user_customization-packages.ssi:249
+#: en/user_customization-packages.ssi:259 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
@@ -115,14 +114,14 @@ msgstr "code{"
#: 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:100
#: 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_customization-packages.ssi:241
+#: en/user_customization-packages.ssi:253
+#: en/user_customization-packages.ssi:263 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
@@ -135,7 +134,7 @@ msgid "}code"
msgstr "}code"
#. type: Plain text
-#: en/user_basics.ssi:218 en/user_customization-packages.ssi:122
+#: en/user_basics.ssi:218 en/user_customization-packages.ssi:118
msgid "% FIXME"
msgstr ""
@@ -180,14 +179,14 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:12
msgid ""
-"Each of the --mirror-* options governs which distribution mirror is used at "
-"various stages of the build. Recall from {Stages of the build}#stages-of-the-"
-"build that the *bootstrap* stage is when the chroot is initially populated "
-"by debootstrap with a minimal system, and the *chroot* stage is when the "
-"chroot used to construct the live system's filesystem is built. Thus, the "
-"corresponding mirror switches are used for those stages, and later, in the "
-"*binary* stage, the --mirror-binary and --mirror-binary-security values are "
-"used, superceding any mirrors used in an earlier stage."
+"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
@@ -199,8 +198,8 @@ msgstr ""
#: en/user_customization-packages.ssi:16
msgid ""
"To set the distribution mirrors used at build time to point at a local "
-"mirror, it is sufficient to set --mirror-bootstrap and --mirror-chroot-"
-"security as follows."
+"mirror, it is sufficient to set #{--mirror-bootstrap}# and #{--mirror-chroot-"
+"security}# as follows."
msgstr ""
#. type: Plain text
@@ -214,8 +213,8 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:25
msgid ""
-"The chroot mirror, specified by --mirror-chroot, defaults to the --mirror-"
-"bootstrap value."
+"The chroot mirror, specified by #{--mirror-chroot}#, defaults to the #{--"
+"mirror-bootstrap}# value."
msgstr ""
#. type: Plain text
@@ -226,14 +225,14 @@ msgstr ""
#. type: Plain text
#: 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."
+"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 defaults 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
@@ -274,7 +273,7 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:50
msgid ""
-"If you add the line to #{config/chroot_sources/live.binary}# the repository "
+"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."
msgstr ""
@@ -286,16 +285,16 @@ msgstr ""
#. type: Plain text
#: 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 files."
+"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:56
msgid ""
"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:"
+"selection through the #{--repository}# option, e.g. for enabling live "
+"snapshots, a simple command is enough to enable it:"
msgstr ""
#. type: Plain text
@@ -305,13 +304,13 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:64
-msgid "2~ Installing additional packages"
+msgid "2~installing-additional-packages Installing additional packages"
msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:66
msgid ""
-"live-helper has a number of mechanisms for indicating that additional "
+"live-build has a number of mechanisms for indicating that additional "
"packages should be installed, including:"
msgstr ""
@@ -327,7 +326,7 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:72
-msgid "_* Local packages (#{chroot_local-packages/}#)"
+msgid "_* Local packages (#{config/chroot_local-packages/}#)"
msgstr ""
#. type: Plain text
@@ -355,35 +354,25 @@ msgstr ""
#: 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 "
-"details."
+"determined by your choice of APT utility. See {Choosing apt or aptitude}"
+"#choosing-apt-or-aptitude for more details."
msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:88
-msgid "% FIXME: <xref linkend=\"package-installation\"/>"
-msgstr ""
-
-#. type: Plain text
-#: 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 "
-"using package lists. See package-lists for more information."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:92
-msgid "% FIXME: <xref linkend=\"package-lists\"/>"
+"using package lists. See {Package lists}#package-lists for more information."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:94
-msgid "3~ Package lists"
+#: en/user_customization-packages.ssi:90
+msgid "3~package-lists Package lists"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:96
+#: en/user_customization-packages.ssi:92
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 "
@@ -392,90 +381,104 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:98
+#: en/user_customization-packages.ssi:94
msgid "To specify one or more package list, you can use:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:102
+#: en/user_customization-packages.ssi:98
msgid "$ lb config --packages-lists \"list1 list2 list3\""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:106
+#: en/user_customization-packages.ssi:102
msgid ""
"Note: Package lists that are distributed with live-build reside in the #{/"
-"usr/share/live/build/lists}# directory."
+"usr/share/live/build/lists/}# directory."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:108
-#, no-wrap
-msgid "*{Local packages lists}*\n"
+#: en/user_customization-packages.ssi:104
+msgid "4~ Local package lists"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:110
+#: en/user_customization-packages.ssi:106
msgid ""
"You may supplement the supplied lists using local package lists stored in #"
-"{config/chroot_local-packageslists}#."
+"{config/chroot_local-packageslists/}#."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:112
+#: en/user_customization-packages.ssi:108
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 "
+"in order to be processed. Local package lists always override package lists "
"distributed with live-build. This can cause undesired effects, we therefore "
-"recommend to use unique names for local packages lists."
+"recommend to use unique names for local package lists."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:114
-#, no-wrap
-msgid "*{Local binary packages lists}*\n"
+#: en/user_customization-packages.ssi:110
+msgid "4~ Local binary package lists"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:116
+#: en/user_customization-packages.ssi:112
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 "
+"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 "
"lists using binary local package lists stored in #{config/binary_local-"
-"packageslists}#. Such media can be used as a customized debian install image "
-"for offline installations."
+"packageslists/}#. Such media can be used as a customized Debian install "
+"image for offline installations."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:118
+#: en/user_customization-packages.ssi:114
msgid ""
-"Package lists that exist in this directory need to have a .list suffix in "
-"order to be processed."
+"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:120
-#, no-wrap
-msgid "*{Extending a provided package list using includes}*\n"
+#: en/user_customization-packages.ssi:116
+msgid "4~ Extending a provided package list using includes"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:129
+#: en/user_customization-packages.ssi:125
msgid "% code{ % % #include <gnome> % iceweasel % % }code"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:131
+#: en/user_customization-packages.ssi:127
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}# "
+"includes. They are available to view in the #{/usr/share/live/build/lists/}# "
"directory."
msgstr ""
#. type: Plain text
+#: en/user_customization-packages.ssi:129
+msgid "4~ Using conditionals inside package lists"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:131
+msgid ""
+"Any of the live-build configuration variables stored in #{config/*}# (minus "
+"the #{LB_}# prefix) may be used in conditional statements in package lists. "
+"Generally, this means any #{lb config}# option uppercased and with dashes "
+"changed to underscores. But in practice, it is only the ones that influence "
+"package selection that make sense, such as #{DISTRIBUTION}#, #{ARCHITECTURE}"
+"# or #{ARCHIVE_AREAS}#."
+msgstr ""
+
+#. type: Plain text
#: en/user_customization-packages.ssi:133
-#, no-wrap
-msgid "*{Using conditionals inside packages lists}*\n"
+msgid ""
+"For example, to install #{ia32-libs}# if the #{--architecture amd64}# is "
+"specified:"
msgstr ""
#. type: Plain text
@@ -485,7 +488,10 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:143
-msgid "or if #{LB_ARCHITECTURE}# is set to #{i386}# or #{amd64}#:"
+msgid ""
+"You may test for any one of a number of values, e.g. to install #"
+"{memtest86+} if either #{--architecture i386}# or #{--architecture amd64}# "
+"is specified:"
msgstr ""
#. type: Plain text
@@ -495,7 +501,10 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:153
-msgid "or if #{LB_ARCHIVE_AREAS}# contains either #{contrib}# or #{non-free}#:"
+msgid ""
+"You may also test against variables that may contain more than one value, e."
+"g. to install #{vrms}# if either #{contrib}# or #{non-free}# is specified "
+"via #{--archive-areas}#:"
msgstr ""
#. type: Plain text
@@ -515,34 +524,26 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:173
-msgid ""
-"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.)"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:175
msgid "The nesting of conditionals is not supported."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:175
msgid "3~ Tasks"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:179
+#: en/user_customization-packages.ssi:177
msgid "%FIXME"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:181
+#: en/user_customization-packages.ssi:179
msgid "2~ Installing modified or third-party packages"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:183
+#: en/user_customization-packages.ssi:181
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 "
@@ -553,7 +554,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:185
+#: en/user_customization-packages.ssi:183
msgid ""
"This section does not cover advice regarding building or maintaining "
"modified packages. Joachim Breitner's 'How to fork privately' method from "
@@ -564,95 +565,90 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:187
+#: en/user_customization-packages.ssi:185
msgid "There are two ways of installing modified custom packages:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:187
msgid "_* #{chroot_local-packages}#"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:191
+#: en/user_customization-packages.ssi:189
msgid "_* Using a custom APT repository"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:191
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 "
-"repository is more time-consuming to set up."
+"Using #{chroot_local-packages}# is simpler to achieve and useful for \"one-"
+"off\" customizations but has a number of drawbacks, whilst using a custom "
+"APT repository is more time-consuming to set up."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:195
+#: en/user_customization-packages.ssi:193
msgid "3~ Using #{chroot_local-packages}# to install custom packages"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:197
+#: en/user_customization-packages.ssi:195
msgid ""
"To install a custom package, simply copy it to the #{config/chroot_local-"
-"packages}# directory. Packages that are inside this directory will be "
+"packages/}# directory. Packages that are inside this directory will be "
"automatically installed into the live system during build - you do not need "
"to specify them elsewhere."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:199
+#: en/user_customization-packages.ssi:197
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:201
+#: en/user_customization-packages.ssi:199
msgid ""
"Using #{chroot_local-packages}# for installation of custom packages has "
"disadvantages:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:203
-msgid "_* It is not possible to use secure APT"
+#: en/user_customization-packages.ssi:201
+msgid "_* It is not possible to use secure APT."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:205
+#: en/user_customization-packages.ssi:203
msgid ""
"_* You must install all appropriate packages in the #{config/chroot_local-"
-"packages}# directory"
+"packages/}# directory."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:205
msgid ""
"_* It does not lend itself to storing Debian Live configurations in revision "
-"control"
+"control."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:209
+#: en/user_customization-packages.ssi:207
msgid "3~ Using an APT repository to install custom packages"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:209
msgid ""
"Unlike using #{chroot_local-packages}#, when using a custom APT repository "
-"you must ensure that you specify the packages elsewhere. See lb-packages for "
-"details."
+"you must ensure that you specify the packages elsewhere. See #{Installing "
+"additional packages}#installing-additional-packages for details."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:213
-msgid "% FIXME: <xref linkend=\"lb-packages\"/>"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:215
+#: en/user_customization-packages.ssi:211
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 "
@@ -660,12 +656,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:217
+#: en/user_customization-packages.ssi:213
msgid "3~ Custom packages and APT"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:219
+#: en/user_customization-packages.ssi:215
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 "
@@ -675,7 +671,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:221
+#: en/user_customization-packages.ssi:217
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 "
@@ -685,17 +681,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:223
+#: en/user_customization-packages.ssi:219
msgid "% FIXME: <xref linkend=\"apt-preferences\"/>"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:225
+#: en/user_customization-packages.ssi:221
msgid "2~ Configuring APT at build time"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:227
+#: en/user_customization-packages.ssi:223
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 "
@@ -706,12 +702,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:229
-msgid "3~ Choosing apt or aptitude"
+#: en/user_customization-packages.ssi:225
+msgid "3~choosing-apt-or-aptitude Choosing apt or aptitude"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:231
+#: en/user_customization-packages.ssi:227
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 "
@@ -721,26 +717,26 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:233
+#: en/user_customization-packages.ssi:229
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
+#: en/user_customization-packages.ssi:231
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
+#: en/user_customization-packages.ssi:233
msgid "3~ Using a proxy with APT"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:239
+#: en/user_customization-packages.ssi:235
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}# "
@@ -748,17 +744,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:243
+#: en/user_customization-packages.ssi:239
msgid "lb config --apt-http-proxy http://proxy/"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:247
+#: en/user_customization-packages.ssi:243
msgid "3~ Tweaking APT to save space"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:249
+#: en/user_customization-packages.ssi:245
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 "
@@ -766,19 +762,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:251
+#: en/user_customization-packages.ssi:247
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
+#: en/user_customization-packages.ssi:251
msgid "$ lb config --binary-indices false"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:259
+#: en/user_customization-packages.ssi:255
msgid ""
"This will not influence the entries in /etc/apt/sources.list, but merely "
"whether /var/lib/apt contains the indices files or not. The tradeoff is that "
@@ -788,19 +784,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:261
+#: en/user_customization-packages.ssi:257
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
+#: en/user_customization-packages.ssi:261
msgid "$ lb config -apt-recommends false"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:269
+#: en/user_customization-packages.ssi:265
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"
@@ -812,12 +808,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:271
+#: en/user_customization-packages.ssi:267
msgid "3~ Passing options to apt or aptitude"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:273
+#: en/user_customization-packages.ssi:269
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 "
@@ -826,11 +822,11 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:275
+#: en/user_customization-packages.ssi:271
msgid "3~ APT pinning"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:277
+#: en/user_customization-packages.ssi:273
msgid "% FIXME: needs content"
msgstr ""
diff --git a/manual/po/ro/user_customization-packages.ssi.po b/manual/po/ro/user_customization-packages.ssi.po
index da74ccc..5991048 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-21 13:45-0400\n"
+"POT-Creation-Date: 2010-11-21 20:09-0400\n"
"PO-Revision-Date: 2010-10-22 08:58-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -56,15 +56,14 @@ msgstr ""
#: en/user_customization-internationalization.ssi:38
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:80
-#: en/user_customization-packages.ssi:100
+#: en/user_customization-packages.ssi:80 en/user_customization-packages.ssi:96
#: 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_customization-packages.ssi:237
+#: en/user_customization-packages.ssi:249
+#: en/user_customization-packages.ssi:259 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
@@ -116,14 +115,14 @@ msgstr "code{"
#: 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:100
#: 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_customization-packages.ssi:241
+#: en/user_customization-packages.ssi:253
+#: en/user_customization-packages.ssi:263 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
@@ -136,7 +135,7 @@ msgid "}code"
msgstr "}code"
#. type: Plain text
-#: en/user_basics.ssi:218 en/user_customization-packages.ssi:122
+#: en/user_basics.ssi:218 en/user_customization-packages.ssi:118
msgid "% FIXME"
msgstr ""
@@ -181,14 +180,14 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:12
msgid ""
-"Each of the --mirror-* options governs which distribution mirror is used at "
-"various stages of the build. Recall from {Stages of the build}#stages-of-the-"
-"build that the *bootstrap* stage is when the chroot is initially populated "
-"by debootstrap with a minimal system, and the *chroot* stage is when the "
-"chroot used to construct the live system's filesystem is built. Thus, the "
-"corresponding mirror switches are used for those stages, and later, in the "
-"*binary* stage, the --mirror-binary and --mirror-binary-security values are "
-"used, superceding any mirrors used in an earlier stage."
+"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
@@ -200,8 +199,8 @@ msgstr ""
#: en/user_customization-packages.ssi:16
msgid ""
"To set the distribution mirrors used at build time to point at a local "
-"mirror, it is sufficient to set --mirror-bootstrap and --mirror-chroot-"
-"security as follows."
+"mirror, it is sufficient to set #{--mirror-bootstrap}# and #{--mirror-chroot-"
+"security}# as follows."
msgstr ""
#. type: Plain text
@@ -215,8 +214,8 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:25
msgid ""
-"The chroot mirror, specified by --mirror-chroot, defaults to the --mirror-"
-"bootstrap value."
+"The chroot mirror, specified by #{--mirror-chroot}#, defaults to the #{--"
+"mirror-bootstrap}# value."
msgstr ""
#. type: Plain text
@@ -227,14 +226,14 @@ msgstr ""
#. type: Plain text
#: 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."
+"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 defaults 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
@@ -275,7 +274,7 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:50
msgid ""
-"If you add the line to #{config/chroot_sources/live.binary}# the repository "
+"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."
msgstr ""
@@ -287,16 +286,16 @@ msgstr ""
#. type: Plain text
#: 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 files."
+"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:56
msgid ""
"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:"
+"selection through the #{--repository}# option, e.g. for enabling live "
+"snapshots, a simple command is enough to enable it:"
msgstr ""
#. type: Plain text
@@ -306,13 +305,13 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:64
-msgid "2~ Installing additional packages"
+msgid "2~installing-additional-packages Installing additional packages"
msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:66
msgid ""
-"live-helper has a number of mechanisms for indicating that additional "
+"live-build has a number of mechanisms for indicating that additional "
"packages should be installed, including:"
msgstr ""
@@ -328,7 +327,7 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:72
-msgid "_* Local packages (#{chroot_local-packages/}#)"
+msgid "_* Local packages (#{config/chroot_local-packages/}#)"
msgstr ""
#. type: Plain text
@@ -356,35 +355,25 @@ msgstr ""
#: 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 "
-"details."
+"determined by your choice of APT utility. See {Choosing apt or aptitude}"
+"#choosing-apt-or-aptitude for more details."
msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:88
-msgid "% FIXME: <xref linkend=\"package-installation\"/>"
-msgstr ""
-
-#. type: Plain text
-#: 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 "
-"using package lists. See package-lists for more information."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:92
-msgid "% FIXME: <xref linkend=\"package-lists\"/>"
+"using package lists. See {Package lists}#package-lists for more information."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:94
-msgid "3~ Package lists"
+#: en/user_customization-packages.ssi:90
+msgid "3~package-lists Package lists"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:96
+#: en/user_customization-packages.ssi:92
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 "
@@ -393,90 +382,104 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:98
+#: en/user_customization-packages.ssi:94
msgid "To specify one or more package list, you can use:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:102
+#: en/user_customization-packages.ssi:98
msgid "$ lb config --packages-lists \"list1 list2 list3\""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:106
+#: en/user_customization-packages.ssi:102
msgid ""
"Note: Package lists that are distributed with live-build reside in the #{/"
-"usr/share/live/build/lists}# directory."
+"usr/share/live/build/lists/}# directory."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:108
-#, no-wrap
-msgid "*{Local packages lists}*\n"
+#: en/user_customization-packages.ssi:104
+msgid "4~ Local package lists"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:110
+#: en/user_customization-packages.ssi:106
msgid ""
"You may supplement the supplied lists using local package lists stored in #"
-"{config/chroot_local-packageslists}#."
+"{config/chroot_local-packageslists/}#."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:112
+#: en/user_customization-packages.ssi:108
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 "
+"in order to be processed. Local package lists always override package lists "
"distributed with live-build. This can cause undesired effects, we therefore "
-"recommend to use unique names for local packages lists."
+"recommend to use unique names for local package lists."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:114
-#, no-wrap
-msgid "*{Local binary packages lists}*\n"
+#: en/user_customization-packages.ssi:110
+msgid "4~ Local binary package lists"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:116
+#: en/user_customization-packages.ssi:112
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 "
+"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 "
"lists using binary local package lists stored in #{config/binary_local-"
-"packageslists}#. Such media can be used as a customized debian install image "
-"for offline installations."
+"packageslists/}#. Such media can be used as a customized Debian install "
+"image for offline installations."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:118
+#: en/user_customization-packages.ssi:114
msgid ""
-"Package lists that exist in this directory need to have a .list suffix in "
-"order to be processed."
+"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:120
-#, no-wrap
-msgid "*{Extending a provided package list using includes}*\n"
+#: en/user_customization-packages.ssi:116
+msgid "4~ Extending a provided package list using includes"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:129
+#: en/user_customization-packages.ssi:125
msgid "% code{ % % #include <gnome> % iceweasel % % }code"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:131
+#: en/user_customization-packages.ssi:127
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}# "
+"includes. They are available to view in the #{/usr/share/live/build/lists/}# "
"directory."
msgstr ""
#. type: Plain text
+#: en/user_customization-packages.ssi:129
+msgid "4~ Using conditionals inside package lists"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:131
+msgid ""
+"Any of the live-build configuration variables stored in #{config/*}# (minus "
+"the #{LB_}# prefix) may be used in conditional statements in package lists. "
+"Generally, this means any #{lb config}# option uppercased and with dashes "
+"changed to underscores. But in practice, it is only the ones that influence "
+"package selection that make sense, such as #{DISTRIBUTION}#, #{ARCHITECTURE}"
+"# or #{ARCHIVE_AREAS}#."
+msgstr ""
+
+#. type: Plain text
#: en/user_customization-packages.ssi:133
-#, no-wrap
-msgid "*{Using conditionals inside packages lists}*\n"
+msgid ""
+"For example, to install #{ia32-libs}# if the #{--architecture amd64}# is "
+"specified:"
msgstr ""
#. type: Plain text
@@ -486,7 +489,10 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:143
-msgid "or if #{LB_ARCHITECTURE}# is set to #{i386}# or #{amd64}#:"
+msgid ""
+"You may test for any one of a number of values, e.g. to install #"
+"{memtest86+} if either #{--architecture i386}# or #{--architecture amd64}# "
+"is specified:"
msgstr ""
#. type: Plain text
@@ -496,7 +502,10 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:153
-msgid "or if #{LB_ARCHIVE_AREAS}# contains either #{contrib}# or #{non-free}#:"
+msgid ""
+"You may also test against variables that may contain more than one value, e."
+"g. to install #{vrms}# if either #{contrib}# or #{non-free}# is specified "
+"via #{--archive-areas}#:"
msgstr ""
#. type: Plain text
@@ -516,34 +525,26 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:173
-msgid ""
-"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.)"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:175
msgid "The nesting of conditionals is not supported."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:175
msgid "3~ Tasks"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:179
+#: en/user_customization-packages.ssi:177
msgid "%FIXME"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:181
+#: en/user_customization-packages.ssi:179
msgid "2~ Installing modified or third-party packages"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:183
+#: en/user_customization-packages.ssi:181
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 "
@@ -554,7 +555,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:185
+#: en/user_customization-packages.ssi:183
msgid ""
"This section does not cover advice regarding building or maintaining "
"modified packages. Joachim Breitner's 'How to fork privately' method from "
@@ -565,95 +566,90 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:187
+#: en/user_customization-packages.ssi:185
msgid "There are two ways of installing modified custom packages:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:187
msgid "_* #{chroot_local-packages}#"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:191
+#: en/user_customization-packages.ssi:189
msgid "_* Using a custom APT repository"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:191
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 "
-"repository is more time-consuming to set up."
+"Using #{chroot_local-packages}# is simpler to achieve and useful for \"one-"
+"off\" customizations but has a number of drawbacks, whilst using a custom "
+"APT repository is more time-consuming to set up."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:195
+#: en/user_customization-packages.ssi:193
msgid "3~ Using #{chroot_local-packages}# to install custom packages"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:197
+#: en/user_customization-packages.ssi:195
msgid ""
"To install a custom package, simply copy it to the #{config/chroot_local-"
-"packages}# directory. Packages that are inside this directory will be "
+"packages/}# directory. Packages that are inside this directory will be "
"automatically installed into the live system during build - you do not need "
"to specify them elsewhere."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:199
+#: en/user_customization-packages.ssi:197
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:201
+#: en/user_customization-packages.ssi:199
msgid ""
"Using #{chroot_local-packages}# for installation of custom packages has "
"disadvantages:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:203
-msgid "_* It is not possible to use secure APT"
+#: en/user_customization-packages.ssi:201
+msgid "_* It is not possible to use secure APT."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:205
+#: en/user_customization-packages.ssi:203
msgid ""
"_* You must install all appropriate packages in the #{config/chroot_local-"
-"packages}# directory"
+"packages/}# directory."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:205
msgid ""
"_* It does not lend itself to storing Debian Live configurations in revision "
-"control"
+"control."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:209
+#: en/user_customization-packages.ssi:207
msgid "3~ Using an APT repository to install custom packages"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:209
msgid ""
"Unlike using #{chroot_local-packages}#, when using a custom APT repository "
-"you must ensure that you specify the packages elsewhere. See lb-packages for "
-"details."
+"you must ensure that you specify the packages elsewhere. See #{Installing "
+"additional packages}#installing-additional-packages for details."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:213
-msgid "% FIXME: <xref linkend=\"lb-packages\"/>"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:215
+#: en/user_customization-packages.ssi:211
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 "
@@ -661,12 +657,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:217
+#: en/user_customization-packages.ssi:213
msgid "3~ Custom packages and APT"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:219
+#: en/user_customization-packages.ssi:215
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 "
@@ -676,7 +672,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:221
+#: en/user_customization-packages.ssi:217
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 "
@@ -686,17 +682,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:223
+#: en/user_customization-packages.ssi:219
msgid "% FIXME: <xref linkend=\"apt-preferences\"/>"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:225
+#: en/user_customization-packages.ssi:221
msgid "2~ Configuring APT at build time"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:227
+#: en/user_customization-packages.ssi:223
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 "
@@ -707,12 +703,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:229
-msgid "3~ Choosing apt or aptitude"
+#: en/user_customization-packages.ssi:225
+msgid "3~choosing-apt-or-aptitude Choosing apt or aptitude"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:231
+#: en/user_customization-packages.ssi:227
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 "
@@ -722,26 +718,26 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:233
+#: en/user_customization-packages.ssi:229
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
+#: en/user_customization-packages.ssi:231
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
+#: en/user_customization-packages.ssi:233
msgid "3~ Using a proxy with APT"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:239
+#: en/user_customization-packages.ssi:235
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}# "
@@ -749,17 +745,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:243
+#: en/user_customization-packages.ssi:239
msgid "lb config --apt-http-proxy http://proxy/"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:247
+#: en/user_customization-packages.ssi:243
msgid "3~ Tweaking APT to save space"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:249
+#: en/user_customization-packages.ssi:245
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 "
@@ -767,19 +763,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:251
+#: en/user_customization-packages.ssi:247
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
+#: en/user_customization-packages.ssi:251
msgid "$ lb config --binary-indices false"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:259
+#: en/user_customization-packages.ssi:255
msgid ""
"This will not influence the entries in /etc/apt/sources.list, but merely "
"whether /var/lib/apt contains the indices files or not. The tradeoff is that "
@@ -789,19 +785,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:261
+#: en/user_customization-packages.ssi:257
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
+#: en/user_customization-packages.ssi:261
msgid "$ lb config -apt-recommends false"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:269
+#: en/user_customization-packages.ssi:265
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"
@@ -813,12 +809,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:271
+#: en/user_customization-packages.ssi:267
msgid "3~ Passing options to apt or aptitude"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:273
+#: en/user_customization-packages.ssi:269
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 "
@@ -827,11 +823,11 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:275
+#: en/user_customization-packages.ssi:271
msgid "3~ APT pinning"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:277
+#: en/user_customization-packages.ssi:273
msgid "% FIXME: needs content"
msgstr ""
diff --git a/manual/pot/user_customization-packages.ssi.pot b/manual/pot/user_customization-packages.ssi.pot
index e03bd6e..aef7d39 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-21 13:45-0400\n"
+"POT-Creation-Date: 2010-11-21 20:09-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"
@@ -55,15 +55,14 @@ msgstr ""
#: en/user_customization-internationalization.ssi:38
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:80
-#: en/user_customization-packages.ssi:100
+#: en/user_customization-packages.ssi:80 en/user_customization-packages.ssi:96
#: 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_customization-packages.ssi:237
+#: en/user_customization-packages.ssi:249
+#: en/user_customization-packages.ssi:259 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
@@ -115,14 +114,14 @@ msgstr ""
#: 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:100
#: 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_customization-packages.ssi:241
+#: en/user_customization-packages.ssi:253
+#: en/user_customization-packages.ssi:263 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
@@ -135,7 +134,7 @@ msgid "}code"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:218 en/user_customization-packages.ssi:122
+#: en/user_basics.ssi:218 en/user_customization-packages.ssi:118
msgid "% FIXME"
msgstr ""
@@ -180,14 +179,14 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:12
msgid ""
-"Each of the --mirror-* options governs which distribution mirror is used at "
-"various stages of the build. Recall from {Stages of the build}#stages-of-the-"
-"build that the *bootstrap* stage is when the chroot is initially populated "
-"by debootstrap with a minimal system, and the *chroot* stage is when the "
-"chroot used to construct the live system's filesystem is built. Thus, the "
-"corresponding mirror switches are used for those stages, and later, in the "
-"*binary* stage, the --mirror-binary and --mirror-binary-security values are "
-"used, superceding any mirrors used in an earlier stage."
+"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
@@ -199,8 +198,8 @@ msgstr ""
#: en/user_customization-packages.ssi:16
msgid ""
"To set the distribution mirrors used at build time to point at a local "
-"mirror, it is sufficient to set --mirror-bootstrap and --mirror-chroot-"
-"security as follows."
+"mirror, it is sufficient to set #{--mirror-bootstrap}# and #{--mirror-chroot-"
+"security}# as follows."
msgstr ""
#. type: Plain text
@@ -214,8 +213,8 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:25
msgid ""
-"The chroot mirror, specified by --mirror-chroot, defaults to the --mirror-"
-"bootstrap value."
+"The chroot mirror, specified by #{--mirror-chroot}#, defaults to the #{--"
+"mirror-bootstrap}# value."
msgstr ""
#. type: Plain text
@@ -226,14 +225,14 @@ msgstr ""
#. type: Plain text
#: 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."
+"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 defaults 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
@@ -274,7 +273,7 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:50
msgid ""
-"If you add the line to #{config/chroot_sources/live.binary}# the repository "
+"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."
msgstr ""
@@ -286,16 +285,16 @@ msgstr ""
#. type: Plain text
#: 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 files."
+"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:56
msgid ""
"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:"
+"selection through the #{--repository}# option, e.g. for enabling live "
+"snapshots, a simple command is enough to enable it:"
msgstr ""
#. type: Plain text
@@ -305,13 +304,13 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:64
-msgid "2~ Installing additional packages"
+msgid "2~installing-additional-packages Installing additional packages"
msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:66
msgid ""
-"live-helper has a number of mechanisms for indicating that additional "
+"live-build has a number of mechanisms for indicating that additional "
"packages should be installed, including:"
msgstr ""
@@ -327,7 +326,7 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:72
-msgid "_* Local packages (#{chroot_local-packages/}#)"
+msgid "_* Local packages (#{config/chroot_local-packages/}#)"
msgstr ""
#. type: Plain text
@@ -355,35 +354,25 @@ msgstr ""
#: 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 "
-"details."
+"determined by your choice of APT utility. See {Choosing apt or aptitude}"
+"#choosing-apt-or-aptitude for more details."
msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:88
-msgid "% FIXME: <xref linkend=\"package-installation\"/>"
-msgstr ""
-
-#. type: Plain text
-#: 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 "
-"using package lists. See package-lists for more information."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:92
-msgid "% FIXME: <xref linkend=\"package-lists\"/>"
+"using package lists. See {Package lists}#package-lists for more information."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:94
-msgid "3~ Package lists"
+#: en/user_customization-packages.ssi:90
+msgid "3~package-lists Package lists"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:96
+#: en/user_customization-packages.ssi:92
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 "
@@ -392,90 +381,104 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:98
+#: en/user_customization-packages.ssi:94
msgid "To specify one or more package list, you can use:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:102
+#: en/user_customization-packages.ssi:98
msgid "$ lb config --packages-lists \"list1 list2 list3\""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:106
+#: en/user_customization-packages.ssi:102
msgid ""
"Note: Package lists that are distributed with live-build reside in the #{/"
-"usr/share/live/build/lists}# directory."
+"usr/share/live/build/lists/}# directory."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:108
-#, no-wrap
-msgid "*{Local packages lists}*\n"
+#: en/user_customization-packages.ssi:104
+msgid "4~ Local package lists"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:110
+#: en/user_customization-packages.ssi:106
msgid ""
"You may supplement the supplied lists using local package lists stored in #"
-"{config/chroot_local-packageslists}#."
+"{config/chroot_local-packageslists/}#."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:112
+#: en/user_customization-packages.ssi:108
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 "
+"in order to be processed. Local package lists always override package lists "
"distributed with live-build. This can cause undesired effects, we therefore "
-"recommend to use unique names for local packages lists."
+"recommend to use unique names for local package lists."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:114
-#, no-wrap
-msgid "*{Local binary packages lists}*\n"
+#: en/user_customization-packages.ssi:110
+msgid "4~ Local binary package lists"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:116
+#: en/user_customization-packages.ssi:112
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 "
+"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 "
"lists using binary local package lists stored in #{config/binary_local-"
-"packageslists}#. Such media can be used as a customized debian install image "
-"for offline installations."
+"packageslists/}#. Such media can be used as a customized Debian install "
+"image for offline installations."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:118
+#: en/user_customization-packages.ssi:114
msgid ""
-"Package lists that exist in this directory need to have a .list suffix in "
-"order to be processed."
+"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:120
-#, no-wrap
-msgid "*{Extending a provided package list using includes}*\n"
+#: en/user_customization-packages.ssi:116
+msgid "4~ Extending a provided package list using includes"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:129
+#: en/user_customization-packages.ssi:125
msgid "% code{ % % #include <gnome> % iceweasel % % }code"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:131
+#: en/user_customization-packages.ssi:127
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}# "
+"includes. They are available to view in the #{/usr/share/live/build/lists/}# "
"directory."
msgstr ""
#. type: Plain text
+#: en/user_customization-packages.ssi:129
+msgid "4~ Using conditionals inside package lists"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:131
+msgid ""
+"Any of the live-build configuration variables stored in #{config/*}# (minus "
+"the #{LB_}# prefix) may be used in conditional statements in package lists. "
+"Generally, this means any #{lb config}# option uppercased and with dashes "
+"changed to underscores. But in practice, it is only the ones that influence "
+"package selection that make sense, such as #{DISTRIBUTION}#, #{ARCHITECTURE}"
+"# or #{ARCHIVE_AREAS}#."
+msgstr ""
+
+#. type: Plain text
#: en/user_customization-packages.ssi:133
-#, no-wrap
-msgid "*{Using conditionals inside packages lists}*\n"
+msgid ""
+"For example, to install #{ia32-libs}# if the #{--architecture amd64}# is "
+"specified:"
msgstr ""
#. type: Plain text
@@ -485,7 +488,10 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:143
-msgid "or if #{LB_ARCHITECTURE}# is set to #{i386}# or #{amd64}#:"
+msgid ""
+"You may test for any one of a number of values, e.g. to install #"
+"{memtest86+} if either #{--architecture i386}# or #{--architecture amd64}# "
+"is specified:"
msgstr ""
#. type: Plain text
@@ -495,7 +501,10 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:153
-msgid "or if #{LB_ARCHIVE_AREAS}# contains either #{contrib}# or #{non-free}#:"
+msgid ""
+"You may also test against variables that may contain more than one value, e."
+"g. to install #{vrms}# if either #{contrib}# or #{non-free}# is specified "
+"via #{--archive-areas}#:"
msgstr ""
#. type: Plain text
@@ -515,34 +524,26 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:173
-msgid ""
-"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.)"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:175
msgid "The nesting of conditionals is not supported."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:175
msgid "3~ Tasks"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:179
+#: en/user_customization-packages.ssi:177
msgid "%FIXME"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:181
+#: en/user_customization-packages.ssi:179
msgid "2~ Installing modified or third-party packages"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:183
+#: en/user_customization-packages.ssi:181
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 "
@@ -553,7 +554,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:185
+#: en/user_customization-packages.ssi:183
msgid ""
"This section does not cover advice regarding building or maintaining "
"modified packages. Joachim Breitner's 'How to fork privately' method from "
@@ -564,95 +565,90 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:187
+#: en/user_customization-packages.ssi:185
msgid "There are two ways of installing modified custom packages:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:187
msgid "_* #{chroot_local-packages}#"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:191
+#: en/user_customization-packages.ssi:189
msgid "_* Using a custom APT repository"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:191
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 "
-"repository is more time-consuming to set up."
+"Using #{chroot_local-packages}# is simpler to achieve and useful for \"one-"
+"off\" customizations but has a number of drawbacks, whilst using a custom "
+"APT repository is more time-consuming to set up."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:195
+#: en/user_customization-packages.ssi:193
msgid "3~ Using #{chroot_local-packages}# to install custom packages"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:197
+#: en/user_customization-packages.ssi:195
msgid ""
"To install a custom package, simply copy it to the #{config/chroot_local-"
-"packages}# directory. Packages that are inside this directory will be "
+"packages/}# directory. Packages that are inside this directory will be "
"automatically installed into the live system during build - you do not need "
"to specify them elsewhere."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:199
+#: en/user_customization-packages.ssi:197
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:201
+#: en/user_customization-packages.ssi:199
msgid ""
"Using #{chroot_local-packages}# for installation of custom packages has "
"disadvantages:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:203
-msgid "_* It is not possible to use secure APT"
+#: en/user_customization-packages.ssi:201
+msgid "_* It is not possible to use secure APT."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:205
+#: en/user_customization-packages.ssi:203
msgid ""
"_* You must install all appropriate packages in the #{config/chroot_local-"
-"packages}# directory"
+"packages/}# directory."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:205
msgid ""
"_* It does not lend itself to storing Debian Live configurations in revision "
-"control"
+"control."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:209
+#: en/user_customization-packages.ssi:207
msgid "3~ Using an APT repository to install custom packages"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:209
msgid ""
"Unlike using #{chroot_local-packages}#, when using a custom APT repository "
-"you must ensure that you specify the packages elsewhere. See lb-packages for "
-"details."
+"you must ensure that you specify the packages elsewhere. See #{Installing "
+"additional packages}#installing-additional-packages for details."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:213
-msgid "% FIXME: <xref linkend=\"lb-packages\"/>"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:215
+#: en/user_customization-packages.ssi:211
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 "
@@ -660,12 +656,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:217
+#: en/user_customization-packages.ssi:213
msgid "3~ Custom packages and APT"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:219
+#: en/user_customization-packages.ssi:215
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 "
@@ -675,7 +671,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:221
+#: en/user_customization-packages.ssi:217
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 "
@@ -685,17 +681,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:223
+#: en/user_customization-packages.ssi:219
msgid "% FIXME: <xref linkend=\"apt-preferences\"/>"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:225
+#: en/user_customization-packages.ssi:221
msgid "2~ Configuring APT at build time"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:227
+#: en/user_customization-packages.ssi:223
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 "
@@ -706,12 +702,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:229
-msgid "3~ Choosing apt or aptitude"
+#: en/user_customization-packages.ssi:225
+msgid "3~choosing-apt-or-aptitude Choosing apt or aptitude"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:231
+#: en/user_customization-packages.ssi:227
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 "
@@ -721,26 +717,26 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:233
+#: en/user_customization-packages.ssi:229
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
+#: en/user_customization-packages.ssi:231
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
+#: en/user_customization-packages.ssi:233
msgid "3~ Using a proxy with APT"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:239
+#: en/user_customization-packages.ssi:235
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}# "
@@ -748,17 +744,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:243
+#: en/user_customization-packages.ssi:239
msgid "lb config --apt-http-proxy http://proxy/"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:247
+#: en/user_customization-packages.ssi:243
msgid "3~ Tweaking APT to save space"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:249
+#: en/user_customization-packages.ssi:245
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 "
@@ -766,19 +762,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:251
+#: en/user_customization-packages.ssi:247
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
+#: en/user_customization-packages.ssi:251
msgid "$ lb config --binary-indices false"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:259
+#: en/user_customization-packages.ssi:255
msgid ""
"This will not influence the entries in /etc/apt/sources.list, but merely "
"whether /var/lib/apt contains the indices files or not. The tradeoff is that "
@@ -788,19 +784,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:261
+#: en/user_customization-packages.ssi:257
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
+#: en/user_customization-packages.ssi:261
msgid "$ lb config -apt-recommends false"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:269
+#: en/user_customization-packages.ssi:265
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"
@@ -812,12 +808,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:271
+#: en/user_customization-packages.ssi:267
msgid "3~ Passing options to apt or aptitude"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:273
+#: en/user_customization-packages.ssi:269
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 "
@@ -826,11 +822,11 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:275
+#: en/user_customization-packages.ssi:271
msgid "3~ APT pinning"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:277
+#: en/user_customization-packages.ssi:273
msgid "% FIXME: needs content"
msgstr ""
diff --git a/manual/pt_BR/user_customization-packages.ssi b/manual/pt_BR/user_customization-packages.ssi
index 7cff6f3..4848216 100644
--- a/manual/pt_BR/user_customization-packages.ssi
+++ b/manual/pt_BR/user_customization-packages.ssi
@@ -20,21 +20,21 @@ to name a few possibilities.
3~ Distribution mirrors
-Each of the --mirror-* options governs which distribution mirror is used at
-various stages of the build. Recall from {Stages of the
+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.
+and later, in the *binary* stage, the #{--mirror-binary}# and
+#{--mirror-binary-security}# values are used, superceding any mirrors used
+in an earlier stage.
4~ Distribution mirrors used at build time
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.
+mirror, it is sufficient to set #{--mirror-bootstrap}# and
+#{--mirror-chroot-security}# as follows.
code{
@@ -43,19 +43,19 @@ $ lb config --mirror-bootstrap http://localhost/debian/ \
}code
-The chroot mirror, specified by --mirror-chroot, defaults to the
---mirror-bootstrap value.
+The chroot mirror, specified by #{--mirror-chroot}#, defaults to the
+#{--mirror-bootstrap}# value.
4~ Distribution mirrors used at run time
-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.
+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 defaults 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{
@@ -81,17 +81,17 @@ 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
+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 files.
+#{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:
+selection through the #{--repository}# option, e.g. for enabling live
+snapshots, a simple command is enough to enable it:
code{
@@ -99,16 +99,16 @@ $ lb config --repository live.debian.net
}code
-2~ Installing additional packages
+2~installing-additional-packages Installing additional packages
-live-helper has a number of mechanisms for indicating that additional
+live-build has a number of mechanisms for indicating that additional
packages should be installed, including:
_* The #{--packages}# option
_* Package lists
-_* Local packages (#{chroot_local-packages/}#)
+_* Local packages (#{config/chroot_local-packages/}#)
_* Tasks
@@ -123,18 +123,14 @@ $ lb config --packages "package1 package2 package3"
}code
The behaviour of live-build when specifying a package that does not exist is
-determined by your choice of APT utility. See package-installation for more
-details.
-
-% FIXME: <xref linkend="package-installation"/>
+determined by your choice of APT utility. See {Choosing apt or
+aptitude}#choosing-apt-or-aptitude for more details.
If you need to specify a large number of packages to be installed or you
need flexibility regarding which packages to install, you should probably be
-using package lists. See package-lists for more information.
-
-% FIXME: <xref linkend="package-lists"/>
+using package lists. See {Package lists}#package-lists for more information.
-3~ Package lists
+3~package-lists Package lists
Package lists are a powerful way of expressing which packages should be
installed. live-build ships with a number of predefined package lists which
@@ -150,40 +146,50 @@ $ lb config --packages-lists "list1 list2 list3"
}code
Note: Package lists that are distributed with live-build reside in the
-#{/usr/share/live/build/lists}# directory.
+#{/usr/share/live/build/lists/}# directory.
-*{Local packages lists}*
+4~ Local package lists
You may supplement the supplied lists using local package lists stored in
-#{config/chroot_local-packageslists}#.
+#{config/chroot_local-packageslists/}#.
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
+in order to be processed. Local package lists always override package lists
distributed with live-build. This can cause undesired effects, we therefore
-recommend to use unique names for local packages lists.
+recommend to use unique names for local package lists.
-*{Local binary packages lists}*
+4~ Local binary package lists
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
+#{pool/}# (without installing them onto the live image) you may need to use
lists using binary local package lists stored in
-#{config/binary_local-packageslists}#. Such media can be used as a
-customized debian install image for offline installations.
+#{config/binary_local-packageslists/}#. Such media can be used as a
+customized Debian install image for offline installations.
-Package lists that exist in this directory need to have a .list suffix in
-order to be processed.
+Package lists that exist in this directory need to have a #{.list}# suffix
+in order to be processed.
-*{Extending a provided package list using includes}*
+4~ Extending a provided package list using includes
% FIXME
% code{ % % #include <gnome> % iceweasel % % }code
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}#
+includes. They are available to view in the #{/usr/share/live/build/lists/}#
directory.
-*{Using conditionals inside packages lists}*
+4~ Using conditionals inside package lists
+
+Any of the live-build configuration variables stored in #{config/*}# (minus
+the #{LB_}# prefix) may be used in conditional statements in package
+lists. Generally, this means any #{lb config}# option uppercased and with
+dashes changed to underscores. But in practice, it is only the ones that
+influence package selection that make sense, such as #{DISTRIBUTION}#,
+#{ARCHITECTURE}# or #{ARCHIVE_AREAS}#.
+
+For example, to install #{ia32-libs}# if the #{--architecture amd64}# is
+specified:
code{
@@ -191,7 +197,9 @@ code{
}code
-or if #{LB_ARCHITECTURE}# is set to #{i386}# or #{amd64}#:
+You may test for any one of a number of values, e.g. to install
+#{memtest86+} if either #{--architecture i386}# or #{--architecture amd64}#
+is specified:
code{
@@ -199,7 +207,9 @@ code{
}code
-or if #{LB_ARCHIVE_AREAS}# contains either #{contrib}# or #{non-free}#:
+You may also test against variables that may contain more than one value,
+e.g. to install #{vrms}# if either #{contrib}# or #{non-free}# is specified
+via #{--archive-areas}#:
code{
@@ -215,10 +225,6 @@ code{
}code
-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.
3~ Tasks
@@ -247,14 +253,14 @@ _* #{chroot_local-packages}#
_* Using a custom APT repository
-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
-repository is more time-consuming to set up.
+Using #{chroot_local-packages}# is simpler to achieve and useful for
+"one-off" customizations but has a number of drawbacks, whilst using a
+custom APT repository is more time-consuming to set up.
3~ Using #{chroot_local-packages}# to install custom packages
To install a custom package, simply copy it to the
-#{config/chroot_local-packages}# directory. Packages that are inside this
+#{config/chroot_local-packages/}# directory. Packages that are inside this
directory will be automatically installed into the live system during build
- you do not need to specify them elsewhere.
@@ -264,21 +270,19 @@ is to use #{dpkg-name}#.
Using #{chroot_local-packages}# for installation of custom packages has
disadvantages:
-_* It is not possible to use secure APT
+_* It is not possible to use secure APT.
_* You must install all appropriate packages in the
-#{config/chroot_local-packages}# directory
+#{config/chroot_local-packages/}# directory.
_* It does not lend itself to storing Debian Live configurations in revision
-control
+control.
3~ Using an APT repository to install custom packages
Unlike using #{chroot_local-packages}#, when using a custom APT repository
-you must ensure that you specify the packages elsewhere. See lb-packages for
-details.
-
-% FIXME: <xref linkend="lb-packages"/>
+you must ensure that you specify the packages elsewhere. See #{Installing
+additional packages}#installing-additional-packages for details.
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
@@ -309,7 +313,7 @@ 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
+3~choosing-apt-or-aptitude 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
diff --git a/manual/ro/user_customization-packages.ssi b/manual/ro/user_customization-packages.ssi
index 7cff6f3..4848216 100644
--- a/manual/ro/user_customization-packages.ssi
+++ b/manual/ro/user_customization-packages.ssi
@@ -20,21 +20,21 @@ to name a few possibilities.
3~ Distribution mirrors
-Each of the --mirror-* options governs which distribution mirror is used at
-various stages of the build. Recall from {Stages of the
+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.
+and later, in the *binary* stage, the #{--mirror-binary}# and
+#{--mirror-binary-security}# values are used, superceding any mirrors used
+in an earlier stage.
4~ Distribution mirrors used at build time
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.
+mirror, it is sufficient to set #{--mirror-bootstrap}# and
+#{--mirror-chroot-security}# as follows.
code{
@@ -43,19 +43,19 @@ $ lb config --mirror-bootstrap http://localhost/debian/ \
}code
-The chroot mirror, specified by --mirror-chroot, defaults to the
---mirror-bootstrap value.
+The chroot mirror, specified by #{--mirror-chroot}#, defaults to the
+#{--mirror-bootstrap}# value.
4~ Distribution mirrors used at run time
-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.
+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 defaults 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{
@@ -81,17 +81,17 @@ 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
+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 files.
+#{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:
+selection through the #{--repository}# option, e.g. for enabling live
+snapshots, a simple command is enough to enable it:
code{
@@ -99,16 +99,16 @@ $ lb config --repository live.debian.net
}code
-2~ Installing additional packages
+2~installing-additional-packages Installing additional packages
-live-helper has a number of mechanisms for indicating that additional
+live-build has a number of mechanisms for indicating that additional
packages should be installed, including:
_* The #{--packages}# option
_* Package lists
-_* Local packages (#{chroot_local-packages/}#)
+_* Local packages (#{config/chroot_local-packages/}#)
_* Tasks
@@ -123,18 +123,14 @@ $ lb config --packages "package1 package2 package3"
}code
The behaviour of live-build when specifying a package that does not exist is
-determined by your choice of APT utility. See package-installation for more
-details.
-
-% FIXME: <xref linkend="package-installation"/>
+determined by your choice of APT utility. See {Choosing apt or
+aptitude}#choosing-apt-or-aptitude for more details.
If you need to specify a large number of packages to be installed or you
need flexibility regarding which packages to install, you should probably be
-using package lists. See package-lists for more information.
-
-% FIXME: <xref linkend="package-lists"/>
+using package lists. See {Package lists}#package-lists for more information.
-3~ Package lists
+3~package-lists Package lists
Package lists are a powerful way of expressing which packages should be
installed. live-build ships with a number of predefined package lists which
@@ -150,40 +146,50 @@ $ lb config --packages-lists "list1 list2 list3"
}code
Note: Package lists that are distributed with live-build reside in the
-#{/usr/share/live/build/lists}# directory.
+#{/usr/share/live/build/lists/}# directory.
-*{Local packages lists}*
+4~ Local package lists
You may supplement the supplied lists using local package lists stored in
-#{config/chroot_local-packageslists}#.
+#{config/chroot_local-packageslists/}#.
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
+in order to be processed. Local package lists always override package lists
distributed with live-build. This can cause undesired effects, we therefore
-recommend to use unique names for local packages lists.
+recommend to use unique names for local package lists.
-*{Local binary packages lists}*
+4~ Local binary package lists
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
+#{pool/}# (without installing them onto the live image) you may need to use
lists using binary local package lists stored in
-#{config/binary_local-packageslists}#. Such media can be used as a
-customized debian install image for offline installations.
+#{config/binary_local-packageslists/}#. Such media can be used as a
+customized Debian install image for offline installations.
-Package lists that exist in this directory need to have a .list suffix in
-order to be processed.
+Package lists that exist in this directory need to have a #{.list}# suffix
+in order to be processed.
-*{Extending a provided package list using includes}*
+4~ Extending a provided package list using includes
% FIXME
% code{ % % #include <gnome> % iceweasel % % }code
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}#
+includes. They are available to view in the #{/usr/share/live/build/lists/}#
directory.
-*{Using conditionals inside packages lists}*
+4~ Using conditionals inside package lists
+
+Any of the live-build configuration variables stored in #{config/*}# (minus
+the #{LB_}# prefix) may be used in conditional statements in package
+lists. Generally, this means any #{lb config}# option uppercased and with
+dashes changed to underscores. But in practice, it is only the ones that
+influence package selection that make sense, such as #{DISTRIBUTION}#,
+#{ARCHITECTURE}# or #{ARCHIVE_AREAS}#.
+
+For example, to install #{ia32-libs}# if the #{--architecture amd64}# is
+specified:
code{
@@ -191,7 +197,9 @@ code{
}code
-or if #{LB_ARCHITECTURE}# is set to #{i386}# or #{amd64}#:
+You may test for any one of a number of values, e.g. to install
+#{memtest86+} if either #{--architecture i386}# or #{--architecture amd64}#
+is specified:
code{
@@ -199,7 +207,9 @@ code{
}code
-or if #{LB_ARCHIVE_AREAS}# contains either #{contrib}# or #{non-free}#:
+You may also test against variables that may contain more than one value,
+e.g. to install #{vrms}# if either #{contrib}# or #{non-free}# is specified
+via #{--archive-areas}#:
code{
@@ -215,10 +225,6 @@ code{
}code
-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.
3~ Tasks
@@ -247,14 +253,14 @@ _* #{chroot_local-packages}#
_* Using a custom APT repository
-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
-repository is more time-consuming to set up.
+Using #{chroot_local-packages}# is simpler to achieve and useful for
+"one-off" customizations but has a number of drawbacks, whilst using a
+custom APT repository is more time-consuming to set up.
3~ Using #{chroot_local-packages}# to install custom packages
To install a custom package, simply copy it to the
-#{config/chroot_local-packages}# directory. Packages that are inside this
+#{config/chroot_local-packages/}# directory. Packages that are inside this
directory will be automatically installed into the live system during build
- you do not need to specify them elsewhere.
@@ -264,21 +270,19 @@ is to use #{dpkg-name}#.
Using #{chroot_local-packages}# for installation of custom packages has
disadvantages:
-_* It is not possible to use secure APT
+_* It is not possible to use secure APT.
_* You must install all appropriate packages in the
-#{config/chroot_local-packages}# directory
+#{config/chroot_local-packages/}# directory.
_* It does not lend itself to storing Debian Live configurations in revision
-control
+control.
3~ Using an APT repository to install custom packages
Unlike using #{chroot_local-packages}#, when using a custom APT repository
-you must ensure that you specify the packages elsewhere. See lb-packages for
-details.
-
-% FIXME: <xref linkend="lb-packages"/>
+you must ensure that you specify the packages elsewhere. See #{Installing
+additional packages}#installing-additional-packages for details.
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
@@ -309,7 +313,7 @@ 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
+3~choosing-apt-or-aptitude 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
--
live-manual
More information about the debian-live-changes
mailing list