[SCM] live-manual branch, upstream, updated. upstream/2.0_a10-1-g46d1329
Daniel Baumann
daniel at debian.org
Mon Nov 29 22:32:19 UTC 2010
The following commit has been merged in the upstream branch:
commit 46d1329970461d5f9c284ee64fe90b359abc8acb
Author: Daniel Baumann <daniel at debian.org>
Date: Mon Nov 29 23:31:43 2010 +0100
Adding upstream version 2.0~a11.
diff --git a/VERSION b/VERSION
index 7973afd..d44f652 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.0~a10
+2.0~a11
diff --git a/manual/de/about_manual.ssi b/manual/de/about_manual.ssi
index 3b69378..218f2e9 100644
--- a/manual/de/about_manual.ssi
+++ b/manual/de/about_manual.ssi
@@ -14,6 +14,25 @@ unprivileged user and those requiring superuser privileges, commands are
prepended by #{$}# or #{#}# respectively. This symbol is not a part of the
command.
+2~ For the impatient
+
+While we believe that everything in this manual is important to at least
+some of our users, we realize it is a lot of material to cover and that you
+may wish to experience early success using the software before delving into
+the details. Therefore, we have provided three tutorials in the
+{Examples}#examples section designed to teach you image building and
+customization basics. Read {Using the examples}#using-the-examples first,
+followed by {Tutorial 1: A standard image}#tutorial-1, {Tutorial 2: A web
+browser utility}#tutorial-2 and finally {Tutorial 3: A personal travelling
+companion}#tutorial-3. By the end of these tutorials, you will have a taste
+of what can be done with Debian Live. We encourage you to return to more
+in-depth study of the manual, perhaps next reading {The basics}#the-basics,
+skimming or skipping {Building a netboot image}#building-netboot-image, and
+finishing by reading the {Customization overview}#customization-overview and
+the chapters that follow it. By this point, we hope you are thoroughly
+excited by what can be done with Debian Live and motivated to read the rest
+of the manual, cover-to-cover.
+
2~terms Terms
_* *{Live system}*: An operating system that can boot without installation
@@ -53,9 +72,9 @@ Debian distribution.
_* *{Boot parameters}*: Parameters that can be entered at the bootloader
prompt to influence the kernel or live-config.
-_* *{chroot}*: The chroot program, chroot(8), enables us to run different
-instances of the GNU/Linux environment on a single system simultaneously
-without rebooting.
+_* *{chroot}*: The chroot program, #{chroot(8)}#, enables us to run
+different instances of the GNU/Linux environment on a single system
+simultaneously without rebooting.
_* *{Binary image}*: A file containing the live system, such as binary.iso
or binary.img.
@@ -63,17 +82,20 @@ or binary.img.
_* *{Target distribution}*: The distribution upon which your live system
will be based. This can differ from the distribution of your host system.
-_* *{Squeeze/Wheezy/Sid (stable/testing/unstable)}*: The stable distribution
-contains the latest officially released distribution of Debian. The testing
-distribution is the staging area for the next stable release. A major
-advantage of using this distribution is that it has more recent versions of
-software relative to the stable release. The unstable distribution is where
-active development of Debian occurs. Generally, this distribution is run by
-developers and those who like to live on the edge.
-
-At the time of writing, Squeeze is the current stable release and Wheezy is
-the current testing release. Sid will always be a synonym for the unstable
-release.
+_* *{Squeeze/Wheezy/Sid (stable/testing/unstable)}*: Debian codenames for
+releases. At the time of writing, Squeeze is the current *{stable}* release
+and Wheezy is the current *{testing}* release. Sid will always be a synonym
+for the *{unstable}* release. Throughout the manual, we tend to use
+codenames for the releases, as that is what is supported by the tools
+themselves.
+
+The *{stable}* distribution contains the latest officially released
+distribution of Debian. The *{testing}* distribution is the staging area for
+the next *{stable}* release. A major advantage of using this distribution is
+that it has more recent versions of software relative to the *{stable}*
+release. The *{unstable}* distribution is where active development of Debian
+occurs. Generally, this distribution is run by developers and those who like
+to live on the edge.
2~ Authors
@@ -143,6 +165,16 @@ $ make build
}code
+Since it takes a while to build the manual in all supported languages, you
+may find it convenient when proofing to build for only one language, e.g. by
+executing:
+
+code{
+
+$ make build LANGUAGES=en
+
+}code
+
3~ Applying patches
Directly commiting to the repository is possible by anyone. However, we ask
@@ -154,11 +186,11 @@ _* Fetch the public commit key:
code{
$ mkdir -p ~/.ssh/identity.d
-$ wget http://live.debian.net/other/keys/live-manual@debian-live \
- -O ~/.ssh/identity.d/live-manual at debian-live
-$ wget http://live.debian.net/other/keys/live-manual@debian-live.pub \
- -O ~/.ssh/identity.d/live-manual at debian-live.pub
-$ chmod 0600 ~/.ssh/identity.d/live-manual at debian-live*
+$ wget http://live.debian.net/other/keys/gitosis@live.debian.net \
+ -O ~/.ssh/identity.d/live.debian.net
+$ wget http://live.debian.net/other/keys/gitosis@live.debian.net.pub \
+ -O ~/.ssh/identity.d/live.debian.net.pub
+$ chmod 0600 ~/.ssh/identity.d/live.debian.net*
}code
@@ -170,7 +202,7 @@ $ cat >> ~/.ssh/config << EOF
Host live.debian.net
Hostname live.debian.net
User gitosis
- IdentityFile ~/.ssh/identity.d/live-manual at debian-live
+ IdentityFile ~/.ssh/identity.d/gitosis at live.debian.net
EOF
}code
diff --git a/manual/de/about_project.ssi b/manual/de/about_project.ssi
index 15fd20c..120d1e4 100644
--- a/manual/de/about_project.ssi
+++ b/manual/de/about_project.ssi
@@ -12,7 +12,7 @@ perspective most of them have one or more of the following disadvantages:
_* They are unofficial projects, developed outside of Debian.
-_* They mix different distributions, e.g. testing and unstable.
+_* They mix different distributions, e.g. *{testing}* and *{unstable}*.
_* They support i386 only.
diff --git a/manual/de/live-manual.ssm b/manual/de/live-manual.ssm
index 53c192c..d432d2a 100644
--- a/manual/de/live-manual.ssm
+++ b/manual/de/live-manual.ssm
@@ -9,12 +9,12 @@
:license: This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.<br><br>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.<br><br>You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses/. <br><br>On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-3 file.
@date:
- :published: 2010-11-13
+ :published: 2010-11-29
@publisher: Debian Live Project <debian-live at lists.debian.org>
@make:
- :bold: /Squeeze|squeeze|Stable|stable|Wheezy|wheezy|Testing|testing|Sid|sid|Unstable|unstable/
+ :bold: /Squeeze|squeeze|Wheezy|wheezy|Sid|sid/
:italics: /live-boot|live-build|live-config|live-magic|live-manual|live-installer|debian-installer-launcher/
:num_top: 1
:skin: skin_debian-live
diff --git a/manual/de/project_bugs.ssi b/manual/de/project_bugs.ssi
index 8443811..a2a2de3 100644
--- a/manual/de/project_bugs.ssi
+++ b/manual/de/project_bugs.ssi
@@ -21,12 +21,13 @@ used and the distribution of the live system you are building.
2~ Known issues
-Due to the nature of Debian testing and Debian unstable distributions being
-a moving target, building a live system may not always be possible.
+Due to the nature of Debian *{testing}* and Debian *{unstable}*
+distributions being a moving target, building a live system may not always
+be possible.
-If this is a problem, do not build a system based on testing or unstable,
-but go with stable. live-build does always default to the current stable
-release.
+If this is a problem, do not build a system based on *{testing}* or
+*{unstable}*, but go with *{stable}*. live-build does always default to the
+current *{stable}* release.
Currently known issues are listed under the section 'status' on our homepage
at http://live.debian.net/
@@ -34,8 +35,9 @@ at http://live.debian.net/
It is out of the scope of this manual to train you in correctly identifying
and fixing problems in packages of the development distributions, however,
there are two things you can always try: When not succeeding to build
-testing, try if unstable works. If unstable does not work either, revert to
-testing and pinning the newer version of the failing package from unstable.
+*{testing}*, try if *{unstable}* works. If *{unstable}* does not work
+either, revert to *{testing}* and pinning the newer version of the failing
+package from *{unstable}*.
2~ Rebuild from scratch
diff --git a/manual/de/user_basics.ssi b/manual/de/user_basics.ssi
index 303cdd7..b4e6373 100644
--- a/manual/de/user_basics.ssi
+++ b/manual/de/user_basics.ssi
@@ -1,9 +1,18 @@
:B~ The basics
-1~ The basics
+1~the-basics The basics
This chapter contains a brief overview of the build process and instructions
-for booting the various binary image types.
+for using the three most commonly used image types. The most versatile image
+type, #{iso-hybrid}#, may be used on a virtual machine, optical media or USB
+portable storage device. In certain special cases, #{usb-hdd}# may be more
+suitable for USB devices. The chapter finishes with instructions for
+building and using a #{net}# type image, which is a bit more involved due to
+the setup required on the server. This is a slightly advanced topic for
+anyone who is not familiar already with netbooting, but is included here
+because once the setup is done, it is a very convenient way to test and
+deploy images for booting on the local network without the hassle of dealing
+with image media.
2~ What is a live system?
@@ -77,7 +86,7 @@ code{
This process can take a while, depending on the speed of your network
connection (see {The lb build command}#lb-build).
-3~ Testing an ISO image with Qemu
+3~testing-iso-with-qemu Testing an ISO image with Qemu
Testing an ISO is simple:
@@ -89,7 +98,7 @@ $ qemu -cdrom binary.iso
}code
-3~ Testing an ISO image with virtualbox-ose
+3~testing-iso-with-virtualbox Testing an ISO image with virtualbox-ose
In order to test the ISO with virtualbox-ose:
@@ -115,7 +124,7 @@ code{
}code
-3~ Burning an ISO image to a physical medium
+3~burning-iso-image Burning an ISO image to a physical medium
Burning an ISO image is easy:
@@ -138,8 +147,8 @@ to use the remaining space on the media for a persistence partition, you
need a USB/HDD image.
Note: if you created an ISO image with the previous example, you will need
-to clean up your working directory with the #{lb clean} command (see {The lb
-clean command}#lb-clean):
+to clean up your working directory with the #{lb clean}# command (see {The
+lb clean command}#lb-clean):
code{
@@ -147,8 +156,8 @@ $ lb clean --binary
}code
-Run the #{lb config}# command with the parameters to configure the "config/"
-hierarchy to create a USB/HDD image type:
+Run the #{lb config}# command with the parameters to configure the
+#{config/}# hierarchy to create a USB/HDD image type:
code{
@@ -183,7 +192,10 @@ better yet, #{ls -l /dev/disk/by-id}#.
*{This will definitely overwrite any previous contents on your stick!}*
-3~ Testing a USB/HDD image with Qemu
+Note: As discussed earlier, this same process can be used for #{iso-hybrid}#
+type images, (suffixed #{-hybrid.iso}#,) but not #{iso}# type images.
+
+3~testing-usb-hdd-with-qemu Testing a USB/HDD image with Qemu
code{
@@ -225,7 +237,7 @@ code{
*{Remember: Every time you install a new binary.img on the stick, all data on the stick will be lost because the partition table is overwritten by the contents of the image.}*
-2~ Building a netboot image
+2~building-netboot-image Building a netboot image
The following sequence of commands will create a basic netboot image
containing the Debian standard system without X.org. It is suitable for
diff --git a/manual/de/user_customization-contents.ssi b/manual/de/user_customization-contents.ssi
index df28e53..f8d01ce 100644
--- a/manual/de/user_customization-contents.ssi
+++ b/manual/de/user_customization-contents.ssi
@@ -1,4 +1,4 @@
-B~ Customizing contents
+:B~ Customizing contents
1~customizing-contents Customizing contents
diff --git a/manual/de/user_customization-internationalization.ssi b/manual/de/user_customization-internationalization.ssi
index b86f8f8..0288819 100644
--- a/manual/de/user_customization-internationalization.ssi
+++ b/manual/de/user_customization-internationalization.ssi
@@ -1,4 +1,4 @@
-B~ Customizing locale and language
+:B~ Customizing locale and language
1~customizing-locale-and-language Customizing locale and language
diff --git a/manual/de/user_customization-overview.ssi b/manual/de/user_customization-overview.ssi
index 44c6731..dfef318 100644
--- a/manual/de/user_customization-overview.ssi
+++ b/manual/de/user_customization-overview.ssi
@@ -1,4 +1,4 @@
-B~ Customizing contents
+:B~ Customizing contents
1~customization-overview Customization overview
diff --git a/manual/de/user_customization-packages.ssi b/manual/de/user_customization-packages.ssi
index 1ae1289..bd1a027 100644
--- a/manual/de/user_customization-packages.ssi
+++ b/manual/de/user_customization-packages.ssi
@@ -13,77 +13,67 @@ use #{tasksel}# tasks, or a combination of all three. Finally, a number of
options give some control over apt, or if you prefer, aptitude, at build
time when packages are installed. You may find these handy if you use a
proxy, want to disable installation of recommended packages to save space,
-or need to control which versions of packages are installed via apt pinning,
+or need to control which versions of packages are installed via APT pinning,
to name a few possibilities.
2~ Package sources
-3~ Debian repositories
+3~ Distribution mirrors
-To set a local mirror to be used to at build time:
+Each of the #{--mirror-*}# options governs which distribution mirror is used
+at various stages of the build. Recall from {Stages of the
+build}#stages-of-the-build that the *bootstrap* stage is when the chroot is
+initially populated by debootstrap with a minimal system, and the *chroot*
+stage is when the chroot used to construct the live system's filesystem is
+built. Thus, the corresponding mirror switches are used for those stages,
+and later, in the *binary* stage, the #{--mirror-binary}# and
+#{--mirror-binary-security}# values are used, superceding any mirrors used
+in an earlier stage.
-code{
-
-$ lb config --mirror-bootstrap http://localhost/debian/
-
-}code
+3~distribution-mirrors-build-time Distribution mirrors used at build time
-The chroot repository, specified by --mirror-chroot, defaults to the same as
---mirror-bootstrap.
-
-Each of the --mirror-* options governs which repository is used at various
-stages of the build. Recall from {Stages of the build}#stages-of-the-build
-that the *bootstrap* stage is when the chroot is initially populated by
-debootstrap with a minimal system, and the *chroot* stage is when the chroot
-used to construct the live system's filesystem is built. Thus, the
-corresponding mirror switches are used for those stages, and later, when the
-binary image is constructed, the --mirror-binary value is used, superceding
-any earlier repositories.
-
-The generic mirror is added to the live system's /etc/apt/sources.list.
+To set the distribution mirrors used at build time to point at a local
+mirror, it is sufficient to set #{--mirror-bootstrap}# and
+#{--mirror-chroot-security}# as follows.
code{
-$ lb config --mirror-binary http://ftp.debian.org/debian/
+$ lb config --mirror-bootstrap http://localhost/debian/ \
+ --mirror-chroot-security http://localhost/debian-security/
}code
-Note: It is not used for building the live system but to install new
-software while using the live system.
+The chroot mirror, specified by #{--mirror-chroot}#, defaults to the
+#{--mirror-bootstrap}# value.
-It can be disabled by setting the binary mirror to the same value as the
-chroot mirror.
+3~ Distribution mirrors used at run time
-Note: the same applies for mirror chroot security and mirror binary security
+The #{--mirror-binary*}# options govern the distribution mirrors placed in
+the binary image. These may be used to install additional packages while
+running the live system. The 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{
-$ lb config --mirror-chroot-security {URL} $ lb config
---mirror-binary-security {URL}
-
-}code
-
-If you don't want to include apt indices, you can skip those with:
-
-code{
-
-$ lb config --binary-indices false
+$ lb config --mirror-binary http://mirror/debian/ \
+ --mirror-binary-security http://mirror/debian-security/
}code
-This will not influence the entries in /etc/apt/sources.list, but only if
-/var/lib/apt contains the indices files or not (and by that making the image
-smaller).
-
-3~ Own repository
+3~ Additional repositories
To add more repositories (e.g. backports, experimental or custom packages,
etc.), create #{config/chroot_sources/your-repository.{chroot,binary}}#
-files.
+files. As with the #{--mirror-*}# options, these govern the repositories
+used in the *chroot* stage when building the image, and in the *binary*
+stage, i.e. for use when running the live system.
-e.g. #{config/chroot_sources/live.chroot}# allows you to install packages
-from the debian live snapshot repository at live system build time (you have
-to add the packages in your package list):
+For example, #{config/chroot_sources/live.chroot}# allows you to install
+packages from the debian live snapshot repository at live system build time.
code{
@@ -91,17 +81,18 @@ deb http://live.debian.net/ sid-snapshots main contrib non-free
}code
-If you add the line to #{config/chroot_sources/live.binary}# the repository
-will be added to your live-system's #{/etc/apt/sources.list}#.
+If you add the same line to #{config/chroot_sources/live.binary}#, the
+repository will be added to your live system's #{/etc/apt/sources.list.d/}#
+directory.
If such files exist, they will be picked up automatically.
-You can also put the gpg-key used to sign the repository into
-config/chroot_sources/your-repository.{binary,chroot}.gpg
+You should 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:
+selection through the #{--repository}# option, e.g. for enabling live
+snapshots, a simple command is enough to enable it:
code{
@@ -109,45 +100,21 @@ $ lb config --repository live.debian.net
}code
-3~ Package installation
-
-You can elect to use either #{apt}# or #{aptitude}# when installing
-packages. Which utility is used is governed by the #{LB_APT}# variable in
-#{config/chroot}# or by the #{--apt}# argument to #{lb config}#:
-
-_* #{apt}#: Specifying a missing package causes package installation to
-fail, which may not be the desired behaviour. This is the default setting
-for building images for Lenny or later.
-
-_* #{aptitude}#: Specifying a missing package causes package installation to
-succeed, which may not be the desired behaviour. This is the default setting
-for building images for Etch.
-
-2~ Installing additional packages
+2~choosing-packages-to-install Choosing packages to install
-live-helper has a number of mechanisms for indicating that additional
-packages should be installed, including:
+There are a number of ways to choose which packages live-build will install
+in your image, covering a variety of different needs. You can simply name
+individual packages to install, either with the #{--packages}# option for a
+few packages, or in a package list of your own for larger numbers. You can
+also choose larger predefined lists of packages, or use APT tasks. And
+finally, you may place package files in your #{config/}# tree, which is well
+suited to testing of new or experimental packages before they are available
+from a repository.
-_* The #{LB_PACKAGES}# variable
+3~ Choosing a few packages
-_* Package lists
-
-_* Local packages (#{chroot_local-packages/}#)
-
-_* Tasks
-
-3~ The #{LB_PACKAGES}# variable
-
-To install additional packages, simply add them to the #{LB_PACKAGES}#
-variable in #{config/chroot}#. For example:
-
-code{
-
-LB_PACKAGES="package1 package2 package3 ... "
-
-}code
-
-You can also specify initial values on the command line:
+When the number of packages added is small, simply specify
+#{--packages}#. For example:
code{
@@ -156,67 +123,99 @@ $ 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"/>
+need flexibility regarding which packages to install, use package lists as
+discussed in the following section, {Package lists}#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.
+installed. The list syntax supports included files and conditional sections
+which makes it easy to build lists from other lists and adapt them for use
+in multiple configurations. You can use predefined package lists, providing
+in a modular fashion package selections from each of the major desktop
+environments and some special purpose lists, as well as standard lists the
+others are based upon. You can also provide your own package lists, or use a
+combination of both.
-To specify one or more package list, you can use:
+3~ Predefined package lists
+
+The simplest way to use lists is to specify one or more predefined lists
+with the #{--packages-lists}# option. For example:
code{
-$ lb config --packages-lists "list1 list2 list3"
+$ lb config --packages-lists "gnome-core rescue"
}code
-Note: Package lists that are distributed with live-build reside in the
-#{/usr/share/live/build/lists}# directory.
+In addition to these lists, live-build supports four virtual package lists:
+#{gnome-desktop}#, #{kde-desktop}#, #{lxde-desktop}# and #{xfce-desktop}#,
+each of which provide a more extensive selection of packages that
+corresponds with Debian Installer defaults for these desktop
+environments. See {Desktop and language tasks}#desktop-and-language-tasks
+for more details.
+
+Note: The prebuilt GNOME, KDE, LXDE and XFCE images available for download
+at http://live.debian.net are built using the corresponding virtual
+#{*-desktop}# lists.
+
+The default location for the list files on your system is
+#{/usr/share/live/build/lists/}#. To determine the packages in a given list,
+read the corresponding file, paying attention to included files and
+conditionals as described in the following sections.
-*{Local packages lists}*
+3~ Local package lists
-You may supplement the supplied lists using local package lists stored in
-#{config/chroot_local-packageslists}#.
+You may supplement or replace entirely 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
+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}*
+3~ 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}*
+3~ Extending a provided package list using includes
-% FIXME
+The package lists that are included with live-build make extensive use of
+includes. Refer to these in the #{/usr/share/live/build/lists/}# directory,
+as they serve as good examples of how to write your own lists.
-% code{ % % #include <gnome> % iceweasel % % }code
+For example, to make a list that includes the predefined #{gnome}# list plus
+iceweasel, create #{config/chroot_local-packageslists/mygnome.list}# with
+the following contents:
-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.
+code{
+
+#include <gnome> iceweasel
+
+}code
+
+3~ 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{
@@ -224,7 +223,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{
@@ -232,7 +233,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{
@@ -248,14 +251,66 @@ code{
}code
-Any live-build configuration variable that begins with #{LB_}# can be tested
-in this way.
-
The nesting of conditionals is not supported.
3~ Tasks
-%FIXME
+The Debian Installer offers the user choices of a number of preselected
+lists of packages, each one focused on a particular kind of system, or task
+a system may be used for, such as "Graphical desktop environment", "Mail
+server" or "Laptop". These lists are called "tasks" and are supported by APT
+through the "Task:" field. You can specify one or more tasks in live-build
+via the #{--tasks}# option, as in the example below.
+
+code{
+
+$ lb config --tasks "mail-server file-server"
+
+}code
+
+The primary tasks available in the Debian Installer can be listed with
+#{tasksel --list-tasks}# in the live system. The contents of any task,
+including ones not included in this list, may be examined with #{tasksel
+--task-packages}#.
+
+3~desktop-and-language-tasks Desktop and language tasks
+
+Desktop and language tasks are special cases. In the Debian Installer, if
+the medium was prepared for a particular desktop environment flavour, the
+corresponding task will be automatically installed. Thus, there are there
+are #{gnome-desktop}#, #{kde-desktop}#, #{lxde-desktop}# and
+#{xfce-desktop}# tasks, none of which are offered in #{tasksel}#'s
+menu. Likewise, there are no menu entries for tasks for languages, but the
+user's language choice during the install influences the selection of
+corresponding language tasks.
+
+In live-build, therefore, these special cases are also given special
+consideration, but with three notable differences at the time of writing.
+
+First, there is no provision made yet automatically for language tasks,
+although a subset of those packages are included if you specify #{lb config
+--language}#. If you need those tasks, which include such things as
+language-specific fonts and input-method packages, you need to specify them
+in your configuration. For example:
+
+code{
+
+$ lb config --tasks "japanese japanese-desktop japanese-gnome-desktop"
+
+}code
+
+Second, live-build supports #{*-desktop}# virtual package lists for each of
+the desktop flavours mentioned above, which select the #{standard-x11}#
+predefined package list, the corresponding #{*-desktop}# task and three
+additional tasks: #{desktop}#, #{standard}# and #{laptop}#. So, for example,
+if you specify #{--packages gnome-desktop}#, it is equivalent to specifying
+#{--packages standard-x11 --tasks "gnome-desktop desktop standard laptop"}#.
+
+Third, if any of the tasks for these desktop flavours are selected, either
+explicitly through #{--tasks}# or implicitly by #{--packages}#, live-build
+will preseed the corresponding desktop value for Debian Installer (if it is
+included) to ensure it follows its own rules for installing different
+desktop flavours.
2~ Installing modified or third-party packages
@@ -279,14 +334,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.
@@ -296,21 +351,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 {Choosing
+packages to install}#choosing-packages-to-install 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
@@ -332,8 +385,87 @@ apt-preferences for more information.
% FIXME: <xref linkend="apt-preferences"/>
-3~ Altering APT preferences during Live system
+2~ Configuring APT at build time
+
+You can configure APT through a number of options applied only at build
+time. (APT configuration used in the running live system may be configured
+in the normal way for live system contents, that is, by including the
+appropriate configurations through #{config/chroot_local_includes/}#.) For a
+complete list, look for options starting with #{apt}# in the #{lb_config}#
+man page.
+
+3~choosing-apt-or-aptitude Choosing apt or aptitude
+
+You can elect to use either #{apt}# or #{aptitude}# when installing packages
+at build time. Which utility is used is governed by the #{--apt}# argument
+to #{lb config}#. Choose the method implementing the preferred behaviour for
+package installation, the notable difference being how missing packages are
+handled.
+
+_* #{apt}#: With this method, if a missing package is specified, the package
+installation will fail. This is the default setting.
+
+_* #{aptitude}#: With this method, if a missing package is specified, the
+package installation will succeed.
+
+3~ Using a proxy with APT
+
+One commonly required APT configuration is to deal with building an image
+behind a proxy. You may specify your APT proxy with the #{--apt-ftp-proxy}#
+or #{--apt-http-proxy}# options as needed, e.g.
+
+code{
+
+lb config --apt-http-proxy http://proxy/
+
+}code
+
+3~ Tweaking APT to save space
+
+You may find yourself needing to save some space on the image media, in
+which case one or the other or both of the following options may be of
+interest.
+
+If you don't want to include APT indices in the image, you can omit those
+with:
+
+code{
+
+$ lb config --binary-indices false
+
+}code
+
+This will not influence the entries in /etc/apt/sources.list, but merely
+whether /var/lib/apt contains the indices files or not. The tradeoff is that
+APT needs those indices in order to operate in the live system, so before
+performing #{apt-cache search}# or #{apt-get install}#, for instance, the
+user must #{apt-get update}# first to create those indices.
+
+If you find the installation of recommended packages bloats your image too
+much, you may disable that default option of APT with:
+
+code{
+
+$ lb config -apt-recommends false
+
+}code
+
+The tradeoff here is that recommended packages are defined as "packages that
+would be found together with this one in all but unusual installations"
+(Debian Policy Manual, §7.2). This may lead to some packages that you
+actually need being omitted, so we suggest you review the difference this
+makes to your packages list (see the #{binary.packages}# file generated by
+#{lb build}#) and re-include in your list any missing packages that you
+still want installed.
+
+3~ Passing options to apt or aptitude
+
+If there is not an #{lb config}# option to alter APT's behaviour in the way
+you need, use #{--apt-options}# or #{--aptitude-options}# to pass any
+options through to your configured APT tool. See the man pages for #{apt}#
+and #{aptitude}# for details.
+
+3~ APT pinning
+
+% FIXME: needs content
-Whilst it may seem unnecessary effort to create an APT repository to install
-custom packages, the infrastructure can be easily re-used at a later date to
-offer updates of the modified package.
diff --git a/manual/de/user_examples.ssi b/manual/de/user_examples.ssi
index 2567323..0bb4753 100644
--- a/manual/de/user_examples.ssi
+++ b/manual/de/user_examples.ssi
@@ -1,10 +1,228 @@
-B~ Examples
+:B~ Examples
-1~ Use Case Builds
+1~examples Examples
-This chapter covers example builds for specific use cases with Debian Live.
+This chapter covers example builds for specific use cases with Debian
+Live. If you are new to building your own Debian Live images, we recommend
+you first look at the three tutorials in sequence, as each one teaches new
+techniques that will help you use and understand the remaining examples.
-2~ VNC Kiosk Client
+2~using-the-examples Using the examples
+
+To use these examples you need a system to build them on that meets the
+requirements listed in {Requirements}#requirements and has live-build
+installed as described in {Installing live-build}#installing-live-build.
+
+Note that, for the sake of brevity, in these examples we do not specify a
+local mirror to use for the build. You can speed up downloads considerably
+if you use a local mirror. You may specify the options when you use #{lb
+config}#, as described in {Distribution mirrors used at build
+time}#distribution-mirrors-build-time, or for more convenience, set the
+default for your build system in #{/etc/live/build.conf}#. Simply create
+this file and in it, set the corresponding #{LB_MIRROR_*}# variables to your
+preferred mirror. For example:
+
+code{
+
+LB_MIRROR_BOOTSTRAP="http://mirror/debian"
+LB_MIRROR_CHROOT="http://mirror/debian"
+LB_MIRROR_CHROOT_SECURITY="http://mirror/debian-security"
+
+}code
+
+2~tutorial-1 Tutorial 1: A standard image
+
+*{Use case:}* Create a simple first image, learning the basics of live-build
+
+In this tutorial, we will build a default ISO hybrid Debian Live image
+containing only base packages (no Xorg) and some Debian Live support
+packages, as a first exercise in using live-build.
+
+You can't get much simpler than this:
+
+code{
+
+$ mkdir tutorial1 ; cd tutorial1 ; lb config
+
+}code
+
+Examine the contents of the #{config/}# directory if you wish. You will see
+stored here a skeletal configuration, ready to customize or, in this case,
+use immediately to build a default image.
+
+Now, as superuser, build the image, saving a log as you build with #{tee}#.
+
+code{
+
+# lb_build 2>&1 | tee binary.log
+
+}code
+
+Assuming all goes well, after a while, the current directory will contain
+#{binary-hybrid.iso}#. This ISO hybrid image can be booted directly in a
+virtual machine as described in {Testing an ISO image with
+Qemu}#testing-iso-with-qemu and {Testing an ISO image with
+virtualbox-ose}#testing-iso-with-virtualbox, or else imaged onto optical
+media or a USB flash device as described in {Burning an ISO image to a
+physical medium}#burning-iso-image and {Copying USB/HDD image to a USB
+stick}#copying-usb-hdd-image, respectively.
+
+2~tutorial-2 Tutorial 2: A web browser utility
+
+*{Use case}* Create a web browser utility image, learning how to apply customizations
+
+In this tutorial, we will create an image suitable for use as a web browser
+utility, serving as an introduction to customizing Debian Live images.
+
+code{
+
+mkdir tutorial2 ; cd tutorial2 ; lb config -p lxde --packages iceweasel
+
+}code
+
+Our choice of LXDE for this example reflects our desire to provide a minimal
+desktop environment, since the focus of the image is the single use we have
+in mind, the web browser. We could go even further and provide a default
+configuration for the web browser in
+#{config/chroot_local-includes/etc/iceweasel/profile/}#, or additional
+support packages for viewing various kinds of web content, but we leave this
+as an exercise for the reader.
+
+Build the image, again as superuser, keeping a log as in {Tutorial
+1}#tutorial-1:
+
+code{
+
+# lb build 2>&1 | tee binary.log
+
+}code
+
+Again, verify the image is OK and test, as in {Tutorial 1}#tutorial-1.
+
+2~tutorial-3 Tutorial 3: A personalized image
+
+*{Use case}* Create a project to build a personalized image, containing your favourite software to take with you on a USB stick wherever you go, and evolving in successive revisions as your needs and preferences change.
+
+Since we will be changing our personalized image over a number of revisions,
+and we want to track those changes, trying things experimentally and
+possibly reverting them if things don't work out, we will keep our
+configuration in the popular #{git}# version control system. We will also
+use the best practice of autoconfiguration via #{auto}# scripts as described
+in {Managing a configuration}#managing-a-configuration.
+
+3~ First revision
+
+code{
+
+$ mkdir -p tutorial3/auto $ cp /usr/share/live/examples/auto/*
+tutorial3/auto/ $ cd tutorial3
+
+}code
+
+Edit #{auto/config}# to read as follows:
+
+code{
+
+#!/bin/sh
+
+lb config noauto \
+ --architecture i386 \
+ --linux-flavours 686 \
+ --packages-lists lxde \
+ --packages "iceweasel xchat" \
+ "${@}"
+
+}code
+
+First, #{--architecture i386}# ensures that on our #{amd64}# build system,
+we build a 32-bit version suitable for use on most machines. Second, we use
+#{--linux-flavours 686}# because we don't anticipate using this image on
+much older systems. Third, we've chosen the #{lxde}# package list to give us
+a minimal desktop. And finally, we have added two initial favourite
+packages: #{iceweasel}# and #{xchat}#.
+
+Now, build the image:
+
+code{
+
+# lb build
+
+}code
+
+Note that unlike in the first two tutorials, we no longer have to type
+#{2>&1 | tee binary.log}# as that is now included in #{auto/build}#.
+
+Once you've tested the image (as in {Tutorial 1}#tutorial-1) and are
+satisfied it works, it's time to initialize our #{git}# repository, adding
+only the auto scripts we just created, and then make the first commit:
+
+code{
+
+$ git init $ git add auto $ git commit -a -m "Initial import."
+
+}code
+
+3~ Second revision
+
+In this revision, we're going to clean up from the first build, add the
+#{vlc}# package to our configuration, rebuild, test and commit.
+
+The #{lb clean}# command will clean up all generated files from the previous
+build except for the cache, which saves having to re-download packages. This
+ensures that the subsequent #{lb build}# will re-run all stages to
+regenerate the files from our new configuration.
+
+code{
+
+# lb clean
+
+}code
+
+Now edit #{auto/config}# to add the #{vlc}# package:
+
+code{
+
+#!/bin/sh
+
+lb config noauto \
+ --architecture i386 \
+ --linux-flavours 686 \
+ --packages-lists lxde \
+ --packages "iceweasel xchat vlc" \
+ "${@}"
+
+}code
+
+Build again:
+
+code{
+
+# lb build
+
+}code
+
+Test, and when you're satisfied, commit the next revision:
+
+code{
+
+$ git commit -a -m "Adding vlc media player."
+
+}code
+
+Of course, more complicated changes to the configuration are possible,
+perhaps adding files in subdirectories of #{config/}#. When you commit new
+revisions, just take care not to hand edit or commit the top-level files in
+#{config}# containing #{LB_*}# variables, as these are build products, too,
+and are always cleaned up by #{lb clean}# and re-created with #{lb config}#
+via their respective #{auto}# scripts.
+
+We've come to the end of our tutorial series. While many more kinds of
+customization are possible, even just using the few features explored in
+these simple examples, an almost infinite variety of different images can be
+created. The remaining examples in this section cover several other use
+cases drawn from the collected experiences of users of Debian Live.
+
+2~ A VNC Kiosk Client
Create an image with live-build to boot directly to a VNC server.
@@ -38,6 +256,50 @@ _* Build the image: #{# lb build}#
_* Enjoy.
-2~ Next Example FIXME
+2~ A base image for a 128M USB key
+
+*{Use case}* Create a standard image with some components removed in order to fit on a 128M USB key with space left over to use as you see fit.
+
+When optimizing an image to fit a certain media size, you need to understand
+the tradeoffs you are making between size and functionality. In this
+example, we trim only so much as to make room for additional material within
+a 128M media size, but without doing anything to destroy integrity of the
+packages contained within, such as the purging of locale data via the
+#{localepurge}# package, or other such "intrusive" optimizations. Of
+particular note, you should not use #{--bootstrap-flavour minimal}# unless
+you really know what you're doing, as omitting priority #{important}#
+packages will most likely produce a broken live system.
+
+code{
+
+$ lb config -k 486 -p minimal --binary-indices false --memtest none
+--apt-recommends false --includes none
+
+}code
+
+Now, build the image in the usual way:
+
+code{
+
+# lb build 2>&1 | tee binary.log
+
+}code
+
+On the author's system at time of writing, the above configuration produced
+a 78Mbyte image. This compares favourably with the 166Mbyte image produced
+by the default configuration in {Tutorial 1}#tutorial-1.
+The biggest space-saver here, compared to building a standard image on an
+#{i386}# architecture system, is to select only the #{486}# kernel flavour
+instead of the default #{-k "486 686"}#. Leaving off APT's indices with
+#{--binary-indices false}# also saves a fair amount of space, the tradeoff
+being that you need to #{apt-get update}# before using apt in the live
+system. Choosing the #{minimal}# package list leaves out the large
+#{locales}# package and associated utilities. Dropping recommended packages
+with #{--apt-recommends false}# saves some additional space, at the expense
+of omitting some packages you might otherwise expect to be there, such as
+#{firmware-linux-free}# which may be needed to support certain hardware. The
+remaining options shave off additional small amounts of space. It's up to
+you to decide if the functionality that is sacrificed with each optimization
+is worth the loss in functionality.
diff --git a/manual/de/user_installation.ssi b/manual/de/user_installation.ssi
index 9869ff4..adcc91b 100644
--- a/manual/de/user_installation.ssi
+++ b/manual/de/user_installation.ssi
@@ -2,7 +2,7 @@
1~ Installation
-2~ Requirements
+2~requirements Requirements
Building Debian Live images has very few system requirements:
@@ -19,7 +19,7 @@ _* Linux 2.6.x
Note that using Debian or a Debian-derived distribution is not required -
live-build will run on almost any distribution with the above requirements.
-2~ Installing live-build
+2~installing-live-build Installing live-build
You can install live-build in a number of different ways:
@@ -98,10 +98,16 @@ are available on http://live.debian.net/debian/.
*{Note:}* You do not need to install live-boot on your system to create customized Debian Live systems. However, doing so will do no harm.
+% FIXME: we also need to mention live-config
+
3~ Using a customized live-boot
+% FIXME: should follow the structure for live-build above (i.e. "from
+source", not "customized" -- we should not get into customization now, but
+should reserve that discussion for later.
+
To modify the code you can follow the process below. Please ensure you are
-familiar with the terms mentioned in {Terms}#terms .
+familiar with the terms mentioned in {Terms}#terms.
_* Checkout the live-boot source
@@ -113,12 +119,18 @@ $ git clone git://live.debian.net/git/live-boot.git
_* Make changes to your local copy
+% FIXME: as indicated above, it's too early for this topic. Move to later in
+the manual.
+
And beware that if you want to add your pre-init script in live-bottom, you
should name it without dashes '-', e.g: call it "99new_feature" and not
"99new-feature".
_* Build a live-boot .deb
+% FIXME: not strictly true? building sid on squeeze is usually OK. also,
+building lenny on squeeze or sid is fine. clarify.
+
You must build either on your target distribution or in a chroot containing
your target platform: this means if your target is Squeeze then you should
build against Squeeze. You can use a personal builder such as /{pbuilder}/
@@ -128,7 +140,7 @@ package):
code{
-$ cd live-boot $ dpkg-buildpackage -rfakeroot -b -uc -us
+$ cd live-boot $ dpkg-buildpackage -b -uc -us
}code
@@ -140,7 +152,8 @@ another custom package. Please see custom-packages for more information. You
should pay particular attention to custom-packages-apt.
% FIXME: <xref linkend="custom-packages"/> <xref
-linkend="custom-packages-apt"/>
+linkend="custom-packages-apt"/> % Ben> What is the latter reference for? I
+can't see the relevance.
3~ Using live-boot snapshots
diff --git a/manual/de/user_managing_a_configuration.ssi b/manual/de/user_managing_a_configuration.ssi
index bc03008..ab5b6c1 100644
--- a/manual/de/user_managing_a_configuration.ssi
+++ b/manual/de/user_managing_a_configuration.ssi
@@ -49,8 +49,8 @@ code{
#!/bin/sh
lb config noauto \
- --architecture i386 \
- ${@}
+ --packages-lists "standard" \
+ "${@}"
}code
@@ -59,7 +59,7 @@ auto/clean
code{
#!/bin/sh
-lb clean noauto ${@}
+lb clean noauto "${@}"
rm -f config/binary config/bootstrap \
config/chroot config/common config/source
rm -f binary.log
@@ -70,14 +70,13 @@ auto/build
code{
-#!/bin/sh lb build noauto ${@} 2>&1 | tee binary.log
+#!/bin/sh lb build noauto "${@}" 2>&1 | tee binary.log
}code
-Edit auto/config, changing or adding any options as you see fit. In the
-example above, --architecture is set to i386 so that when the image is built
-on an amd64 system, it will not default to building amd64 images. Change
-this to an appropriate value for your image (or delete it if you want to use
-the default) and add any additional options in continuation lines that
-follow.
+Edit #{auto/config}#, changing or adding any options as you see fit. In the
+example above, #{--packages-lists standard}# is set to the default
+value. Change this to an appropriate value for your image (or delete it if
+you want to use the default) and add any additional options in continuation
+lines that follow.
diff --git a/manual/en/about_manual.ssi b/manual/en/about_manual.ssi
index 3e06d2e..7e3229c 100644
--- a/manual/en/about_manual.ssi
+++ b/manual/en/about_manual.ssi
@@ -6,6 +6,10 @@ The main goal of this manual is to serve as a single access point to all documen
Some of the commands mentioned in the text must be executed with superuser privileges which can be obtained by becoming the root user via #{su}# or by using #{sudo}#. To distinguish between commands which may be executed by an unprivileged user and those requiring superuser privileges, commands are prepended by #{$}# or #{#}# respectively. This symbol is not a part of the command.
+2~ For the impatient
+
+While we believe that everything in this manual is important to at least some of our users, we realize it is a lot of material to cover and that you may wish to experience early success using the software before delving into the details. Therefore, we have provided three tutorials in the {Examples}#examples section designed to teach you image building and customization basics. Read {Using the examples}#using-the-examples first, followed by {Tutorial 1: A standard image}#tutorial-1, {Tutorial 2: A web browser utility}#tutorial-2 and finally {Tutorial 3: A personal travelling companion}#tutorial-3. By the end of these tutorials, you will have a taste of what can be done with Debian Live. We encourage you to return to more in-depth study of the manual, perhaps next reading {The basics}#the-basics, skimming or skipping {Building a netboot image}#building-netboot-image, and finishing by reading the {Customization overview}#customization-overview and the chapters that follow it. B
y this point, we hope you are thoroughly excited by what can be done with Debian Live and motivated to read the rest of the manual, cover-to-cover.
+
2~terms Terms
_* *{Live system}*: An operating system that can boot without installation to a hard drive. Live systems do not alter local operating system(s) or file(s) already installed on the computer hard drive unless instructed to do so. Live systems are typically booted from media such as CDs, DVDs or USB sticks. Some may also boot over the network.
@@ -30,15 +34,15 @@ _* *{Debian Installer (d-i)}*: The official installation system for the Debian d
_* *{Boot parameters}*: Parameters that can be entered at the bootloader prompt to influence the kernel or live-config.
-_* *{chroot}*: The chroot program, chroot(8), enables us to run different instances of the GNU/Linux environment on a single system simultaneously without rebooting.
+_* *{chroot}*: The chroot program, #{chroot(8)}#, enables us to run different instances of the GNU/Linux environment on a single system simultaneously without rebooting.
_* *{Binary image}*: A file containing the live system, such as binary.iso or binary.img.
_* *{Target distribution}*: The distribution upon which your live system will be based. This can differ from the distribution of your host system.
-_* *{Squeeze/Wheezy/Sid (stable/testing/unstable)}*: The stable distribution contains the latest officially released distribution of Debian. The testing distribution is the staging area for the next stable release. A major advantage of using this distribution is that it has more recent versions of software relative to the stable release. The unstable distribution is where active development of Debian occurs. Generally, this distribution is run by developers and those who like to live on the edge.
+_* *{Squeeze/Wheezy/Sid (stable/testing/unstable)}*: Debian codenames for releases. At the time of writing, Squeeze is the current *{stable}* release and Wheezy is the current *{testing}* release. Sid will always be a synonym for the *{unstable}* release. Throughout the manual, we tend to use codenames for the releases, as that is what is supported by the tools themselves.
-At the time of writing, Squeeze is the current stable release and Wheezy is the current testing release. Sid will always be a synonym for the unstable release.
+The *{stable}* distribution contains the latest officially released distribution of Debian. The *{testing}* distribution is the staging area for the next *{stable}* release. A major advantage of using this distribution is that it has more recent versions of software relative to the *{stable}* release. The *{unstable}* distribution is where active development of Debian occurs. Generally, this distribution is run by developers and those who like to live on the edge.
2~ Authors
@@ -98,6 +102,14 @@ $ make build
}code
+Since it takes a while to build the manual in all supported languages, you may find it convenient when proofing to build for only one language, e.g. by executing:
+
+code{
+
+$ make build LANGUAGES=en
+
+}code
+
3~ Applying patches
Directly commiting to the repository is possible by anyone. However, we ask you to send bigger changes to the mailing list to discuss them first. In order to push to the repository, the following steps are required.
@@ -107,11 +119,11 @@ _* Fetch the public commit key:
code{
$ mkdir -p ~/.ssh/identity.d
-$ wget http://live.debian.net/other/keys/live-manual@debian-live \
- -O ~/.ssh/identity.d/live-manual at debian-live
-$ wget http://live.debian.net/other/keys/live-manual@debian-live.pub \
- -O ~/.ssh/identity.d/live-manual at debian-live.pub
-$ chmod 0600 ~/.ssh/identity.d/live-manual at debian-live*
+$ wget http://live.debian.net/other/keys/gitosis@live.debian.net \
+ -O ~/.ssh/identity.d/live.debian.net
+$ wget http://live.debian.net/other/keys/gitosis@live.debian.net.pub \
+ -O ~/.ssh/identity.d/live.debian.net.pub
+$ chmod 0600 ~/.ssh/identity.d/live.debian.net*
}code
@@ -123,7 +135,7 @@ $ cat >> ~/.ssh/config << EOF
Host live.debian.net
Hostname live.debian.net
User gitosis
- IdentityFile ~/.ssh/identity.d/live-manual at debian-live
+ IdentityFile ~/.ssh/identity.d/gitosis at live.debian.net
EOF
}code
diff --git a/manual/en/about_project.ssi b/manual/en/about_project.ssi
index fc4a752..4529eae 100644
--- a/manual/en/about_project.ssi
+++ b/manual/en/about_project.ssi
@@ -10,7 +10,7 @@ When Debian Live was initiated, there were already several Debian based live sys
_* They are unofficial projects, developed outside of Debian.
-_* They mix different distributions, e.g. testing and unstable.
+_* They mix different distributions, e.g. *{testing}* and *{unstable}*.
_* They support i386 only.
diff --git a/manual/en/live-manual.ssm b/manual/en/live-manual.ssm
index 457ffdc..df15a2c 100644
--- a/manual/en/live-manual.ssm
+++ b/manual/en/live-manual.ssm
@@ -9,12 +9,12 @@
:license: This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.<br><br>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.<br><br>You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses/. <br><br>On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-3 file.
@date:
- :published: 2010-11-13
+ :published: 2010-11-29
@publisher: Debian Live Project <debian-live at lists.debian.org>
@make:
- :bold: /Squeeze|squeeze|Stable|stable|Wheezy|wheezy|Testing|testing|Sid|sid|Unstable|unstable/
+ :bold: /Squeeze|squeeze|Wheezy|wheezy|Sid|sid/
:italics: /live-boot|live-build|live-config|live-magic|live-manual|live-installer|debian-installer-launcher/
:num_top: 1
:skin: skin_debian-live
diff --git a/manual/en/project_bugs.ssi b/manual/en/project_bugs.ssi
index b19451d..8a32ba4 100644
--- a/manual/en/project_bugs.ssi
+++ b/manual/en/project_bugs.ssi
@@ -14,13 +14,13 @@ _* Try to give *{as specific information as possible}* about the bug. This inclu
2~ Known issues
-Due to the nature of Debian testing and Debian unstable distributions being a moving target, building a live system may not always be possible.
+Due to the nature of Debian *{testing}* and Debian *{unstable}* distributions being a moving target, building a live system may not always be possible.
-If this is a problem, do not build a system based on testing or unstable, but go with stable. live-build does always default to the current stable release.
+If this is a problem, do not build a system based on *{testing}* or *{unstable}*, but go with *{stable}*. live-build does always default to the current *{stable}* release.
Currently known issues are listed under the section 'status' on our homepage at http://live.debian.net/
-It is out of the scope of this manual to train you in correctly identifying and fixing problems in packages of the development distributions, however, there are two things you can always try: When not succeeding to build testing, try if unstable works. If unstable does not work either, revert to testing and pinning the newer version of the failing package from unstable.
+It is out of the scope of this manual to train you in correctly identifying and fixing problems in packages of the development distributions, however, there are two things you can always try: When not succeeding to build *{testing}*, try if *{unstable}* works. If *{unstable}* does not work either, revert to *{testing}* and pinning the newer version of the failing package from *{unstable}*.
2~ Rebuild from scratch
diff --git a/manual/en/user_basics.ssi b/manual/en/user_basics.ssi
index c707245..abdc69e 100644
--- a/manual/en/user_basics.ssi
+++ b/manual/en/user_basics.ssi
@@ -1,8 +1,8 @@
:B~ The basics
-1~ The basics
+1~the-basics The basics
-This chapter contains a brief overview of the build process and instructions for booting the various binary image types.
+This chapter contains a brief overview of the build process and instructions for using the three most commonly used image types. The most versatile image type, #{iso-hybrid}#, may be used on a virtual machine, optical media or USB portable storage device. In certain special cases, #{usb-hdd}# may be more suitable for USB devices. The chapter finishes with instructions for building and using a #{net}# type image, which is a bit more involved due to the setup required on the server. This is a slightly advanced topic for anyone who is not familiar already with netbooting, but is included here because once the setup is done, it is a very convenient way to test and deploy images for booting on the local network without the hassle of dealing with image media.
2~ What is a live system?
@@ -46,7 +46,7 @@ code{
This process can take a while, depending on the speed of your network connection (see {The lb build command}#lb-build).
-3~ Testing an ISO image with Qemu
+3~testing-iso-with-qemu Testing an ISO image with Qemu
Testing an ISO is simple:
@@ -58,7 +58,7 @@ $ qemu -cdrom binary.iso
}code
-3~ Testing an ISO image with virtualbox-ose
+3~testing-iso-with-virtualbox Testing an ISO image with virtualbox-ose
In order to test the ISO with virtualbox-ose:
@@ -80,7 +80,7 @@ code{
}code
-3~ Burning an ISO image to a physical medium
+3~burning-iso-image Burning an ISO image to a physical medium
Burning an ISO image is easy:
@@ -96,7 +96,7 @@ $ wodim binary.iso
The following sequence of commands will create a basic USB/HDD image containing just the Debian standard system without X.org. It is suitable for booting from USB sticks, USB hard drives, and various other portable storage devices. Normally, an ISO hybrid image can be used for this purpose instead, but if you have a BIOS which does not handle hybrid images properly, or want to use the remaining space on the media for a persistence partition, you need a USB/HDD image.
-Note: if you created an ISO image with the previous example, you will need to clean up your working directory with the #{lb clean} command (see {The lb clean command}#lb-clean):
+Note: if you created an ISO image with the previous example, you will need to clean up your working directory with the #{lb clean}# command (see {The lb clean command}#lb-clean):
code{
@@ -104,7 +104,7 @@ $ lb clean --binary
}code
-Run the #{lb config}# command with the parameters to configure the "config/" hierarchy to create a USB/HDD image type:
+Run the #{lb config}# command with the parameters to configure the #{config/}# hierarchy to create a USB/HDD image type:
code{
@@ -134,7 +134,9 @@ where #{${USBSTICK}}# is the device file of your key, like #{/dev/sdb}# (not a p
*{This will definitely overwrite any previous contents on your stick!}*
-3~ Testing a USB/HDD image with Qemu
+Note: As discussed earlier, this same process can be used for #{iso-hybrid}# type images, (suffixed #{-hybrid.iso}#,) but not #{iso}# type images.
+
+3~testing-usb-hdd-with-qemu Testing a USB/HDD image with Qemu
code{
@@ -172,7 +174,7 @@ code{
*{Remember: Every time you install a new binary.img on the stick, all data on the stick will be lost because the partition table is overwritten by the contents of the image.}*
-2~ Building a netboot image
+2~building-netboot-image Building a netboot image
The following sequence of commands will create a basic netboot image containing the Debian standard system without X.org. It is suitable for booting over the network.
diff --git a/manual/en/user_customization-contents.ssi b/manual/en/user_customization-contents.ssi
index 7d706fe..ccd4e9e 100644
--- a/manual/en/user_customization-contents.ssi
+++ b/manual/en/user_customization-contents.ssi
@@ -1,4 +1,4 @@
-B~ Customizing contents
+:B~ Customizing contents
1~customizing-contents Customizing contents
diff --git a/manual/en/user_customization-internationalization.ssi b/manual/en/user_customization-internationalization.ssi
index 6298067..7afca4b 100644
--- a/manual/en/user_customization-internationalization.ssi
+++ b/manual/en/user_customization-internationalization.ssi
@@ -1,4 +1,4 @@
-B~ Customizing locale and language
+:B~ Customizing locale and language
1~customizing-locale-and-language Customizing locale and language
diff --git a/manual/en/user_customization-overview.ssi b/manual/en/user_customization-overview.ssi
index 450a64d..ea851ac 100644
--- a/manual/en/user_customization-overview.ssi
+++ b/manual/en/user_customization-overview.ssi
@@ -1,4 +1,4 @@
-B~ Customizing contents
+:B~ Customizing contents
1~customization-overview Customization overview
diff --git a/manual/en/user_customization-packages.ssi b/manual/en/user_customization-packages.ssi
index 768c8a9..e945946 100644
--- a/manual/en/user_customization-packages.ssi
+++ b/manual/en/user_customization-packages.ssi
@@ -2,60 +2,43 @@
1~customizing-package-installation Customizing package installation
-Perhaps the most basic customization of a Debian live system is the selection of packages to be included in the image. This chapter guides you through the various build-time options to customize live-build's installation of packages. We start with customization of the distribution mirror. You can also add your own repositories for backports, experimental or custom packages, or include packages directly as files. You can define your own lists of packages to include, use live-build's predefined lists, use #{tasksel}# tasks, or a combination of all three. Finally, a number of options give some control over apt, or if you prefer, aptitude, at build time when packages are installed. You may find these handy if you use a proxy, want to disable installation of recommended packages to save space, or need to control which versions of packages are installed via apt pinning, to name a few possibilities.
+Perhaps the most basic customization of a Debian live system is the selection of packages to be included in the image. This chapter guides you through the various build-time options to customize live-build's installation of packages. We start with customization of the distribution mirror. You can also add your own repositories for backports, experimental or custom packages, or include packages directly as files. You can define your own lists of packages to include, use live-build's predefined lists, use #{tasksel}# tasks, or a combination of all three. Finally, a number of options give some control over apt, or if you prefer, aptitude, at build time when packages are installed. You may find these handy if you use a proxy, want to disable installation of recommended packages to save space, or need to control which versions of packages are installed via APT pinning, to name a few possibilities.
2~ Package sources
-3~ Debian repositories
+3~ Distribution mirrors
-To set a local mirror to be used to at build time:
+Each of the #{--mirror-*}# options governs which distribution mirror is used at various stages of the build. Recall from {Stages of the build}#stages-of-the-build that the *bootstrap* stage is when the chroot is initially populated by debootstrap with a minimal system, and the *chroot* stage is when the chroot used to construct the live system's filesystem is built. Thus, the corresponding mirror switches are used for those stages, and later, in the *binary* stage, the #{--mirror-binary}# and #{--mirror-binary-security}# values are used, superceding any mirrors used in an earlier stage.
-code{
-
-$ lb config --mirror-bootstrap http://localhost/debian/
-
-}code
-
-The chroot repository, specified by --mirror-chroot, defaults to the same as --mirror-bootstrap.
-
-Each of the --mirror-* options governs which repository is used at various stages of the build. Recall from {Stages of the build}#stages-of-the-build that the *bootstrap* stage is when the chroot is initially populated by debootstrap with a minimal system, and the *chroot* stage is when the chroot used to construct the live system's filesystem is built. Thus, the corresponding mirror switches are used for those stages, and later, when the binary image is constructed, the --mirror-binary value is used, superceding any earlier repositories.
+3~distribution-mirrors-build-time Distribution mirrors used at build time
-The generic mirror is added to the live system's /etc/apt/sources.list.
+To set the distribution mirrors used at build time to point at a local mirror, it is sufficient to set #{--mirror-bootstrap}# and #{--mirror-chroot-security}# as follows.
code{
-$ lb config --mirror-binary http://ftp.debian.org/debian/
+$ lb config --mirror-bootstrap http://localhost/debian/ \
+ --mirror-chroot-security http://localhost/debian-security/
}code
-Note: It is not used for building the live system but to install new software while using the live system.
+The chroot mirror, specified by #{--mirror-chroot}#, defaults to the #{--mirror-bootstrap}# value.
-It can be disabled by setting the binary mirror to the same value as the chroot mirror.
+3~ Distribution mirrors used at run time
-Note: the same applies for mirror chroot security and mirror binary security
+The #{--mirror-binary*}# options govern the distribution mirrors placed in the binary image. These may be used to install additional packages while running the live system. The 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{
-$ lb config --mirror-chroot-security {URL}
-$ lb config --mirror-binary-security {URL}
+$ lb config --mirror-binary http://mirror/debian/ \
+ --mirror-binary-security http://mirror/debian-security/
}code
-If you don't want to include apt indices, you can skip those with:
+3~ Additional repositories
-code{
-
-$ lb config --binary-indices false
-
-}code
+To add more repositories (e.g. backports, experimental or custom packages, etc.), create #{config/chroot_sources/your-repository.{chroot,binary}}# files. As with the #{--mirror-*}# options, these govern the repositories used in the *chroot* stage when building the image, and in the *binary* stage, i.e. for use when running the live system.
-This will not influence the entries in /etc/apt/sources.list, but only if /var/lib/apt contains the indices files or not (and by that making the image smaller).
-
-3~ Own repository
-
-To add more repositories (e.g. backports, experimental or custom packages, etc.), create #{config/chroot_sources/your-repository.{chroot,binary}}# files.
-
-e.g. #{config/chroot_sources/live.chroot}# allows you to install packages from the debian live snapshot repository at live system build time (you have to add the packages in your package list):
+For example, #{config/chroot_sources/live.chroot}# allows you to install packages from the debian live snapshot repository at live system build time.
code{
@@ -63,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}#.
+If you add the same line to #{config/chroot_sources/live.binary}#, the repository will be added to your live system's #{/etc/apt/sources.list.d/}# directory.
If such files exist, they will be picked up automatically.
-You can also put the gpg-key used to sign the repository into config/chroot_sources/your-repository.{binary,chroot}.gpg
+You should 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{
@@ -77,92 +60,74 @@ $ lb config --repository live.debian.net
}code
-3~ Package installation
-
-You can elect to use either #{apt}# or #{aptitude}# when installing packages. Which utility is used is governed by the #{LB_APT}# variable in #{config/chroot}# or by the #{--apt}# argument to #{lb config}#:
-
-_* #{apt}#: Specifying a missing package causes package installation to fail, which may not be the desired behaviour. This is the default setting for building images for Lenny or later.
+2~choosing-packages-to-install Choosing packages to install
-_* #{aptitude}#: Specifying a missing package causes package installation to succeed, which may not be the desired behaviour. This is the default setting for building images for Etch.
+There are a number of ways to choose which packages live-build will install in your image, covering a variety of different needs. You can simply name individual packages to install, either with the #{--packages}# option for a few packages, or in a package list of your own for larger numbers. You can also choose larger predefined lists of packages, or use APT tasks. And finally, you may place package files in your #{config/}# tree, which is well suited to testing of new or experimental packages before they are available from a repository.
-2~ Installing additional packages
+3~ Choosing a few packages
-live-helper has a number of mechanisms for indicating that additional packages should be installed, including:
+When the number of packages added is small, simply specify #{--packages}#. For example:
-_* The #{LB_PACKAGES}# variable
-
-_* Package lists
+code{
-_* Local packages (#{chroot_local-packages/}#)
+$ lb config --packages "package1 package2 package3"
-_* Tasks
+}code
-3~ The #{LB_PACKAGES}# variable
+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.
-To install additional packages, simply add them to the #{LB_PACKAGES}# variable in #{config/chroot}#. For example:
+If you need to specify a large number of packages to be installed or you need flexibility regarding which packages to install, use package lists as discussed in the following section, {Package lists}#package-lists.
-code{
+3~package-lists Package lists
-LB_PACKAGES="package1 package2 package3 ... "
+Package lists are a powerful way of expressing which packages should be installed. The list syntax supports included files and conditional sections which makes it easy to build lists from other lists and adapt them for use in multiple configurations. You can use predefined package lists, providing in a modular fashion package selections from each of the major desktop environments and some special purpose lists, as well as standard lists the others are based upon. You can also provide your own package lists, or use a combination of both.
-}code
+3~ Predefined package lists
-You can also specify initial values on the command line:
+The simplest way to use lists is to specify one or more predefined lists with the #{--packages-lists}# option. For example:
code{
-$ lb config --packages "package1 package2 package3"
+$ lb config --packages-lists "gnome-core rescue"
}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"/>
+In addition to these lists, live-build supports four virtual package lists: #{gnome-desktop}#, #{kde-desktop}#, #{lxde-desktop}# and #{xfce-desktop}#, each of which provide a more extensive selection of packages that corresponds with Debian Installer defaults for these desktop environments. See {Desktop and language tasks}#desktop-and-language-tasks 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.
+Note: The prebuilt GNOME, KDE, LXDE and XFCE images available for download at http://live.debian.net are built using the corresponding virtual #{*-desktop}# lists.
-% FIXME: <xref linkend="package-lists"/>
+The default location for the list files on your system is #{/usr/share/live/build/lists/}#. To determine the packages in a given list, read the corresponding file, paying attention to included files and conditionals as described in the following sections.
-3~ Package lists
+3~ Local 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.
+You may supplement or replace entirely the supplied lists using local package lists stored in #{config/chroot_local-packageslists/}#.
-To specify one or more package list, you can use:
+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.
-code{
-
-$ lb config --packages-lists "list1 list2 list3"
+3~ Local binary package lists
-}code
+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.
-Note: Package lists that are distributed with live-build reside in the #{/usr/share/live/build/lists}# directory.
+Package lists that exist in this directory need to have a #{.list}# suffix in order to be processed.
-*{Local packages lists}*
+3~ Extending a provided package list using includes
-You may supplement the supplied lists using local package lists stored in #{config/chroot_local-packageslists}#.
+The package lists that are included with live-build make extensive use of includes. Refer to these in the #{/usr/share/live/build/lists/}# directory, as they serve as good examples of how to write your own lists.
-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.
+For example, to make a list that includes the predefined #{gnome}# list plus iceweasel, create #{config/chroot_local-packageslists/mygnome.list}# with the following contents:
-*{Local binary packages 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.
-
-Package lists that exist in this directory need to have a .list suffix in order to be processed.
+code{
-*{Extending a provided package list using includes}*
+#include <gnome>
+iceweasel
-% FIXME
+}code
-% code{
-%
-% #include <gnome>
-% iceweasel
-%
-% }code
+3~ Using conditionals inside package lists
-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.
+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}#.
-*{Using conditionals inside packages lists}*
+For example, to install #{ia32-libs}# if the #{--architecture amd64}# is specified:
code{
@@ -172,7 +137,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{
@@ -182,7 +147,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{
@@ -202,13 +167,37 @@ code{
}code
-Any live-build configuration variable that begins with #{LB_}# can be tested in this way.
-
The nesting of conditionals is not supported.
3~ Tasks
-%FIXME
+The Debian Installer offers the user choices of a number of preselected lists of packages, each one focused on a particular kind of system, or task a system may be used for, such as "Graphical desktop environment", "Mail server" or "Laptop". These lists are called "tasks" and are supported by APT through the "Task:" field. You can specify one or more tasks in live-build via the #{--tasks}# option, as in the example below.
+
+code{
+
+$ lb config --tasks "mail-server file-server"
+
+}code
+
+The primary tasks available in the Debian Installer can be listed with #{tasksel --list-tasks}# in the live system. The contents of any task, including ones not included in this list, may be examined with #{tasksel --task-packages}#.
+
+3~desktop-and-language-tasks Desktop and language tasks
+
+Desktop and language tasks are special cases. In the Debian Installer, if the medium was prepared for a particular desktop environment flavour, the corresponding task will be automatically installed. Thus, there are there are #{gnome-desktop}#, #{kde-desktop}#, #{lxde-desktop}# and #{xfce-desktop}# tasks, none of which are offered in #{tasksel}#'s menu. Likewise, there are no menu entries for tasks for languages, but the user's language choice during the install influences the selection of corresponding language tasks.
+
+In live-build, therefore, these special cases are also given special consideration, but with three notable differences at the time of writing.
+
+First, there is no provision made yet automatically for language tasks, although a subset of those packages are included if you specify #{lb config --language}#. If you need those tasks, which include such things as language-specific fonts and input-method packages, you need to specify them in your configuration. For example:
+
+code{
+
+$ lb config --tasks "japanese japanese-desktop japanese-gnome-desktop"
+
+}code
+
+Second, live-build supports #{*-desktop}# virtual package lists for each of the desktop flavours mentioned above, which select the #{standard-x11}# predefined package list, the corresponding #{*-desktop}# task and three additional tasks: #{desktop}#, #{standard}# and #{laptop}#. So, for example, if you specify #{--packages gnome-desktop}#, it is equivalent to specifying #{--packages standard-x11 --tasks "gnome-desktop desktop standard laptop"}#.
+
+Third, if any of the tasks for these desktop flavours are selected, either explicitly through #{--tasks}# or implicitly by #{--packages}#, live-build will preseed the corresponding desktop value for Debian Installer (if it is included) to ensure it follows its own rules for installing different desktop flavours.
2~ Installing modified or third-party packages
@@ -222,27 +211,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 {Choosing packages to install}#choosing-packages-to-install 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.
@@ -254,6 +241,57 @@ Because of this, you may wish to increment the version number in your custom pac
% FIXME: <xref linkend="apt-preferences"/>
-3~ Altering APT preferences during Live system
+2~ Configuring APT at build time
+
+You can configure APT through a number of options applied only at build time. (APT configuration used in the running live system may be configured in the normal way for live system contents, that is, by including the appropriate configurations through #{config/chroot_local_includes/}#.) For a complete list, look for options starting with #{apt}# in the #{lb_config}# man page.
+
+3~choosing-apt-or-aptitude Choosing apt or aptitude
+
+You can elect to use either #{apt}# or #{aptitude}# when installing packages at build time. Which utility is used is governed by the #{--apt}# argument to #{lb config}#. Choose the method implementing the preferred behaviour for package installation, the notable difference being how missing packages are handled.
+
+_* #{apt}#: With this method, if a missing package is specified, the package installation will fail. This is the default setting.
+
+_* #{aptitude}#: With this method, if a missing package is specified, the package installation will succeed.
+
+3~ Using a proxy with APT
+
+One commonly required APT configuration is to deal with building an image behind a proxy. You may specify your APT proxy with the #{--apt-ftp-proxy}# or #{--apt-http-proxy}# options as needed, e.g.
+
+code{
+
+lb config --apt-http-proxy http://proxy/
+
+}code
+
+3~ Tweaking APT to save space
+
+You may find yourself needing to save some space on the image media, in which case one or the other or both of the following options may be of interest.
+
+If you don't want to include APT indices in the image, you can omit those with:
+
+code{
+
+$ lb config --binary-indices false
+
+}code
+
+This will not influence the entries in /etc/apt/sources.list, but merely whether /var/lib/apt contains the indices files or not. The tradeoff is that APT needs those indices in order to operate in the live system, so before performing #{apt-cache search}# or #{apt-get install}#, for instance, the user must #{apt-get update}# first to create those indices.
+
+If you find the installation of recommended packages bloats your image too much, you may disable that default option of APT with:
+
+code{
+
+$ lb config -apt-recommends false
+
+}code
+
+The tradeoff here is that recommended packages are defined as "packages that would be found together with this one in all but unusual installations" (Debian Policy Manual, §7.2). This may lead to some packages that you actually need being omitted, so we suggest you review the difference this makes to your packages list (see the #{binary.packages}# file generated by #{lb build}#) and re-include in your list any missing packages that you still want installed.
+
+3~ Passing options to apt or aptitude
+
+If there is not an #{lb config}# option to alter APT's behaviour in the way you need, use #{--apt-options}# or #{--aptitude-options}# to pass any options through to your configured APT tool. See the man pages for #{apt}# and #{aptitude}# for details.
+
+3~ APT pinning
+
+% FIXME: needs content
-Whilst it may seem unnecessary effort to create an APT repository to install custom packages, the infrastructure can be easily re-used at a later date to offer updates of the modified package.
diff --git a/manual/en/user_examples.ssi b/manual/en/user_examples.ssi
index a2ab393..11222c7 100644
--- a/manual/en/user_examples.ssi
+++ b/manual/en/user_examples.ssi
@@ -1,10 +1,174 @@
-B~ Examples
+:B~ Examples
-1~ Use Case Builds
+1~examples Examples
-This chapter covers example builds for specific use cases with Debian Live.
+This chapter covers example builds for specific use cases with Debian Live. If you are new to building your own Debian Live images, we recommend you first look at the three tutorials in sequence, as each one teaches new techniques that will help you use and understand the remaining examples.
-2~ VNC Kiosk Client
+2~using-the-examples Using the examples
+
+To use these examples you need a system to build them on that meets the requirements listed in {Requirements}#requirements and has live-build installed as described in {Installing live-build}#installing-live-build.
+
+Note that, for the sake of brevity, in these examples we do not specify a local mirror to use for the build. You can speed up downloads considerably if you use a local mirror. You may specify the options when you use #{lb config}#, as described in {Distribution mirrors used at build time}#distribution-mirrors-build-time, or for more convenience, set the default for your build system in #{/etc/live/build.conf}#. Simply create this file and in it, set the corresponding #{LB_MIRROR_*}# variables to your preferred mirror. For example:
+
+code{
+
+LB_MIRROR_BOOTSTRAP="http://mirror/debian"
+LB_MIRROR_CHROOT="http://mirror/debian"
+LB_MIRROR_CHROOT_SECURITY="http://mirror/debian-security"
+
+}code
+
+2~tutorial-1 Tutorial 1: A standard image
+
+*{Use case:}* Create a simple first image, learning the basics of live-build
+
+In this tutorial, we will build a default ISO hybrid Debian Live image containing only base packages (no Xorg) and some Debian Live support packages, as a first exercise in using live-build.
+
+You can't get much simpler than this:
+
+code{
+
+$ mkdir tutorial1 ; cd tutorial1 ; lb config
+
+}code
+
+Examine the contents of the #{config/}# directory if you wish. You will see stored here a skeletal configuration, ready to customize or, in this case, use immediately to build a default image.
+
+Now, as superuser, build the image, saving a log as you build with #{tee}#.
+
+code{
+
+# lb_build 2>&1 | tee binary.log
+
+}code
+
+Assuming all goes well, after a while, the current directory will contain #{binary-hybrid.iso}#. This ISO hybrid image can be booted directly in a virtual machine as described in {Testing an ISO image with Qemu}#testing-iso-with-qemu and {Testing an ISO image with virtualbox-ose}#testing-iso-with-virtualbox, or else imaged onto optical media or a USB flash device as described in {Burning an ISO image to a physical medium}#burning-iso-image and {Copying USB/HDD image to a USB stick}#copying-usb-hdd-image, respectively.
+
+2~tutorial-2 Tutorial 2: A web browser utility
+
+*{Use case}* Create a web browser utility image, learning how to apply customizations
+
+In this tutorial, we will create an image suitable for use as a web browser utility, serving as an introduction to customizing Debian Live images.
+
+code{
+
+mkdir tutorial2 ; cd tutorial2 ; lb config -p lxde --packages iceweasel
+
+}code
+
+Our choice of LXDE for this example reflects our desire to provide a minimal desktop environment, since the focus of the image is the single use we have in mind, the web browser. We could go even further and provide a default configuration for the web browser in #{config/chroot_local-includes/etc/iceweasel/profile/}#, or additional support packages for viewing various kinds of web content, but we leave this as an exercise for the reader.
+
+Build the image, again as superuser, keeping a log as in {Tutorial 1}#tutorial-1:
+
+code{
+
+# lb build 2>&1 | tee binary.log
+
+}code
+
+Again, verify the image is OK and test, as in {Tutorial 1}#tutorial-1.
+
+2~tutorial-3 Tutorial 3: A personalized image
+
+*{Use case}* Create a project to build a personalized image, containing your favourite software to take with you on a USB stick wherever you go, and evolving in successive revisions as your needs and preferences change.
+
+Since we will be changing our personalized image over a number of revisions, and we want to track those changes, trying things experimentally and possibly reverting them if things don't work out, we will keep our configuration in the popular #{git}# version control system. We will also use the best practice of autoconfiguration via #{auto}# scripts as described in {Managing a configuration}#managing-a-configuration.
+
+3~ First revision
+
+code{
+
+$ mkdir -p tutorial3/auto
+$ cp /usr/share/live/examples/auto/* tutorial3/auto/
+$ cd tutorial3
+
+}code
+
+Edit #{auto/config}# to read as follows:
+
+code{
+
+#!/bin/sh
+
+lb config noauto \
+ --architecture i386 \
+ --linux-flavours 686 \
+ --packages-lists lxde \
+ --packages "iceweasel xchat" \
+ "${@}"
+
+}code
+
+First, #{--architecture i386}# ensures that on our #{amd64}# build system, we build a 32-bit version suitable for use on most machines. Second, we use #{--linux-flavours 686}# because we don't anticipate using this image on much older systems. Third, we've chosen the #{lxde}# package list to give us a minimal desktop. And finally, we have added two initial favourite packages: #{iceweasel}# and #{xchat}#.
+
+Now, build the image:
+
+code{
+
+# lb build
+
+}code
+
+Note that unlike in the first two tutorials, we no longer have to type #{2>&1 | tee binary.log}# as that is now included in #{auto/build}#.
+
+Once you've tested the image (as in {Tutorial 1}#tutorial-1) and are satisfied it works, it's time to initialize our #{git}# repository, adding only the auto scripts we just created, and then make the first commit:
+
+code{
+
+$ git init
+$ git add auto
+$ git commit -a -m "Initial import."
+
+}code
+
+3~ Second revision
+
+In this revision, we're going to clean up from the first build, add the #{vlc}# package to our configuration, rebuild, test and commit.
+
+The #{lb clean}# command will clean up all generated files from the previous build except for the cache, which saves having to re-download packages. This ensures that the subsequent #{lb build}# will re-run all stages to regenerate the files from our new configuration.
+
+code{
+
+# lb clean
+
+}code
+
+Now edit #{auto/config}# to add the #{vlc}# package:
+
+code{
+
+#!/bin/sh
+
+lb config noauto \
+ --architecture i386 \
+ --linux-flavours 686 \
+ --packages-lists lxde \
+ --packages "iceweasel xchat vlc" \
+ "${@}"
+
+}code
+
+Build again:
+
+code{
+
+# lb build
+
+}code
+
+Test, and when you're satisfied, commit the next revision:
+
+code{
+
+$ git commit -a -m "Adding vlc media player."
+
+}code
+
+Of course, more complicated changes to the configuration are possible, perhaps adding files in subdirectories of #{config/}#. When you commit new revisions, just take care not to hand edit or commit the top-level files in #{config}# containing #{LB_*}# variables, as these are build products, too, and are always cleaned up by #{lb clean}# and re-created with #{lb config}# via their respective #{auto}# scripts.
+
+We've come to the end of our tutorial series. While many more kinds of customization are possible, even just using the few features explored in these simple examples, an almost infinite variety of different images can be created. The remaining examples in this section cover several other use cases drawn from the collected experiences of users of Debian Live.
+
+2~ A VNC Kiosk Client
Create an image with live-build to boot directly to a VNC server.
@@ -35,6 +199,27 @@ _* Build the image: #{# lb build}#
_* Enjoy.
-2~ Next Example FIXME
+2~ A base image for a 128M USB key
+
+*{Use case}* Create a standard image with some components removed in order to fit on a 128M USB key with space left over to use as you see fit.
+
+When optimizing an image to fit a certain media size, you need to understand the tradeoffs you are making between size and functionality. In this example, we trim only so much as to make room for additional material within a 128M media size, but without doing anything to destroy integrity of the packages contained within, such as the purging of locale data via the #{localepurge}# package, or other such "intrusive" optimizations. Of particular note, you should not use #{--bootstrap-flavour minimal}# unless you really know what you're doing, as omitting priority #{important}# packages will most likely produce a broken live system.
+
+code{
+
+$ lb config -k 486 -p minimal --binary-indices false --memtest none --apt-recommends false --includes none
+
+}code
+
+Now, build the image in the usual way:
+
+code{
+
+# lb build 2>&1 | tee binary.log
+
+}code
+
+On the author's system at time of writing, the above configuration produced a 78Mbyte image. This compares favourably with the 166Mbyte image produced by the default configuration in {Tutorial 1}#tutorial-1.
+The biggest space-saver here, compared to building a standard image on an #{i386}# architecture system, is to select only the #{486}# kernel flavour instead of the default #{-k "486 686"}#. Leaving off APT's indices with #{--binary-indices false}# also saves a fair amount of space, the tradeoff being that you need to #{apt-get update}# before using apt in the live system. Choosing the #{minimal}# package list leaves out the large #{locales}# package and associated utilities. Dropping recommended packages with #{--apt-recommends false}# saves some additional space, at the expense of omitting some packages you might otherwise expect to be there, such as #{firmware-linux-free}# which may be needed to support certain hardware. The remaining options shave off additional small amounts of space. It's up to you to decide if the functionality that is sacrificed with each optimization is worth the loss in functionality.
diff --git a/manual/en/user_installation.ssi b/manual/en/user_installation.ssi
index 7e246b7..a295d0b 100644
--- a/manual/en/user_installation.ssi
+++ b/manual/en/user_installation.ssi
@@ -2,7 +2,7 @@
1~ Installation
-2~ Requirements
+2~requirements Requirements
Building Debian Live images has very few system requirements:
@@ -18,7 +18,7 @@ _* Linux 2.6.x
Note that using Debian or a Debian-derived distribution is not required - live-build will run on almost any distribution with the above requirements.
-2~ Installing live-build
+2~installing-live-build Installing live-build
You can install live-build in a number of different ways:
@@ -94,9 +94,13 @@ If you do not wish to build or install live-build from source, you can use snaps
*{Note:}* You do not need to install live-boot on your system to create customized Debian Live systems. However, doing so will do no harm.
+% FIXME: we also need to mention live-config
+
3~ Using a customized live-boot
-To modify the code you can follow the process below. Please ensure you are familiar with the terms mentioned in {Terms}#terms .
+% FIXME: should follow the structure for live-build above (i.e. "from source", not "customized" -- we should not get into customization now, but should reserve that discussion for later.
+
+To modify the code you can follow the process below. Please ensure you are familiar with the terms mentioned in {Terms}#terms.
_* Checkout the live-boot source
@@ -108,16 +112,20 @@ $ git clone git://live.debian.net/git/live-boot.git
_* Make changes to your local copy
+% FIXME: as indicated above, it's too early for this topic. Move to later in the manual.
+
And beware that if you want to add your pre-init script in live-bottom, you should name it without dashes '-', e.g: call it "99new_feature" and not "99new-feature".
_* Build a live-boot .deb
+% FIXME: not strictly true? building sid on squeeze is usually OK. also, building lenny on squeeze or sid is fine. clarify.
+
You must build either on your target distribution or in a chroot containing your target platform: this means if your target is Squeeze then you should build against Squeeze. You can use a personal builder such as /{pbuilder}/ or /{sbuild}/ to automate building packages in chroot. To build directly on the target platform, use #{dpkg-buildpackage}# (provided by the /{dpkg-dev}/ package):
code{
$ cd live-boot
-$ dpkg-buildpackage -rfakeroot -b -uc -us
+$ dpkg-buildpackage -b -uc -us
}code
@@ -126,6 +134,7 @@ _* Use the generated live-boot .deb
As live-boot is installed by live-build system, installing the package in the host system is not sufficient: you should treat the generated .deb like another custom package. Please see custom-packages for more information. You should pay particular attention to custom-packages-apt.
% FIXME: <xref linkend="custom-packages"/> <xref linkend="custom-packages-apt"/>
+% Ben> What is the latter reference for? I can't see the relevance.
3~ Using live-boot snapshots
diff --git a/manual/en/user_managing_a_configuration.ssi b/manual/en/user_managing_a_configuration.ssi
index 7c68d73..2beb2a0 100644
--- a/manual/en/user_managing_a_configuration.ssi
+++ b/manual/en/user_managing_a_configuration.ssi
@@ -24,8 +24,8 @@ code{
#!/bin/sh
lb config noauto \
- --architecture i386 \
- ${@}
+ --packages-lists "standard" \
+ "${@}"
}code
@@ -34,7 +34,7 @@ auto/clean
code{
#!/bin/sh
-lb clean noauto ${@}
+lb clean noauto "${@}"
rm -f config/binary config/bootstrap \
config/chroot config/common config/source
rm -f binary.log
@@ -46,9 +46,9 @@ auto/build
code{
#!/bin/sh
-lb build noauto ${@} 2>&1 | tee binary.log
+lb build noauto "${@}" 2>&1 | tee binary.log
}code
-Edit auto/config, changing or adding any options as you see fit. In the example above, --architecture is set to i386 so that when the image is built on an amd64 system, it will not default to building amd64 images. Change this to an appropriate value for your image (or delete it if you want to use the default) and add any additional options in continuation lines that follow.
+Edit #{auto/config}#, changing or adding any options as you see fit. In the example above, #{--packages-lists standard}# is set to the default value. Change this to an appropriate value for your image (or delete it if you want to use the default) and add any additional options in continuation lines that follow.
diff --git a/manual/fr/about_manual.ssi b/manual/fr/about_manual.ssi
index 08ab76d..df8584f 100644
--- a/manual/fr/about_manual.ssi
+++ b/manual/fr/about_manual.ssi
@@ -15,6 +15,25 @@ nécessitant les privilèges super-utilisateur, les commandes sont précédées
respectivement par #{$}# ou #{#}#. Ce symbole ne fait pas partie de la
commande.
+2~ For the impatient
+
+While we believe that everything in this manual is important to at least
+some of our users, we realize it is a lot of material to cover and that you
+may wish to experience early success using the software before delving into
+the details. Therefore, we have provided three tutorials in the
+{Examples}#examples section designed to teach you image building and
+customization basics. Read {Using the examples}#using-the-examples first,
+followed by {Tutorial 1: A standard image}#tutorial-1, {Tutorial 2: A web
+browser utility}#tutorial-2 and finally {Tutorial 3: A personal travelling
+companion}#tutorial-3. By the end of these tutorials, you will have a taste
+of what can be done with Debian Live. We encourage you to return to more
+in-depth study of the manual, perhaps next reading {The basics}#the-basics,
+skimming or skipping {Building a netboot image}#building-netboot-image, and
+finishing by reading the {Customization overview}#customization-overview and
+the chapters that follow it. By this point, we hope you are thoroughly
+excited by what can be done with Debian Live and motivated to read the rest
+of the manual, cover-to-cover.
+
2~terms Terminologie
_* *{Système Live}*: Un système d'exploitation pouvant être démarré sans
@@ -57,9 +76,9 @@ distribution Debian.
_* *{Paramètres de démarrage}*: Les paramètres pouvant être entrés à
l'invite du bootloader afin de modifier le kernel ou live-config.
-_* *{chroot}*: Le programme chroot, chroot(8), nous permet de faire tourner
-plusieurs instances concurrentes de l'environnement GNU/Linux sur un système
-sans redémarrage.
+_* *{chroot}*: Le programme chroot, #{chroot(8)}#, nous permet de faire
+tourner plusieurs instances concurrentes de l'environnement GNU/Linux sur un
+système sans redémarrage.
_* *{Image binaire}*: Un fichier contenant le système live, tel que
binary.iso ou binary.img.
@@ -68,16 +87,20 @@ _* *{Distribution de destination}*: La distribution sur laquelle votre
système live sera basée. Ceci peut varier en fonction de la distribution de
votre système hôte.
-_* *{Squeeze/Wheezy/Sid (stable/testing/unstable)}*: La distribution stable
-contient la dernière version officielle de Debian. La distribution testing
-est la future version stable où seuls les paquets suffisamment matures
-peuvent entrer. Un avantage de cette distribution est qu'elle contient des
-logiciels de versions plus récentes que la version stable. La distribution
-unstable est en constante évolution. En général cette distribution est
-utilisée par les développeurs et ceux qui aiment le risque.
-
-Au moment d'écrire ce document, Squeeze est la version Stable et Wheezy est
-la version testing. Sid restera toujours synonyme de version unstable.
+_* *{Squeeze/Wheezy/Sid (stable/testing/unstable)}*: Debian codenames for
+releases. At the time of writing, Squeeze is the current *{stable}* release
+and Wheezy is the current *{testing}* release. Sid will always be a synonym
+for the *{unstable}* release. Throughout the manual, we tend to use
+codenames for the releases, as that is what is supported by the tools
+themselves.
+
+La distribution *{stable}* contient la dernière version officielle de
+Debian. La distribution *{testing}* est la future version stable où seuls
+les paquets suffisamment matures peuvent entrer. Un avantage de cette
+distribution est qu'elle contient des logiciels de versions plus récentes
+que la version *{stable}*. La distribution *{unstable}* est en constante
+évolution. En général cette distribution est utilisée par les développeurs
+et ceux qui aiment le risque.
2~ Auteurs
@@ -147,6 +170,16 @@ $ make build
}code
+Since it takes a while to build the manual in all supported languages, you
+may find it convenient when proofing to build for only one language, e.g. by
+executing:
+
+code{
+
+$ make build LANGUAGES=en
+
+}code
+
3~ Appliquer des patches
Les contributions directes au répertoire sont possibles pour tout le
@@ -159,11 +192,11 @@ _* Téléchargez la clé publique:
code{
$ mkdir -p ~/.ssh/identity.d
-$ wget http://live.debian.net/other/keys/live-manual@debian-live \
- -O ~/.ssh/identity.d/live-manual at debian-live
-$ wget http://live.debian.net/other/keys/live-manual@debian-live.pub \
- -O ~/.ssh/identity.d/live-manual at debian-live.pub
-$ chmod 0600 ~/.ssh/identity.d/live-manual at debian-live*
+$ wget http://live.debian.net/other/keys/gitosis@live.debian.net \
+ -O ~/.ssh/identity.d/gitosis at live.debian.net
+$ wget http://live.debian.net/other/keys/gitosis@live.debian.net.pub \
+ -O ~/.ssh/identity.d/gitosis at live.debian.net.pub
+$ chmod 0600 ~/.ssh/identity.d/gitosis at live.debian.net*
}code
@@ -175,7 +208,7 @@ $ cat >> ~/.ssh/config << EOF
Host live.debian.net
Hostname live.debian.net
User gitosis
- IdentityFile ~/.ssh/identity.d/live-manual at debian-live
+ IdentityFile ~/.ssh/identity.d/gitosis at live.debian.net
EOF
}code
diff --git a/manual/fr/about_project.ssi b/manual/fr/about_project.ssi
index 473de07..def33ca 100644
--- a/manual/fr/about_project.ssi
+++ b/manual/fr/about_project.ssi
@@ -12,7 +12,7 @@ perspective most of them have one or more of the following disadvantages:
_* They are unofficial projects, developed outside of Debian.
-_* They mix different distributions, e.g. testing and unstable.
+_* They mix different distributions, e.g. *{testing}* and *{unstable}*.
_* They support i386 only.
diff --git a/manual/fr/live-manual.ssm b/manual/fr/live-manual.ssm
index ca909a0..d5160cc 100644
--- a/manual/fr/live-manual.ssm
+++ b/manual/fr/live-manual.ssm
@@ -9,12 +9,12 @@
:license: This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.<br><br>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.<br><br>You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses/. <br><br>On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-3 file.
@date:
- :published: 2010-11-13
+ :published: 2010-11-29
@publisher: Debian Live Project <debian-live at lists.debian.org>
@make:
- :bold: /Squeeze|squeeze|Stable|stable|Wheezy|wheezy|Testing|testing|Sid|sid|Unstable|unstable/
+ :bold: /Squeeze|squeeze|Wheezy|wheezy|Sid|sid/
:italics: /live-boot|live-build|live-config|live-magic|live-manual|live-installer|debian-installer-launcher/
:num_top: 1
:skin: skin_debian-live
diff --git a/manual/fr/project_bugs.ssi b/manual/fr/project_bugs.ssi
index 8443811..a2a2de3 100644
--- a/manual/fr/project_bugs.ssi
+++ b/manual/fr/project_bugs.ssi
@@ -21,12 +21,13 @@ used and the distribution of the live system you are building.
2~ Known issues
-Due to the nature of Debian testing and Debian unstable distributions being
-a moving target, building a live system may not always be possible.
+Due to the nature of Debian *{testing}* and Debian *{unstable}*
+distributions being a moving target, building a live system may not always
+be possible.
-If this is a problem, do not build a system based on testing or unstable,
-but go with stable. live-build does always default to the current stable
-release.
+If this is a problem, do not build a system based on *{testing}* or
+*{unstable}*, but go with *{stable}*. live-build does always default to the
+current *{stable}* release.
Currently known issues are listed under the section 'status' on our homepage
at http://live.debian.net/
@@ -34,8 +35,9 @@ at http://live.debian.net/
It is out of the scope of this manual to train you in correctly identifying
and fixing problems in packages of the development distributions, however,
there are two things you can always try: When not succeeding to build
-testing, try if unstable works. If unstable does not work either, revert to
-testing and pinning the newer version of the failing package from unstable.
+*{testing}*, try if *{unstable}* works. If *{unstable}* does not work
+either, revert to *{testing}* and pinning the newer version of the failing
+package from *{unstable}*.
2~ Rebuild from scratch
diff --git a/manual/fr/user_basics.ssi b/manual/fr/user_basics.ssi
index 303cdd7..b4e6373 100644
--- a/manual/fr/user_basics.ssi
+++ b/manual/fr/user_basics.ssi
@@ -1,9 +1,18 @@
:B~ The basics
-1~ The basics
+1~the-basics The basics
This chapter contains a brief overview of the build process and instructions
-for booting the various binary image types.
+for using the three most commonly used image types. The most versatile image
+type, #{iso-hybrid}#, may be used on a virtual machine, optical media or USB
+portable storage device. In certain special cases, #{usb-hdd}# may be more
+suitable for USB devices. The chapter finishes with instructions for
+building and using a #{net}# type image, which is a bit more involved due to
+the setup required on the server. This is a slightly advanced topic for
+anyone who is not familiar already with netbooting, but is included here
+because once the setup is done, it is a very convenient way to test and
+deploy images for booting on the local network without the hassle of dealing
+with image media.
2~ What is a live system?
@@ -77,7 +86,7 @@ code{
This process can take a while, depending on the speed of your network
connection (see {The lb build command}#lb-build).
-3~ Testing an ISO image with Qemu
+3~testing-iso-with-qemu Testing an ISO image with Qemu
Testing an ISO is simple:
@@ -89,7 +98,7 @@ $ qemu -cdrom binary.iso
}code
-3~ Testing an ISO image with virtualbox-ose
+3~testing-iso-with-virtualbox Testing an ISO image with virtualbox-ose
In order to test the ISO with virtualbox-ose:
@@ -115,7 +124,7 @@ code{
}code
-3~ Burning an ISO image to a physical medium
+3~burning-iso-image Burning an ISO image to a physical medium
Burning an ISO image is easy:
@@ -138,8 +147,8 @@ to use the remaining space on the media for a persistence partition, you
need a USB/HDD image.
Note: if you created an ISO image with the previous example, you will need
-to clean up your working directory with the #{lb clean} command (see {The lb
-clean command}#lb-clean):
+to clean up your working directory with the #{lb clean}# command (see {The
+lb clean command}#lb-clean):
code{
@@ -147,8 +156,8 @@ $ lb clean --binary
}code
-Run the #{lb config}# command with the parameters to configure the "config/"
-hierarchy to create a USB/HDD image type:
+Run the #{lb config}# command with the parameters to configure the
+#{config/}# hierarchy to create a USB/HDD image type:
code{
@@ -183,7 +192,10 @@ better yet, #{ls -l /dev/disk/by-id}#.
*{This will definitely overwrite any previous contents on your stick!}*
-3~ Testing a USB/HDD image with Qemu
+Note: As discussed earlier, this same process can be used for #{iso-hybrid}#
+type images, (suffixed #{-hybrid.iso}#,) but not #{iso}# type images.
+
+3~testing-usb-hdd-with-qemu Testing a USB/HDD image with Qemu
code{
@@ -225,7 +237,7 @@ code{
*{Remember: Every time you install a new binary.img on the stick, all data on the stick will be lost because the partition table is overwritten by the contents of the image.}*
-2~ Building a netboot image
+2~building-netboot-image Building a netboot image
The following sequence of commands will create a basic netboot image
containing the Debian standard system without X.org. It is suitable for
diff --git a/manual/fr/user_customization-contents.ssi b/manual/fr/user_customization-contents.ssi
index df28e53..f8d01ce 100644
--- a/manual/fr/user_customization-contents.ssi
+++ b/manual/fr/user_customization-contents.ssi
@@ -1,4 +1,4 @@
-B~ Customizing contents
+:B~ Customizing contents
1~customizing-contents Customizing contents
diff --git a/manual/fr/user_customization-internationalization.ssi b/manual/fr/user_customization-internationalization.ssi
index b86f8f8..0288819 100644
--- a/manual/fr/user_customization-internationalization.ssi
+++ b/manual/fr/user_customization-internationalization.ssi
@@ -1,4 +1,4 @@
-B~ Customizing locale and language
+:B~ Customizing locale and language
1~customizing-locale-and-language Customizing locale and language
diff --git a/manual/fr/user_customization-overview.ssi b/manual/fr/user_customization-overview.ssi
index 44c6731..dfef318 100644
--- a/manual/fr/user_customization-overview.ssi
+++ b/manual/fr/user_customization-overview.ssi
@@ -1,4 +1,4 @@
-B~ Customizing contents
+:B~ Customizing contents
1~customization-overview Customization overview
diff --git a/manual/fr/user_customization-packages.ssi b/manual/fr/user_customization-packages.ssi
index 1ae1289..bd1a027 100644
--- a/manual/fr/user_customization-packages.ssi
+++ b/manual/fr/user_customization-packages.ssi
@@ -13,77 +13,67 @@ use #{tasksel}# tasks, or a combination of all three. Finally, a number of
options give some control over apt, or if you prefer, aptitude, at build
time when packages are installed. You may find these handy if you use a
proxy, want to disable installation of recommended packages to save space,
-or need to control which versions of packages are installed via apt pinning,
+or need to control which versions of packages are installed via APT pinning,
to name a few possibilities.
2~ Package sources
-3~ Debian repositories
+3~ Distribution mirrors
-To set a local mirror to be used to at build time:
+Each of the #{--mirror-*}# options governs which distribution mirror is used
+at various stages of the build. Recall from {Stages of the
+build}#stages-of-the-build that the *bootstrap* stage is when the chroot is
+initially populated by debootstrap with a minimal system, and the *chroot*
+stage is when the chroot used to construct the live system's filesystem is
+built. Thus, the corresponding mirror switches are used for those stages,
+and later, in the *binary* stage, the #{--mirror-binary}# and
+#{--mirror-binary-security}# values are used, superceding any mirrors used
+in an earlier stage.
-code{
-
-$ lb config --mirror-bootstrap http://localhost/debian/
-
-}code
+3~distribution-mirrors-build-time Distribution mirrors used at build time
-The chroot repository, specified by --mirror-chroot, defaults to the same as
---mirror-bootstrap.
-
-Each of the --mirror-* options governs which repository is used at various
-stages of the build. Recall from {Stages of the build}#stages-of-the-build
-that the *bootstrap* stage is when the chroot is initially populated by
-debootstrap with a minimal system, and the *chroot* stage is when the chroot
-used to construct the live system's filesystem is built. Thus, the
-corresponding mirror switches are used for those stages, and later, when the
-binary image is constructed, the --mirror-binary value is used, superceding
-any earlier repositories.
-
-The generic mirror is added to the live system's /etc/apt/sources.list.
+To set the distribution mirrors used at build time to point at a local
+mirror, it is sufficient to set #{--mirror-bootstrap}# and
+#{--mirror-chroot-security}# as follows.
code{
-$ lb config --mirror-binary http://ftp.debian.org/debian/
+$ lb config --mirror-bootstrap http://localhost/debian/ \
+ --mirror-chroot-security http://localhost/debian-security/
}code
-Note: It is not used for building the live system but to install new
-software while using the live system.
+The chroot mirror, specified by #{--mirror-chroot}#, defaults to the
+#{--mirror-bootstrap}# value.
-It can be disabled by setting the binary mirror to the same value as the
-chroot mirror.
+3~ Distribution mirrors used at run time
-Note: the same applies for mirror chroot security and mirror binary security
+The #{--mirror-binary*}# options govern the distribution mirrors placed in
+the binary image. These may be used to install additional packages while
+running the live system. The 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{
-$ lb config --mirror-chroot-security {URL} $ lb config
---mirror-binary-security {URL}
-
-}code
-
-If you don't want to include apt indices, you can skip those with:
-
-code{
-
-$ lb config --binary-indices false
+$ lb config --mirror-binary http://mirror/debian/ \
+ --mirror-binary-security http://mirror/debian-security/
}code
-This will not influence the entries in /etc/apt/sources.list, but only if
-/var/lib/apt contains the indices files or not (and by that making the image
-smaller).
-
-3~ Own repository
+3~ Additional repositories
To add more repositories (e.g. backports, experimental or custom packages,
etc.), create #{config/chroot_sources/your-repository.{chroot,binary}}#
-files.
+files. As with the #{--mirror-*}# options, these govern the repositories
+used in the *chroot* stage when building the image, and in the *binary*
+stage, i.e. for use when running the live system.
-e.g. #{config/chroot_sources/live.chroot}# allows you to install packages
-from the debian live snapshot repository at live system build time (you have
-to add the packages in your package list):
+For example, #{config/chroot_sources/live.chroot}# allows you to install
+packages from the debian live snapshot repository at live system build time.
code{
@@ -91,17 +81,18 @@ deb http://live.debian.net/ sid-snapshots main contrib non-free
}code
-If you add the line to #{config/chroot_sources/live.binary}# the repository
-will be added to your live-system's #{/etc/apt/sources.list}#.
+If you add the same line to #{config/chroot_sources/live.binary}#, the
+repository will be added to your live system's #{/etc/apt/sources.list.d/}#
+directory.
If such files exist, they will be picked up automatically.
-You can also put the gpg-key used to sign the repository into
-config/chroot_sources/your-repository.{binary,chroot}.gpg
+You should 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:
+selection through the #{--repository}# option, e.g. for enabling live
+snapshots, a simple command is enough to enable it:
code{
@@ -109,45 +100,21 @@ $ lb config --repository live.debian.net
}code
-3~ Package installation
-
-You can elect to use either #{apt}# or #{aptitude}# when installing
-packages. Which utility is used is governed by the #{LB_APT}# variable in
-#{config/chroot}# or by the #{--apt}# argument to #{lb config}#:
-
-_* #{apt}#: Specifying a missing package causes package installation to
-fail, which may not be the desired behaviour. This is the default setting
-for building images for Lenny or later.
-
-_* #{aptitude}#: Specifying a missing package causes package installation to
-succeed, which may not be the desired behaviour. This is the default setting
-for building images for Etch.
-
-2~ Installing additional packages
+2~choosing-packages-to-install Choosing packages to install
-live-helper has a number of mechanisms for indicating that additional
-packages should be installed, including:
+There are a number of ways to choose which packages live-build will install
+in your image, covering a variety of different needs. You can simply name
+individual packages to install, either with the #{--packages}# option for a
+few packages, or in a package list of your own for larger numbers. You can
+also choose larger predefined lists of packages, or use APT tasks. And
+finally, you may place package files in your #{config/}# tree, which is well
+suited to testing of new or experimental packages before they are available
+from a repository.
-_* The #{LB_PACKAGES}# variable
+3~ Choosing a few packages
-_* Package lists
-
-_* Local packages (#{chroot_local-packages/}#)
-
-_* Tasks
-
-3~ The #{LB_PACKAGES}# variable
-
-To install additional packages, simply add them to the #{LB_PACKAGES}#
-variable in #{config/chroot}#. For example:
-
-code{
-
-LB_PACKAGES="package1 package2 package3 ... "
-
-}code
-
-You can also specify initial values on the command line:
+When the number of packages added is small, simply specify
+#{--packages}#. For example:
code{
@@ -156,67 +123,99 @@ $ 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"/>
+need flexibility regarding which packages to install, use package lists as
+discussed in the following section, {Package lists}#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.
+installed. The list syntax supports included files and conditional sections
+which makes it easy to build lists from other lists and adapt them for use
+in multiple configurations. You can use predefined package lists, providing
+in a modular fashion package selections from each of the major desktop
+environments and some special purpose lists, as well as standard lists the
+others are based upon. You can also provide your own package lists, or use a
+combination of both.
-To specify one or more package list, you can use:
+3~ Predefined package lists
+
+The simplest way to use lists is to specify one or more predefined lists
+with the #{--packages-lists}# option. For example:
code{
-$ lb config --packages-lists "list1 list2 list3"
+$ lb config --packages-lists "gnome-core rescue"
}code
-Note: Package lists that are distributed with live-build reside in the
-#{/usr/share/live/build/lists}# directory.
+In addition to these lists, live-build supports four virtual package lists:
+#{gnome-desktop}#, #{kde-desktop}#, #{lxde-desktop}# and #{xfce-desktop}#,
+each of which provide a more extensive selection of packages that
+corresponds with Debian Installer defaults for these desktop
+environments. See {Desktop and language tasks}#desktop-and-language-tasks
+for more details.
+
+Note: The prebuilt GNOME, KDE, LXDE and XFCE images available for download
+at http://live.debian.net are built using the corresponding virtual
+#{*-desktop}# lists.
+
+The default location for the list files on your system is
+#{/usr/share/live/build/lists/}#. To determine the packages in a given list,
+read the corresponding file, paying attention to included files and
+conditionals as described in the following sections.
-*{Local packages lists}*
+3~ Local package lists
-You may supplement the supplied lists using local package lists stored in
-#{config/chroot_local-packageslists}#.
+You may supplement or replace entirely 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
+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}*
+3~ 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}*
+3~ Extending a provided package list using includes
-% FIXME
+The package lists that are included with live-build make extensive use of
+includes. Refer to these in the #{/usr/share/live/build/lists/}# directory,
+as they serve as good examples of how to write your own lists.
-% code{ % % #include <gnome> % iceweasel % % }code
+For example, to make a list that includes the predefined #{gnome}# list plus
+iceweasel, create #{config/chroot_local-packageslists/mygnome.list}# with
+the following contents:
-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.
+code{
+
+#include <gnome> iceweasel
+
+}code
+
+3~ 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{
@@ -224,7 +223,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{
@@ -232,7 +233,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{
@@ -248,14 +251,66 @@ code{
}code
-Any live-build configuration variable that begins with #{LB_}# can be tested
-in this way.
-
The nesting of conditionals is not supported.
3~ Tasks
-%FIXME
+The Debian Installer offers the user choices of a number of preselected
+lists of packages, each one focused on a particular kind of system, or task
+a system may be used for, such as "Graphical desktop environment", "Mail
+server" or "Laptop". These lists are called "tasks" and are supported by APT
+through the "Task:" field. You can specify one or more tasks in live-build
+via the #{--tasks}# option, as in the example below.
+
+code{
+
+$ lb config --tasks "mail-server file-server"
+
+}code
+
+The primary tasks available in the Debian Installer can be listed with
+#{tasksel --list-tasks}# in the live system. The contents of any task,
+including ones not included in this list, may be examined with #{tasksel
+--task-packages}#.
+
+3~desktop-and-language-tasks Desktop and language tasks
+
+Desktop and language tasks are special cases. In the Debian Installer, if
+the medium was prepared for a particular desktop environment flavour, the
+corresponding task will be automatically installed. Thus, there are there
+are #{gnome-desktop}#, #{kde-desktop}#, #{lxde-desktop}# and
+#{xfce-desktop}# tasks, none of which are offered in #{tasksel}#'s
+menu. Likewise, there are no menu entries for tasks for languages, but the
+user's language choice during the install influences the selection of
+corresponding language tasks.
+
+In live-build, therefore, these special cases are also given special
+consideration, but with three notable differences at the time of writing.
+
+First, there is no provision made yet automatically for language tasks,
+although a subset of those packages are included if you specify #{lb config
+--language}#. If you need those tasks, which include such things as
+language-specific fonts and input-method packages, you need to specify them
+in your configuration. For example:
+
+code{
+
+$ lb config --tasks "japanese japanese-desktop japanese-gnome-desktop"
+
+}code
+
+Second, live-build supports #{*-desktop}# virtual package lists for each of
+the desktop flavours mentioned above, which select the #{standard-x11}#
+predefined package list, the corresponding #{*-desktop}# task and three
+additional tasks: #{desktop}#, #{standard}# and #{laptop}#. So, for example,
+if you specify #{--packages gnome-desktop}#, it is equivalent to specifying
+#{--packages standard-x11 --tasks "gnome-desktop desktop standard laptop"}#.
+
+Third, if any of the tasks for these desktop flavours are selected, either
+explicitly through #{--tasks}# or implicitly by #{--packages}#, live-build
+will preseed the corresponding desktop value for Debian Installer (if it is
+included) to ensure it follows its own rules for installing different
+desktop flavours.
2~ Installing modified or third-party packages
@@ -279,14 +334,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.
@@ -296,21 +351,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 {Choosing
+packages to install}#choosing-packages-to-install 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
@@ -332,8 +385,87 @@ apt-preferences for more information.
% FIXME: <xref linkend="apt-preferences"/>
-3~ Altering APT preferences during Live system
+2~ Configuring APT at build time
+
+You can configure APT through a number of options applied only at build
+time. (APT configuration used in the running live system may be configured
+in the normal way for live system contents, that is, by including the
+appropriate configurations through #{config/chroot_local_includes/}#.) For a
+complete list, look for options starting with #{apt}# in the #{lb_config}#
+man page.
+
+3~choosing-apt-or-aptitude Choosing apt or aptitude
+
+You can elect to use either #{apt}# or #{aptitude}# when installing packages
+at build time. Which utility is used is governed by the #{--apt}# argument
+to #{lb config}#. Choose the method implementing the preferred behaviour for
+package installation, the notable difference being how missing packages are
+handled.
+
+_* #{apt}#: With this method, if a missing package is specified, the package
+installation will fail. This is the default setting.
+
+_* #{aptitude}#: With this method, if a missing package is specified, the
+package installation will succeed.
+
+3~ Using a proxy with APT
+
+One commonly required APT configuration is to deal with building an image
+behind a proxy. You may specify your APT proxy with the #{--apt-ftp-proxy}#
+or #{--apt-http-proxy}# options as needed, e.g.
+
+code{
+
+lb config --apt-http-proxy http://proxy/
+
+}code
+
+3~ Tweaking APT to save space
+
+You may find yourself needing to save some space on the image media, in
+which case one or the other or both of the following options may be of
+interest.
+
+If you don't want to include APT indices in the image, you can omit those
+with:
+
+code{
+
+$ lb config --binary-indices false
+
+}code
+
+This will not influence the entries in /etc/apt/sources.list, but merely
+whether /var/lib/apt contains the indices files or not. The tradeoff is that
+APT needs those indices in order to operate in the live system, so before
+performing #{apt-cache search}# or #{apt-get install}#, for instance, the
+user must #{apt-get update}# first to create those indices.
+
+If you find the installation of recommended packages bloats your image too
+much, you may disable that default option of APT with:
+
+code{
+
+$ lb config -apt-recommends false
+
+}code
+
+The tradeoff here is that recommended packages are defined as "packages that
+would be found together with this one in all but unusual installations"
+(Debian Policy Manual, §7.2). This may lead to some packages that you
+actually need being omitted, so we suggest you review the difference this
+makes to your packages list (see the #{binary.packages}# file generated by
+#{lb build}#) and re-include in your list any missing packages that you
+still want installed.
+
+3~ Passing options to apt or aptitude
+
+If there is not an #{lb config}# option to alter APT's behaviour in the way
+you need, use #{--apt-options}# or #{--aptitude-options}# to pass any
+options through to your configured APT tool. See the man pages for #{apt}#
+and #{aptitude}# for details.
+
+3~ APT pinning
+
+% FIXME: needs content
-Whilst it may seem unnecessary effort to create an APT repository to install
-custom packages, the infrastructure can be easily re-used at a later date to
-offer updates of the modified package.
diff --git a/manual/fr/user_examples.ssi b/manual/fr/user_examples.ssi
index 2567323..0bb4753 100644
--- a/manual/fr/user_examples.ssi
+++ b/manual/fr/user_examples.ssi
@@ -1,10 +1,228 @@
-B~ Examples
+:B~ Examples
-1~ Use Case Builds
+1~examples Examples
-This chapter covers example builds for specific use cases with Debian Live.
+This chapter covers example builds for specific use cases with Debian
+Live. If you are new to building your own Debian Live images, we recommend
+you first look at the three tutorials in sequence, as each one teaches new
+techniques that will help you use and understand the remaining examples.
-2~ VNC Kiosk Client
+2~using-the-examples Using the examples
+
+To use these examples you need a system to build them on that meets the
+requirements listed in {Requirements}#requirements and has live-build
+installed as described in {Installing live-build}#installing-live-build.
+
+Note that, for the sake of brevity, in these examples we do not specify a
+local mirror to use for the build. You can speed up downloads considerably
+if you use a local mirror. You may specify the options when you use #{lb
+config}#, as described in {Distribution mirrors used at build
+time}#distribution-mirrors-build-time, or for more convenience, set the
+default for your build system in #{/etc/live/build.conf}#. Simply create
+this file and in it, set the corresponding #{LB_MIRROR_*}# variables to your
+preferred mirror. For example:
+
+code{
+
+LB_MIRROR_BOOTSTRAP="http://mirror/debian"
+LB_MIRROR_CHROOT="http://mirror/debian"
+LB_MIRROR_CHROOT_SECURITY="http://mirror/debian-security"
+
+}code
+
+2~tutorial-1 Tutorial 1: A standard image
+
+*{Use case:}* Create a simple first image, learning the basics of live-build
+
+In this tutorial, we will build a default ISO hybrid Debian Live image
+containing only base packages (no Xorg) and some Debian Live support
+packages, as a first exercise in using live-build.
+
+You can't get much simpler than this:
+
+code{
+
+$ mkdir tutorial1 ; cd tutorial1 ; lb config
+
+}code
+
+Examine the contents of the #{config/}# directory if you wish. You will see
+stored here a skeletal configuration, ready to customize or, in this case,
+use immediately to build a default image.
+
+Now, as superuser, build the image, saving a log as you build with #{tee}#.
+
+code{
+
+# lb_build 2>&1 | tee binary.log
+
+}code
+
+Assuming all goes well, after a while, the current directory will contain
+#{binary-hybrid.iso}#. This ISO hybrid image can be booted directly in a
+virtual machine as described in {Testing an ISO image with
+Qemu}#testing-iso-with-qemu and {Testing an ISO image with
+virtualbox-ose}#testing-iso-with-virtualbox, or else imaged onto optical
+media or a USB flash device as described in {Burning an ISO image to a
+physical medium}#burning-iso-image and {Copying USB/HDD image to a USB
+stick}#copying-usb-hdd-image, respectively.
+
+2~tutorial-2 Tutorial 2: A web browser utility
+
+*{Use case}* Create a web browser utility image, learning how to apply customizations
+
+In this tutorial, we will create an image suitable for use as a web browser
+utility, serving as an introduction to customizing Debian Live images.
+
+code{
+
+mkdir tutorial2 ; cd tutorial2 ; lb config -p lxde --packages iceweasel
+
+}code
+
+Our choice of LXDE for this example reflects our desire to provide a minimal
+desktop environment, since the focus of the image is the single use we have
+in mind, the web browser. We could go even further and provide a default
+configuration for the web browser in
+#{config/chroot_local-includes/etc/iceweasel/profile/}#, or additional
+support packages for viewing various kinds of web content, but we leave this
+as an exercise for the reader.
+
+Build the image, again as superuser, keeping a log as in {Tutorial
+1}#tutorial-1:
+
+code{
+
+# lb build 2>&1 | tee binary.log
+
+}code
+
+Again, verify the image is OK and test, as in {Tutorial 1}#tutorial-1.
+
+2~tutorial-3 Tutorial 3: A personalized image
+
+*{Use case}* Create a project to build a personalized image, containing your favourite software to take with you on a USB stick wherever you go, and evolving in successive revisions as your needs and preferences change.
+
+Since we will be changing our personalized image over a number of revisions,
+and we want to track those changes, trying things experimentally and
+possibly reverting them if things don't work out, we will keep our
+configuration in the popular #{git}# version control system. We will also
+use the best practice of autoconfiguration via #{auto}# scripts as described
+in {Managing a configuration}#managing-a-configuration.
+
+3~ First revision
+
+code{
+
+$ mkdir -p tutorial3/auto $ cp /usr/share/live/examples/auto/*
+tutorial3/auto/ $ cd tutorial3
+
+}code
+
+Edit #{auto/config}# to read as follows:
+
+code{
+
+#!/bin/sh
+
+lb config noauto \
+ --architecture i386 \
+ --linux-flavours 686 \
+ --packages-lists lxde \
+ --packages "iceweasel xchat" \
+ "${@}"
+
+}code
+
+First, #{--architecture i386}# ensures that on our #{amd64}# build system,
+we build a 32-bit version suitable for use on most machines. Second, we use
+#{--linux-flavours 686}# because we don't anticipate using this image on
+much older systems. Third, we've chosen the #{lxde}# package list to give us
+a minimal desktop. And finally, we have added two initial favourite
+packages: #{iceweasel}# and #{xchat}#.
+
+Now, build the image:
+
+code{
+
+# lb build
+
+}code
+
+Note that unlike in the first two tutorials, we no longer have to type
+#{2>&1 | tee binary.log}# as that is now included in #{auto/build}#.
+
+Once you've tested the image (as in {Tutorial 1}#tutorial-1) and are
+satisfied it works, it's time to initialize our #{git}# repository, adding
+only the auto scripts we just created, and then make the first commit:
+
+code{
+
+$ git init $ git add auto $ git commit -a -m "Initial import."
+
+}code
+
+3~ Second revision
+
+In this revision, we're going to clean up from the first build, add the
+#{vlc}# package to our configuration, rebuild, test and commit.
+
+The #{lb clean}# command will clean up all generated files from the previous
+build except for the cache, which saves having to re-download packages. This
+ensures that the subsequent #{lb build}# will re-run all stages to
+regenerate the files from our new configuration.
+
+code{
+
+# lb clean
+
+}code
+
+Now edit #{auto/config}# to add the #{vlc}# package:
+
+code{
+
+#!/bin/sh
+
+lb config noauto \
+ --architecture i386 \
+ --linux-flavours 686 \
+ --packages-lists lxde \
+ --packages "iceweasel xchat vlc" \
+ "${@}"
+
+}code
+
+Build again:
+
+code{
+
+# lb build
+
+}code
+
+Test, and when you're satisfied, commit the next revision:
+
+code{
+
+$ git commit -a -m "Adding vlc media player."
+
+}code
+
+Of course, more complicated changes to the configuration are possible,
+perhaps adding files in subdirectories of #{config/}#. When you commit new
+revisions, just take care not to hand edit or commit the top-level files in
+#{config}# containing #{LB_*}# variables, as these are build products, too,
+and are always cleaned up by #{lb clean}# and re-created with #{lb config}#
+via their respective #{auto}# scripts.
+
+We've come to the end of our tutorial series. While many more kinds of
+customization are possible, even just using the few features explored in
+these simple examples, an almost infinite variety of different images can be
+created. The remaining examples in this section cover several other use
+cases drawn from the collected experiences of users of Debian Live.
+
+2~ A VNC Kiosk Client
Create an image with live-build to boot directly to a VNC server.
@@ -38,6 +256,50 @@ _* Build the image: #{# lb build}#
_* Enjoy.
-2~ Next Example FIXME
+2~ A base image for a 128M USB key
+
+*{Use case}* Create a standard image with some components removed in order to fit on a 128M USB key with space left over to use as you see fit.
+
+When optimizing an image to fit a certain media size, you need to understand
+the tradeoffs you are making between size and functionality. In this
+example, we trim only so much as to make room for additional material within
+a 128M media size, but without doing anything to destroy integrity of the
+packages contained within, such as the purging of locale data via the
+#{localepurge}# package, or other such "intrusive" optimizations. Of
+particular note, you should not use #{--bootstrap-flavour minimal}# unless
+you really know what you're doing, as omitting priority #{important}#
+packages will most likely produce a broken live system.
+
+code{
+
+$ lb config -k 486 -p minimal --binary-indices false --memtest none
+--apt-recommends false --includes none
+
+}code
+
+Now, build the image in the usual way:
+
+code{
+
+# lb build 2>&1 | tee binary.log
+
+}code
+
+On the author's system at time of writing, the above configuration produced
+a 78Mbyte image. This compares favourably with the 166Mbyte image produced
+by the default configuration in {Tutorial 1}#tutorial-1.
+The biggest space-saver here, compared to building a standard image on an
+#{i386}# architecture system, is to select only the #{486}# kernel flavour
+instead of the default #{-k "486 686"}#. Leaving off APT's indices with
+#{--binary-indices false}# also saves a fair amount of space, the tradeoff
+being that you need to #{apt-get update}# before using apt in the live
+system. Choosing the #{minimal}# package list leaves out the large
+#{locales}# package and associated utilities. Dropping recommended packages
+with #{--apt-recommends false}# saves some additional space, at the expense
+of omitting some packages you might otherwise expect to be there, such as
+#{firmware-linux-free}# which may be needed to support certain hardware. The
+remaining options shave off additional small amounts of space. It's up to
+you to decide if the functionality that is sacrificed with each optimization
+is worth the loss in functionality.
diff --git a/manual/fr/user_installation.ssi b/manual/fr/user_installation.ssi
index 9869ff4..adcc91b 100644
--- a/manual/fr/user_installation.ssi
+++ b/manual/fr/user_installation.ssi
@@ -2,7 +2,7 @@
1~ Installation
-2~ Requirements
+2~requirements Requirements
Building Debian Live images has very few system requirements:
@@ -19,7 +19,7 @@ _* Linux 2.6.x
Note that using Debian or a Debian-derived distribution is not required -
live-build will run on almost any distribution with the above requirements.
-2~ Installing live-build
+2~installing-live-build Installing live-build
You can install live-build in a number of different ways:
@@ -98,10 +98,16 @@ are available on http://live.debian.net/debian/.
*{Note:}* You do not need to install live-boot on your system to create customized Debian Live systems. However, doing so will do no harm.
+% FIXME: we also need to mention live-config
+
3~ Using a customized live-boot
+% FIXME: should follow the structure for live-build above (i.e. "from
+source", not "customized" -- we should not get into customization now, but
+should reserve that discussion for later.
+
To modify the code you can follow the process below. Please ensure you are
-familiar with the terms mentioned in {Terms}#terms .
+familiar with the terms mentioned in {Terms}#terms.
_* Checkout the live-boot source
@@ -113,12 +119,18 @@ $ git clone git://live.debian.net/git/live-boot.git
_* Make changes to your local copy
+% FIXME: as indicated above, it's too early for this topic. Move to later in
+the manual.
+
And beware that if you want to add your pre-init script in live-bottom, you
should name it without dashes '-', e.g: call it "99new_feature" and not
"99new-feature".
_* Build a live-boot .deb
+% FIXME: not strictly true? building sid on squeeze is usually OK. also,
+building lenny on squeeze or sid is fine. clarify.
+
You must build either on your target distribution or in a chroot containing
your target platform: this means if your target is Squeeze then you should
build against Squeeze. You can use a personal builder such as /{pbuilder}/
@@ -128,7 +140,7 @@ package):
code{
-$ cd live-boot $ dpkg-buildpackage -rfakeroot -b -uc -us
+$ cd live-boot $ dpkg-buildpackage -b -uc -us
}code
@@ -140,7 +152,8 @@ another custom package. Please see custom-packages for more information. You
should pay particular attention to custom-packages-apt.
% FIXME: <xref linkend="custom-packages"/> <xref
-linkend="custom-packages-apt"/>
+linkend="custom-packages-apt"/> % Ben> What is the latter reference for? I
+can't see the relevance.
3~ Using live-boot snapshots
diff --git a/manual/fr/user_managing_a_configuration.ssi b/manual/fr/user_managing_a_configuration.ssi
index bc03008..ab5b6c1 100644
--- a/manual/fr/user_managing_a_configuration.ssi
+++ b/manual/fr/user_managing_a_configuration.ssi
@@ -49,8 +49,8 @@ code{
#!/bin/sh
lb config noauto \
- --architecture i386 \
- ${@}
+ --packages-lists "standard" \
+ "${@}"
}code
@@ -59,7 +59,7 @@ auto/clean
code{
#!/bin/sh
-lb clean noauto ${@}
+lb clean noauto "${@}"
rm -f config/binary config/bootstrap \
config/chroot config/common config/source
rm -f binary.log
@@ -70,14 +70,13 @@ auto/build
code{
-#!/bin/sh lb build noauto ${@} 2>&1 | tee binary.log
+#!/bin/sh lb build noauto "${@}" 2>&1 | tee binary.log
}code
-Edit auto/config, changing or adding any options as you see fit. In the
-example above, --architecture is set to i386 so that when the image is built
-on an amd64 system, it will not default to building amd64 images. Change
-this to an appropriate value for your image (or delete it if you want to use
-the default) and add any additional options in continuation lines that
-follow.
+Edit #{auto/config}#, changing or adding any options as you see fit. In the
+example above, #{--packages-lists standard}# is set to the default
+value. Change this to an appropriate value for your image (or delete it if
+you want to use the default) and add any additional options in continuation
+lines that follow.
diff --git a/manual/po/de/about_manual.ssi.po b/manual/po/de/about_manual.ssi.po
index b3b1028..febb13f 100644
--- a/manual/po/de/about_manual.ssi.po
+++ b/manual/po/de/about_manual.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-23 16:43+0300\n"
+"POT-Creation-Date: 2010-11-28 07:21-0400\n"
"PO-Revision-Date: 2010-10-22 08:36-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -48,12 +48,38 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:10
-msgid "2~terms Terms"
+msgid "2~ For the impatient"
msgstr ""
#. type: Plain text
#: en/about_manual.ssi:12
msgid ""
+"While we believe that everything in this manual is important to at least "
+"some of our users, we realize it is a lot of material to cover and that you "
+"may wish to experience early success using the software before delving into "
+"the details. Therefore, we have provided three tutorials in the {Examples}"
+"#examples section designed to teach you image building and customization "
+"basics. Read {Using the examples}#using-the-examples first, followed by "
+"{Tutorial 1: A standard image}#tutorial-1, {Tutorial 2: A web browser "
+"utility}#tutorial-2 and finally {Tutorial 3: A personal travelling companion}"
+"#tutorial-3. By the end of these tutorials, you will have a taste of what "
+"can be done with Debian Live. We encourage you to return to more in-depth "
+"study of the manual, perhaps next reading {The basics}#the-basics, skimming "
+"or skipping {Building a netboot image}#building-netboot-image, and finishing "
+"by reading the {Customization overview}#customization-overview and the "
+"chapters that follow it. By this point, we hope you are thoroughly excited "
+"by what can be done with Debian Live and motivated to read the rest of the "
+"manual, cover-to-cover."
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:14
+msgid "2~terms Terms"
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:16
+msgid ""
"_* *{Live system}*: An operating system that can boot without installation "
"to a hard drive. Live systems do not alter local operating system(s) or file"
"(s) already installed on the computer hard drive unless instructed to do so. "
@@ -62,14 +88,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:14
+#: en/about_manual.ssi:18
msgid ""
"_* *{Debian Live}*: The Debian sub-project which maintains the live-boot, "
"live-build, live-config, and live-manual packages."
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:16
+#: en/about_manual.ssi:20
msgid ""
"_* *{Debian Live system}*: A live system that uses software from the Debian "
"operating system that may be booted from CDs, DVDs, USB sticks, over the "
@@ -78,24 +104,24 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:18
+#: en/about_manual.ssi:22
msgid "_* *{Host system}*: The environment used to create the live system."
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:20
+#: en/about_manual.ssi:24
msgid "_* *{Target system}*: The environment used to run the live system."
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:22
+#: en/about_manual.ssi:26
msgid ""
"_* *{live-boot}*: A collection of scripts used to boot live systems. live-"
"boot was formerly a part of live-initramfs."
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:24
+#: en/about_manual.ssi:28
msgid ""
"_* *{live-build}*: A collection of scripts used to build customized Debian "
"Live systems. live-build was formerly known as live-helper, and even earlier "
@@ -103,152 +129,155 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:26
+#: en/about_manual.ssi:30
msgid ""
"_* *{live-config}*: A collection of scripts used to configure a live system "
"during the boot process. live-config was formerly a part of live-initramfs."
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:28
+#: en/about_manual.ssi:32
msgid ""
"_* *{live-manual}*: This document is maintained in a package called live-"
"manual."
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:30
+#: en/about_manual.ssi:34
msgid ""
"_* *{Debian Installer (d-i)}*: The official installation system for the "
"Debian distribution."
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:32
+#: en/about_manual.ssi:36
msgid ""
"_* *{Boot parameters}*: Parameters that can be entered at the bootloader "
"prompt to influence the kernel or live-config."
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:34
+#: en/about_manual.ssi:38
msgid ""
-"_* *{chroot}*: The chroot program, chroot(8), enables us to run different "
-"instances of the GNU/Linux environment on a single system simultaneously "
-"without rebooting."
+"_* *{chroot}*: The chroot program, #{chroot(8)}#, enables us to run "
+"different instances of the GNU/Linux environment on a single system "
+"simultaneously without rebooting."
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:36
+#: en/about_manual.ssi:40
msgid ""
"_* *{Binary image}*: A file containing the live system, such as binary.iso "
"or binary.img."
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:38
+#: en/about_manual.ssi:42
msgid ""
"_* *{Target distribution}*: The distribution upon which your live system "
"will be based. This can differ from the distribution of your host system."
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:40
+#: en/about_manual.ssi:44
msgid ""
-"_* *{Squeeze/Wheezy/Sid (stable/testing/unstable)}*: The stable distribution "
-"contains the latest officially released distribution of Debian. The testing "
-"distribution is the staging area for the next stable release. A major "
-"advantage of using this distribution is that it has more recent versions of "
-"software relative to the stable release. The unstable distribution is where "
-"active development of Debian occurs. Generally, this distribution is run by "
-"developers and those who like to live on the edge."
+"_* *{Squeeze/Wheezy/Sid (stable/testing/unstable)}*: Debian codenames for "
+"releases. At the time of writing, Squeeze is the current *{stable}* release "
+"and Wheezy is the current *{testing}* release. Sid will always be a synonym "
+"for the *{unstable}* release. Throughout the manual, we tend to use "
+"codenames for the releases, as that is what is supported by the tools "
+"themselves."
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:42
+#: en/about_manual.ssi:46
msgid ""
-"At the time of writing, Squeeze is the current stable release and Wheezy is "
-"the current testing release. Sid will always be a synonym for the unstable "
-"release."
+"The *{stable}* distribution contains the latest officially released "
+"distribution of Debian. The *{testing}* distribution is the staging area for "
+"the next *{stable}* release. A major advantage of using this distribution is "
+"that it has more recent versions of software relative to the *{stable}* "
+"release. The *{unstable}* distribution is where active development of Debian "
+"occurs. Generally, this distribution is run by developers and those who like "
+"to live on the edge."
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:44
+#: en/about_manual.ssi:48
msgid "2~ Authors"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:46
+#: en/about_manual.ssi:50
msgid "A list of authors (in alphabetical order):"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:48
+#: en/about_manual.ssi:52
msgid "_* Ben Armstrong"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:50
+#: en/about_manual.ssi:54
msgid "_* Brendan Sleight"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:52
+#: en/about_manual.ssi:56
msgid "_* Chris Lamb"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:54
+#: en/about_manual.ssi:58
msgid "_* Daniel Baumann"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:56
+#: en/about_manual.ssi:60
msgid "_* Franklin Piat"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:58
+#: en/about_manual.ssi:62
msgid "_* Jonas Stein"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:60
+#: en/about_manual.ssi:64
msgid "_* Kai Hendry"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:62
+#: en/about_manual.ssi:66
msgid "_* Marco Amadori"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:64
+#: en/about_manual.ssi:68
msgid "_* Mathieu Geli"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:66
+#: en/about_manual.ssi:70
msgid "_* Matthias Kirschner"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:68
+#: en/about_manual.ssi:72
msgid "_* Richard Nelson"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:70
+#: en/about_manual.ssi:74
msgid "_* Trent W. Buck"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:72
+#: en/about_manual.ssi:76
msgid "2~ Contributing to this document"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:74
+#: en/about_manual.ssi:78
msgid ""
"This manual is intended as a community project and all proposals for "
"improvements and contributions are extremely welcome. The preferred way to "
@@ -257,7 +286,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:76
+#: en/about_manual.ssi:80
msgid ""
"When submitting a contribution, please clearly identify its copyright holder "
"and include the licensing statement. Note that to be accepted, the "
@@ -266,86 +295,94 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:78
+#: en/about_manual.ssi:82
msgid ""
"The sources for this manual are maintained using the Git version control "
"system. You can checkout the latest copy by executing:"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:80 en/about_manual.ssi:88 en/about_manual.ssi:96
-#: en/about_manual.ssi:108 en/about_manual.ssi:121 en/about_manual.ssi:134
-#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
-#: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
-#: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
-#: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
-#: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
-#: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
-#: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
-#: en/other_faq.ssi:41 en/other_faq.ssi:83 en/other_faq.ssi:103
-#: en/other_faq.ssi:117 en/other_faq.ssi:137 en/other_faq.ssi:151
-#: en/other_faq.ssi:198 en/other_faq.ssi:245 en/other_faq.ssi:261
-#: en/other_faq.ssi:287 en/other_faq.ssi:299 en/other_faq.ssi:314
-#: en/other_faq.ssi:333 en/other_faq.ssi:345 en/other_faq.ssi:353
-#: en/other_faq.ssi:364 en/other_faq.ssi:374 en/other_howtos.ssi:16
-#: en/other_howtos.ssi:43 en/other_live-environment.ssi:14
-#: en/other_live-environment.ssi:30 en/other_live-environment.ssi:51
-#: en/other_live-environment.ssi:61 en/other_live-environment.ssi:69
-#: en/other_live-environment.ssi:77 en/other_live-environment.ssi:85
-#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
-#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
-#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
-#: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
-#: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
-#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111 en/user_basics.ssi:34
-#: en/user_basics.ssi:44 en/user_basics.ssi:56 en/user_basics.ssi:68
-#: en/user_basics.ssi:80 en/user_basics.ssi:92 en/user_basics.ssi:106
-#: en/user_basics.ssi:114 en/user_basics.ssi:122 en/user_basics.ssi:132
-#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
-#: en/user_basics.ssi:172 en/user_basics.ssi:186 en/user_basics.ssi:194
-#: en/user_basics.ssi:204 en/user_basics.ssi:224 en/user_basics.ssi:257
-#: en/user_basics.ssi:273 en/user_basics.ssi:281 en/user_basics.ssi:301
-#: en/user_basics.ssi:326 en/user_customization-contents.ssi:34
-#: en/user_customization-contents.ssi:43 en/user_customization-contents.ssi:66
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
+#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
+#: en/about_manual.ssi:170 en/other_coding-style.ssi:28
+#: en/other_coding-style.ssi:38 en/other_coding-style.ssi:51
+#: en/other_coding-style.ssi:61 en/other_coding-style.ssi:88
+#: en/other_coding-style.ssi:96 en/other_coding-style.ssi:106
+#: en/other_coding-style.ssi:117 en/other_common-tasks.ssi:32
+#: en/other_customization-backports.ssi:8 en/other_customization-bootup.ssi:30
+#: en/other_customization-bootup.ssi:39 en/other_faq.ssi:41
+#: en/other_faq.ssi:83 en/other_faq.ssi:103 en/other_faq.ssi:117
+#: en/other_faq.ssi:137 en/other_faq.ssi:151 en/other_faq.ssi:198
+#: en/other_faq.ssi:245 en/other_faq.ssi:261 en/other_faq.ssi:287
+#: en/other_faq.ssi:299 en/other_faq.ssi:314 en/other_faq.ssi:333
+#: en/other_faq.ssi:345 en/other_faq.ssi:353 en/other_faq.ssi:364
+#: en/other_faq.ssi:374 en/other_howtos.ssi:16 en/other_howtos.ssi:43
+#: en/other_live-environment.ssi:14 en/other_live-environment.ssi:30
+#: en/other_live-environment.ssi:51 en/other_live-environment.ssi:61
+#: en/other_live-environment.ssi:69 en/other_live-environment.ssi:77
+#: en/other_live-environment.ssi:85 en/other_live-environment.ssi:93
+#: en/other_live-environment.ssi:116 en/other_live-environment.ssi:124
+#: en/other_live-environment.ssi:133 en/other_procedures.ssi:12
+#: en/other_procedures.ssi:46 en/other_procedures.ssi:58
+#: en/project_bugs.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/user_basics.ssi:54 en/user_basics.ssi:66 en/user_basics.ssi:78
+#: en/user_basics.ssi:88 en/user_basics.ssi:102 en/user_basics.ssi:110
+#: en/user_basics.ssi:118 en/user_basics.ssi:128 en/user_basics.ssi:142
+#: en/user_basics.ssi:154 en/user_basics.ssi:162 en/user_basics.ssi:170
+#: en/user_basics.ssi:184 en/user_basics.ssi:192 en/user_basics.ssi:202
+#: en/user_basics.ssi:222 en/user_basics.ssi:255 en/user_basics.ssi:271
+#: en/user_basics.ssi:279 en/user_basics.ssi:299 en/user_basics.ssi:324
+#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
+#: en/user_customization-contents.ssi:66
#: en/user_customization-internationalization.ssi:10
#: en/user_customization-internationalization.ssi:18
#: en/user_customization-internationalization.ssi:26
#: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:16 en/user_customization-packages.ssi:24
-#: en/user_customization-packages.ssi:36 en/user_customization-packages.ssi:45
-#: en/user_customization-packages.ssi:59 en/user_customization-packages.ssi:73
-#: en/user_customization-packages.ssi:103
-#: en/user_customization-packages.ssi:111
-#: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:166
-#: en/user_customization-packages.ssi:176
-#: en/user_customization-packages.ssi:186
-#: en/user_customization-packages.ssi:196 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:104
-#: en/user_installation.ssi:118 en/user_installation.ssi:135
-#: en/user_managing_a_configuration.ssi:24
+#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
+#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
+#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:90
+#: en/user_customization-packages.ssi:120
+#: en/user_customization-packages.ssi:133
+#: en/user_customization-packages.ssi:143
+#: en/user_customization-packages.ssi:153
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:261
+#: en/user_customization-packages.ssi:273
+#: en/user_customization-packages.ssi:283 en/user_examples.ssi:12
+#: en/user_examples.ssi:27 en/user_examples.ssi:37 en/user_examples.ssi:51
+#: en/user_examples.ssi:61 en/user_examples.ssi:77 en/user_examples.ssi:87
+#: en/user_examples.ssi:104 en/user_examples.ssi:114 en/user_examples.ssi:128
+#: en/user_examples.ssi:136 en/user_examples.ssi:151 en/user_examples.ssi:159
+#: en/user_examples.ssi:185 en/user_examples.ssi:206 en/user_examples.ssi:214
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:76 en/user_installation.ssi:84
+#: en/user_installation.ssi:104 en/user_installation.ssi:118
+#: en/user_installation.ssi:135 en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
-#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:46
-#: en/user_overview.ssi:90 en/user_overview.ssi:98
+#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:36
+#: en/user_overview.ssi:80 en/user_overview.ssi:88
msgid "code{"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:82
+#: en/about_manual.ssi:86
msgid "$ git clone git://live.debian.net/git/live-manual.git"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
-#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
-#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
-#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
-#: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
-#: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
+#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:166
+#: en/about_manual.ssi:173 en/other_coding-style.ssi:34
+#: en/other_coding-style.ssi:45 en/other_coding-style.ssi:57
+#: en/other_coding-style.ssi:68 en/other_coding-style.ssi:92
+#: en/other_coding-style.ssi:100 en/other_coding-style.ssi:113
+#: en/other_coding-style.ssi:124 en/other_common-tasks.ssi:36
+#: en/other_customization-backports.ssi:16
#: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
#: en/other_faq.ssi:37 en/other_faq.ssi:46 en/other_faq.ssi:92
#: en/other_faq.ssi:108 en/other_faq.ssi:141 en/other_faq.ssi:155
@@ -360,45 +397,51 @@ msgstr ""
#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
#: en/other_live-environment.ssi:138 en/other_procedures.ssi:16
#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
-#: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
-#: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
-#: en/other_use-cases.ssi:137 en/user_basics.ssi:38 en/user_basics.ssi:48
-#: en/user_basics.ssi:62 en/user_basics.ssi:72 en/user_basics.ssi:86
-#: en/user_basics.ssi:98 en/user_basics.ssi:110 en/user_basics.ssi:118
-#: en/user_basics.ssi:126 en/user_basics.ssi:136 en/user_basics.ssi:150
-#: en/user_basics.ssi:160 en/user_basics.ssi:168 en/user_basics.ssi:176
-#: en/user_basics.ssi:190 en/user_basics.ssi:198 en/user_basics.ssi:208
-#: en/user_basics.ssi:249 en/user_basics.ssi:261 en/user_basics.ssi:277
-#: en/user_basics.ssi:285 en/user_basics.ssi:312 en/user_basics.ssi:351
+#: en/project_bugs.ssi:62 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:60 en/user_basics.ssi:72 en/user_basics.ssi:82
+#: en/user_basics.ssi:94 en/user_basics.ssi:106 en/user_basics.ssi:114
+#: en/user_basics.ssi:122 en/user_basics.ssi:132 en/user_basics.ssi:148
+#: en/user_basics.ssi:158 en/user_basics.ssi:166 en/user_basics.ssi:174
+#: en/user_basics.ssi:188 en/user_basics.ssi:196 en/user_basics.ssi:206
+#: en/user_basics.ssi:247 en/user_basics.ssi:259 en/user_basics.ssi:275
+#: en/user_basics.ssi:283 en/user_basics.ssi:310 en/user_basics.ssi:349
#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
#: en/user_customization-contents.ssi:70
#: en/user_customization-internationalization.ssi:14
#: en/user_customization-internationalization.ssi:22
#: en/user_customization-internationalization.ssi:30
#: en/user_customization-internationalization.ssi:42
-#: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
-#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
-#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
-#: en/user_customization-packages.ssi:107
-#: en/user_customization-packages.ssi:115
-#: en/user_customization-packages.ssi:135
-#: en/user_customization-packages.ssi:172
-#: en/user_customization-packages.ssi:182
-#: en/user_customization-packages.ssi:192
-#: en/user_customization-packages.ssi:202 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 en/user_installation.ssi:108
-#: en/user_installation.ssi:123 en/user_installation.ssi:138
-#: en/user_managing_a_configuration.ssi:31
+#: en/user_customization-packages.ssi:23 en/user_customization-packages.ssi:36
+#: en/user_customization-packages.ssi:48 en/user_customization-packages.ssi:62
+#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:94
+#: en/user_customization-packages.ssi:125
+#: en/user_customization-packages.ssi:139
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:159
+#: en/user_customization-packages.ssi:169
+#: en/user_customization-packages.ssi:181
+#: en/user_customization-packages.ssi:197
+#: en/user_customization-packages.ssi:265
+#: en/user_customization-packages.ssi:277
+#: en/user_customization-packages.ssi:287 en/user_examples.ssi:17
+#: en/user_examples.ssi:31 en/user_examples.ssi:41 en/user_examples.ssi:55
+#: en/user_examples.ssi:65 en/user_examples.ssi:83 en/user_examples.ssi:98
+#: en/user_examples.ssi:108 en/user_examples.ssi:120 en/user_examples.ssi:132
+#: en/user_examples.ssi:147 en/user_examples.ssi:155 en/user_examples.ssi:163
+#: en/user_examples.ssi:194 en/user_examples.ssi:210 en/user_examples.ssi:218
+#: 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
+#: en/user_installation.ssi:108 en/user_installation.ssi:123
+#: en/user_installation.ssi:138 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
-#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:84
-#: en/user_overview.ssi:94 en/user_overview.ssi:102
+#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:74
+#: en/user_overview.ssi:84 en/user_overview.ssi:92
msgid "}code"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:86
+#: en/about_manual.ssi:90
msgid ""
"Prior to submission of your contribution, please preview your work. To "
"preview the live-manual, ensure the packages needed for building are "
@@ -406,29 +449,42 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:90
+#: en/about_manual.ssi:94
msgid "# apt-get install make po4a sisu-complete"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:94
+#: en/about_manual.ssi:98
msgid ""
"You may build the live-manual from the top level directory of your git "
"checkout by executing:"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:98
+#: en/about_manual.ssi:102
msgid "$ make build"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:102
+#: en/about_manual.ssi:106
+msgid ""
+"Since it takes a while to build the manual in all supported languages, you "
+"may find it convenient when proofing to build for only one language, e.g. by "
+"executing:"
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:110
+msgid "$ make build LANGUAGES=en"
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:114
msgid "3~ Applying patches"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:104
+#: en/about_manual.ssi:116
msgid ""
"Directly commiting to the repository is possible by anyone. However, we ask "
"you to send bigger changes to the mailing list to discuss them first. In "
@@ -436,51 +492,51 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:106
+#: en/about_manual.ssi:118
msgid "_* Fetch the public commit key:"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:115
+#: en/about_manual.ssi:127
#, no-wrap
msgid ""
"$ mkdir -p ~/.ssh/identity.d\n"
-"$ wget http://live.debian.net/other/keys/live-manual@debian-live \\\n"
-"\t-O ~/.ssh/identity.d/live-manual at debian-live\n"
-"$ wget http://live.debian.net/other/keys/live-manual@debian-live.pub \\\n"
-"\t-O ~/.ssh/identity.d/live-manual at debian-live.pub\n"
-"$ chmod 0600 ~/.ssh/identity.d/live-manual at debian-live*\n"
+"$ wget http://live.debian.net/other/keys/gitosis@live.debian.net \\\n"
+"\t-O ~/.ssh/identity.d/live.debian.net\n"
+"$ wget http://live.debian.net/other/keys/gitosis@live.debian.net.pub \\\n"
+"\t-O ~/.ssh/identity.d/live.debian.net.pub\n"
+"$ chmod 0600 ~/.ssh/identity.d/live.debian.net*\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:119
+#: en/about_manual.ssi:131
msgid "_* Add the following section to your openssh-client config:"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:128
+#: en/about_manual.ssi:140
#, no-wrap
msgid ""
"$ cat >> ~/.ssh/config << EOF\n"
"Host live.debian.net\n"
" Hostname live.debian.net\n"
" User gitosis\n"
-" IdentityFile ~/.ssh/identity.d/live-manual at debian-live\n"
+" IdentityFile ~/.ssh/identity.d/gitosis at live.debian.net\n"
"EOF\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:132
+#: en/about_manual.ssi:144
msgid "_* Checkout a clone of the manual through ssh:"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:136
+#: en/about_manual.ssi:148
msgid "$ git clone gitosis at live.debian.net:/live-manual.git"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:140
+#: en/about_manual.ssi:152
msgid ""
"_* After editing the files in manual/en/, please call the 'commit' target in "
"the top level directory to sanitize the files and update the translation "
@@ -488,12 +544,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:144
+#: en/about_manual.ssi:156
msgid "$ make commit"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:148
+#: en/about_manual.ssi:160
msgid ""
"_* After sanitizing commit the changes. Write commit messages, that consist "
"of full useful sentences, starting with a capital letter and ending with a "
@@ -502,16 +558,16 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:152
+#: en/about_manual.ssi:164
msgid "$ git commit -a"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:156
+#: en/about_manual.ssi:168
msgid "_* Push the commit to the server:"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:160
+#: en/about_manual.ssi:172
msgid "$ git push"
msgstr ""
diff --git a/manual/po/de/about_project.ssi.po b/manual/po/de/about_project.ssi.po
index f41eb26..5de72d3 100644
--- a/manual/po/de/about_project.ssi.po
+++ b/manual/po/de/about_project.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-22 07:52-0200\n"
+"POT-Creation-Date: 2010-11-27 10:30-0400\n"
"PO-Revision-Date: 2010-10-03 20:30+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -51,7 +51,7 @@ msgstr ""
#. type: Plain text
#: en/about_project.ssi:14
-msgid "_* They mix different distributions, e.g. testing and unstable."
+msgid "_* They mix different distributions, e.g. *{testing}* and *{unstable}*."
msgstr ""
#. type: Plain text
diff --git a/manual/po/de/live-manual.ssm.po b/manual/po/de/live-manual.ssm.po
index ce2b8fd..8e55b7a 100644
--- a/manual/po/de/live-manual.ssm.po
+++ b/manual/po/de/live-manual.ssm.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-11-13 16:15+0100\n"
+"POT-Creation-Date: 2010-11-29 14:16-0400\n"
"PO-Revision-Date: 2010-10-03 20:30+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -45,7 +45,7 @@ msgstr ""
#, no-wrap
msgid ""
"@date:\n"
-" :published: 2010-11-13\n"
+" :published: 2010-11-29\n"
msgstr ""
#. type: Plain text
@@ -58,7 +58,7 @@ msgstr ""
#, no-wrap
msgid ""
"@make:\n"
-" :bold: /Squeeze|squeeze|Stable|stable|Wheezy|wheezy|Testing|testing|Sid|sid|Unstable|unstable/\n"
+" :bold: /Squeeze|squeeze|Wheezy|wheezy|Sid|sid/\n"
" :italics: /live-boot|live-build|live-config|live-magic|live-manual|live-installer|debian-installer-launcher/\n"
" :num_top: 1\n"
" :skin: skin_debian-live\n"
diff --git a/manual/po/de/project_bugs.ssi.po b/manual/po/de/project_bugs.ssi.po
index c5e0191..8624e7e 100644
--- a/manual/po/de/project_bugs.ssi.po
+++ b/manual/po/de/project_bugs.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-27 21:40-0200\n"
+"POT-Creation-Date: 2010-11-27 10:30-0400\n"
"PO-Revision-Date: 2010-10-25 23:27+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -17,9 +17,9 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. type: Plain text
-#: en/about_manual.ssi:80 en/about_manual.ssi:88 en/about_manual.ssi:96
-#: en/about_manual.ssi:108 en/about_manual.ssi:121 en/about_manual.ssi:134
-#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
+#: en/about_manual.ssi:112 en/about_manual.ssi:125 en/about_manual.ssi:138
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
#: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
#: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
#: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
@@ -39,48 +39,49 @@ msgstr ""
#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
-#: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
-#: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
-#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111
-#: en/project_bugs.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
-#: en/user_basics.ssi:54 en/user_basics.ssi:66 en/user_basics.ssi:78
-#: en/user_basics.ssi:88 en/user_basics.ssi:102 en/user_basics.ssi:110
-#: en/user_basics.ssi:118 en/user_basics.ssi:128 en/user_basics.ssi:140
-#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
-#: en/user_basics.ssi:182 en/user_basics.ssi:190 en/user_basics.ssi:200
-#: en/user_basics.ssi:220 en/user_basics.ssi:253 en/user_basics.ssi:269
-#: en/user_basics.ssi:277 en/user_basics.ssi:297 en/user_basics.ssi:322
-#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
-#: en/user_customization-contents.ssi:66
+#: en/other_procedures.ssi:58 en/project_bugs.ssi:58 en/user_basics.ssi:32
+#: en/user_basics.ssi:42 en/user_basics.ssi:54 en/user_basics.ssi:66
+#: en/user_basics.ssi:78 en/user_basics.ssi:88 en/user_basics.ssi:102
+#: en/user_basics.ssi:110 en/user_basics.ssi:118 en/user_basics.ssi:128
+#: en/user_basics.ssi:142 en/user_basics.ssi:154 en/user_basics.ssi:162
+#: en/user_basics.ssi:170 en/user_basics.ssi:184 en/user_basics.ssi:192
+#: en/user_basics.ssi:202 en/user_basics.ssi:222 en/user_basics.ssi:255
+#: en/user_basics.ssi:271 en/user_basics.ssi:279 en/user_basics.ssi:299
+#: en/user_basics.ssi:324 en/user_customization-contents.ssi:34
+#: en/user_customization-contents.ssi:43 en/user_customization-contents.ssi:66
#: en/user_customization-internationalization.ssi:10
#: en/user_customization-internationalization.ssi:18
#: en/user_customization-internationalization.ssi:26
#: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:16 en/user_customization-packages.ssi:24
-#: en/user_customization-packages.ssi:36 en/user_customization-packages.ssi:45
-#: en/user_customization-packages.ssi:59 en/user_customization-packages.ssi:73
-#: en/user_customization-packages.ssi:103
-#: en/user_customization-packages.ssi:111
-#: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:166
-#: en/user_customization-packages.ssi:176
-#: en/user_customization-packages.ssi:186
-#: en/user_customization-packages.ssi:196 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:104
-#: en/user_installation.ssi:118 en/user_installation.ssi:135
-#: en/user_managing_a_configuration.ssi:24
+#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
+#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
+#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:90
+#: en/user_customization-packages.ssi:120
+#: en/user_customization-packages.ssi:133
+#: en/user_customization-packages.ssi:143
+#: en/user_customization-packages.ssi:153
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:261
+#: en/user_customization-packages.ssi:273
+#: en/user_customization-packages.ssi:283 en/user_examples.ssi:12
+#: en/user_examples.ssi:27 en/user_examples.ssi:37 en/user_examples.ssi:75
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:76 en/user_installation.ssi:84
+#: en/user_installation.ssi:104 en/user_installation.ssi:118
+#: en/user_installation.ssi:135 en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
-#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:46
-#: en/user_overview.ssi:90 en/user_overview.ssi:98
+#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:36
+#: en/user_overview.ssi:80 en/user_overview.ssi:88
msgid "code{"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:121 en/about_manual.ssi:134 en/about_manual.ssi:142
+#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:165
#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
@@ -100,40 +101,42 @@ msgstr ""
#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
#: en/other_live-environment.ssi:138 en/other_procedures.ssi:16
#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
-#: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
-#: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
-#: en/other_use-cases.ssi:137 en/project_bugs.ssi:62 en/user_basics.ssi:36
-#: en/user_basics.ssi:46 en/user_basics.ssi:60 en/user_basics.ssi:72
-#: en/user_basics.ssi:82 en/user_basics.ssi:94 en/user_basics.ssi:106
-#: en/user_basics.ssi:114 en/user_basics.ssi:122 en/user_basics.ssi:132
-#: en/user_basics.ssi:146 en/user_basics.ssi:156 en/user_basics.ssi:164
-#: en/user_basics.ssi:172 en/user_basics.ssi:186 en/user_basics.ssi:194
-#: en/user_basics.ssi:204 en/user_basics.ssi:245 en/user_basics.ssi:257
-#: en/user_basics.ssi:273 en/user_basics.ssi:281 en/user_basics.ssi:308
-#: en/user_basics.ssi:347 en/user_customization-contents.ssi:39
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:70
+#: en/project_bugs.ssi:62 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:60 en/user_basics.ssi:72 en/user_basics.ssi:82
+#: en/user_basics.ssi:94 en/user_basics.ssi:106 en/user_basics.ssi:114
+#: en/user_basics.ssi:122 en/user_basics.ssi:132 en/user_basics.ssi:148
+#: en/user_basics.ssi:158 en/user_basics.ssi:166 en/user_basics.ssi:174
+#: en/user_basics.ssi:188 en/user_basics.ssi:196 en/user_basics.ssi:206
+#: en/user_basics.ssi:247 en/user_basics.ssi:259 en/user_basics.ssi:275
+#: en/user_basics.ssi:283 en/user_basics.ssi:310 en/user_basics.ssi:349
+#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:70
#: en/user_customization-internationalization.ssi:14
#: en/user_customization-internationalization.ssi:22
#: en/user_customization-internationalization.ssi:30
#: en/user_customization-internationalization.ssi:42
-#: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
-#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
-#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
-#: en/user_customization-packages.ssi:107
-#: en/user_customization-packages.ssi:115
-#: en/user_customization-packages.ssi:135
-#: en/user_customization-packages.ssi:172
-#: en/user_customization-packages.ssi:182
-#: en/user_customization-packages.ssi:192
-#: en/user_customization-packages.ssi:202 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 en/user_installation.ssi:108
-#: en/user_installation.ssi:123 en/user_installation.ssi:138
-#: en/user_managing_a_configuration.ssi:31
+#: en/user_customization-packages.ssi:23 en/user_customization-packages.ssi:36
+#: en/user_customization-packages.ssi:48 en/user_customization-packages.ssi:62
+#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:94
+#: en/user_customization-packages.ssi:125
+#: en/user_customization-packages.ssi:139
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:159
+#: en/user_customization-packages.ssi:169
+#: en/user_customization-packages.ssi:181
+#: en/user_customization-packages.ssi:197
+#: en/user_customization-packages.ssi:265
+#: en/user_customization-packages.ssi:277
+#: en/user_customization-packages.ssi:287 en/user_examples.ssi:17
+#: en/user_examples.ssi:31 en/user_examples.ssi:41 en/user_examples.ssi:84
+#: 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
+#: en/user_installation.ssi:108 en/user_installation.ssi:123
+#: en/user_installation.ssi:138 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
-#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:84
-#: en/user_overview.ssi:94 en/user_overview.ssi:102
+#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:74
+#: en/user_overview.ssi:84 en/user_overview.ssi:92
msgid "}code"
msgstr ""
@@ -191,16 +194,17 @@ msgstr ""
#. type: Plain text
#: en/project_bugs.ssi:18
msgid ""
-"Due to the nature of Debian testing and Debian unstable distributions being "
-"a moving target, building a live system may not always be possible."
+"Due to the nature of Debian *{testing}* and Debian *{unstable}* "
+"distributions being a moving target, building a live system may not always "
+"be possible."
msgstr ""
#. type: Plain text
#: en/project_bugs.ssi:20
msgid ""
-"If this is a problem, do not build a system based on testing or unstable, "
-"but go with stable. live-build does always default to the current stable "
-"release."
+"If this is a problem, do not build a system based on *{testing}* or *"
+"{unstable}*, but go with *{stable}*. live-build does always default to the "
+"current *{stable}* release."
msgstr ""
#. type: Plain text
@@ -215,9 +219,10 @@ msgstr ""
msgid ""
"It is out of the scope of this manual to train you in correctly identifying "
"and fixing problems in packages of the development distributions, however, "
-"there are two things you can always try: When not succeeding to build "
-"testing, try if unstable works. If unstable does not work either, revert to "
-"testing and pinning the newer version of the failing package from unstable."
+"there are two things you can always try: When not succeeding to build *"
+"{testing}*, try if *{unstable}* works. If *{unstable}* does not work either, "
+"revert to *{testing}* and pinning the newer version of the failing package "
+"from *{unstable}*."
msgstr ""
#. type: Plain text
diff --git a/manual/po/de/user_basics.ssi.po b/manual/po/de/user_basics.ssi.po
index 4bd270e..0845284 100644
--- a/manual/po/de/user_basics.ssi.po
+++ b/manual/po/de/user_basics.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-11-01 06:47-0200\n"
+"POT-Creation-Date: 2010-11-28 07:16-0400\n"
"PO-Revision-Date: 2010-10-03 20:30+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -17,9 +17,9 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. type: Plain text
-#: en/about_manual.ssi:80 en/about_manual.ssi:88 en/about_manual.ssi:96
-#: en/about_manual.ssi:108 en/about_manual.ssi:121 en/about_manual.ssi:134
-#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
+#: en/about_manual.ssi:112 en/about_manual.ssi:125 en/about_manual.ssi:138
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
#: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
#: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
#: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
@@ -39,38 +39,43 @@ msgstr ""
#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
-#: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
-#: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
-#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111
-#: en/project_bugs.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
-#: en/user_basics.ssi:54 en/user_basics.ssi:66 en/user_basics.ssi:78
-#: en/user_basics.ssi:88 en/user_basics.ssi:102 en/user_basics.ssi:110
-#: en/user_basics.ssi:118 en/user_basics.ssi:128 en/user_basics.ssi:140
-#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
-#: en/user_basics.ssi:182 en/user_basics.ssi:190 en/user_basics.ssi:200
-#: en/user_basics.ssi:220 en/user_basics.ssi:253 en/user_basics.ssi:269
-#: en/user_basics.ssi:277 en/user_basics.ssi:297 en/user_basics.ssi:322
-#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
-#: en/user_customization-contents.ssi:66
+#: en/other_procedures.ssi:58 en/project_bugs.ssi:58 en/user_basics.ssi:32
+#: en/user_basics.ssi:42 en/user_basics.ssi:54 en/user_basics.ssi:66
+#: en/user_basics.ssi:78 en/user_basics.ssi:88 en/user_basics.ssi:102
+#: en/user_basics.ssi:110 en/user_basics.ssi:118 en/user_basics.ssi:128
+#: en/user_basics.ssi:142 en/user_basics.ssi:154 en/user_basics.ssi:162
+#: en/user_basics.ssi:170 en/user_basics.ssi:184 en/user_basics.ssi:192
+#: en/user_basics.ssi:202 en/user_basics.ssi:222 en/user_basics.ssi:255
+#: en/user_basics.ssi:271 en/user_basics.ssi:279 en/user_basics.ssi:299
+#: en/user_basics.ssi:324 en/user_customization-contents.ssi:34
+#: en/user_customization-contents.ssi:43 en/user_customization-contents.ssi:66
#: en/user_customization-internationalization.ssi:10
#: en/user_customization-internationalization.ssi:18
#: en/user_customization-internationalization.ssi:26
#: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:16 en/user_customization-packages.ssi:24
-#: en/user_customization-packages.ssi:36 en/user_customization-packages.ssi:45
-#: en/user_customization-packages.ssi:59 en/user_customization-packages.ssi:73
-#: en/user_customization-packages.ssi:103
-#: en/user_customization-packages.ssi:111
-#: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:166
-#: en/user_customization-packages.ssi:176
-#: en/user_customization-packages.ssi:186
-#: en/user_customization-packages.ssi:196 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:104
-#: en/user_installation.ssi:118 en/user_installation.ssi:135
-#: en/user_managing_a_configuration.ssi:24
+#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
+#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
+#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:90
+#: en/user_customization-packages.ssi:120
+#: en/user_customization-packages.ssi:133
+#: en/user_customization-packages.ssi:143
+#: en/user_customization-packages.ssi:153
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:261
+#: en/user_customization-packages.ssi:273
+#: en/user_customization-packages.ssi:283 en/user_examples.ssi:12
+#: en/user_examples.ssi:27 en/user_examples.ssi:37 en/user_examples.ssi:51
+#: en/user_examples.ssi:61 en/user_examples.ssi:77 en/user_examples.ssi:87
+#: en/user_examples.ssi:104 en/user_examples.ssi:114 en/user_examples.ssi:128
+#: en/user_examples.ssi:136 en/user_examples.ssi:151 en/user_examples.ssi:159
+#: en/user_examples.ssi:185 en/user_examples.ssi:206 en/user_examples.ssi:214
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:76 en/user_installation.ssi:84
+#: en/user_installation.ssi:104 en/user_installation.ssi:118
+#: en/user_installation.ssi:135 en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:36
#: en/user_overview.ssi:80 en/user_overview.ssi:88
@@ -78,9 +83,9 @@ msgid "code{"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:121 en/about_manual.ssi:134 en/about_manual.ssi:142
+#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:165
#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
@@ -100,37 +105,43 @@ msgstr ""
#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
#: en/other_live-environment.ssi:138 en/other_procedures.ssi:16
#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
-#: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
-#: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
-#: en/other_use-cases.ssi:137 en/project_bugs.ssi:62 en/user_basics.ssi:36
-#: en/user_basics.ssi:46 en/user_basics.ssi:60 en/user_basics.ssi:72
-#: en/user_basics.ssi:82 en/user_basics.ssi:94 en/user_basics.ssi:106
-#: en/user_basics.ssi:114 en/user_basics.ssi:122 en/user_basics.ssi:132
-#: en/user_basics.ssi:146 en/user_basics.ssi:156 en/user_basics.ssi:164
-#: en/user_basics.ssi:172 en/user_basics.ssi:186 en/user_basics.ssi:194
-#: en/user_basics.ssi:204 en/user_basics.ssi:245 en/user_basics.ssi:257
-#: en/user_basics.ssi:273 en/user_basics.ssi:281 en/user_basics.ssi:308
-#: en/user_basics.ssi:347 en/user_customization-contents.ssi:39
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:70
+#: en/project_bugs.ssi:62 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:60 en/user_basics.ssi:72 en/user_basics.ssi:82
+#: en/user_basics.ssi:94 en/user_basics.ssi:106 en/user_basics.ssi:114
+#: en/user_basics.ssi:122 en/user_basics.ssi:132 en/user_basics.ssi:148
+#: en/user_basics.ssi:158 en/user_basics.ssi:166 en/user_basics.ssi:174
+#: en/user_basics.ssi:188 en/user_basics.ssi:196 en/user_basics.ssi:206
+#: en/user_basics.ssi:247 en/user_basics.ssi:259 en/user_basics.ssi:275
+#: en/user_basics.ssi:283 en/user_basics.ssi:310 en/user_basics.ssi:349
+#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:70
#: en/user_customization-internationalization.ssi:14
#: en/user_customization-internationalization.ssi:22
#: en/user_customization-internationalization.ssi:30
#: en/user_customization-internationalization.ssi:42
-#: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
-#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
-#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
-#: en/user_customization-packages.ssi:107
-#: en/user_customization-packages.ssi:115
-#: en/user_customization-packages.ssi:135
-#: en/user_customization-packages.ssi:172
-#: en/user_customization-packages.ssi:182
-#: en/user_customization-packages.ssi:192
-#: en/user_customization-packages.ssi:202 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 en/user_installation.ssi:108
-#: en/user_installation.ssi:123 en/user_installation.ssi:138
-#: en/user_managing_a_configuration.ssi:31
+#: en/user_customization-packages.ssi:23 en/user_customization-packages.ssi:36
+#: en/user_customization-packages.ssi:48 en/user_customization-packages.ssi:62
+#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:94
+#: en/user_customization-packages.ssi:125
+#: en/user_customization-packages.ssi:139
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:159
+#: en/user_customization-packages.ssi:169
+#: en/user_customization-packages.ssi:181
+#: en/user_customization-packages.ssi:197
+#: en/user_customization-packages.ssi:265
+#: en/user_customization-packages.ssi:277
+#: en/user_customization-packages.ssi:287 en/user_examples.ssi:17
+#: en/user_examples.ssi:31 en/user_examples.ssi:41 en/user_examples.ssi:55
+#: en/user_examples.ssi:65 en/user_examples.ssi:83 en/user_examples.ssi:98
+#: en/user_examples.ssi:108 en/user_examples.ssi:120 en/user_examples.ssi:132
+#: en/user_examples.ssi:147 en/user_examples.ssi:155 en/user_examples.ssi:163
+#: en/user_examples.ssi:194 en/user_examples.ssi:210 en/user_examples.ssi:218
+#: 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
+#: en/user_installation.ssi:108 en/user_installation.ssi:123
+#: en/user_installation.ssi:138 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:74
#: en/user_overview.ssi:84 en/user_overview.ssi:92
@@ -144,14 +155,23 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:4
-msgid "1~ The basics"
+msgid "1~the-basics The basics"
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:6
msgid ""
"This chapter contains a brief overview of the build process and instructions "
-"for booting the various binary image types."
+"for using the three most commonly used image types. The most versatile image "
+"type, #{iso-hybrid}#, may be used on a virtual machine, optical media or USB "
+"portable storage device. In certain special cases, #{usb-hdd}# may be more "
+"suitable for USB devices. The chapter finishes with instructions for "
+"building and using a #{net}# type image, which is a bit more involved due to "
+"the setup required on the server. This is a slightly advanced topic for "
+"anyone who is not familiar already with netbooting, but is included here "
+"because once the setup is done, it is a very convenient way to test and "
+"deploy images for booting on the local network without the hassle of dealing "
+"with image media."
msgstr ""
#. type: Plain text
@@ -269,7 +289,8 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:44 en/user_basics.ssi:120 en/user_basics.ssi:202
+#: en/user_basics.ssi:44 en/user_basics.ssi:120 en/user_basics.ssi:204
+#: en/user_examples.ssi:106 en/user_examples.ssi:153
msgid "# lb build"
msgstr ""
@@ -282,7 +303,7 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:50
-msgid "3~ Testing an ISO image with Qemu"
+msgid "3~testing-iso-with-qemu Testing an ISO image with Qemu"
msgstr ""
#. type: Plain text
@@ -291,7 +312,7 @@ msgid "Testing an ISO is simple:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:56 en/user_basics.ssi:142
+#: en/user_basics.ssi:56 en/user_basics.ssi:144
msgid "# apt-get install qemu"
msgstr ""
@@ -302,7 +323,7 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:62
-msgid "3~ Testing an ISO image with virtualbox-ose"
+msgid "3~testing-iso-with-virtualbox Testing an ISO image with virtualbox-ose"
msgstr ""
#. type: Plain text
@@ -343,7 +364,7 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:84
-msgid "3~ Burning an ISO image to a physical medium"
+msgid "3~burning-iso-image Burning an ISO image to a physical medium"
msgstr ""
#. type: Plain text
@@ -382,20 +403,20 @@ msgstr ""
#: en/user_basics.ssi:100
msgid ""
"Note: if you created an ISO image with the previous example, you will need "
-"to clean up your working directory with the #{lb clean} command (see {The lb "
-"clean command}#lb-clean):"
+"to clean up your working directory with the #{lb clean}# command (see {The "
+"lb clean command}#lb-clean):"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:104 en/user_basics.ssi:184
+#: en/user_basics.ssi:104 en/user_basics.ssi:186
msgid "$ lb clean --binary"
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:108
msgid ""
-"Run the #{lb config}# command with the parameters to configure the \"config/"
-"\" hierarchy to create a USB/HDD image type:"
+"Run the #{lb config}# command with the parameters to configure the #{config/}"
+"# hierarchy to create a USB/HDD image type:"
msgstr ""
#. type: Plain text
@@ -443,21 +464,28 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:138
-msgid "3~ Testing a USB/HDD image with Qemu"
+msgid ""
+"Note: As discussed earlier, this same process can be used for #{iso-hybrid}# "
+"type images, (suffixed #{-hybrid.iso}#,) but not #{iso}# type images."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:144
+#: en/user_basics.ssi:140
+msgid "3~testing-usb-hdd-with-qemu Testing a USB/HDD image with Qemu"
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:146
msgid "$ qemu -hda binary.img"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:148
+#: en/user_basics.ssi:150
msgid "3~ Using the space left on a USB stick"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:150
+#: en/user_basics.ssi:152
msgid ""
"If you want to use the remaining free space after you have installed the "
"binary.img, you can use a partitioning tool such as #{gparted}# or #{parted}"
@@ -466,45 +494,45 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:154
+#: en/user_basics.ssi:156
msgid "# gparted ${USBSTICK}"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:158
+#: en/user_basics.ssi:160
msgid ""
"After the creation of the partition, you have to create a filesystem on it. "
"One possible choice would be ext4."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:162
+#: en/user_basics.ssi:164
msgid "# mkfs.ext4 ${USBSTICK}"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:166
+#: en/user_basics.ssi:168
msgid "If you want to use this data partition with Windows, use FAT32."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:170
+#: en/user_basics.ssi:172
msgid "# mkfs.vfat -F 32"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:174
+#: en/user_basics.ssi:176
#, no-wrap
msgid "*{Remember: Every time you install a new binary.img on the stick, all data on the stick will be lost because the partition table is overwritten by the contents of the image.}*\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:176
-msgid "2~ Building a netboot image"
+#: en/user_basics.ssi:178
+msgid "2~building-netboot-image Building a netboot image"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:178
+#: en/user_basics.ssi:180
msgid ""
"The following sequence of commands will create a basic netboot image "
"containing the Debian standard system without X.org. It is suitable for "
@@ -512,28 +540,28 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:180
+#: en/user_basics.ssi:182
msgid ""
"Note: if you performed any previous examples, you will need to clean up your "
"working directory with the #{lb clean}# command:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:188
+#: en/user_basics.ssi:190
msgid ""
"Run the #{lb config}# command with the parameters to configure the \"config/"
"\" hierarchy to create our netboot image:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:192
+#: en/user_basics.ssi:194
msgid ""
"$ lb config -b net --net-root-path \"/srv/debian-live\" --net-root-server "
"\"192.168.0.1\""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:196
+#: en/user_basics.ssi:198
msgid ""
"In contrast with the ISO and USB/HDD images, netbooting does not support "
"serving a filesystem image with the client, so the files must be served via "
@@ -543,12 +571,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:198
+#: en/user_basics.ssi:200
msgid "Now build the image with the #{lb build}# command:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:206
+#: en/user_basics.ssi:208
msgid ""
"In a network boot, the client runs a small piece of software which usually "
"resides on the EPROM of the Ethernet card. This program sends a DHCP request "
@@ -559,7 +587,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:208
+#: en/user_basics.ssi:210
msgid ""
"For example, if you unpack the generated binary-net.tar.gz archive in the /"
"srv/debian-live directory, you'll find the filesystem image in live/"
@@ -568,17 +596,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:210
+#: en/user_basics.ssi:212
msgid "We must now configure three services on the server to enable netboot."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:212
+#: en/user_basics.ssi:214
msgid "3~ DHCP server"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:214
+#: en/user_basics.ssi:216
msgid ""
"We must configure our network's DHCP server to be sure to give an IP address "
"to the netbooting client system, and to advertise the location of the PXE "
@@ -586,25 +614,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:216
+#: en/user_basics.ssi:218
msgid ""
"Here is an example for inspiration, written for the ISC DHCP server #{isc-"
"dhcp-server}# in the /etc/dhcp/dhcpd.conf configuration file;"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:218 en/user_customization-packages.ssi:153
+#: en/user_basics.ssi:220
msgid "% FIXME"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:222
+#: en/user_basics.ssi:224
#, no-wrap
msgid "subnet 192.168.1.0 netmask 255.255.255.0 { # 192.168.1.0/24\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:225
+#: en/user_basics.ssi:227
#, no-wrap
msgid ""
" # IP addresses available for guests\n"
@@ -612,7 +640,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:228
+#: en/user_basics.ssi:230
#, no-wrap
msgid ""
" # allow booting from the net\n"
@@ -620,7 +648,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:233
+#: en/user_basics.ssi:235
#, no-wrap
msgid ""
" # for net booting, server where the first file to be loaded (by TFTP\n"
@@ -630,7 +658,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:237
+#: en/user_basics.ssi:239
#, no-wrap
msgid ""
" # net boot configuration for guests with a PXE client:\n"
@@ -639,7 +667,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:240
+#: en/user_basics.ssi:242
#, no-wrap
msgid ""
" # PXE bootloader (first program to be loaded, by TFTP)\n"
@@ -647,7 +675,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:243
+#: en/user_basics.ssi:245
#, no-wrap
msgid ""
" }\n"
@@ -655,17 +683,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:247
+#: en/user_basics.ssi:249
msgid "3~ TFTP server"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:249
+#: en/user_basics.ssi:251
msgid "This serves the kernel and initial ramdisk to the system at run time."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:251
+#: en/user_basics.ssi:253
msgid ""
"You should install the tftpd-hpa package. It can serve all files contained "
"inside a root directory, usually /srv/tftp. To let it serve files inside /"
@@ -673,22 +701,22 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:255
+#: en/user_basics.ssi:257
msgid "dpkg-reconfigure -plow tftpd-hpa"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:259
+#: en/user_basics.ssi:261
msgid "and fill in the new tftp server directory when being asked about it."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:261
+#: en/user_basics.ssi:263
msgid "3~ NFS server"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:263
+#: en/user_basics.ssi:265
msgid ""
"Once the guest computer has downloaded and booted a Linux kernel and loaded "
"its initrd, it will try to mount the Live filesystem image through a NFS "
@@ -696,35 +724,35 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:265
+#: en/user_basics.ssi:267
msgid "You need to install the nfs-kernel-server package."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:267
+#: en/user_basics.ssi:269
msgid ""
"Then, make the filesystem image available through NFS by adding a line like "
"the following to /etc/exports:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:271
+#: en/user_basics.ssi:273
msgid "/srv/debian-live *(ro,async,no_root_squash,no_subtree_check)"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:275
+#: en/user_basics.ssi:277
msgid ""
"and tell the NFS server about this new export with the following command:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:279
+#: en/user_basics.ssi:281
msgid "# exportfs -rv"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:283
+#: en/user_basics.ssi:285
msgid ""
"Setting up these three services can be a little tricky. You might need some "
"patience to get all of them working together. The Debian Installer Manual's "
@@ -733,40 +761,40 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:285
+#: en/user_basics.ssi:287
msgid "3~ Netboot testing HowTo"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:287
+#: en/user_basics.ssi:289
msgid ""
"Netboot image creation is made easy with live-build magic, but testing the "
"images on physical machines can be really time consuming."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:289
+#: en/user_basics.ssi:291
msgid ""
"To make our life easier, we can use virtualization. There are two solutions."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:291
+#: en/user_basics.ssi:293
msgid "3~ Qemu"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:293
+#: en/user_basics.ssi:295
msgid "_* Install qemu, bridge-utils, sudo."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:295
+#: en/user_basics.ssi:297
msgid "Edit /etc/qemu-ifup:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:306
+#: en/user_basics.ssi:308
msgid ""
"#!/bin/sh sudo -p \"Password for $0:\" /sbin/ifconfig $1 172.20.0.1 echo "
"\"Executing /etc/qemu-ifup\" echo \"Bringing up $1 for bridged mode...\" "
@@ -775,62 +803,62 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:310
+#: en/user_basics.ssi:312
msgid "Get, or build a grub-floppy-netboot (in the svn)."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:312
+#: en/user_basics.ssi:314
msgid "Launch qemu with \"-net nic,vlan=0 -net tap,vlan=0,ifname=tun0\""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:314
+#: en/user_basics.ssi:316
msgid "3~ VMWare Player"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:316
+#: en/user_basics.ssi:318
msgid "_* Install VMWare Player (\"free as in beer\" edition)"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:318
+#: en/user_basics.ssi:320
msgid ""
"_* Create a PXETester directory, and create a text file called pxe.vwx inside"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:320
+#: en/user_basics.ssi:322
msgid "_* Paste this text inside:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:328
+#: en/user_basics.ssi:330
msgid ""
"#!/usr/bin/vmware config.version = \"8\" virtualHW.version = \"4\" memsize = "
"\"512\" MemAllowAutoScaleDown = \"FALSE\""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:334
+#: en/user_basics.ssi:336
msgid ""
"ide0:0.present = \"FALSE\" ide1:0.present = \"FALSE\" floppy0.present = "
"\"FALSE\" sound.present = \"FALSE\" tools.remindInstall = \"FALSE\""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:337
+#: en/user_basics.ssi:339
msgid "ethernet0.present = \"TRUE\" ethernet0.addressType = \"generated\""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:340
+#: en/user_basics.ssi:342
msgid "displayName = \"Test Boot PXE\" guestOS = \"other\""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:345
+#: en/user_basics.ssi:347
msgid ""
"ethernet0.generatedAddress = \"00:0c:29:8d:71:3b\" uuid.location = \"56 4d "
"83 72 5c c4 de 3f-ae 9e 07 91 1d 8d 71 3b\" uuid.bios = \"56 4d 83 72 5c c4 "
@@ -838,19 +866,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:349
+#: en/user_basics.ssi:351
msgid ""
"_* You can play with this configuration file (i.e. change memory limit to "
"256)"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:351
+#: en/user_basics.ssi:353
msgid ""
"_* Double click on this file (or run VMWare player and select this file)."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:352
+#: en/user_basics.ssi:354
msgid "_* When running just press space if that strange question comes up..."
msgstr ""
diff --git a/manual/po/de/user_customization-contents.ssi.po b/manual/po/de/user_customization-contents.ssi.po
index 66e39e1..3c160cd 100644
--- a/manual/po/de/user_customization-contents.ssi.po
+++ b/manual/po/de/user_customization-contents.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-23 16:43+0300\n"
+"POT-Creation-Date: 2010-11-27 09:40-0400\n"
"PO-Revision-Date: 2010-10-03 20:30+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -17,9 +17,9 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. type: Plain text
-#: en/about_manual.ssi:80 en/about_manual.ssi:88 en/about_manual.ssi:96
-#: en/about_manual.ssi:108 en/about_manual.ssi:121 en/about_manual.ssi:134
-#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
+#: en/about_manual.ssi:112 en/about_manual.ssi:125 en/about_manual.ssi:138
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
#: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
#: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
#: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
@@ -39,47 +39,49 @@ msgstr ""
#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
-#: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
-#: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
-#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111 en/user_basics.ssi:34
-#: en/user_basics.ssi:44 en/user_basics.ssi:56 en/user_basics.ssi:68
-#: en/user_basics.ssi:80 en/user_basics.ssi:92 en/user_basics.ssi:106
-#: en/user_basics.ssi:114 en/user_basics.ssi:122 en/user_basics.ssi:132
-#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
-#: en/user_basics.ssi:172 en/user_basics.ssi:186 en/user_basics.ssi:194
-#: en/user_basics.ssi:204 en/user_basics.ssi:224 en/user_basics.ssi:257
-#: en/user_basics.ssi:273 en/user_basics.ssi:281 en/user_basics.ssi:301
-#: en/user_basics.ssi:326 en/user_customization-contents.ssi:34
+#: en/other_procedures.ssi:58 en/project_bugs.ssi:58 en/user_basics.ssi:32
+#: en/user_basics.ssi:42 en/user_basics.ssi:54 en/user_basics.ssi:66
+#: en/user_basics.ssi:78 en/user_basics.ssi:88 en/user_basics.ssi:102
+#: en/user_basics.ssi:110 en/user_basics.ssi:118 en/user_basics.ssi:128
+#: en/user_basics.ssi:142 en/user_basics.ssi:154 en/user_basics.ssi:162
+#: en/user_basics.ssi:170 en/user_basics.ssi:184 en/user_basics.ssi:192
+#: en/user_basics.ssi:202 en/user_basics.ssi:222 en/user_basics.ssi:255
+#: en/user_basics.ssi:271 en/user_basics.ssi:279 en/user_basics.ssi:299
+#: en/user_basics.ssi:324 en/user_customization-contents.ssi:34
#: en/user_customization-contents.ssi:43 en/user_customization-contents.ssi:66
#: en/user_customization-internationalization.ssi:10
#: en/user_customization-internationalization.ssi:18
#: en/user_customization-internationalization.ssi:26
#: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:16 en/user_customization-packages.ssi:24
-#: en/user_customization-packages.ssi:36 en/user_customization-packages.ssi:45
-#: en/user_customization-packages.ssi:59 en/user_customization-packages.ssi:73
-#: en/user_customization-packages.ssi:103
-#: en/user_customization-packages.ssi:111
-#: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:166
-#: en/user_customization-packages.ssi:176
-#: en/user_customization-packages.ssi:186
-#: en/user_customization-packages.ssi:196 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:104
-#: en/user_installation.ssi:118 en/user_installation.ssi:135
-#: en/user_managing_a_configuration.ssi:24
+#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
+#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
+#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:90
+#: en/user_customization-packages.ssi:120
+#: en/user_customization-packages.ssi:133
+#: en/user_customization-packages.ssi:143
+#: en/user_customization-packages.ssi:153
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:261
+#: en/user_customization-packages.ssi:273
+#: en/user_customization-packages.ssi:283 en/user_examples.ssi:12
+#: en/user_examples.ssi:27 en/user_examples.ssi:37 en/user_examples.ssi:75
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:76 en/user_installation.ssi:84
+#: en/user_installation.ssi:104 en/user_installation.ssi:118
+#: en/user_installation.ssi:135 en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
-#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:46
-#: en/user_overview.ssi:90 en/user_overview.ssi:98
+#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:36
+#: en/user_overview.ssi:80 en/user_overview.ssi:88
msgid "code{"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:121 en/about_manual.ssi:134 en/about_manual.ssi:142
+#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:165
#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
@@ -99,46 +101,48 @@ msgstr ""
#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
#: en/other_live-environment.ssi:138 en/other_procedures.ssi:16
#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
-#: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
-#: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
-#: en/other_use-cases.ssi:137 en/user_basics.ssi:38 en/user_basics.ssi:48
-#: en/user_basics.ssi:62 en/user_basics.ssi:72 en/user_basics.ssi:86
-#: en/user_basics.ssi:98 en/user_basics.ssi:110 en/user_basics.ssi:118
-#: en/user_basics.ssi:126 en/user_basics.ssi:136 en/user_basics.ssi:150
-#: en/user_basics.ssi:160 en/user_basics.ssi:168 en/user_basics.ssi:176
-#: en/user_basics.ssi:190 en/user_basics.ssi:198 en/user_basics.ssi:208
-#: en/user_basics.ssi:249 en/user_basics.ssi:261 en/user_basics.ssi:277
-#: en/user_basics.ssi:285 en/user_basics.ssi:312 en/user_basics.ssi:351
+#: en/project_bugs.ssi:62 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:60 en/user_basics.ssi:72 en/user_basics.ssi:82
+#: en/user_basics.ssi:94 en/user_basics.ssi:106 en/user_basics.ssi:114
+#: en/user_basics.ssi:122 en/user_basics.ssi:132 en/user_basics.ssi:148
+#: en/user_basics.ssi:158 en/user_basics.ssi:166 en/user_basics.ssi:174
+#: en/user_basics.ssi:188 en/user_basics.ssi:196 en/user_basics.ssi:206
+#: en/user_basics.ssi:247 en/user_basics.ssi:259 en/user_basics.ssi:275
+#: en/user_basics.ssi:283 en/user_basics.ssi:310 en/user_basics.ssi:349
#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
#: en/user_customization-contents.ssi:70
#: en/user_customization-internationalization.ssi:14
#: en/user_customization-internationalization.ssi:22
#: en/user_customization-internationalization.ssi:30
#: en/user_customization-internationalization.ssi:42
-#: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
-#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
-#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
-#: en/user_customization-packages.ssi:107
-#: en/user_customization-packages.ssi:115
-#: en/user_customization-packages.ssi:135
-#: en/user_customization-packages.ssi:172
-#: en/user_customization-packages.ssi:182
-#: en/user_customization-packages.ssi:192
-#: en/user_customization-packages.ssi:202 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 en/user_installation.ssi:108
-#: en/user_installation.ssi:123 en/user_installation.ssi:138
-#: en/user_managing_a_configuration.ssi:31
+#: en/user_customization-packages.ssi:23 en/user_customization-packages.ssi:36
+#: en/user_customization-packages.ssi:48 en/user_customization-packages.ssi:62
+#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:94
+#: en/user_customization-packages.ssi:125
+#: en/user_customization-packages.ssi:139
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:159
+#: en/user_customization-packages.ssi:169
+#: en/user_customization-packages.ssi:181
+#: en/user_customization-packages.ssi:197
+#: en/user_customization-packages.ssi:265
+#: en/user_customization-packages.ssi:277
+#: en/user_customization-packages.ssi:287 en/user_examples.ssi:17
+#: en/user_examples.ssi:31 en/user_examples.ssi:41 en/user_examples.ssi:84
+#: 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
+#: en/user_installation.ssi:108 en/user_installation.ssi:123
+#: en/user_installation.ssi:138 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
-#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:84
-#: en/user_overview.ssi:94 en/user_overview.ssi:102
+#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:74
+#: en/user_overview.ssi:84 en/user_overview.ssi:92
msgid "}code"
msgstr ""
#. type: Plain text
#: en/user_customization-contents.ssi:2 en/user_customization-overview.ssi:2
-msgid "B~ Customizing contents"
+msgid ":B~ Customizing contents"
msgstr ""
#. type: Plain text
diff --git a/manual/po/de/user_customization-internationalization.ssi.po b/manual/po/de/user_customization-internationalization.ssi.po
index 052e2ca..c0cc38d 100644
--- a/manual/po/de/user_customization-internationalization.ssi.po
+++ b/manual/po/de/user_customization-internationalization.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-28 09:15-0200\n"
+"POT-Creation-Date: 2010-11-27 09:40-0400\n"
"PO-Revision-Date: 2010-10-03 21:43+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -17,9 +17,9 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. type: Plain text
-#: en/about_manual.ssi:80 en/about_manual.ssi:88 en/about_manual.ssi:96
-#: en/about_manual.ssi:108 en/about_manual.ssi:121 en/about_manual.ssi:134
-#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
+#: en/about_manual.ssi:112 en/about_manual.ssi:125 en/about_manual.ssi:138
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
#: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
#: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
#: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
@@ -39,48 +39,49 @@ msgstr ""
#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
-#: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
-#: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
-#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111
-#: en/project_bugs.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
-#: en/user_basics.ssi:54 en/user_basics.ssi:66 en/user_basics.ssi:78
-#: en/user_basics.ssi:88 en/user_basics.ssi:102 en/user_basics.ssi:110
-#: en/user_basics.ssi:118 en/user_basics.ssi:128 en/user_basics.ssi:140
-#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
-#: en/user_basics.ssi:182 en/user_basics.ssi:190 en/user_basics.ssi:200
-#: en/user_basics.ssi:220 en/user_basics.ssi:253 en/user_basics.ssi:269
-#: en/user_basics.ssi:277 en/user_basics.ssi:297 en/user_basics.ssi:322
-#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
-#: en/user_customization-contents.ssi:66
+#: en/other_procedures.ssi:58 en/project_bugs.ssi:58 en/user_basics.ssi:32
+#: en/user_basics.ssi:42 en/user_basics.ssi:54 en/user_basics.ssi:66
+#: en/user_basics.ssi:78 en/user_basics.ssi:88 en/user_basics.ssi:102
+#: en/user_basics.ssi:110 en/user_basics.ssi:118 en/user_basics.ssi:128
+#: en/user_basics.ssi:142 en/user_basics.ssi:154 en/user_basics.ssi:162
+#: en/user_basics.ssi:170 en/user_basics.ssi:184 en/user_basics.ssi:192
+#: en/user_basics.ssi:202 en/user_basics.ssi:222 en/user_basics.ssi:255
+#: en/user_basics.ssi:271 en/user_basics.ssi:279 en/user_basics.ssi:299
+#: en/user_basics.ssi:324 en/user_customization-contents.ssi:34
+#: en/user_customization-contents.ssi:43 en/user_customization-contents.ssi:66
#: en/user_customization-internationalization.ssi:10
#: en/user_customization-internationalization.ssi:18
#: en/user_customization-internationalization.ssi:26
#: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:16 en/user_customization-packages.ssi:24
-#: en/user_customization-packages.ssi:36 en/user_customization-packages.ssi:45
-#: en/user_customization-packages.ssi:59 en/user_customization-packages.ssi:73
-#: en/user_customization-packages.ssi:103
-#: en/user_customization-packages.ssi:111
-#: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:166
-#: en/user_customization-packages.ssi:176
-#: en/user_customization-packages.ssi:186
-#: en/user_customization-packages.ssi:196 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:104
-#: en/user_installation.ssi:118 en/user_installation.ssi:135
-#: en/user_managing_a_configuration.ssi:24
+#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
+#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
+#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:90
+#: en/user_customization-packages.ssi:120
+#: en/user_customization-packages.ssi:133
+#: en/user_customization-packages.ssi:143
+#: en/user_customization-packages.ssi:153
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:261
+#: en/user_customization-packages.ssi:273
+#: en/user_customization-packages.ssi:283 en/user_examples.ssi:12
+#: en/user_examples.ssi:27 en/user_examples.ssi:37 en/user_examples.ssi:75
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:76 en/user_installation.ssi:84
+#: en/user_installation.ssi:104 en/user_installation.ssi:118
+#: en/user_installation.ssi:135 en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
-#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:46
-#: en/user_overview.ssi:90 en/user_overview.ssi:98
+#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:36
+#: en/user_overview.ssi:80 en/user_overview.ssi:88
msgid "code{"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:121 en/about_manual.ssi:134 en/about_manual.ssi:142
+#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:165
#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
@@ -100,46 +101,48 @@ msgstr ""
#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
#: en/other_live-environment.ssi:138 en/other_procedures.ssi:16
#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
-#: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
-#: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
-#: en/other_use-cases.ssi:137 en/project_bugs.ssi:62 en/user_basics.ssi:36
-#: en/user_basics.ssi:46 en/user_basics.ssi:60 en/user_basics.ssi:72
-#: en/user_basics.ssi:82 en/user_basics.ssi:94 en/user_basics.ssi:106
-#: en/user_basics.ssi:114 en/user_basics.ssi:122 en/user_basics.ssi:132
-#: en/user_basics.ssi:146 en/user_basics.ssi:156 en/user_basics.ssi:164
-#: en/user_basics.ssi:172 en/user_basics.ssi:186 en/user_basics.ssi:194
-#: en/user_basics.ssi:204 en/user_basics.ssi:245 en/user_basics.ssi:257
-#: en/user_basics.ssi:273 en/user_basics.ssi:281 en/user_basics.ssi:308
-#: en/user_basics.ssi:347 en/user_customization-contents.ssi:39
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:70
+#: en/project_bugs.ssi:62 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:60 en/user_basics.ssi:72 en/user_basics.ssi:82
+#: en/user_basics.ssi:94 en/user_basics.ssi:106 en/user_basics.ssi:114
+#: en/user_basics.ssi:122 en/user_basics.ssi:132 en/user_basics.ssi:148
+#: en/user_basics.ssi:158 en/user_basics.ssi:166 en/user_basics.ssi:174
+#: en/user_basics.ssi:188 en/user_basics.ssi:196 en/user_basics.ssi:206
+#: en/user_basics.ssi:247 en/user_basics.ssi:259 en/user_basics.ssi:275
+#: en/user_basics.ssi:283 en/user_basics.ssi:310 en/user_basics.ssi:349
+#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:70
#: en/user_customization-internationalization.ssi:14
#: en/user_customization-internationalization.ssi:22
#: en/user_customization-internationalization.ssi:30
#: en/user_customization-internationalization.ssi:42
-#: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
-#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
-#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
-#: en/user_customization-packages.ssi:107
-#: en/user_customization-packages.ssi:115
-#: en/user_customization-packages.ssi:135
-#: en/user_customization-packages.ssi:172
-#: en/user_customization-packages.ssi:182
-#: en/user_customization-packages.ssi:192
-#: en/user_customization-packages.ssi:202 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 en/user_installation.ssi:108
-#: en/user_installation.ssi:123 en/user_installation.ssi:138
-#: en/user_managing_a_configuration.ssi:31
+#: en/user_customization-packages.ssi:23 en/user_customization-packages.ssi:36
+#: en/user_customization-packages.ssi:48 en/user_customization-packages.ssi:62
+#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:94
+#: en/user_customization-packages.ssi:125
+#: en/user_customization-packages.ssi:139
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:159
+#: en/user_customization-packages.ssi:169
+#: en/user_customization-packages.ssi:181
+#: en/user_customization-packages.ssi:197
+#: en/user_customization-packages.ssi:265
+#: en/user_customization-packages.ssi:277
+#: en/user_customization-packages.ssi:287 en/user_examples.ssi:17
+#: en/user_examples.ssi:31 en/user_examples.ssi:41 en/user_examples.ssi:84
+#: 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
+#: en/user_installation.ssi:108 en/user_installation.ssi:123
+#: en/user_installation.ssi:138 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
-#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:84
-#: en/user_overview.ssi:94 en/user_overview.ssi:102
+#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:74
+#: en/user_overview.ssi:84 en/user_overview.ssi:92
msgid "}code"
msgstr ""
#. type: Plain text
#: en/user_customization-internationalization.ssi:2
-msgid "B~ Customizing locale and language"
+msgid ":B~ Customizing locale and language"
msgstr ""
#. type: Plain text
diff --git a/manual/po/de/user_customization-overview.ssi.po b/manual/po/de/user_customization-overview.ssi.po
index f05addd..214bd0c 100644
--- a/manual/po/de/user_customization-overview.ssi.po
+++ b/manual/po/de/user_customization-overview.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-11-11 11:58-0400\n"
+"POT-Creation-Date: 2010-11-27 09:40-0400\n"
"PO-Revision-Date: 2010-10-22 07:52-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -18,7 +18,7 @@ msgstr ""
#. type: Plain text
#: en/user_customization-contents.ssi:2 en/user_customization-overview.ssi:2
-msgid "B~ Customizing contents"
+msgid ":B~ Customizing contents"
msgstr ""
#. type: Plain text
diff --git a/manual/po/de/user_customization-packages.ssi.po b/manual/po/de/user_customization-packages.ssi.po
index 8593d82..411bfc0 100644
--- a/manual/po/de/user_customization-packages.ssi.po
+++ b/manual/po/de/user_customization-packages.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-11-12 16:21-0400\n"
+"POT-Creation-Date: 2010-11-28 08:44-0400\n"
"PO-Revision-Date: 2010-10-03 20:30+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -17,52 +17,61 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. type: Plain text
-#: en/about_manual.ssi:80 en/about_manual.ssi:88 en/about_manual.ssi:96
-#: en/about_manual.ssi:108 en/about_manual.ssi:121 en/about_manual.ssi:134
-#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
-#: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
-#: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
-#: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
-#: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
-#: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
-#: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
-#: en/other_faq.ssi:41 en/other_faq.ssi:83 en/other_faq.ssi:103
-#: en/other_faq.ssi:117 en/other_faq.ssi:137 en/other_faq.ssi:151
-#: en/other_faq.ssi:198 en/other_faq.ssi:245 en/other_faq.ssi:261
-#: en/other_faq.ssi:287 en/other_faq.ssi:299 en/other_faq.ssi:314
-#: en/other_faq.ssi:333 en/other_faq.ssi:345 en/other_faq.ssi:353
-#: en/other_faq.ssi:364 en/other_faq.ssi:374 en/other_howtos.ssi:16
-#: en/other_howtos.ssi:43 en/other_live-environment.ssi:14
-#: en/other_live-environment.ssi:30 en/other_live-environment.ssi:51
-#: en/other_live-environment.ssi:61 en/other_live-environment.ssi:69
-#: en/other_live-environment.ssi:77 en/other_live-environment.ssi:85
-#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
-#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
-#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
-#: en/other_procedures.ssi:58 en/project_bugs.ssi:58 en/user_basics.ssi:32
-#: en/user_basics.ssi:42 en/user_basics.ssi:54 en/user_basics.ssi:66
-#: en/user_basics.ssi:78 en/user_basics.ssi:88 en/user_basics.ssi:102
-#: en/user_basics.ssi:110 en/user_basics.ssi:118 en/user_basics.ssi:128
-#: en/user_basics.ssi:140 en/user_basics.ssi:152 en/user_basics.ssi:160
-#: en/user_basics.ssi:168 en/user_basics.ssi:182 en/user_basics.ssi:190
-#: en/user_basics.ssi:200 en/user_basics.ssi:220 en/user_basics.ssi:253
-#: en/user_basics.ssi:269 en/user_basics.ssi:277 en/user_basics.ssi:297
-#: en/user_basics.ssi:322 en/user_customization-contents.ssi:34
-#: en/user_customization-contents.ssi:43 en/user_customization-contents.ssi:66
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
+#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
+#: en/about_manual.ssi:170 en/other_coding-style.ssi:28
+#: en/other_coding-style.ssi:38 en/other_coding-style.ssi:51
+#: en/other_coding-style.ssi:61 en/other_coding-style.ssi:88
+#: en/other_coding-style.ssi:96 en/other_coding-style.ssi:106
+#: en/other_coding-style.ssi:117 en/other_common-tasks.ssi:32
+#: en/other_customization-backports.ssi:8 en/other_customization-bootup.ssi:30
+#: en/other_customization-bootup.ssi:39 en/other_faq.ssi:41
+#: en/other_faq.ssi:83 en/other_faq.ssi:103 en/other_faq.ssi:117
+#: en/other_faq.ssi:137 en/other_faq.ssi:151 en/other_faq.ssi:198
+#: en/other_faq.ssi:245 en/other_faq.ssi:261 en/other_faq.ssi:287
+#: en/other_faq.ssi:299 en/other_faq.ssi:314 en/other_faq.ssi:333
+#: en/other_faq.ssi:345 en/other_faq.ssi:353 en/other_faq.ssi:364
+#: en/other_faq.ssi:374 en/other_howtos.ssi:16 en/other_howtos.ssi:43
+#: en/other_live-environment.ssi:14 en/other_live-environment.ssi:30
+#: en/other_live-environment.ssi:51 en/other_live-environment.ssi:61
+#: en/other_live-environment.ssi:69 en/other_live-environment.ssi:77
+#: en/other_live-environment.ssi:85 en/other_live-environment.ssi:93
+#: en/other_live-environment.ssi:116 en/other_live-environment.ssi:124
+#: en/other_live-environment.ssi:133 en/other_procedures.ssi:12
+#: en/other_procedures.ssi:46 en/other_procedures.ssi:58
+#: en/project_bugs.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/user_basics.ssi:54 en/user_basics.ssi:66 en/user_basics.ssi:78
+#: en/user_basics.ssi:88 en/user_basics.ssi:102 en/user_basics.ssi:110
+#: en/user_basics.ssi:118 en/user_basics.ssi:128 en/user_basics.ssi:142
+#: en/user_basics.ssi:154 en/user_basics.ssi:162 en/user_basics.ssi:170
+#: en/user_basics.ssi:184 en/user_basics.ssi:192 en/user_basics.ssi:202
+#: en/user_basics.ssi:222 en/user_basics.ssi:255 en/user_basics.ssi:271
+#: en/user_basics.ssi:279 en/user_basics.ssi:299 en/user_basics.ssi:324
+#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
+#: en/user_customization-contents.ssi:66
#: en/user_customization-internationalization.ssi:10
#: en/user_customization-internationalization.ssi:18
#: en/user_customization-internationalization.ssi:26
#: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:26
-#: en/user_customization-packages.ssi:38 en/user_customization-packages.ssi:47
-#: en/user_customization-packages.ssi:61 en/user_customization-packages.ssi:75
-#: en/user_customization-packages.ssi:105
-#: en/user_customization-packages.ssi:113
+#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
+#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
+#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:90
+#: en/user_customization-packages.ssi:120
#: en/user_customization-packages.ssi:133
-#: en/user_customization-packages.ssi:168
-#: en/user_customization-packages.ssi:178
-#: en/user_customization-packages.ssi:188
-#: en/user_customization-packages.ssi:198 en/user_examples.ssi:24
+#: en/user_customization-packages.ssi:143
+#: en/user_customization-packages.ssi:153
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:261
+#: en/user_customization-packages.ssi:273
+#: en/user_customization-packages.ssi:283 en/user_examples.ssi:14
+#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
+#: en/user_examples.ssi:64 en/user_examples.ssi:80 en/user_examples.ssi:90
+#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:131
+#: en/user_examples.ssi:139 en/user_examples.ssi:154 en/user_examples.ssi:162
+#: en/user_examples.ssi:188 en/user_examples.ssi:209 en/user_examples.ssi:217
#: 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
@@ -75,14 +84,15 @@ msgid "code{"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
-#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
-#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
-#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
-#: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
-#: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
+#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:166
+#: en/about_manual.ssi:173 en/other_coding-style.ssi:34
+#: en/other_coding-style.ssi:45 en/other_coding-style.ssi:57
+#: en/other_coding-style.ssi:68 en/other_coding-style.ssi:92
+#: en/other_coding-style.ssi:100 en/other_coding-style.ssi:113
+#: en/other_coding-style.ssi:124 en/other_common-tasks.ssi:36
+#: en/other_customization-backports.ssi:16
#: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
#: en/other_faq.ssi:37 en/other_faq.ssi:46 en/other_faq.ssi:92
#: en/other_faq.ssi:108 en/other_faq.ssi:141 en/other_faq.ssi:155
@@ -100,27 +110,35 @@ msgstr ""
#: en/project_bugs.ssi:62 en/user_basics.ssi:36 en/user_basics.ssi:46
#: en/user_basics.ssi:60 en/user_basics.ssi:72 en/user_basics.ssi:82
#: en/user_basics.ssi:94 en/user_basics.ssi:106 en/user_basics.ssi:114
-#: en/user_basics.ssi:122 en/user_basics.ssi:132 en/user_basics.ssi:146
-#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
-#: en/user_basics.ssi:186 en/user_basics.ssi:194 en/user_basics.ssi:204
-#: en/user_basics.ssi:245 en/user_basics.ssi:257 en/user_basics.ssi:273
-#: en/user_basics.ssi:281 en/user_basics.ssi:308 en/user_basics.ssi:347
+#: en/user_basics.ssi:122 en/user_basics.ssi:132 en/user_basics.ssi:148
+#: en/user_basics.ssi:158 en/user_basics.ssi:166 en/user_basics.ssi:174
+#: en/user_basics.ssi:188 en/user_basics.ssi:196 en/user_basics.ssi:206
+#: en/user_basics.ssi:247 en/user_basics.ssi:259 en/user_basics.ssi:275
+#: en/user_basics.ssi:283 en/user_basics.ssi:310 en/user_basics.ssi:349
#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
#: en/user_customization-contents.ssi:70
#: en/user_customization-internationalization.ssi:14
#: en/user_customization-internationalization.ssi:22
#: en/user_customization-internationalization.ssi:30
#: en/user_customization-internationalization.ssi:42
-#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:30
-#: en/user_customization-packages.ssi:43 en/user_customization-packages.ssi:51
-#: en/user_customization-packages.ssi:65 en/user_customization-packages.ssi:79
-#: en/user_customization-packages.ssi:109
-#: en/user_customization-packages.ssi:117
-#: en/user_customization-packages.ssi:137
-#: en/user_customization-packages.ssi:174
-#: en/user_customization-packages.ssi:184
-#: en/user_customization-packages.ssi:194
-#: en/user_customization-packages.ssi:204 en/user_examples.ssi:33
+#: en/user_customization-packages.ssi:23 en/user_customization-packages.ssi:36
+#: en/user_customization-packages.ssi:48 en/user_customization-packages.ssi:62
+#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:94
+#: en/user_customization-packages.ssi:125
+#: en/user_customization-packages.ssi:139
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:159
+#: en/user_customization-packages.ssi:169
+#: en/user_customization-packages.ssi:181
+#: en/user_customization-packages.ssi:197
+#: en/user_customization-packages.ssi:265
+#: en/user_customization-packages.ssi:277
+#: en/user_customization-packages.ssi:287 en/user_examples.ssi:20
+#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:58
+#: en/user_examples.ssi:68 en/user_examples.ssi:86 en/user_examples.ssi:101
+#: en/user_examples.ssi:111 en/user_examples.ssi:123 en/user_examples.ssi:135
+#: en/user_examples.ssi:150 en/user_examples.ssi:158 en/user_examples.ssi:166
+#: en/user_examples.ssi:197 en/user_examples.ssi:213 en/user_examples.ssi:221
#: en/user_installation.ssi:42 en/user_installation.ssi:50
#: en/user_installation.ssi:60 en/user_installation.ssi:72
#: en/user_installation.ssi:80 en/user_installation.ssi:88
@@ -133,11 +151,6 @@ msgid "}code"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:218 en/user_customization-packages.ssi:155
-msgid "% FIXME"
-msgstr ""
-
-#. type: Plain text
#: en/user_customization-packages.ssi:2
msgid ":B~ Customizing package installation"
msgstr ""
@@ -161,7 +174,7 @@ msgid ""
"options give some control over apt, or if you prefer, aptitude, at build "
"time when packages are installed. You may find these handy if you use a "
"proxy, want to disable installation of recommended packages to save space, "
-"or need to control which versions of packages are installed via apt pinning, "
+"or need to control which versions of packages are installed via APT pinning, "
"to name a few possibilities."
msgstr ""
@@ -172,431 +185,486 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:10
-msgid "3~ Debian repositories"
+msgid "3~ Distribution mirrors"
msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:12
-msgid "To set a local mirror to be used to at build time:"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:16
-msgid "$ lb config --mirror-bootstrap http://localhost/debian/"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:20
msgid ""
-"The chroot repository, specified by --mirror-chroot, defaults to the same as "
-"--mirror-bootstrap."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:22
-msgid ""
-"Each of the --mirror-* options governs which repository is used at various "
-"stages of the build. Recall from {Stages of the build}#stages-of-the-build "
-"that the *bootstrap* stage is when the chroot is initially populated by "
-"debootstrap with a minimal system, and the *chroot* stage is when the chroot "
-"used to construct the live system's filesystem is built. Thus, the "
-"corresponding mirror switches are used for those stages, and later, when the "
-"binary image is constructed, the --mirror-binary value is used, superceding "
-"any earlier repositories."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:24
-msgid "The generic mirror is added to the live system's /etc/apt/sources.list."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:28
-msgid "$ lb config --mirror-binary http://ftp.debian.org/debian/"
+"Each of the #{--mirror-*}# options governs which distribution mirror is used "
+"at various stages of the build. Recall from {Stages of the build}#stages-of-"
+"the-build that the *bootstrap* stage is when the chroot is initially "
+"populated by debootstrap with a minimal system, and the *chroot* stage is "
+"when the chroot used to construct the live system's filesystem is built. "
+"Thus, the corresponding mirror switches are used for those stages, and "
+"later, in the *binary* stage, the #{--mirror-binary}# and #{--mirror-binary-"
+"security}# values are used, superceding any mirrors used in an earlier stage."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:32
+#: en/user_customization-packages.ssi:14
msgid ""
-"Note: It is not used for building the live system but to install new "
-"software while using the live system."
+"3~distribution-mirrors-build-time Distribution mirrors used at build time"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:34
+#: en/user_customization-packages.ssi:16
msgid ""
-"It can be disabled by setting the binary mirror to the same value as the "
-"chroot mirror."
+"To set the distribution mirrors used at build time to point at a local "
+"mirror, it is sufficient to set #{--mirror-bootstrap}# and #{--mirror-chroot-"
+"security}# as follows."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:36
+#: en/user_customization-packages.ssi:21
+#, no-wrap
msgid ""
-"Note: the same applies for mirror chroot security and mirror binary security"
+"$ lb config --mirror-bootstrap http://localhost/debian/ \\\n"
+" --mirror-chroot-security http://localhost/debian-security/\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:41
+#: en/user_customization-packages.ssi:25
msgid ""
-"$ lb config --mirror-chroot-security {URL} $ lb config --mirror-binary-"
-"security {URL}"
+"The chroot mirror, specified by #{--mirror-chroot}#, defaults to the #{--"
+"mirror-bootstrap}# value."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:45
-msgid "If you don't want to include apt indices, you can skip those with:"
+#: en/user_customization-packages.ssi:27
+msgid "3~ Distribution mirrors used at run time"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:49
-msgid "$ lb config --binary-indices false"
+#: en/user_customization-packages.ssi:29
+msgid ""
+"The #{--mirror-binary*}# options govern the distribution mirrors placed in "
+"the binary image. These may be used to install additional packages while "
+"running the live system. The 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
-#: en/user_customization-packages.ssi:53
+#: en/user_customization-packages.ssi:34
+#, no-wrap
msgid ""
-"This will not influence the entries in /etc/apt/sources.list, but only if /"
-"var/lib/apt contains the indices files or not (and by that making the image "
-"smaller)."
+"$ lb config --mirror-binary http://mirror/debian/ \\\n"
+" --mirror-binary-security http://mirror/debian-security/\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:55
-msgid "3~ Own repository"
+#: en/user_customization-packages.ssi:38
+msgid "3~ Additional repositories"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:57
+#: en/user_customization-packages.ssi:40
msgid ""
"To add more repositories (e.g. backports, experimental or custom packages, "
"etc.), create #{config/chroot_sources/your-repository.{chroot,binary}}# "
-"files."
+"files. As with the #{--mirror-*}# options, these govern the repositories "
+"used in the *chroot* stage when building the image, and in the *binary* "
+"stage, i.e. for use when running the live system."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:59
+#: en/user_customization-packages.ssi:42
msgid ""
-"e.g. #{config/chroot_sources/live.chroot}# allows you to install packages "
-"from the debian live snapshot repository at live system build time (you have "
-"to add the packages in your package list):"
+"For example, #{config/chroot_sources/live.chroot}# allows you to install "
+"packages from the debian live snapshot repository at live system build time."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:63
+#: en/user_customization-packages.ssi:46
msgid "deb http://live.debian.net/ sid-snapshots main contrib non-free"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:67
+#: en/user_customization-packages.ssi:50
msgid ""
-"If you add the line to #{config/chroot_sources/live.binary}# the repository "
-"will be added to your live-system's #{/etc/apt/sources.list}#."
+"If you add the same line to #{config/chroot_sources/live.binary}#, the "
+"repository will be added to your live system's #{/etc/apt/sources.list.d/}# "
+"directory."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:69
+#: en/user_customization-packages.ssi:52
msgid "If such files exist, they will be picked up automatically."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:71
+#: en/user_customization-packages.ssi:54
msgid ""
-"You can also put the gpg-key used to sign the repository into config/"
-"chroot_sources/your-repository.{binary,chroot}.gpg"
+"You should also put the GPG key used to sign the repository into #{config/"
+"chroot_sources/your-repository.{binary,chroot}.gpg}# files."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:73
+#: en/user_customization-packages.ssi:56
msgid ""
"Note: some preconfigured package repositories are available for easy "
-"selection through the --repository switch, e.g. for enabling live snapshots, "
-"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
-#: en/user_customization-packages.ssi:77
+#: en/user_customization-packages.ssi:60
msgid "$ lb config --repository live.debian.net"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:81
-msgid "3~ Package installation"
+#: en/user_customization-packages.ssi:64
+msgid "2~choosing-packages-to-install Choosing packages to install"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:83
+#: en/user_customization-packages.ssi:66
msgid ""
-"You can elect to use either #{apt}# or #{aptitude}# when installing "
-"packages. Which utility is used is governed by the #{LB_APT}# variable in #"
-"{config/chroot}# or by the #{--apt}# argument to #{lb config}#:"
+"There are a number of ways to choose which packages live-build will install "
+"in your image, covering a variety of different needs. You can simply name "
+"individual packages to install, either with the #{--packages}# option for a "
+"few packages, or in a package list of your own for larger numbers. You can "
+"also choose larger predefined lists of packages, or use APT tasks. And "
+"finally, you may place package files in your #{config/}# tree, which is well "
+"suited to testing of new or experimental packages before they are available "
+"from a repository."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:85
-msgid ""
-"_* #{apt}#: Specifying a missing package causes package installation to "
-"fail, which may not be the desired behaviour. This is the default setting "
-"for building images for Lenny or later."
+#: en/user_customization-packages.ssi:68
+msgid "3~ Choosing a few packages"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:87
+#: en/user_customization-packages.ssi:70
msgid ""
-"_* #{aptitude}#: Specifying a missing package causes package installation to "
-"succeed, which may not be the desired behaviour. This is the default setting "
-"for building images for Etch."
+"When the number of packages added is small, simply specify #{--packages}#. "
+"For example:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:89
-msgid "2~ Installing additional packages"
+#: en/user_customization-packages.ssi:74
+msgid "$ lb config --packages \"package1 package2 package3\""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:91
+#: en/user_customization-packages.ssi:78
msgid ""
-"live-helper has a number of mechanisms for indicating that additional "
-"packages should be installed, including:"
+"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."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:93
-msgid "_* The #{LB_PACKAGES}# variable"
+#: en/user_customization-packages.ssi:80
+msgid ""
+"If you need to specify a large number of packages to be installed or you "
+"need flexibility regarding which packages to install, use package lists as "
+"discussed in the following section, {Package lists}#package-lists."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:95
-msgid "_* Package lists"
+#: en/user_customization-packages.ssi:82
+msgid "3~package-lists Package lists"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:97
-msgid "_* Local packages (#{chroot_local-packages/}#)"
+#: en/user_customization-packages.ssi:84
+msgid ""
+"Package lists are a powerful way of expressing which packages should be "
+"installed. The list syntax supports included files and conditional sections "
+"which makes it easy to build lists from other lists and adapt them for use "
+"in multiple configurations. You can use predefined package lists, providing "
+"in a modular fashion package selections from each of the major desktop "
+"environments and some special purpose lists, as well as standard lists the "
+"others are based upon. You can also provide your own package lists, or use a "
+"combination of both."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:99
-msgid "_* Tasks"
+#: en/user_customization-packages.ssi:86
+msgid "3~ Predefined package lists"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:101
-msgid "3~ The #{LB_PACKAGES}# variable"
+#: en/user_customization-packages.ssi:88
+msgid ""
+"The simplest way to use lists is to specify one or more predefined lists "
+"with the #{--packages-lists}# option. For example:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:103
-msgid ""
-"To install additional packages, simply add them to the #{LB_PACKAGES}# "
-"variable in #{config/chroot}#. For example:"
+#: en/user_customization-packages.ssi:92
+msgid "$ lb config --packages-lists \"gnome-core rescue\""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:107
-msgid "LB_PACKAGES=\"package1 package2 package3 ... \""
+#: en/user_customization-packages.ssi:96
+msgid ""
+"In addition to these lists, live-build supports four virtual package lists: #"
+"{gnome-desktop}#, #{kde-desktop}#, #{lxde-desktop}# and #{xfce-desktop}#, "
+"each of which provide a more extensive selection of packages that "
+"corresponds with Debian Installer defaults for these desktop environments. "
+"See {Desktop and language tasks}#desktop-and-language-tasks for more details."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:111
-msgid "You can also specify initial values on the command line:"
+#: en/user_customization-packages.ssi:98
+msgid ""
+"Note: The prebuilt GNOME, KDE, LXDE and XFCE images available for download "
+"at http://live.debian.net are built using the corresponding virtual #{*-"
+"desktop}# lists."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:115
-msgid "$ lb config --packages \"package1 package2 package3\""
+#: en/user_customization-packages.ssi:100
+msgid ""
+"The default location for the list files on your system is #{/usr/share/live/"
+"build/lists/}#. To determine the packages in a given list, read the "
+"corresponding file, paying attention to included files and conditionals as "
+"described in the following sections."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:119
-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."
+#: en/user_customization-packages.ssi:102
+msgid "3~ Local package lists"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:121
-msgid "% FIXME: <xref linkend=\"package-installation\"/>"
+#: en/user_customization-packages.ssi:104
+msgid ""
+"You may supplement or replace entirely the supplied lists using local "
+"package lists stored in #{config/chroot_local-packageslists/}#."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:123
+#: en/user_customization-packages.ssi:106
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."
+"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."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:125
-msgid "% FIXME: <xref linkend=\"package-lists\"/>"
+#: en/user_customization-packages.ssi:108
+msgid "3~ Local binary package lists"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:127
-msgid "3~ Package lists"
+#: en/user_customization-packages.ssi:110
+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 "
+"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."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:129
+#: en/user_customization-packages.ssi:112
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 "
-"provide sensible default package selections for the major desktop "
-"environments, as well as standard systems."
+"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:131
-msgid "To specify one or more package list, you can use:"
+#: en/user_customization-packages.ssi:114
+msgid "3~ Extending a provided package list using includes"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:135
-msgid "$ lb config --packages-lists \"list1 list2 list3\""
+#: en/user_customization-packages.ssi:116
+msgid ""
+"The package lists that are included with live-build make extensive use of "
+"includes. Refer to these in the #{/usr/share/live/build/lists/}# directory, "
+"as they serve as good examples of how to write your own lists."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:139
+#: en/user_customization-packages.ssi:118
msgid ""
-"Note: Package lists that are distributed with live-build reside in the #{/"
-"usr/share/live/build/lists}# directory."
+"For example, to make a list that includes the predefined #{gnome}# list plus "
+"iceweasel, create #{config/chroot_local-packageslists/mygnome.list}# with "
+"the following contents:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:141
-#, no-wrap
-msgid "*{Local packages lists}*\n"
+#: en/user_customization-packages.ssi:123
+msgid "#include <gnome> iceweasel"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:143
+#: en/user_customization-packages.ssi:127
+msgid "3~ Using conditionals inside package lists"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:129
msgid ""
-"You may supplement the supplied lists using local package lists stored in #"
-"{config/chroot_local-packageslists}#."
+"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:145
+#: en/user_customization-packages.ssi:131
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 "
-"distributed with live-build. This can cause undesired effects, we therefore "
-"recommend to use unique names for local packages lists."
+"For example, to install #{ia32-libs}# if the #{--architecture amd64}# is "
+"specified:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:147
-#, no-wrap
-msgid "*{Local binary packages lists}*\n"
+#: en/user_customization-packages.ssi:137
+msgid "#if ARCHITECTURE amd64 ia32-libs #endif"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:141
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 "
-"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."
+"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
+#: en/user_customization-packages.ssi:147
+msgid "#if ARCHITECTURE i386 amd64 memtest86+ #endif"
msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:151
msgid ""
-"Package lists that exist in this directory need to have a .list suffix in "
-"order to be processed."
+"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
-#: en/user_customization-packages.ssi:153
-#, no-wrap
-msgid "*{Extending a provided package list using includes}*\n"
+#: en/user_customization-packages.ssi:157
+msgid "#if ARCHIVE_AREAS contrib non-free vrms #endif"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:162
-msgid "% code{ % % #include <gnome> % iceweasel % % }code"
+#: en/user_customization-packages.ssi:161
+msgid "A conditional may surround an #{#include}# directive:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:164
-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}# "
-"directory."
+#: en/user_customization-packages.ssi:167
+msgid "#if ARCHITECTURE amd64 #include <gnome-full> #endif"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:166
-#, no-wrap
-msgid "*{Using conditionals inside packages lists}*\n"
+#: en/user_customization-packages.ssi:171
+msgid "The nesting of conditionals is not supported."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:172
-msgid "#if ARCHITECTURE amd64 ia32-libs #endif"
+#: en/user_customization-packages.ssi:173
+msgid "3~ Tasks"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:176
-msgid "or if #{LB_ARCHITECTURE}# is set to #{i386}# or #{amd64}#:"
+#: en/user_customization-packages.ssi:175
+msgid ""
+"The Debian Installer offers the user choices of a number of preselected "
+"lists of packages, each one focused on a particular kind of system, or task "
+"a system may be used for, such as \"Graphical desktop environment\", \"Mail "
+"server\" or \"Laptop\". These lists are called \"tasks\" and are supported "
+"by APT through the \"Task:\" field. You can specify one or more tasks in "
+"live-build via the #{--tasks}# option, as in the example below."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:182
-msgid "#if ARCHITECTURE i386 amd64 memtest86+ #endif"
+#: en/user_customization-packages.ssi:179
+msgid "$ lb config --tasks \"mail-server file-server\""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:186
-msgid "or if #{LB_ARCHIVE_AREAS}# contains either #{contrib}# or #{non-free}#:"
+#: en/user_customization-packages.ssi:183
+msgid ""
+"The primary tasks available in the Debian Installer can be listed with #"
+"{tasksel --list-tasks}# in the live system. The contents of any task, "
+"including ones not included in this list, may be examined with #{tasksel --"
+"task-packages}#."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:192
-msgid "#if ARCHIVE_AREAS contrib non-free vrms #endif"
+#: en/user_customization-packages.ssi:185
+msgid "3~desktop-and-language-tasks Desktop and language tasks"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:196
-msgid "A conditional may surround an #{#include}# directive:"
+#: en/user_customization-packages.ssi:187
+msgid ""
+"Desktop and language tasks are special cases. In the Debian Installer, if "
+"the medium was prepared for a particular desktop environment flavour, the "
+"corresponding task will be automatically installed. Thus, there are there "
+"are #{gnome-desktop}#, #{kde-desktop}#, #{lxde-desktop}# and #{xfce-desktop}"
+"# tasks, none of which are offered in #{tasksel}#'s menu. Likewise, there "
+"are no menu entries for tasks for languages, but the user's language choice "
+"during the install influences the selection of corresponding language tasks."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:202
-msgid "#if ARCHITECTURE amd64 #include <gnome-full> #endif"
+#: en/user_customization-packages.ssi:189
+msgid ""
+"In live-build, therefore, these special cases are also given special "
+"consideration, but with three notable differences at the time of writing."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:206
+#: en/user_customization-packages.ssi:191
msgid ""
-"Any live-build configuration variable that begins with #{LB_}# can be tested "
-"in this way."
+"First, there is no provision made yet automatically for language tasks, "
+"although a subset of those packages are included if you specify #{lb config "
+"--language}#. If you need those tasks, which include such things as language-"
+"specific fonts and input-method packages, you need to specify them in your "
+"configuration. For example:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:208
-msgid "The nesting of conditionals is not supported."
+#: en/user_customization-packages.ssi:195
+msgid ""
+"$ lb config --tasks \"japanese japanese-desktop japanese-gnome-desktop\""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:210
-msgid "3~ Tasks"
+#: en/user_customization-packages.ssi:199
+msgid ""
+"Second, live-build supports #{*-desktop}# virtual package lists for each of "
+"the desktop flavours mentioned above, which select the #{standard-x11}# "
+"predefined package list, the corresponding #{*-desktop}# task and three "
+"additional tasks: #{desktop}#, #{standard}# and #{laptop}#. So, for example, "
+"if you specify #{--packages gnome-desktop}#, it is equivalent to specifying #"
+"{--packages standard-x11 --tasks \"gnome-desktop desktop standard laptop\"}#."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:212
-msgid "%FIXME"
+#: en/user_customization-packages.ssi:201
+msgid ""
+"Third, if any of the tasks for these desktop flavours are selected, either "
+"explicitly through #{--tasks}# or implicitly by #{--packages}#, live-build "
+"will preseed the corresponding desktop value for Debian Installer (if it is "
+"included) to ensure it follows its own rules for installing different "
+"desktop flavours."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:214
+#: en/user_customization-packages.ssi:203
msgid "2~ Installing modified or third-party packages"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:205
msgid ""
"Whilst it is against the philosophy of Debian Live, it may sometimes be "
"necessary to build a Live system with modified versions of packages that are "
@@ -607,7 +675,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:218
+#: en/user_customization-packages.ssi:207
msgid ""
"This section does not cover advice regarding building or maintaining "
"modified packages. Joachim Breitner's 'How to fork privately' method from "
@@ -618,95 +686,90 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:220
+#: en/user_customization-packages.ssi:209
msgid "There are two ways of installing modified custom packages:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:222
+#: en/user_customization-packages.ssi:211
msgid "_* #{chroot_local-packages}#"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:224
+#: en/user_customization-packages.ssi:213
msgid "_* Using a custom APT repository"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:226
+#: en/user_customization-packages.ssi:215
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:228
+#: en/user_customization-packages.ssi:217
msgid "3~ Using #{chroot_local-packages}# to install custom packages"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:230
+#: en/user_customization-packages.ssi:219
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:232
+#: en/user_customization-packages.ssi:221
msgid ""
"Packages *{must}* be named in the prescribed way. One simple way to do this "
"is to use #{dpkg-name}#."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:234
+#: en/user_customization-packages.ssi:223
msgid ""
"Using #{chroot_local-packages}# for installation of custom packages has "
"disadvantages:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:236
-msgid "_* It is not possible to use secure APT"
+#: en/user_customization-packages.ssi:225
+msgid "_* It is not possible to use secure APT."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:238
+#: en/user_customization-packages.ssi:227
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:240
+#: en/user_customization-packages.ssi:229
msgid ""
"_* It does not lend itself to storing Debian Live configurations in revision "
-"control"
+"control."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:242
+#: en/user_customization-packages.ssi:231
msgid "3~ Using an APT repository to install custom packages"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:244
+#: en/user_customization-packages.ssi:233
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."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:246
-msgid "% FIXME: <xref linkend=\"lb-packages\"/>"
+"you must ensure that you specify the packages elsewhere. See {Choosing "
+"packages to install}#choosing-packages-to-install for details."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:248
+#: en/user_customization-packages.ssi:235
msgid ""
"Whilst it may seem unnecessary effort to create an APT repository to install "
"custom packages, the infrastructure can be easily re-used at a later date to "
@@ -714,12 +777,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:250
+#: en/user_customization-packages.ssi:237
msgid "3~ Custom packages and APT"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:252
+#: en/user_customization-packages.ssi:239
msgid ""
"live-build uses APT to install all packages into the live system so will "
"therefore inherit behaviours from this program. One relevant example is that "
@@ -729,7 +792,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:254
+#: en/user_customization-packages.ssi:241
msgid ""
"Because of this, you may wish to increment the version number in your custom "
"packages' #{debian/changelog}# files to ensure that your modified version is "
@@ -739,19 +802,152 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:256
+#: en/user_customization-packages.ssi:243
msgid "% FIXME: <xref linkend=\"apt-preferences\"/>"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:258
-msgid "3~ Altering APT preferences during Live system"
+#: en/user_customization-packages.ssi:245
+msgid "2~ Configuring APT at build time"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:247
+msgid ""
+"You can configure APT through a number of options applied only at build "
+"time. (APT configuration used in the running live system may be configured "
+"in the normal way for live system contents, that is, by including the "
+"appropriate configurations through #{config/chroot_local_includes/}#.) For a "
+"complete list, look for options starting with #{apt}# in the #{lb_config}# "
+"man page."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:249
+msgid "3~choosing-apt-or-aptitude Choosing apt or aptitude"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:251
+msgid ""
+"You can elect to use either #{apt}# or #{aptitude}# when installing packages "
+"at build time. Which utility is used is governed by the #{--apt}# argument "
+"to #{lb config}#. Choose the method implementing the preferred behaviour for "
+"package installation, the notable difference being how missing packages are "
+"handled."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:253
+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:255
+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:257
+msgid "3~ Using a proxy with APT"
msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:259
msgid ""
-"Whilst it may seem unnecessary effort to create an APT repository to install "
-"custom packages, the infrastructure can be easily re-used at a later date to "
-"offer updates of the modified package."
+"One commonly required APT configuration is to deal with building an image "
+"behind a proxy. You may specify your APT proxy with the #{--apt-ftp-proxy}# "
+"or #{--apt-http-proxy}# options as needed, e.g."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:263
+msgid "lb config --apt-http-proxy http://proxy/"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:267
+msgid "3~ Tweaking APT to save space"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:269
+msgid ""
+"You may find yourself needing to save some space on the image media, in "
+"which case one or the other or both of the following options may be of "
+"interest."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:271
+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:275
+msgid "$ lb config --binary-indices false"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:279
+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 "
+"APT needs those indices in order to operate in the live system, so before "
+"performing #{apt-cache search}# or #{apt-get install}#, for instance, the "
+"user must #{apt-get update}# first to create those indices."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:281
+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:285
+msgid "$ lb config -apt-recommends false"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:289
+msgid ""
+"The tradeoff here is that recommended packages are defined as \"packages "
+"that would be found together with this one in all but unusual installations"
+"\" (Debian Policy Manual, 7.2). This may lead to some packages that you "
+"actually need being omitted, so we suggest you review the difference this "
+"makes to your packages list (see the #{binary.packages}# file generated by #"
+"{lb build}#) and re-include in your list any missing packages that you still "
+"want installed."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:291
+msgid "3~ Passing options to apt or aptitude"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:293
+msgid ""
+"If there is not an #{lb config}# option to alter APT's behaviour in the way "
+"you need, use #{--apt-options}# or #{--aptitude-options}# to pass any "
+"options through to your configured APT tool. See the man pages for #{apt}# "
+"and #{aptitude}# for details."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:295
+msgid "3~ APT pinning"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:297
+msgid "% FIXME: needs content"
msgstr ""
diff --git a/manual/po/de/user_examples.ssi.po b/manual/po/de/user_examples.ssi.po
index a41671f..7a3eeca 100644
--- a/manual/po/de/user_examples.ssi.po
+++ b/manual/po/de/user_examples.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-11-04 16:34-0400\n"
+"POT-Creation-Date: 2010-11-28 07:51-0400\n"
"PO-Revision-Date: 2010-11-04 16:34-0400\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -17,52 +17,61 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. type: Plain text
-#: en/about_manual.ssi:80 en/about_manual.ssi:88 en/about_manual.ssi:96
-#: en/about_manual.ssi:108 en/about_manual.ssi:121 en/about_manual.ssi:134
-#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
-#: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
-#: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
-#: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
-#: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
-#: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
-#: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
-#: en/other_faq.ssi:41 en/other_faq.ssi:83 en/other_faq.ssi:103
-#: en/other_faq.ssi:117 en/other_faq.ssi:137 en/other_faq.ssi:151
-#: en/other_faq.ssi:198 en/other_faq.ssi:245 en/other_faq.ssi:261
-#: en/other_faq.ssi:287 en/other_faq.ssi:299 en/other_faq.ssi:314
-#: en/other_faq.ssi:333 en/other_faq.ssi:345 en/other_faq.ssi:353
-#: en/other_faq.ssi:364 en/other_faq.ssi:374 en/other_howtos.ssi:16
-#: en/other_howtos.ssi:43 en/other_live-environment.ssi:14
-#: en/other_live-environment.ssi:30 en/other_live-environment.ssi:51
-#: en/other_live-environment.ssi:61 en/other_live-environment.ssi:69
-#: en/other_live-environment.ssi:77 en/other_live-environment.ssi:85
-#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
-#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
-#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
-#: en/other_procedures.ssi:58 en/project_bugs.ssi:58 en/user_basics.ssi:32
-#: en/user_basics.ssi:42 en/user_basics.ssi:54 en/user_basics.ssi:66
-#: en/user_basics.ssi:78 en/user_basics.ssi:88 en/user_basics.ssi:102
-#: en/user_basics.ssi:110 en/user_basics.ssi:118 en/user_basics.ssi:128
-#: en/user_basics.ssi:140 en/user_basics.ssi:152 en/user_basics.ssi:160
-#: en/user_basics.ssi:168 en/user_basics.ssi:182 en/user_basics.ssi:190
-#: en/user_basics.ssi:200 en/user_basics.ssi:220 en/user_basics.ssi:253
-#: en/user_basics.ssi:269 en/user_basics.ssi:277 en/user_basics.ssi:297
-#: en/user_basics.ssi:322 en/user_customization-contents.ssi:34
-#: en/user_customization-contents.ssi:43 en/user_customization-contents.ssi:66
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
+#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
+#: en/about_manual.ssi:170 en/other_coding-style.ssi:28
+#: en/other_coding-style.ssi:38 en/other_coding-style.ssi:51
+#: en/other_coding-style.ssi:61 en/other_coding-style.ssi:88
+#: en/other_coding-style.ssi:96 en/other_coding-style.ssi:106
+#: en/other_coding-style.ssi:117 en/other_common-tasks.ssi:32
+#: en/other_customization-backports.ssi:8 en/other_customization-bootup.ssi:30
+#: en/other_customization-bootup.ssi:39 en/other_faq.ssi:41
+#: en/other_faq.ssi:83 en/other_faq.ssi:103 en/other_faq.ssi:117
+#: en/other_faq.ssi:137 en/other_faq.ssi:151 en/other_faq.ssi:198
+#: en/other_faq.ssi:245 en/other_faq.ssi:261 en/other_faq.ssi:287
+#: en/other_faq.ssi:299 en/other_faq.ssi:314 en/other_faq.ssi:333
+#: en/other_faq.ssi:345 en/other_faq.ssi:353 en/other_faq.ssi:364
+#: en/other_faq.ssi:374 en/other_howtos.ssi:16 en/other_howtos.ssi:43
+#: en/other_live-environment.ssi:14 en/other_live-environment.ssi:30
+#: en/other_live-environment.ssi:51 en/other_live-environment.ssi:61
+#: en/other_live-environment.ssi:69 en/other_live-environment.ssi:77
+#: en/other_live-environment.ssi:85 en/other_live-environment.ssi:93
+#: en/other_live-environment.ssi:116 en/other_live-environment.ssi:124
+#: en/other_live-environment.ssi:133 en/other_procedures.ssi:12
+#: en/other_procedures.ssi:46 en/other_procedures.ssi:58
+#: en/project_bugs.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/user_basics.ssi:54 en/user_basics.ssi:66 en/user_basics.ssi:78
+#: en/user_basics.ssi:88 en/user_basics.ssi:102 en/user_basics.ssi:110
+#: en/user_basics.ssi:118 en/user_basics.ssi:128 en/user_basics.ssi:142
+#: en/user_basics.ssi:154 en/user_basics.ssi:162 en/user_basics.ssi:170
+#: en/user_basics.ssi:184 en/user_basics.ssi:192 en/user_basics.ssi:202
+#: en/user_basics.ssi:222 en/user_basics.ssi:255 en/user_basics.ssi:271
+#: en/user_basics.ssi:279 en/user_basics.ssi:299 en/user_basics.ssi:324
+#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
+#: en/user_customization-contents.ssi:66
#: en/user_customization-internationalization.ssi:10
#: en/user_customization-internationalization.ssi:18
#: en/user_customization-internationalization.ssi:26
#: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:16 en/user_customization-packages.ssi:24
-#: en/user_customization-packages.ssi:36 en/user_customization-packages.ssi:45
-#: en/user_customization-packages.ssi:59 en/user_customization-packages.ssi:73
-#: en/user_customization-packages.ssi:103
-#: en/user_customization-packages.ssi:111
-#: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:166
-#: en/user_customization-packages.ssi:176
-#: en/user_customization-packages.ssi:186
-#: en/user_customization-packages.ssi:196 en/user_examples.ssi:24
+#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
+#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
+#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:90
+#: en/user_customization-packages.ssi:120
+#: en/user_customization-packages.ssi:133
+#: en/user_customization-packages.ssi:143
+#: en/user_customization-packages.ssi:153
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:261
+#: en/user_customization-packages.ssi:273
+#: en/user_customization-packages.ssi:283 en/user_examples.ssi:14
+#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
+#: en/user_examples.ssi:64 en/user_examples.ssi:80 en/user_examples.ssi:90
+#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:131
+#: en/user_examples.ssi:139 en/user_examples.ssi:154 en/user_examples.ssi:162
+#: en/user_examples.ssi:188 en/user_examples.ssi:209 en/user_examples.ssi:217
#: 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
@@ -75,14 +84,15 @@ msgid "code{"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
-#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
-#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
-#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
-#: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
-#: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
+#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:166
+#: en/about_manual.ssi:173 en/other_coding-style.ssi:34
+#: en/other_coding-style.ssi:45 en/other_coding-style.ssi:57
+#: en/other_coding-style.ssi:68 en/other_coding-style.ssi:92
+#: en/other_coding-style.ssi:100 en/other_coding-style.ssi:113
+#: en/other_coding-style.ssi:124 en/other_common-tasks.ssi:36
+#: en/other_customization-backports.ssi:16
#: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
#: en/other_faq.ssi:37 en/other_faq.ssi:46 en/other_faq.ssi:92
#: en/other_faq.ssi:108 en/other_faq.ssi:141 en/other_faq.ssi:155
@@ -100,27 +110,35 @@ msgstr ""
#: en/project_bugs.ssi:62 en/user_basics.ssi:36 en/user_basics.ssi:46
#: en/user_basics.ssi:60 en/user_basics.ssi:72 en/user_basics.ssi:82
#: en/user_basics.ssi:94 en/user_basics.ssi:106 en/user_basics.ssi:114
-#: en/user_basics.ssi:122 en/user_basics.ssi:132 en/user_basics.ssi:146
-#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
-#: en/user_basics.ssi:186 en/user_basics.ssi:194 en/user_basics.ssi:204
-#: en/user_basics.ssi:245 en/user_basics.ssi:257 en/user_basics.ssi:273
-#: en/user_basics.ssi:281 en/user_basics.ssi:308 en/user_basics.ssi:347
+#: en/user_basics.ssi:122 en/user_basics.ssi:132 en/user_basics.ssi:148
+#: en/user_basics.ssi:158 en/user_basics.ssi:166 en/user_basics.ssi:174
+#: en/user_basics.ssi:188 en/user_basics.ssi:196 en/user_basics.ssi:206
+#: en/user_basics.ssi:247 en/user_basics.ssi:259 en/user_basics.ssi:275
+#: en/user_basics.ssi:283 en/user_basics.ssi:310 en/user_basics.ssi:349
#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
#: en/user_customization-contents.ssi:70
#: en/user_customization-internationalization.ssi:14
#: en/user_customization-internationalization.ssi:22
#: en/user_customization-internationalization.ssi:30
#: en/user_customization-internationalization.ssi:42
-#: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
-#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
-#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
-#: en/user_customization-packages.ssi:107
-#: en/user_customization-packages.ssi:115
-#: en/user_customization-packages.ssi:135
-#: en/user_customization-packages.ssi:172
-#: en/user_customization-packages.ssi:182
-#: en/user_customization-packages.ssi:192
-#: en/user_customization-packages.ssi:202 en/user_examples.ssi:33
+#: en/user_customization-packages.ssi:23 en/user_customization-packages.ssi:36
+#: en/user_customization-packages.ssi:48 en/user_customization-packages.ssi:62
+#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:94
+#: en/user_customization-packages.ssi:125
+#: en/user_customization-packages.ssi:139
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:159
+#: en/user_customization-packages.ssi:169
+#: en/user_customization-packages.ssi:181
+#: en/user_customization-packages.ssi:197
+#: en/user_customization-packages.ssi:265
+#: en/user_customization-packages.ssi:277
+#: en/user_customization-packages.ssi:287 en/user_examples.ssi:20
+#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:58
+#: en/user_examples.ssi:68 en/user_examples.ssi:86 en/user_examples.ssi:101
+#: en/user_examples.ssi:111 en/user_examples.ssi:123 en/user_examples.ssi:135
+#: en/user_examples.ssi:150 en/user_examples.ssi:158 en/user_examples.ssi:166
+#: en/user_examples.ssi:197 en/user_examples.ssi:213 en/user_examples.ssi:221
#: en/user_installation.ssi:42 en/user_installation.ssi:50
#: en/user_installation.ssi:60 en/user_installation.ssi:72
#: en/user_installation.ssi:80 en/user_installation.ssi:88
@@ -133,95 +151,474 @@ msgid "}code"
msgstr ""
#. type: Plain text
-#: en/other_faq.ssi:85 en/other_faq.ssi:247 en/user_examples.ssi:26
+#: en/other_faq.ssi:85 en/other_faq.ssi:247 en/user_examples.ssi:92
+#: en/user_examples.ssi:141 en/user_examples.ssi:190
msgid "#!/bin/sh"
msgstr ""
#. type: Plain text
+#: en/user_basics.ssi:44 en/user_basics.ssi:120 en/user_basics.ssi:204
+#: en/user_examples.ssi:109 en/user_examples.ssi:156
+msgid "# lb build"
+msgstr ""
+
+#. type: Plain text
#: en/user_examples.ssi:2
-msgid "B~ Examples"
+msgid ":B~ Examples"
msgstr ""
#. type: Plain text
#: en/user_examples.ssi:4
-msgid "1~ Use Case Builds"
+msgid "1~examples Examples"
msgstr ""
#. type: Plain text
#: en/user_examples.ssi:6
msgid ""
-"This chapter covers example builds for specific use cases with Debian Live."
+"This chapter covers example builds for specific use cases with Debian Live. "
+"If you are new to building your own Debian Live images, we recommend you "
+"first look at the three tutorials in sequence, as each one teaches new "
+"techniques that will help you use and understand the remaining examples."
msgstr ""
#. type: Plain text
#: en/user_examples.ssi:8
-msgid "2~ VNC Kiosk Client"
+msgid "2~using-the-examples Using the examples"
msgstr ""
#. type: Plain text
#: en/user_examples.ssi:10
-msgid "Create an image with live-build to boot directly to a VNC server."
+msgid ""
+"To use these examples you need a system to build them on that meets the "
+"requirements listed in {Requirements}#requirements and has live-build "
+"installed as described in {Installing live-build}#installing-live-build."
msgstr ""
#. type: Plain text
#: en/user_examples.ssi:12
+msgid ""
+"Note that, for the sake of brevity, in these examples we do not specify a "
+"local mirror to use for the build. You can speed up downloads considerably "
+"if you use a local mirror. You may specify the options when you use #{lb "
+"config}#, as described in {Distribution mirrors used at build time}"
+"#distribution-mirrors-build-time, or for more convenience, set the default "
+"for your build system in #{/etc/live/build.conf}#. Simply create this file "
+"and in it, set the corresponding #{LB_MIRROR_*}# variables to your preferred "
+"mirror. For example:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:18
+msgid ""
+"LB_MIRROR_BOOTSTRAP=\"http://mirror/debian\" LB_MIRROR_CHROOT=\"http://"
+"mirror/debian\" LB_MIRROR_CHROOT_SECURITY=\"http://mirror/debian-security\""
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:22
+msgid "2~tutorial-1 Tutorial 1: A standard image"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:24
+#, no-wrap
+msgid "*{Use case:}* Create a simple first image, learning the basics of live-build\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:26
+msgid ""
+"In this tutorial, we will build a default ISO hybrid Debian Live image "
+"containing only base packages (no Xorg) and some Debian Live support "
+"packages, as a first exercise in using live-build."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:28
+msgid "You can't get much simpler than this:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:32
+msgid "$ mkdir tutorial1 ; cd tutorial1 ; lb config"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:36
+msgid ""
+"Examine the contents of the #{config/}# directory if you wish. You will see "
+"stored here a skeletal configuration, ready to customize or, in this case, "
+"use immediately to build a default image."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:38
+msgid ""
+"Now, as superuser, build the image, saving a log as you build with #{tee}#."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:42
+msgid "# lb_build 2>&1 | tee binary.log"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:46
+msgid ""
+"Assuming all goes well, after a while, the current directory will contain #"
+"{binary-hybrid.iso}#. This ISO hybrid image can be booted directly in a "
+"virtual machine as described in {Testing an ISO image with Qemu}#testing-iso-"
+"with-qemu and {Testing an ISO image with virtualbox-ose}#testing-iso-with-"
+"virtualbox, or else imaged onto optical media or a USB flash device as "
+"described in {Burning an ISO image to a physical medium}#burning-iso-image "
+"and {Copying USB/HDD image to a USB stick}#copying-usb-hdd-image, "
+"respectively."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:48
+msgid "2~tutorial-2 Tutorial 2: A web browser utility"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:50
+#, no-wrap
+msgid "*{Use case}* Create a web browser utility image, learning how to apply customizations\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:52
+msgid ""
+"In this tutorial, we will create an image suitable for use as a web browser "
+"utility, serving as an introduction to customizing Debian Live images."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:56
+msgid "mkdir tutorial2 ; cd tutorial2 ; lb config -p lxde --packages iceweasel"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:60
+msgid ""
+"Our choice of LXDE for this example reflects our desire to provide a minimal "
+"desktop environment, since the focus of the image is the single use we have "
+"in mind, the web browser. We could go even further and provide a default "
+"configuration for the web browser in #{config/chroot_local-includes/etc/"
+"iceweasel/profile/}#, or additional support packages for viewing various "
+"kinds of web content, but we leave this as an exercise for the reader."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:62
+msgid ""
+"Build the image, again as superuser, keeping a log as in {Tutorial 1}"
+"#tutorial-1:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:66 en/user_examples.ssi:219
+msgid "# lb build 2>&1 | tee binary.log"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:70
+msgid "Again, verify the image is OK and test, as in {Tutorial 1}#tutorial-1."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:72
+msgid "2~tutorial-3 Tutorial 3: A personalized image"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:74
+#, no-wrap
+msgid "*{Use case}* Create a project to build a personalized image, containing your favourite software to take with you on a USB stick wherever you go, and evolving in successive revisions as your needs and preferences change.\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:76
+msgid ""
+"Since we will be changing our personalized image over a number of revisions, "
+"and we want to track those changes, trying things experimentally and "
+"possibly reverting them if things don't work out, we will keep our "
+"configuration in the popular #{git}# version control system. We will also "
+"use the best practice of autoconfiguration via #{auto}# scripts as described "
+"in {Managing a configuration}#managing-a-configuration."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:78
+msgid "3~ First revision"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:84
+msgid ""
+"$ mkdir -p tutorial3/auto $ cp /usr/share/live/examples/auto/* tutorial3/"
+"auto/ $ cd tutorial3"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:88
+msgid "Edit #{auto/config}# to read as follows:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:99
+#, no-wrap
+msgid ""
+"lb config noauto \\\n"
+" --architecture i386 \\\n"
+" --linux-flavours 686 \\\n"
+" --packages-lists lxde \\\n"
+" --packages \"iceweasel xchat\" \\\n"
+" \"${@}\"\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:103
+msgid ""
+"First, #{--architecture i386}# ensures that on our #{amd64}# build system, "
+"we build a 32-bit version suitable for use on most machines. Second, we use #"
+"{--linux-flavours 686}# because we don't anticipate using this image on much "
+"older systems. Third, we've chosen the #{lxde}# package list to give us a "
+"minimal desktop. And finally, we have added two initial favourite packages: #"
+"{iceweasel}# and #{xchat}#."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:105
+msgid "Now, build the image:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:113
+msgid ""
+"Note that unlike in the first two tutorials, we no longer have to type #"
+"{2>&1 | tee binary.log}# as that is now included in #{auto/build}#."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:115
+msgid ""
+"Once you've tested the image (as in {Tutorial 1}#tutorial-1) and are "
+"satisfied it works, it's time to initialize our #{git}# repository, adding "
+"only the auto scripts we just created, and then make the first commit:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:121
+msgid "$ git init $ git add auto $ git commit -a -m \"Initial import.\""
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:125
+msgid "3~ Second revision"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:127
+msgid ""
+"In this revision, we're going to clean up from the first build, add the #"
+"{vlc}# package to our configuration, rebuild, test and commit."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:129
+msgid ""
+"The #{lb clean}# command will clean up all generated files from the previous "
+"build except for the cache, which saves having to re-download packages. This "
+"ensures that the subsequent #{lb build}# will re-run all stages to "
+"regenerate the files from our new configuration."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:133
+msgid "# lb clean"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:137
+msgid "Now edit #{auto/config}# to add the #{vlc}# package:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:148
+#, no-wrap
+msgid ""
+"lb config noauto \\\n"
+" --architecture i386 \\\n"
+" --linux-flavours 686 \\\n"
+" --packages-lists lxde \\\n"
+" --packages \"iceweasel xchat vlc\" \\\n"
+" \"${@}\"\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:152
+msgid "Build again:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:160
+msgid "Test, and when you're satisfied, commit the next revision:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:164
+msgid "$ git commit -a -m \"Adding vlc media player.\""
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:168
+msgid ""
+"Of course, more complicated changes to the configuration are possible, "
+"perhaps adding files in subdirectories of #{config/}#. When you commit new "
+"revisions, just take care not to hand edit or commit the top-level files in #"
+"{config}# containing #{LB_*}# variables, as these are build products, too, "
+"and are always cleaned up by #{lb clean}# and re-created with #{lb config}# "
+"via their respective #{auto}# scripts."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:170
+msgid ""
+"We've come to the end of our tutorial series. While many more kinds of "
+"customization are possible, even just using the few features explored in "
+"these simple examples, an almost infinite variety of different images can be "
+"created. The remaining examples in this section cover several other use "
+"cases drawn from the collected experiences of users of Debian Live."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:172
+msgid "2~ A VNC Kiosk Client"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:174
+msgid "Create an image with live-build to boot directly to a VNC server."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:176
msgid "_* Make a build directory: #{$ mkdir vncBuild}#"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:14
+#: en/user_examples.ssi:178
msgid "_* Move to the build directory: #{$ cd vncBuild}#"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:16
+#: en/user_examples.ssi:180
msgid ""
"Example to config the build directory to include gdm metacity "
"xtightvncviewer: #{$ lb config --packages \"gdm3 metacity xtightvncviewer\"}#"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:18
+#: en/user_examples.ssi:182
msgid ""
"Create a folder /etc/skel folder for a custom .xsession for the default "
"user: #{$ mkdir -p config/chroot_local-includes/etc/skel}#"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:20
+#: en/user_examples.ssi:184
msgid ""
"Create the .xsession for the default user: #{$ touch config/chroot_local-"
"includes/etc/skel/.xsession}#"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:22
+#: en/user_examples.ssi:186
msgid ""
"Edit the .xsession file to launch metacity and start xvncviewer with "
"something similar to the below:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:29
+#: en/user_examples.ssi:193
msgid "/usr/bin/metacity & /usr/bin/vncviewer xxx.xxx.xxx.xxx:PORT"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:31
+#: en/user_examples.ssi:195
msgid "exit"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:35
+#: en/user_examples.ssi:199
msgid "_* Build the image: #{# lb build}#"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:37
+#: en/user_examples.ssi:201
msgid "_* Enjoy."
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:39
-msgid "2~ Next Example FIXME"
+#: en/user_examples.ssi:203
+msgid "2~ A base image for a 128M USB key"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:205
+#, no-wrap
+msgid "*{Use case}* Create a standard image with some components removed in order to fit on a 128M USB key with space left over to use as you see fit.\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:207
+msgid ""
+"When optimizing an image to fit a certain media size, you need to understand "
+"the tradeoffs you are making between size and functionality. In this "
+"example, we trim only so much as to make room for additional material within "
+"a 128M media size, but without doing anything to destroy integrity of the "
+"packages contained within, such as the purging of locale data via the #"
+"{localepurge}# package, or other such \"intrusive\" optimizations. Of "
+"particular note, you should not use #{--bootstrap-flavour minimal}# unless "
+"you really know what you're doing, as omitting priority #{important}# "
+"packages will most likely produce a broken live system."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:211
+msgid ""
+"$ lb config -k 486 -p minimal --binary-indices false --memtest none --apt-"
+"recommends false --includes none"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:215
+msgid "Now, build the image in the usual way:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:223
+msgid ""
+"On the author's system at time of writing, the above configuration produced "
+"a 78Mbyte image. This compares favourably with the 166Mbyte image produced "
+"by the default configuration in {Tutorial 1}#tutorial-1."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:225
+msgid ""
+"The biggest space-saver here, compared to building a standard image on an #"
+"{i386}# architecture system, is to select only the #{486}# kernel flavour "
+"instead of the default #{-k \"486 686\"}#. Leaving off APT's indices with #"
+"{--binary-indices false}# also saves a fair amount of space, the tradeoff "
+"being that you need to #{apt-get update}# before using apt in the live "
+"system. Choosing the #{minimal}# package list leaves out the large #{locales}"
+"# package and associated utilities. Dropping recommended packages with #{--"
+"apt-recommends false}# saves some additional space, at the expense of "
+"omitting some packages you might otherwise expect to be there, such as #"
+"{firmware-linux-free}# which may be needed to support certain hardware. The "
+"remaining options shave off additional small amounts of space. It's up to "
+"you to decide if the functionality that is sacrificed with each optimization "
+"is worth the loss in functionality."
msgstr ""
diff --git a/manual/po/de/user_installation.ssi.po b/manual/po/de/user_installation.ssi.po
index 4d06253..798a589 100644
--- a/manual/po/de/user_installation.ssi.po
+++ b/manual/po/de/user_installation.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-23 16:43+0300\n"
+"POT-Creation-Date: 2010-11-29 14:16-0400\n"
"PO-Revision-Date: 2010-10-03 20:30+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -17,74 +17,82 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. type: Plain text
-#: en/about_manual.ssi:80 en/about_manual.ssi:88 en/about_manual.ssi:96
-#: en/about_manual.ssi:108 en/about_manual.ssi:121 en/about_manual.ssi:134
-#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
-#: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
-#: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
-#: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
-#: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
-#: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
-#: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
-#: en/other_faq.ssi:41 en/other_faq.ssi:83 en/other_faq.ssi:103
-#: en/other_faq.ssi:117 en/other_faq.ssi:137 en/other_faq.ssi:151
-#: en/other_faq.ssi:198 en/other_faq.ssi:245 en/other_faq.ssi:261
-#: en/other_faq.ssi:287 en/other_faq.ssi:299 en/other_faq.ssi:314
-#: en/other_faq.ssi:333 en/other_faq.ssi:345 en/other_faq.ssi:353
-#: en/other_faq.ssi:364 en/other_faq.ssi:374 en/other_howtos.ssi:16
-#: en/other_howtos.ssi:43 en/other_live-environment.ssi:14
-#: en/other_live-environment.ssi:30 en/other_live-environment.ssi:51
-#: en/other_live-environment.ssi:61 en/other_live-environment.ssi:69
-#: en/other_live-environment.ssi:77 en/other_live-environment.ssi:85
-#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
-#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
-#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
-#: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
-#: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
-#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111 en/user_basics.ssi:34
-#: en/user_basics.ssi:44 en/user_basics.ssi:56 en/user_basics.ssi:68
-#: en/user_basics.ssi:80 en/user_basics.ssi:92 en/user_basics.ssi:106
-#: en/user_basics.ssi:114 en/user_basics.ssi:122 en/user_basics.ssi:132
-#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
-#: en/user_basics.ssi:172 en/user_basics.ssi:186 en/user_basics.ssi:194
-#: en/user_basics.ssi:204 en/user_basics.ssi:224 en/user_basics.ssi:257
-#: en/user_basics.ssi:273 en/user_basics.ssi:281 en/user_basics.ssi:301
-#: en/user_basics.ssi:326 en/user_customization-contents.ssi:34
-#: en/user_customization-contents.ssi:43 en/user_customization-contents.ssi:66
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
+#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
+#: en/about_manual.ssi:170 en/other_coding-style.ssi:28
+#: en/other_coding-style.ssi:38 en/other_coding-style.ssi:51
+#: en/other_coding-style.ssi:61 en/other_coding-style.ssi:88
+#: en/other_coding-style.ssi:96 en/other_coding-style.ssi:106
+#: en/other_coding-style.ssi:117 en/other_common-tasks.ssi:32
+#: en/other_customization-backports.ssi:8 en/other_customization-bootup.ssi:30
+#: en/other_customization-bootup.ssi:39 en/other_faq.ssi:41
+#: en/other_faq.ssi:83 en/other_faq.ssi:103 en/other_faq.ssi:117
+#: en/other_faq.ssi:137 en/other_faq.ssi:151 en/other_faq.ssi:198
+#: en/other_faq.ssi:245 en/other_faq.ssi:261 en/other_faq.ssi:287
+#: en/other_faq.ssi:299 en/other_faq.ssi:314 en/other_faq.ssi:333
+#: en/other_faq.ssi:345 en/other_faq.ssi:353 en/other_faq.ssi:364
+#: en/other_faq.ssi:374 en/other_howtos.ssi:16 en/other_howtos.ssi:43
+#: en/other_live-environment.ssi:14 en/other_live-environment.ssi:30
+#: en/other_live-environment.ssi:51 en/other_live-environment.ssi:61
+#: en/other_live-environment.ssi:69 en/other_live-environment.ssi:77
+#: en/other_live-environment.ssi:85 en/other_live-environment.ssi:93
+#: en/other_live-environment.ssi:116 en/other_live-environment.ssi:124
+#: en/other_live-environment.ssi:133 en/other_procedures.ssi:12
+#: en/other_procedures.ssi:46 en/other_procedures.ssi:58
+#: en/project_bugs.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/user_basics.ssi:54 en/user_basics.ssi:66 en/user_basics.ssi:78
+#: en/user_basics.ssi:88 en/user_basics.ssi:102 en/user_basics.ssi:110
+#: en/user_basics.ssi:118 en/user_basics.ssi:128 en/user_basics.ssi:142
+#: en/user_basics.ssi:154 en/user_basics.ssi:162 en/user_basics.ssi:170
+#: en/user_basics.ssi:184 en/user_basics.ssi:192 en/user_basics.ssi:202
+#: en/user_basics.ssi:222 en/user_basics.ssi:255 en/user_basics.ssi:271
+#: en/user_basics.ssi:279 en/user_basics.ssi:299 en/user_basics.ssi:324
+#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
+#: en/user_customization-contents.ssi:66
#: en/user_customization-internationalization.ssi:10
#: en/user_customization-internationalization.ssi:18
#: en/user_customization-internationalization.ssi:26
#: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:16 en/user_customization-packages.ssi:24
-#: en/user_customization-packages.ssi:36 en/user_customization-packages.ssi:45
-#: en/user_customization-packages.ssi:59 en/user_customization-packages.ssi:73
-#: en/user_customization-packages.ssi:103
-#: en/user_customization-packages.ssi:111
-#: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:166
-#: en/user_customization-packages.ssi:176
-#: en/user_customization-packages.ssi:186
-#: en/user_customization-packages.ssi:196 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:104
-#: en/user_installation.ssi:118 en/user_installation.ssi:135
-#: en/user_managing_a_configuration.ssi:24
+#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
+#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
+#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:90
+#: en/user_customization-packages.ssi:120
+#: en/user_customization-packages.ssi:133
+#: en/user_customization-packages.ssi:143
+#: en/user_customization-packages.ssi:153
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:261
+#: en/user_customization-packages.ssi:273
+#: en/user_customization-packages.ssi:283 en/user_examples.ssi:14
+#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
+#: en/user_examples.ssi:64 en/user_examples.ssi:80 en/user_examples.ssi:90
+#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:131
+#: en/user_examples.ssi:139 en/user_examples.ssi:154 en/user_examples.ssi:162
+#: en/user_examples.ssi:188 en/user_examples.ssi:209 en/user_examples.ssi:217
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:76 en/user_installation.ssi:84
+#: en/user_installation.ssi:108 en/user_installation.ssi:126
+#: en/user_installation.ssi:144 en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
-#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:46
-#: en/user_overview.ssi:90 en/user_overview.ssi:98
+#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:36
+#: en/user_overview.ssi:80 en/user_overview.ssi:88
msgid "code{"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
-#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
-#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
-#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
-#: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
-#: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
+#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:166
+#: en/about_manual.ssi:173 en/other_coding-style.ssi:34
+#: en/other_coding-style.ssi:45 en/other_coding-style.ssi:57
+#: en/other_coding-style.ssi:68 en/other_coding-style.ssi:92
+#: en/other_coding-style.ssi:100 en/other_coding-style.ssi:113
+#: en/other_coding-style.ssi:124 en/other_common-tasks.ssi:36
+#: en/other_customization-backports.ssi:16
#: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
#: en/other_faq.ssi:37 en/other_faq.ssi:46 en/other_faq.ssi:92
#: en/other_faq.ssi:108 en/other_faq.ssi:141 en/other_faq.ssi:155
@@ -99,40 +107,46 @@ msgstr ""
#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
#: en/other_live-environment.ssi:138 en/other_procedures.ssi:16
#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
-#: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
-#: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
-#: en/other_use-cases.ssi:137 en/user_basics.ssi:38 en/user_basics.ssi:48
-#: en/user_basics.ssi:62 en/user_basics.ssi:72 en/user_basics.ssi:86
-#: en/user_basics.ssi:98 en/user_basics.ssi:110 en/user_basics.ssi:118
-#: en/user_basics.ssi:126 en/user_basics.ssi:136 en/user_basics.ssi:150
-#: en/user_basics.ssi:160 en/user_basics.ssi:168 en/user_basics.ssi:176
-#: en/user_basics.ssi:190 en/user_basics.ssi:198 en/user_basics.ssi:208
-#: en/user_basics.ssi:249 en/user_basics.ssi:261 en/user_basics.ssi:277
-#: en/user_basics.ssi:285 en/user_basics.ssi:312 en/user_basics.ssi:351
+#: en/project_bugs.ssi:62 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:60 en/user_basics.ssi:72 en/user_basics.ssi:82
+#: en/user_basics.ssi:94 en/user_basics.ssi:106 en/user_basics.ssi:114
+#: en/user_basics.ssi:122 en/user_basics.ssi:132 en/user_basics.ssi:148
+#: en/user_basics.ssi:158 en/user_basics.ssi:166 en/user_basics.ssi:174
+#: en/user_basics.ssi:188 en/user_basics.ssi:196 en/user_basics.ssi:206
+#: en/user_basics.ssi:247 en/user_basics.ssi:259 en/user_basics.ssi:275
+#: en/user_basics.ssi:283 en/user_basics.ssi:310 en/user_basics.ssi:349
#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
#: en/user_customization-contents.ssi:70
#: en/user_customization-internationalization.ssi:14
#: en/user_customization-internationalization.ssi:22
#: en/user_customization-internationalization.ssi:30
#: en/user_customization-internationalization.ssi:42
-#: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
-#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
-#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
-#: en/user_customization-packages.ssi:107
-#: en/user_customization-packages.ssi:115
-#: en/user_customization-packages.ssi:135
-#: en/user_customization-packages.ssi:172
-#: en/user_customization-packages.ssi:182
-#: en/user_customization-packages.ssi:192
-#: en/user_customization-packages.ssi:202 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 en/user_installation.ssi:108
-#: en/user_installation.ssi:123 en/user_installation.ssi:138
-#: en/user_managing_a_configuration.ssi:31
+#: en/user_customization-packages.ssi:23 en/user_customization-packages.ssi:36
+#: en/user_customization-packages.ssi:48 en/user_customization-packages.ssi:62
+#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:94
+#: en/user_customization-packages.ssi:125
+#: en/user_customization-packages.ssi:139
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:159
+#: en/user_customization-packages.ssi:169
+#: en/user_customization-packages.ssi:181
+#: en/user_customization-packages.ssi:197
+#: en/user_customization-packages.ssi:265
+#: en/user_customization-packages.ssi:277
+#: en/user_customization-packages.ssi:287 en/user_examples.ssi:20
+#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:58
+#: en/user_examples.ssi:68 en/user_examples.ssi:86 en/user_examples.ssi:101
+#: en/user_examples.ssi:111 en/user_examples.ssi:123 en/user_examples.ssi:135
+#: en/user_examples.ssi:150 en/user_examples.ssi:158 en/user_examples.ssi:166
+#: en/user_examples.ssi:197 en/user_examples.ssi:213 en/user_examples.ssi:221
+#: 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
+#: en/user_installation.ssi:112 en/user_installation.ssi:131
+#: en/user_installation.ssi:147 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
-#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:84
-#: en/user_overview.ssi:94 en/user_overview.ssi:102
+#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:74
+#: en/user_overview.ssi:84 en/user_overview.ssi:92
msgid "}code"
msgstr ""
@@ -148,7 +162,7 @@ msgstr ""
#. type: Plain text
#: en/user_installation.ssi:6
-msgid "2~ Requirements"
+msgid "2~requirements Requirements"
msgstr ""
#. type: Plain text
@@ -190,7 +204,7 @@ msgstr ""
#. type: Plain text
#: en/user_installation.ssi:22
-msgid "2~ Installing live-build"
+msgid "2~installing-live-build Installing live-build"
msgstr ""
#. type: Plain text
@@ -324,33 +338,53 @@ msgstr ""
#. type: Plain text
#: en/user_installation.ssi:98
-msgid "3~ Using a customized live-boot"
+msgid "% FIXME: we also need to mention live-config"
msgstr ""
#. type: Plain text
#: en/user_installation.ssi:100
+msgid "3~ Using a customized live-boot"
+msgstr ""
+
+#. type: Plain text
+#: en/user_installation.ssi:102
+msgid ""
+"% FIXME: should follow the structure for live-build above (i.e. \"from source"
+"\", not \"customized\" -- we should not get into customization now, but "
+"should reserve that discussion for later."
+msgstr ""
+
+#. type: Plain text
+#: en/user_installation.ssi:104
msgid ""
"To modify the code you can follow the process below. Please ensure you are "
-"familiar with the terms mentioned in {Terms}#terms ."
+"familiar with the terms mentioned in {Terms}#terms."
msgstr ""
#. type: Plain text
-#: en/user_installation.ssi:102
+#: en/user_installation.ssi:106
msgid "_* Checkout the live-boot source"
msgstr ""
#. type: Plain text
-#: en/user_installation.ssi:106
+#: en/user_installation.ssi:110
msgid "$ git clone git://live.debian.net/git/live-boot.git"
msgstr ""
#. type: Plain text
-#: en/user_installation.ssi:110
+#: en/user_installation.ssi:114
msgid "_* Make changes to your local copy"
msgstr ""
#. type: Plain text
-#: en/user_installation.ssi:112
+#: en/user_installation.ssi:116
+msgid ""
+"% FIXME: as indicated above, it's too early for this topic. Move to later in "
+"the manual."
+msgstr ""
+
+#. type: Plain text
+#: en/user_installation.ssi:118
msgid ""
"And beware that if you want to add your pre-init script in live-bottom, you "
"should name it without dashes '-', e.g: call it \"99new_feature\" and not "
@@ -358,12 +392,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_installation.ssi:114
+#: en/user_installation.ssi:120
msgid "_* Build a live-boot .deb"
msgstr ""
#. type: Plain text
-#: en/user_installation.ssi:116
+#: en/user_installation.ssi:122
+msgid ""
+"% FIXME: not strictly true? building sid on squeeze is usually OK. also, "
+"building lenny on squeeze or sid is fine. clarify."
+msgstr ""
+
+#. type: Plain text
+#: en/user_installation.ssi:124
msgid ""
"You must build either on your target distribution or in a chroot containing "
"your target platform: this means if your target is Squeeze then you should "
@@ -374,17 +415,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_installation.ssi:121
-msgid "$ cd live-boot $ dpkg-buildpackage -rfakeroot -b -uc -us"
+#: en/user_installation.ssi:129
+msgid "$ cd live-boot $ dpkg-buildpackage -b -uc -us"
msgstr ""
#. type: Plain text
-#: en/user_installation.ssi:125
+#: en/user_installation.ssi:133
msgid "_* Use the generated live-boot .deb"
msgstr ""
#. type: Plain text
-#: en/user_installation.ssi:127
+#: en/user_installation.ssi:135
msgid ""
"As live-boot is installed by live-build system, installing the package in "
"the host system is not sufficient: you should treat the generated .deb like "
@@ -393,19 +434,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_installation.ssi:129
+#: en/user_installation.ssi:138
msgid ""
"% FIXME: <xref linkend=\"custom-packages\"/> <xref linkend=\"custom-packages-"
-"apt\"/>"
+"apt\"/> % Ben> What is the latter reference for? I can't see the relevance."
msgstr ""
#. type: Plain text
-#: en/user_installation.ssi:131
+#: en/user_installation.ssi:140
msgid "3~ Using live-boot snapshots"
msgstr ""
#. type: Plain text
-#: en/user_installation.ssi:133
+#: en/user_installation.ssi:142
msgid ""
"You can let live-build automatically use the latest snapshot of live-boot by "
"configuring a third-party repository in your live-build configuration "
@@ -414,6 +455,6 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_installation.ssi:137
+#: en/user_installation.ssi:146
msgid "lb config --repository live.debian.net"
msgstr ""
diff --git a/manual/po/de/user_managing_a_configuration.ssi.po b/manual/po/de/user_managing_a_configuration.ssi.po
index 416e9eb..291ee10 100644
--- a/manual/po/de/user_managing_a_configuration.ssi.po
+++ b/manual/po/de/user_managing_a_configuration.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-28 16:34-0200\n"
+"POT-Creation-Date: 2010-11-27 19:55-0400\n"
"PO-Revision-Date: 2010-10-13 17:00+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -17,9 +17,9 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. type: Plain text
-#: en/about_manual.ssi:80 en/about_manual.ssi:88 en/about_manual.ssi:96
-#: en/about_manual.ssi:108 en/about_manual.ssi:121 en/about_manual.ssi:134
-#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
+#: en/about_manual.ssi:112 en/about_manual.ssi:125 en/about_manual.ssi:138
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
#: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
#: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
#: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
@@ -39,38 +39,43 @@ msgstr ""
#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
-#: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
-#: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
-#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111
-#: en/project_bugs.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
-#: en/user_basics.ssi:54 en/user_basics.ssi:66 en/user_basics.ssi:78
-#: en/user_basics.ssi:88 en/user_basics.ssi:102 en/user_basics.ssi:110
-#: en/user_basics.ssi:118 en/user_basics.ssi:128 en/user_basics.ssi:140
-#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
-#: en/user_basics.ssi:182 en/user_basics.ssi:190 en/user_basics.ssi:200
-#: en/user_basics.ssi:220 en/user_basics.ssi:253 en/user_basics.ssi:269
-#: en/user_basics.ssi:277 en/user_basics.ssi:297 en/user_basics.ssi:322
-#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
-#: en/user_customization-contents.ssi:66
+#: en/other_procedures.ssi:58 en/project_bugs.ssi:58 en/user_basics.ssi:32
+#: en/user_basics.ssi:42 en/user_basics.ssi:54 en/user_basics.ssi:66
+#: en/user_basics.ssi:78 en/user_basics.ssi:88 en/user_basics.ssi:102
+#: en/user_basics.ssi:110 en/user_basics.ssi:118 en/user_basics.ssi:128
+#: en/user_basics.ssi:142 en/user_basics.ssi:154 en/user_basics.ssi:162
+#: en/user_basics.ssi:170 en/user_basics.ssi:184 en/user_basics.ssi:192
+#: en/user_basics.ssi:202 en/user_basics.ssi:222 en/user_basics.ssi:255
+#: en/user_basics.ssi:271 en/user_basics.ssi:279 en/user_basics.ssi:299
+#: en/user_basics.ssi:324 en/user_customization-contents.ssi:34
+#: en/user_customization-contents.ssi:43 en/user_customization-contents.ssi:66
#: en/user_customization-internationalization.ssi:10
#: en/user_customization-internationalization.ssi:18
#: en/user_customization-internationalization.ssi:26
#: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:16 en/user_customization-packages.ssi:24
-#: en/user_customization-packages.ssi:36 en/user_customization-packages.ssi:45
-#: en/user_customization-packages.ssi:59 en/user_customization-packages.ssi:73
-#: en/user_customization-packages.ssi:103
-#: en/user_customization-packages.ssi:111
-#: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:166
-#: en/user_customization-packages.ssi:176
-#: en/user_customization-packages.ssi:186
-#: en/user_customization-packages.ssi:196 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:104
-#: en/user_installation.ssi:118 en/user_installation.ssi:135
-#: en/user_managing_a_configuration.ssi:24
+#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
+#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
+#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:90
+#: en/user_customization-packages.ssi:120
+#: en/user_customization-packages.ssi:133
+#: en/user_customization-packages.ssi:143
+#: en/user_customization-packages.ssi:153
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:261
+#: en/user_customization-packages.ssi:273
+#: en/user_customization-packages.ssi:283 en/user_examples.ssi:12
+#: en/user_examples.ssi:27 en/user_examples.ssi:37 en/user_examples.ssi:51
+#: en/user_examples.ssi:61 en/user_examples.ssi:77 en/user_examples.ssi:87
+#: en/user_examples.ssi:104 en/user_examples.ssi:114 en/user_examples.ssi:128
+#: en/user_examples.ssi:136 en/user_examples.ssi:151 en/user_examples.ssi:159
+#: en/user_examples.ssi:185 en/user_examples.ssi:206 en/user_examples.ssi:214
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:76 en/user_installation.ssi:84
+#: en/user_installation.ssi:104 en/user_installation.ssi:118
+#: en/user_installation.ssi:135 en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:36
#: en/user_overview.ssi:80 en/user_overview.ssi:88
@@ -78,9 +83,9 @@ msgid "code{"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:121 en/about_manual.ssi:134 en/about_manual.ssi:142
+#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:165
#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
@@ -100,37 +105,43 @@ msgstr ""
#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
#: en/other_live-environment.ssi:138 en/other_procedures.ssi:16
#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
-#: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
-#: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
-#: en/other_use-cases.ssi:137 en/project_bugs.ssi:62 en/user_basics.ssi:36
-#: en/user_basics.ssi:46 en/user_basics.ssi:60 en/user_basics.ssi:72
-#: en/user_basics.ssi:82 en/user_basics.ssi:94 en/user_basics.ssi:106
-#: en/user_basics.ssi:114 en/user_basics.ssi:122 en/user_basics.ssi:132
-#: en/user_basics.ssi:146 en/user_basics.ssi:156 en/user_basics.ssi:164
-#: en/user_basics.ssi:172 en/user_basics.ssi:186 en/user_basics.ssi:194
-#: en/user_basics.ssi:204 en/user_basics.ssi:245 en/user_basics.ssi:257
-#: en/user_basics.ssi:273 en/user_basics.ssi:281 en/user_basics.ssi:308
-#: en/user_basics.ssi:347 en/user_customization-contents.ssi:39
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:70
+#: en/project_bugs.ssi:62 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:60 en/user_basics.ssi:72 en/user_basics.ssi:82
+#: en/user_basics.ssi:94 en/user_basics.ssi:106 en/user_basics.ssi:114
+#: en/user_basics.ssi:122 en/user_basics.ssi:132 en/user_basics.ssi:148
+#: en/user_basics.ssi:158 en/user_basics.ssi:166 en/user_basics.ssi:174
+#: en/user_basics.ssi:188 en/user_basics.ssi:196 en/user_basics.ssi:206
+#: en/user_basics.ssi:247 en/user_basics.ssi:259 en/user_basics.ssi:275
+#: en/user_basics.ssi:283 en/user_basics.ssi:310 en/user_basics.ssi:349
+#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:70
#: en/user_customization-internationalization.ssi:14
#: en/user_customization-internationalization.ssi:22
#: en/user_customization-internationalization.ssi:30
#: en/user_customization-internationalization.ssi:42
-#: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
-#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
-#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
-#: en/user_customization-packages.ssi:107
-#: en/user_customization-packages.ssi:115
-#: en/user_customization-packages.ssi:135
-#: en/user_customization-packages.ssi:172
-#: en/user_customization-packages.ssi:182
-#: en/user_customization-packages.ssi:192
-#: en/user_customization-packages.ssi:202 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 en/user_installation.ssi:108
-#: en/user_installation.ssi:123 en/user_installation.ssi:138
-#: en/user_managing_a_configuration.ssi:31
+#: en/user_customization-packages.ssi:23 en/user_customization-packages.ssi:36
+#: en/user_customization-packages.ssi:48 en/user_customization-packages.ssi:62
+#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:94
+#: en/user_customization-packages.ssi:125
+#: en/user_customization-packages.ssi:139
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:159
+#: en/user_customization-packages.ssi:169
+#: en/user_customization-packages.ssi:181
+#: en/user_customization-packages.ssi:197
+#: en/user_customization-packages.ssi:265
+#: en/user_customization-packages.ssi:277
+#: en/user_customization-packages.ssi:287 en/user_examples.ssi:17
+#: en/user_examples.ssi:31 en/user_examples.ssi:41 en/user_examples.ssi:55
+#: en/user_examples.ssi:65 en/user_examples.ssi:83 en/user_examples.ssi:98
+#: en/user_examples.ssi:108 en/user_examples.ssi:120 en/user_examples.ssi:132
+#: en/user_examples.ssi:147 en/user_examples.ssi:155 en/user_examples.ssi:163
+#: en/user_examples.ssi:194 en/user_examples.ssi:210 en/user_examples.ssi:218
+#: 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
+#: en/user_installation.ssi:108 en/user_installation.ssi:123
+#: en/user_installation.ssi:138 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:74
#: en/user_overview.ssi:84 en/user_overview.ssi:92
@@ -229,8 +240,8 @@ msgstr ""
msgid ""
"#!/bin/sh\n"
"lb config noauto \\\n"
-"\t--architecture i386 \\\n"
-"\t${@}\n"
+"\t--packages-lists \"standard\" \\\n"
+"\t\"${@}\"\n"
msgstr ""
#. type: Plain text
@@ -243,7 +254,7 @@ msgstr ""
#, no-wrap
msgid ""
"#!/bin/sh\n"
-"lb clean noauto ${@}\n"
+"lb clean noauto \"${@}\"\n"
"rm -f config/binary config/bootstrap \\\n"
"\tconfig/chroot config/common config/source\n"
"rm -f binary.log\n"
@@ -256,16 +267,15 @@ msgstr ""
#. type: Plain text
#: en/user_managing_a_configuration.ssi:50
-msgid "#!/bin/sh lb build noauto ${@} 2>&1 | tee binary.log"
+msgid "#!/bin/sh lb build noauto \"${@}\" 2>&1 | tee binary.log"
msgstr ""
#. type: Plain text
#: en/user_managing_a_configuration.ssi:54
msgid ""
-"Edit auto/config, changing or adding any options as you see fit. In the "
-"example above, --architecture is set to i386 so that when the image is built "
-"on an amd64 system, it will not default to building amd64 images. Change "
-"this to an appropriate value for your image (or delete it if you want to use "
-"the default) and add any additional options in continuation lines that "
-"follow."
+"Edit #{auto/config}#, changing or adding any options as you see fit. In the "
+"example above, #{--packages-lists standard}# is set to the default value. "
+"Change this to an appropriate value for your image (or delete it if you want "
+"to use the default) and add any additional options in continuation lines "
+"that follow."
msgstr ""
diff --git a/manual/po/fr/about_manual.ssi.po b/manual/po/fr/about_manual.ssi.po
index 7829de8..3c5046b 100644
--- a/manual/po/fr/about_manual.ssi.po
+++ b/manual/po/fr/about_manual.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0~a8\n"
-"POT-Creation-Date: 2010-10-23 16:43+0300\n"
+"POT-Creation-Date: 2010-11-28 07:21-0400\n"
"PO-Revision-Date: 2010-10-27 23:14+0200\n"
"Last-Translator: Creak <romain.failliot at foolstep.com>\n"
"Language-Team: Français <debian-live at lists.debian.org>\n"
@@ -59,11 +59,37 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:10
+msgid "2~ For the impatient"
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:12
+msgid ""
+"While we believe that everything in this manual is important to at least "
+"some of our users, we realize it is a lot of material to cover and that you "
+"may wish to experience early success using the software before delving into "
+"the details. Therefore, we have provided three tutorials in the {Examples}"
+"#examples section designed to teach you image building and customization "
+"basics. Read {Using the examples}#using-the-examples first, followed by "
+"{Tutorial 1: A standard image}#tutorial-1, {Tutorial 2: A web browser "
+"utility}#tutorial-2 and finally {Tutorial 3: A personal travelling companion}"
+"#tutorial-3. By the end of these tutorials, you will have a taste of what "
+"can be done with Debian Live. We encourage you to return to more in-depth "
+"study of the manual, perhaps next reading {The basics}#the-basics, skimming "
+"or skipping {Building a netboot image}#building-netboot-image, and finishing "
+"by reading the {Customization overview}#customization-overview and the "
+"chapters that follow it. By this point, we hope you are thoroughly excited "
+"by what can be done with Debian Live and motivated to read the rest of the "
+"manual, cover-to-cover."
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:14
msgid "2~terms Terms"
msgstr "2~terms Terminologie"
#. type: Plain text
-#: en/about_manual.ssi:12
+#: en/about_manual.ssi:16
msgid ""
"_* *{Live system}*: An operating system that can boot without installation "
"to a hard drive. Live systems do not alter local operating system(s) or file"
@@ -79,7 +105,7 @@ msgstr ""
"clés USB. Certains peuvent également être démarrés depuis le réseau."
#. type: Plain text
-#: en/about_manual.ssi:14
+#: en/about_manual.ssi:18
msgid ""
"_* *{Debian Live}*: The Debian sub-project which maintains the live-boot, "
"live-build, live-config, and live-manual packages."
@@ -88,7 +114,7 @@ msgstr ""
"boot, live-build, live-config, et live-manual."
#. type: Plain text
-#: en/about_manual.ssi:16
+#: en/about_manual.ssi:20
msgid ""
"_* *{Debian Live system}*: A live system that uses software from the Debian "
"operating system that may be booted from CDs, DVDs, USB sticks, over the "
@@ -101,20 +127,20 @@ msgstr ""
"l'aide du paramètre de démarrage #{fetch=URL}#)."
#. type: Plain text
-#: en/about_manual.ssi:18
+#: en/about_manual.ssi:22
msgid "_* *{Host system}*: The environment used to create the live system."
msgstr ""
"_* *{Système hôte}*: L'environnement utilisé pour créer le système live."
#. type: Plain text
-#: en/about_manual.ssi:20
+#: en/about_manual.ssi:24
msgid "_* *{Target system}*: The environment used to run the live system."
msgstr ""
"_* *{Système de destination}*: L'environnement utilisé pour faire tourner le "
"système live."
#. type: Plain text
-#: en/about_manual.ssi:22
+#: en/about_manual.ssi:26
msgid ""
"_* *{live-boot}*: A collection of scripts used to boot live systems. live-"
"boot was formerly a part of live-initramfs."
@@ -123,7 +149,7 @@ msgstr ""
"systèmes live. live-boot faisait initialement partie de live-initramfs."
#. type: Plain text
-#: en/about_manual.ssi:24
+#: en/about_manual.ssi:28
msgid ""
"_* *{live-build}*: A collection of scripts used to build customized Debian "
"Live systems. live-build was formerly known as live-helper, and even earlier "
@@ -134,7 +160,7 @@ msgstr ""
"live-helper."
#. type: Plain text
-#: en/about_manual.ssi:26
+#: en/about_manual.ssi:30
msgid ""
"_* *{live-config}*: A collection of scripts used to configure a live system "
"during the boot process. live-config was formerly a part of live-initramfs."
@@ -144,7 +170,7 @@ msgstr ""
"initialement partie de live-initramfs."
#. type: Plain text
-#: en/about_manual.ssi:28
+#: en/about_manual.ssi:32
msgid ""
"_* *{live-manual}*: This document is maintained in a package called live-"
"manual."
@@ -153,7 +179,7 @@ msgstr ""
"manual."
#. type: Plain text
-#: en/about_manual.ssi:30
+#: en/about_manual.ssi:34
msgid ""
"_* *{Debian Installer (d-i)}*: The official installation system for the "
"Debian distribution."
@@ -162,7 +188,7 @@ msgstr ""
"distribution Debian."
#. type: Plain text
-#: en/about_manual.ssi:32
+#: en/about_manual.ssi:36
msgid ""
"_* *{Boot parameters}*: Parameters that can be entered at the bootloader "
"prompt to influence the kernel or live-config."
@@ -171,18 +197,18 @@ msgstr ""
"l'invite du bootloader afin de modifier le kernel ou live-config."
#. type: Plain text
-#: en/about_manual.ssi:34
+#: en/about_manual.ssi:38
msgid ""
-"_* *{chroot}*: The chroot program, chroot(8), enables us to run different "
-"instances of the GNU/Linux environment on a single system simultaneously "
-"without rebooting."
+"_* *{chroot}*: The chroot program, #{chroot(8)}#, enables us to run "
+"different instances of the GNU/Linux environment on a single system "
+"simultaneously without rebooting."
msgstr ""
-"_* *{chroot}*: Le programme chroot, chroot(8), nous permet de faire tourner "
-"plusieurs instances concurrentes de l'environnement GNU/Linux sur un système "
-"sans redémarrage."
+"_* *{chroot}*: Le programme chroot, #{chroot(8)}#, nous permet de faire "
+"tourner plusieurs instances concurrentes de l'environnement GNU/Linux sur un "
+"système sans redémarrage."
#. type: Plain text
-#: en/about_manual.ssi:36
+#: en/about_manual.ssi:40
msgid ""
"_* *{Binary image}*: A file containing the live system, such as binary.iso "
"or binary.img."
@@ -191,7 +217,7 @@ msgstr ""
"iso ou binary.img."
#. type: Plain text
-#: en/about_manual.ssi:38
+#: en/about_manual.ssi:42
msgid ""
"_* *{Target distribution}*: The distribution upon which your live system "
"will be based. This can differ from the distribution of your host system."
@@ -201,111 +227,112 @@ msgstr ""
"votre système hôte."
#. type: Plain text
-#: en/about_manual.ssi:40
+#: en/about_manual.ssi:44
msgid ""
-"_* *{Squeeze/Wheezy/Sid (stable/testing/unstable)}*: The stable distribution "
-"contains the latest officially released distribution of Debian. The testing "
-"distribution is the staging area for the next stable release. A major "
-"advantage of using this distribution is that it has more recent versions of "
-"software relative to the stable release. The unstable distribution is where "
-"active development of Debian occurs. Generally, this distribution is run by "
-"developers and those who like to live on the edge."
-msgstr ""
-"_* *{Squeeze/Wheezy/Sid (stable/testing/unstable)}*: La distribution stable "
-"contient la dernière version officielle de Debian. La distribution testing "
-"est la future version stable où seuls les paquets suffisamment matures "
-"peuvent entrer. Un avantage de cette distribution est qu'elle contient des "
-"logiciels de versions plus récentes que la version stable. La distribution "
-"unstable est en constante évolution. En général cette distribution est "
-"utilisée par les développeurs et ceux qui aiment le risque."
+"_* *{Squeeze/Wheezy/Sid (stable/testing/unstable)}*: Debian codenames for "
+"releases. At the time of writing, Squeeze is the current *{stable}* release "
+"and Wheezy is the current *{testing}* release. Sid will always be a synonym "
+"for the *{unstable}* release. Throughout the manual, we tend to use "
+"codenames for the releases, as that is what is supported by the tools "
+"themselves."
+msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:42
+#: en/about_manual.ssi:46
msgid ""
-"At the time of writing, Squeeze is the current stable release and Wheezy is "
-"the current testing release. Sid will always be a synonym for the unstable "
-"release."
+"The *{stable}* distribution contains the latest officially released "
+"distribution of Debian. The *{testing}* distribution is the staging area for "
+"the next *{stable}* release. A major advantage of using this distribution is "
+"that it has more recent versions of software relative to the *{stable}* "
+"release. The *{unstable}* distribution is where active development of Debian "
+"occurs. Generally, this distribution is run by developers and those who like "
+"to live on the edge."
msgstr ""
-"Au moment d'écrire ce document, Squeeze est la version Stable et Wheezy est "
-"la version testing. Sid restera toujours synonyme de version unstable."
+"La distribution *{stable}* contient la dernière version officielle de "
+"Debian. La distribution *{testing}* est la future version stable où seuls "
+"les paquets suffisamment matures peuvent entrer. Un avantage de cette "
+"distribution est qu'elle contient des logiciels de versions plus récentes "
+"que la version *{stable}*. La distribution *{unstable}* est en constante "
+"évolution. En général cette distribution est utilisée par les développeurs "
+"et ceux qui aiment le risque."
#. type: Plain text
-#: en/about_manual.ssi:44
+#: en/about_manual.ssi:48
msgid "2~ Authors"
msgstr "2~ Auteurs"
#. type: Plain text
-#: en/about_manual.ssi:46
+#: en/about_manual.ssi:50
msgid "A list of authors (in alphabetical order):"
msgstr "La liste des auteurs (dans l'ordre alphabétique):"
#. type: Plain text
-#: en/about_manual.ssi:48
+#: en/about_manual.ssi:52
msgid "_* Ben Armstrong"
msgstr "_* Ben Armstrong"
#. type: Plain text
-#: en/about_manual.ssi:50
+#: en/about_manual.ssi:54
msgid "_* Brendan Sleight"
msgstr "_* Brendan Sleight"
#. type: Plain text
-#: en/about_manual.ssi:52
+#: en/about_manual.ssi:56
msgid "_* Chris Lamb"
msgstr "_* Chris Lamb"
#. type: Plain text
-#: en/about_manual.ssi:54
+#: en/about_manual.ssi:58
msgid "_* Daniel Baumann"
msgstr "_* Daniel Baumann"
#. type: Plain text
-#: en/about_manual.ssi:56
+#: en/about_manual.ssi:60
msgid "_* Franklin Piat"
msgstr "_* Franklin Piat"
#. type: Plain text
-#: en/about_manual.ssi:58
+#: en/about_manual.ssi:62
msgid "_* Jonas Stein"
msgstr "_* Jonas Stein"
#. type: Plain text
-#: en/about_manual.ssi:60
+#: en/about_manual.ssi:64
msgid "_* Kai Hendry"
msgstr "_* Kai Hendry"
#. type: Plain text
-#: en/about_manual.ssi:62
+#: en/about_manual.ssi:66
msgid "_* Marco Amadori"
msgstr "_* Marco Amadori"
#. type: Plain text
-#: en/about_manual.ssi:64
+#: en/about_manual.ssi:68
msgid "_* Mathieu Geli"
msgstr "_* Mathieu Geli"
#. type: Plain text
-#: en/about_manual.ssi:66
+#: en/about_manual.ssi:70
msgid "_* Matthias Kirschner"
msgstr "_* Matthias Kirschner"
#. type: Plain text
-#: en/about_manual.ssi:68
+#: en/about_manual.ssi:72
msgid "_* Richard Nelson"
msgstr "_* Richard Nelson"
#. type: Plain text
-#: en/about_manual.ssi:70
+#: en/about_manual.ssi:74
msgid "_* Trent W. Buck"
msgstr "_* Trent W. Buck"
#. type: Plain text
-#: en/about_manual.ssi:72
+#: en/about_manual.ssi:76
msgid "2~ Contributing to this document"
msgstr "2~ Contribuer à ce document"
#. type: Plain text
-#: en/about_manual.ssi:74
+#: en/about_manual.ssi:78
msgid ""
"This manual is intended as a community project and all proposals for "
"improvements and contributions are extremely welcome. The preferred way to "
@@ -318,7 +345,7 @@ msgstr ""
"vous plaît voir {Contact}#contact pour plus d'informations."
#. type: Plain text
-#: en/about_manual.ssi:76
+#: en/about_manual.ssi:80
msgid ""
"When submitting a contribution, please clearly identify its copyright holder "
"and include the licensing statement. Note that to be accepted, the "
@@ -331,7 +358,7 @@ msgstr ""
"reste du document, c'est-à-dire la GPL version 3 ou ultérieure."
#. type: Plain text
-#: en/about_manual.ssi:78
+#: en/about_manual.ssi:82
msgid ""
"The sources for this manual are maintained using the Git version control "
"system. You can checkout the latest copy by executing:"
@@ -340,79 +367,87 @@ msgstr ""
"versions Git. Vous pouvez obtenir la dernière copie en exécutant:"
#. type: Plain text
-#: en/about_manual.ssi:80 en/about_manual.ssi:88 en/about_manual.ssi:96
-#: en/about_manual.ssi:108 en/about_manual.ssi:121 en/about_manual.ssi:134
-#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
-#: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
-#: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
-#: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
-#: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
-#: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
-#: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
-#: en/other_faq.ssi:41 en/other_faq.ssi:83 en/other_faq.ssi:103
-#: en/other_faq.ssi:117 en/other_faq.ssi:137 en/other_faq.ssi:151
-#: en/other_faq.ssi:198 en/other_faq.ssi:245 en/other_faq.ssi:261
-#: en/other_faq.ssi:287 en/other_faq.ssi:299 en/other_faq.ssi:314
-#: en/other_faq.ssi:333 en/other_faq.ssi:345 en/other_faq.ssi:353
-#: en/other_faq.ssi:364 en/other_faq.ssi:374 en/other_howtos.ssi:16
-#: en/other_howtos.ssi:43 en/other_live-environment.ssi:14
-#: en/other_live-environment.ssi:30 en/other_live-environment.ssi:51
-#: en/other_live-environment.ssi:61 en/other_live-environment.ssi:69
-#: en/other_live-environment.ssi:77 en/other_live-environment.ssi:85
-#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
-#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
-#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
-#: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
-#: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
-#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111 en/user_basics.ssi:34
-#: en/user_basics.ssi:44 en/user_basics.ssi:56 en/user_basics.ssi:68
-#: en/user_basics.ssi:80 en/user_basics.ssi:92 en/user_basics.ssi:106
-#: en/user_basics.ssi:114 en/user_basics.ssi:122 en/user_basics.ssi:132
-#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
-#: en/user_basics.ssi:172 en/user_basics.ssi:186 en/user_basics.ssi:194
-#: en/user_basics.ssi:204 en/user_basics.ssi:224 en/user_basics.ssi:257
-#: en/user_basics.ssi:273 en/user_basics.ssi:281 en/user_basics.ssi:301
-#: en/user_basics.ssi:326 en/user_customization-contents.ssi:34
-#: en/user_customization-contents.ssi:43 en/user_customization-contents.ssi:66
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
+#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
+#: en/about_manual.ssi:170 en/other_coding-style.ssi:28
+#: en/other_coding-style.ssi:38 en/other_coding-style.ssi:51
+#: en/other_coding-style.ssi:61 en/other_coding-style.ssi:88
+#: en/other_coding-style.ssi:96 en/other_coding-style.ssi:106
+#: en/other_coding-style.ssi:117 en/other_common-tasks.ssi:32
+#: en/other_customization-backports.ssi:8 en/other_customization-bootup.ssi:30
+#: en/other_customization-bootup.ssi:39 en/other_faq.ssi:41
+#: en/other_faq.ssi:83 en/other_faq.ssi:103 en/other_faq.ssi:117
+#: en/other_faq.ssi:137 en/other_faq.ssi:151 en/other_faq.ssi:198
+#: en/other_faq.ssi:245 en/other_faq.ssi:261 en/other_faq.ssi:287
+#: en/other_faq.ssi:299 en/other_faq.ssi:314 en/other_faq.ssi:333
+#: en/other_faq.ssi:345 en/other_faq.ssi:353 en/other_faq.ssi:364
+#: en/other_faq.ssi:374 en/other_howtos.ssi:16 en/other_howtos.ssi:43
+#: en/other_live-environment.ssi:14 en/other_live-environment.ssi:30
+#: en/other_live-environment.ssi:51 en/other_live-environment.ssi:61
+#: en/other_live-environment.ssi:69 en/other_live-environment.ssi:77
+#: en/other_live-environment.ssi:85 en/other_live-environment.ssi:93
+#: en/other_live-environment.ssi:116 en/other_live-environment.ssi:124
+#: en/other_live-environment.ssi:133 en/other_procedures.ssi:12
+#: en/other_procedures.ssi:46 en/other_procedures.ssi:58
+#: en/project_bugs.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/user_basics.ssi:54 en/user_basics.ssi:66 en/user_basics.ssi:78
+#: en/user_basics.ssi:88 en/user_basics.ssi:102 en/user_basics.ssi:110
+#: en/user_basics.ssi:118 en/user_basics.ssi:128 en/user_basics.ssi:142
+#: en/user_basics.ssi:154 en/user_basics.ssi:162 en/user_basics.ssi:170
+#: en/user_basics.ssi:184 en/user_basics.ssi:192 en/user_basics.ssi:202
+#: en/user_basics.ssi:222 en/user_basics.ssi:255 en/user_basics.ssi:271
+#: en/user_basics.ssi:279 en/user_basics.ssi:299 en/user_basics.ssi:324
+#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
+#: en/user_customization-contents.ssi:66
#: en/user_customization-internationalization.ssi:10
#: en/user_customization-internationalization.ssi:18
#: en/user_customization-internationalization.ssi:26
#: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:16 en/user_customization-packages.ssi:24
-#: en/user_customization-packages.ssi:36 en/user_customization-packages.ssi:45
-#: en/user_customization-packages.ssi:59 en/user_customization-packages.ssi:73
-#: en/user_customization-packages.ssi:103
-#: en/user_customization-packages.ssi:111
-#: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:166
-#: en/user_customization-packages.ssi:176
-#: en/user_customization-packages.ssi:186
-#: en/user_customization-packages.ssi:196 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:104
-#: en/user_installation.ssi:118 en/user_installation.ssi:135
-#: en/user_managing_a_configuration.ssi:24
+#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
+#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
+#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:90
+#: en/user_customization-packages.ssi:120
+#: en/user_customization-packages.ssi:133
+#: en/user_customization-packages.ssi:143
+#: en/user_customization-packages.ssi:153
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:261
+#: en/user_customization-packages.ssi:273
+#: en/user_customization-packages.ssi:283 en/user_examples.ssi:12
+#: en/user_examples.ssi:27 en/user_examples.ssi:37 en/user_examples.ssi:51
+#: en/user_examples.ssi:61 en/user_examples.ssi:77 en/user_examples.ssi:87
+#: en/user_examples.ssi:104 en/user_examples.ssi:114 en/user_examples.ssi:128
+#: en/user_examples.ssi:136 en/user_examples.ssi:151 en/user_examples.ssi:159
+#: en/user_examples.ssi:185 en/user_examples.ssi:206 en/user_examples.ssi:214
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:76 en/user_installation.ssi:84
+#: en/user_installation.ssi:104 en/user_installation.ssi:118
+#: en/user_installation.ssi:135 en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
-#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:46
-#: en/user_overview.ssi:90 en/user_overview.ssi:98
+#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:36
+#: en/user_overview.ssi:80 en/user_overview.ssi:88
msgid "code{"
msgstr "code{"
#. type: Plain text
-#: en/about_manual.ssi:82
+#: en/about_manual.ssi:86
msgid "$ git clone git://live.debian.net/git/live-manual.git"
msgstr "$ git clone git://live.debian.net/git/live-manual.git"
#. type: Plain text
-#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
-#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
-#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
-#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
-#: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
-#: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
+#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:166
+#: en/about_manual.ssi:173 en/other_coding-style.ssi:34
+#: en/other_coding-style.ssi:45 en/other_coding-style.ssi:57
+#: en/other_coding-style.ssi:68 en/other_coding-style.ssi:92
+#: en/other_coding-style.ssi:100 en/other_coding-style.ssi:113
+#: en/other_coding-style.ssi:124 en/other_common-tasks.ssi:36
+#: en/other_customization-backports.ssi:16
#: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
#: en/other_faq.ssi:37 en/other_faq.ssi:46 en/other_faq.ssi:92
#: en/other_faq.ssi:108 en/other_faq.ssi:141 en/other_faq.ssi:155
@@ -427,45 +462,51 @@ msgstr "$ git clone git://live.debian.net/git/live-manual.git"
#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
#: en/other_live-environment.ssi:138 en/other_procedures.ssi:16
#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
-#: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
-#: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
-#: en/other_use-cases.ssi:137 en/user_basics.ssi:38 en/user_basics.ssi:48
-#: en/user_basics.ssi:62 en/user_basics.ssi:72 en/user_basics.ssi:86
-#: en/user_basics.ssi:98 en/user_basics.ssi:110 en/user_basics.ssi:118
-#: en/user_basics.ssi:126 en/user_basics.ssi:136 en/user_basics.ssi:150
-#: en/user_basics.ssi:160 en/user_basics.ssi:168 en/user_basics.ssi:176
-#: en/user_basics.ssi:190 en/user_basics.ssi:198 en/user_basics.ssi:208
-#: en/user_basics.ssi:249 en/user_basics.ssi:261 en/user_basics.ssi:277
-#: en/user_basics.ssi:285 en/user_basics.ssi:312 en/user_basics.ssi:351
+#: en/project_bugs.ssi:62 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:60 en/user_basics.ssi:72 en/user_basics.ssi:82
+#: en/user_basics.ssi:94 en/user_basics.ssi:106 en/user_basics.ssi:114
+#: en/user_basics.ssi:122 en/user_basics.ssi:132 en/user_basics.ssi:148
+#: en/user_basics.ssi:158 en/user_basics.ssi:166 en/user_basics.ssi:174
+#: en/user_basics.ssi:188 en/user_basics.ssi:196 en/user_basics.ssi:206
+#: en/user_basics.ssi:247 en/user_basics.ssi:259 en/user_basics.ssi:275
+#: en/user_basics.ssi:283 en/user_basics.ssi:310 en/user_basics.ssi:349
#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
#: en/user_customization-contents.ssi:70
#: en/user_customization-internationalization.ssi:14
#: en/user_customization-internationalization.ssi:22
#: en/user_customization-internationalization.ssi:30
#: en/user_customization-internationalization.ssi:42
-#: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
-#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
-#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
-#: en/user_customization-packages.ssi:107
-#: en/user_customization-packages.ssi:115
-#: en/user_customization-packages.ssi:135
-#: en/user_customization-packages.ssi:172
-#: en/user_customization-packages.ssi:182
-#: en/user_customization-packages.ssi:192
-#: en/user_customization-packages.ssi:202 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 en/user_installation.ssi:108
-#: en/user_installation.ssi:123 en/user_installation.ssi:138
-#: en/user_managing_a_configuration.ssi:31
+#: en/user_customization-packages.ssi:23 en/user_customization-packages.ssi:36
+#: en/user_customization-packages.ssi:48 en/user_customization-packages.ssi:62
+#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:94
+#: en/user_customization-packages.ssi:125
+#: en/user_customization-packages.ssi:139
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:159
+#: en/user_customization-packages.ssi:169
+#: en/user_customization-packages.ssi:181
+#: en/user_customization-packages.ssi:197
+#: en/user_customization-packages.ssi:265
+#: en/user_customization-packages.ssi:277
+#: en/user_customization-packages.ssi:287 en/user_examples.ssi:17
+#: en/user_examples.ssi:31 en/user_examples.ssi:41 en/user_examples.ssi:55
+#: en/user_examples.ssi:65 en/user_examples.ssi:83 en/user_examples.ssi:98
+#: en/user_examples.ssi:108 en/user_examples.ssi:120 en/user_examples.ssi:132
+#: en/user_examples.ssi:147 en/user_examples.ssi:155 en/user_examples.ssi:163
+#: en/user_examples.ssi:194 en/user_examples.ssi:210 en/user_examples.ssi:218
+#: 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
+#: en/user_installation.ssi:108 en/user_installation.ssi:123
+#: en/user_installation.ssi:138 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
-#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:84
-#: en/user_overview.ssi:94 en/user_overview.ssi:102
+#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:74
+#: en/user_overview.ssi:84 en/user_overview.ssi:92
msgid "}code"
msgstr "}code"
#. type: Plain text
-#: en/about_manual.ssi:86
+#: en/about_manual.ssi:90
msgid ""
"Prior to submission of your contribution, please preview your work. To "
"preview the live-manual, ensure the packages needed for building are "
@@ -476,12 +517,12 @@ msgstr ""
"sont installés en exécutant:"
#. type: Plain text
-#: en/about_manual.ssi:90
+#: en/about_manual.ssi:94
msgid "# apt-get install make po4a sisu-complete"
msgstr "# apt-get install make po4a sisu-complete"
#. type: Plain text
-#: en/about_manual.ssi:94
+#: en/about_manual.ssi:98
msgid ""
"You may build the live-manual from the top level directory of your git "
"checkout by executing:"
@@ -490,17 +531,30 @@ msgstr ""
"checkout git en exécutant:"
#. type: Plain text
-#: en/about_manual.ssi:98
+#: en/about_manual.ssi:102
msgid "$ make build"
msgstr "$ make build"
#. type: Plain text
-#: en/about_manual.ssi:102
+#: en/about_manual.ssi:106
+msgid ""
+"Since it takes a while to build the manual in all supported languages, you "
+"may find it convenient when proofing to build for only one language, e.g. by "
+"executing:"
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:110
+msgid "$ make build LANGUAGES=en"
+msgstr "$ make build LANGUAGES=en"
+
+#. type: Plain text
+#: en/about_manual.ssi:114
msgid "3~ Applying patches"
msgstr "3~ Appliquer des patches"
#. type: Plain text
-#: en/about_manual.ssi:104
+#: en/about_manual.ssi:116
msgid ""
"Directly commiting to the repository is possible by anyone. However, we ask "
"you to send bigger changes to the mailing list to discuss them first. In "
@@ -512,63 +566,63 @@ msgstr ""
"répertoire, les étapes suivantes sont nécessaires."
#. type: Plain text
-#: en/about_manual.ssi:106
+#: en/about_manual.ssi:118
msgid "_* Fetch the public commit key:"
msgstr "_* Téléchargez la clé publique:"
#. type: Plain text
-#: en/about_manual.ssi:115
+#: en/about_manual.ssi:127
#, no-wrap
msgid ""
"$ mkdir -p ~/.ssh/identity.d\n"
-"$ wget http://live.debian.net/other/keys/live-manual@debian-live \\\n"
-"\t-O ~/.ssh/identity.d/live-manual at debian-live\n"
-"$ wget http://live.debian.net/other/keys/live-manual@debian-live.pub \\\n"
-"\t-O ~/.ssh/identity.d/live-manual at debian-live.pub\n"
-"$ chmod 0600 ~/.ssh/identity.d/live-manual at debian-live*\n"
+"$ wget http://live.debian.net/other/keys/gitosis@live.debian.net \\\n"
+"\t-O ~/.ssh/identity.d/live.debian.net\n"
+"$ wget http://live.debian.net/other/keys/gitosis@live.debian.net.pub \\\n"
+"\t-O ~/.ssh/identity.d/live.debian.net.pub\n"
+"$ chmod 0600 ~/.ssh/identity.d/live.debian.net*\n"
msgstr ""
"$ mkdir -p ~/.ssh/identity.d\n"
-"$ wget http://live.debian.net/other/keys/live-manual@debian-live \\\n"
-"\t-O ~/.ssh/identity.d/live-manual at debian-live\n"
-"$ wget http://live.debian.net/other/keys/live-manual@debian-live.pub \\\n"
-"\t-O ~/.ssh/identity.d/live-manual at debian-live.pub\n"
-"$ chmod 0600 ~/.ssh/identity.d/live-manual at debian-live*\n"
+"$ wget http://live.debian.net/other/keys/gitosis@live.debian.net \\\n"
+"\t-O ~/.ssh/identity.d/gitosis at live.debian.net\n"
+"$ wget http://live.debian.net/other/keys/gitosis@live.debian.net.pub \\\n"
+"\t-O ~/.ssh/identity.d/gitosis at live.debian.net.pub\n"
+"$ chmod 0600 ~/.ssh/identity.d/gitosis at live.debian.net*\n"
#. type: Plain text
-#: en/about_manual.ssi:119
+#: en/about_manual.ssi:131
msgid "_* Add the following section to your openssh-client config:"
msgstr "_* Ajoutez la section suivante à votre configuration openssh-client:"
#. type: Plain text
-#: en/about_manual.ssi:128
+#: en/about_manual.ssi:140
#, no-wrap
msgid ""
"$ cat >> ~/.ssh/config << EOF\n"
"Host live.debian.net\n"
" Hostname live.debian.net\n"
" User gitosis\n"
-" IdentityFile ~/.ssh/identity.d/live-manual at debian-live\n"
+" IdentityFile ~/.ssh/identity.d/gitosis at live.debian.net\n"
"EOF\n"
msgstr ""
"$ cat >> ~/.ssh/config << EOF\n"
"Host live.debian.net\n"
" Hostname live.debian.net\n"
" User gitosis\n"
-" IdentityFile ~/.ssh/identity.d/live-manual at debian-live\n"
+" IdentityFile ~/.ssh/identity.d/gitosis at live.debian.net\n"
"EOF\n"
#. type: Plain text
-#: en/about_manual.ssi:132
+#: en/about_manual.ssi:144
msgid "_* Checkout a clone of the manual through ssh:"
msgstr "_* Clonez le manuel via ssh:"
#. type: Plain text
-#: en/about_manual.ssi:136
+#: en/about_manual.ssi:148
msgid "$ git clone gitosis at live.debian.net:/live-manual.git"
msgstr "$ git clone gitosis at live.debian.net:/live-manual.git"
#. type: Plain text
-#: en/about_manual.ssi:140
+#: en/about_manual.ssi:152
msgid ""
"_* After editing the files in manual/en/, please call the 'commit' target in "
"the top level directory to sanitize the files and update the translation "
@@ -579,12 +633,12 @@ msgstr ""
"mettre à jour les fichiers de traduction:"
#. type: Plain text
-#: en/about_manual.ssi:144
+#: en/about_manual.ssi:156
msgid "$ make commit"
msgstr "$ make commit"
#. type: Plain text
-#: en/about_manual.ssi:148
+#: en/about_manual.ssi:160
msgid ""
"_* After sanitizing commit the changes. Write commit messages, that consist "
"of full useful sentences, starting with a capital letter and ending with a "
@@ -597,16 +651,16 @@ msgstr ""
"Removing/Correcting/':"
#. type: Plain text
-#: en/about_manual.ssi:152
+#: en/about_manual.ssi:164
msgid "$ git commit -a"
msgstr "$ git commit -a"
#. type: Plain text
-#: en/about_manual.ssi:156
+#: en/about_manual.ssi:168
msgid "_* Push the commit to the server:"
msgstr "_* Envoyez votre commit au serveur:"
#. type: Plain text
-#: en/about_manual.ssi:160
+#: en/about_manual.ssi:172
msgid "$ git push"
msgstr "$ git push"
diff --git a/manual/po/fr/about_project.ssi.po b/manual/po/fr/about_project.ssi.po
index d4d9b96..1e4269a 100644
--- a/manual/po/fr/about_project.ssi.po
+++ b/manual/po/fr/about_project.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-22 07:52-0200\n"
+"POT-Creation-Date: 2010-11-27 10:30-0400\n"
"PO-Revision-Date: 2010-10-16 11:30-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -51,7 +51,7 @@ msgstr ""
#. type: Plain text
#: en/about_project.ssi:14
-msgid "_* They mix different distributions, e.g. testing and unstable."
+msgid "_* They mix different distributions, e.g. *{testing}* and *{unstable}*."
msgstr ""
#. type: Plain text
diff --git a/manual/po/fr/live-manual.ssm.po b/manual/po/fr/live-manual.ssm.po
index f228ca9..8ea2a4c 100644
--- a/manual/po/fr/live-manual.ssm.po
+++ b/manual/po/fr/live-manual.ssm.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-11-13 16:15+0100\n"
+"POT-Creation-Date: 2010-11-29 14:16-0400\n"
"PO-Revision-Date: 2010-10-21 07:06-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -45,7 +45,7 @@ msgstr ""
#, no-wrap
msgid ""
"@date:\n"
-" :published: 2010-11-13\n"
+" :published: 2010-11-29\n"
msgstr ""
#. type: Plain text
@@ -58,7 +58,7 @@ msgstr ""
#, no-wrap
msgid ""
"@make:\n"
-" :bold: /Squeeze|squeeze|Stable|stable|Wheezy|wheezy|Testing|testing|Sid|sid|Unstable|unstable/\n"
+" :bold: /Squeeze|squeeze|Wheezy|wheezy|Sid|sid/\n"
" :italics: /live-boot|live-build|live-config|live-magic|live-manual|live-installer|debian-installer-launcher/\n"
" :num_top: 1\n"
" :skin: skin_debian-live\n"
diff --git a/manual/po/fr/project_bugs.ssi.po b/manual/po/fr/project_bugs.ssi.po
index 17e6d7d..4d98600 100644
--- a/manual/po/fr/project_bugs.ssi.po
+++ b/manual/po/fr/project_bugs.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-27 21:40-0200\n"
+"POT-Creation-Date: 2010-11-27 10:30-0400\n"
"PO-Revision-Date: 2010-10-25 23:27+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -17,9 +17,9 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
#. type: Plain text
-#: en/about_manual.ssi:80 en/about_manual.ssi:88 en/about_manual.ssi:96
-#: en/about_manual.ssi:108 en/about_manual.ssi:121 en/about_manual.ssi:134
-#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
+#: en/about_manual.ssi:112 en/about_manual.ssi:125 en/about_manual.ssi:138
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
#: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
#: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
#: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
@@ -39,48 +39,49 @@ msgstr ""
#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
-#: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
-#: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
-#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111
-#: en/project_bugs.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
-#: en/user_basics.ssi:54 en/user_basics.ssi:66 en/user_basics.ssi:78
-#: en/user_basics.ssi:88 en/user_basics.ssi:102 en/user_basics.ssi:110
-#: en/user_basics.ssi:118 en/user_basics.ssi:128 en/user_basics.ssi:140
-#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
-#: en/user_basics.ssi:182 en/user_basics.ssi:190 en/user_basics.ssi:200
-#: en/user_basics.ssi:220 en/user_basics.ssi:253 en/user_basics.ssi:269
-#: en/user_basics.ssi:277 en/user_basics.ssi:297 en/user_basics.ssi:322
-#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
-#: en/user_customization-contents.ssi:66
+#: en/other_procedures.ssi:58 en/project_bugs.ssi:58 en/user_basics.ssi:32
+#: en/user_basics.ssi:42 en/user_basics.ssi:54 en/user_basics.ssi:66
+#: en/user_basics.ssi:78 en/user_basics.ssi:88 en/user_basics.ssi:102
+#: en/user_basics.ssi:110 en/user_basics.ssi:118 en/user_basics.ssi:128
+#: en/user_basics.ssi:142 en/user_basics.ssi:154 en/user_basics.ssi:162
+#: en/user_basics.ssi:170 en/user_basics.ssi:184 en/user_basics.ssi:192
+#: en/user_basics.ssi:202 en/user_basics.ssi:222 en/user_basics.ssi:255
+#: en/user_basics.ssi:271 en/user_basics.ssi:279 en/user_basics.ssi:299
+#: en/user_basics.ssi:324 en/user_customization-contents.ssi:34
+#: en/user_customization-contents.ssi:43 en/user_customization-contents.ssi:66
#: en/user_customization-internationalization.ssi:10
#: en/user_customization-internationalization.ssi:18
#: en/user_customization-internationalization.ssi:26
#: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:16 en/user_customization-packages.ssi:24
-#: en/user_customization-packages.ssi:36 en/user_customization-packages.ssi:45
-#: en/user_customization-packages.ssi:59 en/user_customization-packages.ssi:73
-#: en/user_customization-packages.ssi:103
-#: en/user_customization-packages.ssi:111
-#: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:166
-#: en/user_customization-packages.ssi:176
-#: en/user_customization-packages.ssi:186
-#: en/user_customization-packages.ssi:196 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:104
-#: en/user_installation.ssi:118 en/user_installation.ssi:135
-#: en/user_managing_a_configuration.ssi:24
+#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
+#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
+#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:90
+#: en/user_customization-packages.ssi:120
+#: en/user_customization-packages.ssi:133
+#: en/user_customization-packages.ssi:143
+#: en/user_customization-packages.ssi:153
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:261
+#: en/user_customization-packages.ssi:273
+#: en/user_customization-packages.ssi:283 en/user_examples.ssi:12
+#: en/user_examples.ssi:27 en/user_examples.ssi:37 en/user_examples.ssi:75
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:76 en/user_installation.ssi:84
+#: en/user_installation.ssi:104 en/user_installation.ssi:118
+#: en/user_installation.ssi:135 en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
-#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:46
-#: en/user_overview.ssi:90 en/user_overview.ssi:98
+#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:36
+#: en/user_overview.ssi:80 en/user_overview.ssi:88
msgid "code{"
msgstr "code{"
#. type: Plain text
-#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:121 en/about_manual.ssi:134 en/about_manual.ssi:142
+#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:165
#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
@@ -100,40 +101,42 @@ msgstr "code{"
#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
#: en/other_live-environment.ssi:138 en/other_procedures.ssi:16
#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
-#: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
-#: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
-#: en/other_use-cases.ssi:137 en/project_bugs.ssi:62 en/user_basics.ssi:36
-#: en/user_basics.ssi:46 en/user_basics.ssi:60 en/user_basics.ssi:72
-#: en/user_basics.ssi:82 en/user_basics.ssi:94 en/user_basics.ssi:106
-#: en/user_basics.ssi:114 en/user_basics.ssi:122 en/user_basics.ssi:132
-#: en/user_basics.ssi:146 en/user_basics.ssi:156 en/user_basics.ssi:164
-#: en/user_basics.ssi:172 en/user_basics.ssi:186 en/user_basics.ssi:194
-#: en/user_basics.ssi:204 en/user_basics.ssi:245 en/user_basics.ssi:257
-#: en/user_basics.ssi:273 en/user_basics.ssi:281 en/user_basics.ssi:308
-#: en/user_basics.ssi:347 en/user_customization-contents.ssi:39
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:70
+#: en/project_bugs.ssi:62 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:60 en/user_basics.ssi:72 en/user_basics.ssi:82
+#: en/user_basics.ssi:94 en/user_basics.ssi:106 en/user_basics.ssi:114
+#: en/user_basics.ssi:122 en/user_basics.ssi:132 en/user_basics.ssi:148
+#: en/user_basics.ssi:158 en/user_basics.ssi:166 en/user_basics.ssi:174
+#: en/user_basics.ssi:188 en/user_basics.ssi:196 en/user_basics.ssi:206
+#: en/user_basics.ssi:247 en/user_basics.ssi:259 en/user_basics.ssi:275
+#: en/user_basics.ssi:283 en/user_basics.ssi:310 en/user_basics.ssi:349
+#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:70
#: en/user_customization-internationalization.ssi:14
#: en/user_customization-internationalization.ssi:22
#: en/user_customization-internationalization.ssi:30
#: en/user_customization-internationalization.ssi:42
-#: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
-#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
-#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
-#: en/user_customization-packages.ssi:107
-#: en/user_customization-packages.ssi:115
-#: en/user_customization-packages.ssi:135
-#: en/user_customization-packages.ssi:172
-#: en/user_customization-packages.ssi:182
-#: en/user_customization-packages.ssi:192
-#: en/user_customization-packages.ssi:202 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 en/user_installation.ssi:108
-#: en/user_installation.ssi:123 en/user_installation.ssi:138
-#: en/user_managing_a_configuration.ssi:31
+#: en/user_customization-packages.ssi:23 en/user_customization-packages.ssi:36
+#: en/user_customization-packages.ssi:48 en/user_customization-packages.ssi:62
+#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:94
+#: en/user_customization-packages.ssi:125
+#: en/user_customization-packages.ssi:139
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:159
+#: en/user_customization-packages.ssi:169
+#: en/user_customization-packages.ssi:181
+#: en/user_customization-packages.ssi:197
+#: en/user_customization-packages.ssi:265
+#: en/user_customization-packages.ssi:277
+#: en/user_customization-packages.ssi:287 en/user_examples.ssi:17
+#: en/user_examples.ssi:31 en/user_examples.ssi:41 en/user_examples.ssi:84
+#: 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
+#: en/user_installation.ssi:108 en/user_installation.ssi:123
+#: en/user_installation.ssi:138 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
-#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:84
-#: en/user_overview.ssi:94 en/user_overview.ssi:102
+#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:74
+#: en/user_overview.ssi:84 en/user_overview.ssi:92
msgid "}code"
msgstr "}code"
@@ -191,16 +194,17 @@ msgstr ""
#. type: Plain text
#: en/project_bugs.ssi:18
msgid ""
-"Due to the nature of Debian testing and Debian unstable distributions being "
-"a moving target, building a live system may not always be possible."
+"Due to the nature of Debian *{testing}* and Debian *{unstable}* "
+"distributions being a moving target, building a live system may not always "
+"be possible."
msgstr ""
#. type: Plain text
#: en/project_bugs.ssi:20
msgid ""
-"If this is a problem, do not build a system based on testing or unstable, "
-"but go with stable. live-build does always default to the current stable "
-"release."
+"If this is a problem, do not build a system based on *{testing}* or *"
+"{unstable}*, but go with *{stable}*. live-build does always default to the "
+"current *{stable}* release."
msgstr ""
#. type: Plain text
@@ -215,9 +219,10 @@ msgstr ""
msgid ""
"It is out of the scope of this manual to train you in correctly identifying "
"and fixing problems in packages of the development distributions, however, "
-"there are two things you can always try: When not succeeding to build "
-"testing, try if unstable works. If unstable does not work either, revert to "
-"testing and pinning the newer version of the failing package from unstable."
+"there are two things you can always try: When not succeeding to build *"
+"{testing}*, try if *{unstable}* works. If *{unstable}* does not work either, "
+"revert to *{testing}* and pinning the newer version of the failing package "
+"from *{unstable}*."
msgstr ""
#. type: Plain text
diff --git a/manual/po/fr/user_basics.ssi.po b/manual/po/fr/user_basics.ssi.po
index bdde68f..b066784 100644
--- a/manual/po/fr/user_basics.ssi.po
+++ b/manual/po/fr/user_basics.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-11-01 06:47-0200\n"
+"POT-Creation-Date: 2010-11-28 07:16-0400\n"
"PO-Revision-Date: 2010-10-20 06:53-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -17,9 +17,9 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
#. type: Plain text
-#: en/about_manual.ssi:80 en/about_manual.ssi:88 en/about_manual.ssi:96
-#: en/about_manual.ssi:108 en/about_manual.ssi:121 en/about_manual.ssi:134
-#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
+#: en/about_manual.ssi:112 en/about_manual.ssi:125 en/about_manual.ssi:138
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
#: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
#: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
#: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
@@ -39,38 +39,43 @@ msgstr ""
#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
-#: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
-#: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
-#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111
-#: en/project_bugs.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
-#: en/user_basics.ssi:54 en/user_basics.ssi:66 en/user_basics.ssi:78
-#: en/user_basics.ssi:88 en/user_basics.ssi:102 en/user_basics.ssi:110
-#: en/user_basics.ssi:118 en/user_basics.ssi:128 en/user_basics.ssi:140
-#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
-#: en/user_basics.ssi:182 en/user_basics.ssi:190 en/user_basics.ssi:200
-#: en/user_basics.ssi:220 en/user_basics.ssi:253 en/user_basics.ssi:269
-#: en/user_basics.ssi:277 en/user_basics.ssi:297 en/user_basics.ssi:322
-#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
-#: en/user_customization-contents.ssi:66
+#: en/other_procedures.ssi:58 en/project_bugs.ssi:58 en/user_basics.ssi:32
+#: en/user_basics.ssi:42 en/user_basics.ssi:54 en/user_basics.ssi:66
+#: en/user_basics.ssi:78 en/user_basics.ssi:88 en/user_basics.ssi:102
+#: en/user_basics.ssi:110 en/user_basics.ssi:118 en/user_basics.ssi:128
+#: en/user_basics.ssi:142 en/user_basics.ssi:154 en/user_basics.ssi:162
+#: en/user_basics.ssi:170 en/user_basics.ssi:184 en/user_basics.ssi:192
+#: en/user_basics.ssi:202 en/user_basics.ssi:222 en/user_basics.ssi:255
+#: en/user_basics.ssi:271 en/user_basics.ssi:279 en/user_basics.ssi:299
+#: en/user_basics.ssi:324 en/user_customization-contents.ssi:34
+#: en/user_customization-contents.ssi:43 en/user_customization-contents.ssi:66
#: en/user_customization-internationalization.ssi:10
#: en/user_customization-internationalization.ssi:18
#: en/user_customization-internationalization.ssi:26
#: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:16 en/user_customization-packages.ssi:24
-#: en/user_customization-packages.ssi:36 en/user_customization-packages.ssi:45
-#: en/user_customization-packages.ssi:59 en/user_customization-packages.ssi:73
-#: en/user_customization-packages.ssi:103
-#: en/user_customization-packages.ssi:111
-#: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:166
-#: en/user_customization-packages.ssi:176
-#: en/user_customization-packages.ssi:186
-#: en/user_customization-packages.ssi:196 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:104
-#: en/user_installation.ssi:118 en/user_installation.ssi:135
-#: en/user_managing_a_configuration.ssi:24
+#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
+#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
+#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:90
+#: en/user_customization-packages.ssi:120
+#: en/user_customization-packages.ssi:133
+#: en/user_customization-packages.ssi:143
+#: en/user_customization-packages.ssi:153
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:261
+#: en/user_customization-packages.ssi:273
+#: en/user_customization-packages.ssi:283 en/user_examples.ssi:12
+#: en/user_examples.ssi:27 en/user_examples.ssi:37 en/user_examples.ssi:51
+#: en/user_examples.ssi:61 en/user_examples.ssi:77 en/user_examples.ssi:87
+#: en/user_examples.ssi:104 en/user_examples.ssi:114 en/user_examples.ssi:128
+#: en/user_examples.ssi:136 en/user_examples.ssi:151 en/user_examples.ssi:159
+#: en/user_examples.ssi:185 en/user_examples.ssi:206 en/user_examples.ssi:214
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:76 en/user_installation.ssi:84
+#: en/user_installation.ssi:104 en/user_installation.ssi:118
+#: en/user_installation.ssi:135 en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:36
#: en/user_overview.ssi:80 en/user_overview.ssi:88
@@ -78,9 +83,9 @@ msgid "code{"
msgstr "code{"
#. type: Plain text
-#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:121 en/about_manual.ssi:134 en/about_manual.ssi:142
+#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:165
#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
@@ -100,37 +105,43 @@ msgstr "code{"
#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
#: en/other_live-environment.ssi:138 en/other_procedures.ssi:16
#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
-#: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
-#: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
-#: en/other_use-cases.ssi:137 en/project_bugs.ssi:62 en/user_basics.ssi:36
-#: en/user_basics.ssi:46 en/user_basics.ssi:60 en/user_basics.ssi:72
-#: en/user_basics.ssi:82 en/user_basics.ssi:94 en/user_basics.ssi:106
-#: en/user_basics.ssi:114 en/user_basics.ssi:122 en/user_basics.ssi:132
-#: en/user_basics.ssi:146 en/user_basics.ssi:156 en/user_basics.ssi:164
-#: en/user_basics.ssi:172 en/user_basics.ssi:186 en/user_basics.ssi:194
-#: en/user_basics.ssi:204 en/user_basics.ssi:245 en/user_basics.ssi:257
-#: en/user_basics.ssi:273 en/user_basics.ssi:281 en/user_basics.ssi:308
-#: en/user_basics.ssi:347 en/user_customization-contents.ssi:39
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:70
+#: en/project_bugs.ssi:62 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:60 en/user_basics.ssi:72 en/user_basics.ssi:82
+#: en/user_basics.ssi:94 en/user_basics.ssi:106 en/user_basics.ssi:114
+#: en/user_basics.ssi:122 en/user_basics.ssi:132 en/user_basics.ssi:148
+#: en/user_basics.ssi:158 en/user_basics.ssi:166 en/user_basics.ssi:174
+#: en/user_basics.ssi:188 en/user_basics.ssi:196 en/user_basics.ssi:206
+#: en/user_basics.ssi:247 en/user_basics.ssi:259 en/user_basics.ssi:275
+#: en/user_basics.ssi:283 en/user_basics.ssi:310 en/user_basics.ssi:349
+#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:70
#: en/user_customization-internationalization.ssi:14
#: en/user_customization-internationalization.ssi:22
#: en/user_customization-internationalization.ssi:30
#: en/user_customization-internationalization.ssi:42
-#: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
-#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
-#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
-#: en/user_customization-packages.ssi:107
-#: en/user_customization-packages.ssi:115
-#: en/user_customization-packages.ssi:135
-#: en/user_customization-packages.ssi:172
-#: en/user_customization-packages.ssi:182
-#: en/user_customization-packages.ssi:192
-#: en/user_customization-packages.ssi:202 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 en/user_installation.ssi:108
-#: en/user_installation.ssi:123 en/user_installation.ssi:138
-#: en/user_managing_a_configuration.ssi:31
+#: en/user_customization-packages.ssi:23 en/user_customization-packages.ssi:36
+#: en/user_customization-packages.ssi:48 en/user_customization-packages.ssi:62
+#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:94
+#: en/user_customization-packages.ssi:125
+#: en/user_customization-packages.ssi:139
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:159
+#: en/user_customization-packages.ssi:169
+#: en/user_customization-packages.ssi:181
+#: en/user_customization-packages.ssi:197
+#: en/user_customization-packages.ssi:265
+#: en/user_customization-packages.ssi:277
+#: en/user_customization-packages.ssi:287 en/user_examples.ssi:17
+#: en/user_examples.ssi:31 en/user_examples.ssi:41 en/user_examples.ssi:55
+#: en/user_examples.ssi:65 en/user_examples.ssi:83 en/user_examples.ssi:98
+#: en/user_examples.ssi:108 en/user_examples.ssi:120 en/user_examples.ssi:132
+#: en/user_examples.ssi:147 en/user_examples.ssi:155 en/user_examples.ssi:163
+#: en/user_examples.ssi:194 en/user_examples.ssi:210 en/user_examples.ssi:218
+#: 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
+#: en/user_installation.ssi:108 en/user_installation.ssi:123
+#: en/user_installation.ssi:138 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:74
#: en/user_overview.ssi:84 en/user_overview.ssi:92
@@ -144,14 +155,23 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:4
-msgid "1~ The basics"
+msgid "1~the-basics The basics"
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:6
msgid ""
"This chapter contains a brief overview of the build process and instructions "
-"for booting the various binary image types."
+"for using the three most commonly used image types. The most versatile image "
+"type, #{iso-hybrid}#, may be used on a virtual machine, optical media or USB "
+"portable storage device. In certain special cases, #{usb-hdd}# may be more "
+"suitable for USB devices. The chapter finishes with instructions for "
+"building and using a #{net}# type image, which is a bit more involved due to "
+"the setup required on the server. This is a slightly advanced topic for "
+"anyone who is not familiar already with netbooting, but is included here "
+"because once the setup is done, it is a very convenient way to test and "
+"deploy images for booting on the local network without the hassle of dealing "
+"with image media."
msgstr ""
#. type: Plain text
@@ -269,7 +289,8 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:44 en/user_basics.ssi:120 en/user_basics.ssi:202
+#: en/user_basics.ssi:44 en/user_basics.ssi:120 en/user_basics.ssi:204
+#: en/user_examples.ssi:106 en/user_examples.ssi:153
msgid "# lb build"
msgstr ""
@@ -282,7 +303,7 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:50
-msgid "3~ Testing an ISO image with Qemu"
+msgid "3~testing-iso-with-qemu Testing an ISO image with Qemu"
msgstr ""
#. type: Plain text
@@ -291,7 +312,7 @@ msgid "Testing an ISO is simple:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:56 en/user_basics.ssi:142
+#: en/user_basics.ssi:56 en/user_basics.ssi:144
msgid "# apt-get install qemu"
msgstr ""
@@ -302,7 +323,7 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:62
-msgid "3~ Testing an ISO image with virtualbox-ose"
+msgid "3~testing-iso-with-virtualbox Testing an ISO image with virtualbox-ose"
msgstr ""
#. type: Plain text
@@ -343,7 +364,7 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:84
-msgid "3~ Burning an ISO image to a physical medium"
+msgid "3~burning-iso-image Burning an ISO image to a physical medium"
msgstr ""
#. type: Plain text
@@ -382,20 +403,20 @@ msgstr ""
#: en/user_basics.ssi:100
msgid ""
"Note: if you created an ISO image with the previous example, you will need "
-"to clean up your working directory with the #{lb clean} command (see {The lb "
-"clean command}#lb-clean):"
+"to clean up your working directory with the #{lb clean}# command (see {The "
+"lb clean command}#lb-clean):"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:104 en/user_basics.ssi:184
+#: en/user_basics.ssi:104 en/user_basics.ssi:186
msgid "$ lb clean --binary"
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:108
msgid ""
-"Run the #{lb config}# command with the parameters to configure the \"config/"
-"\" hierarchy to create a USB/HDD image type:"
+"Run the #{lb config}# command with the parameters to configure the #{config/}"
+"# hierarchy to create a USB/HDD image type:"
msgstr ""
#. type: Plain text
@@ -443,21 +464,28 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:138
-msgid "3~ Testing a USB/HDD image with Qemu"
+msgid ""
+"Note: As discussed earlier, this same process can be used for #{iso-hybrid}# "
+"type images, (suffixed #{-hybrid.iso}#,) but not #{iso}# type images."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:144
+#: en/user_basics.ssi:140
+msgid "3~testing-usb-hdd-with-qemu Testing a USB/HDD image with Qemu"
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:146
msgid "$ qemu -hda binary.img"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:148
+#: en/user_basics.ssi:150
msgid "3~ Using the space left on a USB stick"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:150
+#: en/user_basics.ssi:152
msgid ""
"If you want to use the remaining free space after you have installed the "
"binary.img, you can use a partitioning tool such as #{gparted}# or #{parted}"
@@ -466,45 +494,45 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:154
+#: en/user_basics.ssi:156
msgid "# gparted ${USBSTICK}"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:158
+#: en/user_basics.ssi:160
msgid ""
"After the creation of the partition, you have to create a filesystem on it. "
"One possible choice would be ext4."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:162
+#: en/user_basics.ssi:164
msgid "# mkfs.ext4 ${USBSTICK}"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:166
+#: en/user_basics.ssi:168
msgid "If you want to use this data partition with Windows, use FAT32."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:170
+#: en/user_basics.ssi:172
msgid "# mkfs.vfat -F 32"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:174
+#: en/user_basics.ssi:176
#, no-wrap
msgid "*{Remember: Every time you install a new binary.img on the stick, all data on the stick will be lost because the partition table is overwritten by the contents of the image.}*\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:176
-msgid "2~ Building a netboot image"
+#: en/user_basics.ssi:178
+msgid "2~building-netboot-image Building a netboot image"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:178
+#: en/user_basics.ssi:180
msgid ""
"The following sequence of commands will create a basic netboot image "
"containing the Debian standard system without X.org. It is suitable for "
@@ -512,28 +540,28 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:180
+#: en/user_basics.ssi:182
msgid ""
"Note: if you performed any previous examples, you will need to clean up your "
"working directory with the #{lb clean}# command:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:188
+#: en/user_basics.ssi:190
msgid ""
"Run the #{lb config}# command with the parameters to configure the \"config/"
"\" hierarchy to create our netboot image:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:192
+#: en/user_basics.ssi:194
msgid ""
"$ lb config -b net --net-root-path \"/srv/debian-live\" --net-root-server "
"\"192.168.0.1\""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:196
+#: en/user_basics.ssi:198
msgid ""
"In contrast with the ISO and USB/HDD images, netbooting does not support "
"serving a filesystem image with the client, so the files must be served via "
@@ -543,12 +571,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:198
+#: en/user_basics.ssi:200
msgid "Now build the image with the #{lb build}# command:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:206
+#: en/user_basics.ssi:208
msgid ""
"In a network boot, the client runs a small piece of software which usually "
"resides on the EPROM of the Ethernet card. This program sends a DHCP request "
@@ -559,7 +587,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:208
+#: en/user_basics.ssi:210
msgid ""
"For example, if you unpack the generated binary-net.tar.gz archive in the /"
"srv/debian-live directory, you'll find the filesystem image in live/"
@@ -568,17 +596,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:210
+#: en/user_basics.ssi:212
msgid "We must now configure three services on the server to enable netboot."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:212
+#: en/user_basics.ssi:214
msgid "3~ DHCP server"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:214
+#: en/user_basics.ssi:216
msgid ""
"We must configure our network's DHCP server to be sure to give an IP address "
"to the netbooting client system, and to advertise the location of the PXE "
@@ -586,25 +614,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:216
+#: en/user_basics.ssi:218
msgid ""
"Here is an example for inspiration, written for the ISC DHCP server #{isc-"
"dhcp-server}# in the /etc/dhcp/dhcpd.conf configuration file;"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:218 en/user_customization-packages.ssi:153
+#: en/user_basics.ssi:220
msgid "% FIXME"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:222
+#: en/user_basics.ssi:224
#, no-wrap
msgid "subnet 192.168.1.0 netmask 255.255.255.0 { # 192.168.1.0/24\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:225
+#: en/user_basics.ssi:227
#, no-wrap
msgid ""
" # IP addresses available for guests\n"
@@ -612,7 +640,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:228
+#: en/user_basics.ssi:230
#, no-wrap
msgid ""
" # allow booting from the net\n"
@@ -620,7 +648,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:233
+#: en/user_basics.ssi:235
#, no-wrap
msgid ""
" # for net booting, server where the first file to be loaded (by TFTP\n"
@@ -630,7 +658,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:237
+#: en/user_basics.ssi:239
#, no-wrap
msgid ""
" # net boot configuration for guests with a PXE client:\n"
@@ -639,7 +667,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:240
+#: en/user_basics.ssi:242
#, no-wrap
msgid ""
" # PXE bootloader (first program to be loaded, by TFTP)\n"
@@ -647,7 +675,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:243
+#: en/user_basics.ssi:245
#, no-wrap
msgid ""
" }\n"
@@ -655,17 +683,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:247
+#: en/user_basics.ssi:249
msgid "3~ TFTP server"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:249
+#: en/user_basics.ssi:251
msgid "This serves the kernel and initial ramdisk to the system at run time."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:251
+#: en/user_basics.ssi:253
msgid ""
"You should install the tftpd-hpa package. It can serve all files contained "
"inside a root directory, usually /srv/tftp. To let it serve files inside /"
@@ -673,22 +701,22 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:255
+#: en/user_basics.ssi:257
msgid "dpkg-reconfigure -plow tftpd-hpa"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:259
+#: en/user_basics.ssi:261
msgid "and fill in the new tftp server directory when being asked about it."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:261
+#: en/user_basics.ssi:263
msgid "3~ NFS server"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:263
+#: en/user_basics.ssi:265
msgid ""
"Once the guest computer has downloaded and booted a Linux kernel and loaded "
"its initrd, it will try to mount the Live filesystem image through a NFS "
@@ -696,35 +724,35 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:265
+#: en/user_basics.ssi:267
msgid "You need to install the nfs-kernel-server package."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:267
+#: en/user_basics.ssi:269
msgid ""
"Then, make the filesystem image available through NFS by adding a line like "
"the following to /etc/exports:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:271
+#: en/user_basics.ssi:273
msgid "/srv/debian-live *(ro,async,no_root_squash,no_subtree_check)"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:275
+#: en/user_basics.ssi:277
msgid ""
"and tell the NFS server about this new export with the following command:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:279
+#: en/user_basics.ssi:281
msgid "# exportfs -rv"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:283
+#: en/user_basics.ssi:285
msgid ""
"Setting up these three services can be a little tricky. You might need some "
"patience to get all of them working together. The Debian Installer Manual's "
@@ -733,40 +761,40 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:285
+#: en/user_basics.ssi:287
msgid "3~ Netboot testing HowTo"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:287
+#: en/user_basics.ssi:289
msgid ""
"Netboot image creation is made easy with live-build magic, but testing the "
"images on physical machines can be really time consuming."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:289
+#: en/user_basics.ssi:291
msgid ""
"To make our life easier, we can use virtualization. There are two solutions."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:291
+#: en/user_basics.ssi:293
msgid "3~ Qemu"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:293
+#: en/user_basics.ssi:295
msgid "_* Install qemu, bridge-utils, sudo."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:295
+#: en/user_basics.ssi:297
msgid "Edit /etc/qemu-ifup:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:306
+#: en/user_basics.ssi:308
msgid ""
"#!/bin/sh sudo -p \"Password for $0:\" /sbin/ifconfig $1 172.20.0.1 echo "
"\"Executing /etc/qemu-ifup\" echo \"Bringing up $1 for bridged mode...\" "
@@ -775,62 +803,62 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:310
+#: en/user_basics.ssi:312
msgid "Get, or build a grub-floppy-netboot (in the svn)."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:312
+#: en/user_basics.ssi:314
msgid "Launch qemu with \"-net nic,vlan=0 -net tap,vlan=0,ifname=tun0\""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:314
+#: en/user_basics.ssi:316
msgid "3~ VMWare Player"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:316
+#: en/user_basics.ssi:318
msgid "_* Install VMWare Player (\"free as in beer\" edition)"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:318
+#: en/user_basics.ssi:320
msgid ""
"_* Create a PXETester directory, and create a text file called pxe.vwx inside"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:320
+#: en/user_basics.ssi:322
msgid "_* Paste this text inside:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:328
+#: en/user_basics.ssi:330
msgid ""
"#!/usr/bin/vmware config.version = \"8\" virtualHW.version = \"4\" memsize = "
"\"512\" MemAllowAutoScaleDown = \"FALSE\""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:334
+#: en/user_basics.ssi:336
msgid ""
"ide0:0.present = \"FALSE\" ide1:0.present = \"FALSE\" floppy0.present = "
"\"FALSE\" sound.present = \"FALSE\" tools.remindInstall = \"FALSE\""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:337
+#: en/user_basics.ssi:339
msgid "ethernet0.present = \"TRUE\" ethernet0.addressType = \"generated\""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:340
+#: en/user_basics.ssi:342
msgid "displayName = \"Test Boot PXE\" guestOS = \"other\""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:345
+#: en/user_basics.ssi:347
msgid ""
"ethernet0.generatedAddress = \"00:0c:29:8d:71:3b\" uuid.location = \"56 4d "
"83 72 5c c4 de 3f-ae 9e 07 91 1d 8d 71 3b\" uuid.bios = \"56 4d 83 72 5c c4 "
@@ -838,19 +866,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:349
+#: en/user_basics.ssi:351
msgid ""
"_* You can play with this configuration file (i.e. change memory limit to "
"256)"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:351
+#: en/user_basics.ssi:353
msgid ""
"_* Double click on this file (or run VMWare player and select this file)."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:352
+#: en/user_basics.ssi:354
msgid "_* When running just press space if that strange question comes up..."
msgstr ""
diff --git a/manual/po/fr/user_customization-contents.ssi.po b/manual/po/fr/user_customization-contents.ssi.po
index 60a7d10..8e52b37 100644
--- a/manual/po/fr/user_customization-contents.ssi.po
+++ b/manual/po/fr/user_customization-contents.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-23 16:43+0300\n"
+"POT-Creation-Date: 2010-11-27 09:40-0400\n"
"PO-Revision-Date: 2010-10-16 14:45-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -17,9 +17,9 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
#. type: Plain text
-#: en/about_manual.ssi:80 en/about_manual.ssi:88 en/about_manual.ssi:96
-#: en/about_manual.ssi:108 en/about_manual.ssi:121 en/about_manual.ssi:134
-#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
+#: en/about_manual.ssi:112 en/about_manual.ssi:125 en/about_manual.ssi:138
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
#: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
#: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
#: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
@@ -39,47 +39,49 @@ msgstr ""
#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
-#: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
-#: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
-#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111 en/user_basics.ssi:34
-#: en/user_basics.ssi:44 en/user_basics.ssi:56 en/user_basics.ssi:68
-#: en/user_basics.ssi:80 en/user_basics.ssi:92 en/user_basics.ssi:106
-#: en/user_basics.ssi:114 en/user_basics.ssi:122 en/user_basics.ssi:132
-#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
-#: en/user_basics.ssi:172 en/user_basics.ssi:186 en/user_basics.ssi:194
-#: en/user_basics.ssi:204 en/user_basics.ssi:224 en/user_basics.ssi:257
-#: en/user_basics.ssi:273 en/user_basics.ssi:281 en/user_basics.ssi:301
-#: en/user_basics.ssi:326 en/user_customization-contents.ssi:34
+#: en/other_procedures.ssi:58 en/project_bugs.ssi:58 en/user_basics.ssi:32
+#: en/user_basics.ssi:42 en/user_basics.ssi:54 en/user_basics.ssi:66
+#: en/user_basics.ssi:78 en/user_basics.ssi:88 en/user_basics.ssi:102
+#: en/user_basics.ssi:110 en/user_basics.ssi:118 en/user_basics.ssi:128
+#: en/user_basics.ssi:142 en/user_basics.ssi:154 en/user_basics.ssi:162
+#: en/user_basics.ssi:170 en/user_basics.ssi:184 en/user_basics.ssi:192
+#: en/user_basics.ssi:202 en/user_basics.ssi:222 en/user_basics.ssi:255
+#: en/user_basics.ssi:271 en/user_basics.ssi:279 en/user_basics.ssi:299
+#: en/user_basics.ssi:324 en/user_customization-contents.ssi:34
#: en/user_customization-contents.ssi:43 en/user_customization-contents.ssi:66
#: en/user_customization-internationalization.ssi:10
#: en/user_customization-internationalization.ssi:18
#: en/user_customization-internationalization.ssi:26
#: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:16 en/user_customization-packages.ssi:24
-#: en/user_customization-packages.ssi:36 en/user_customization-packages.ssi:45
-#: en/user_customization-packages.ssi:59 en/user_customization-packages.ssi:73
-#: en/user_customization-packages.ssi:103
-#: en/user_customization-packages.ssi:111
-#: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:166
-#: en/user_customization-packages.ssi:176
-#: en/user_customization-packages.ssi:186
-#: en/user_customization-packages.ssi:196 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:104
-#: en/user_installation.ssi:118 en/user_installation.ssi:135
-#: en/user_managing_a_configuration.ssi:24
+#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
+#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
+#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:90
+#: en/user_customization-packages.ssi:120
+#: en/user_customization-packages.ssi:133
+#: en/user_customization-packages.ssi:143
+#: en/user_customization-packages.ssi:153
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:261
+#: en/user_customization-packages.ssi:273
+#: en/user_customization-packages.ssi:283 en/user_examples.ssi:12
+#: en/user_examples.ssi:27 en/user_examples.ssi:37 en/user_examples.ssi:75
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:76 en/user_installation.ssi:84
+#: en/user_installation.ssi:104 en/user_installation.ssi:118
+#: en/user_installation.ssi:135 en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
-#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:46
-#: en/user_overview.ssi:90 en/user_overview.ssi:98
+#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:36
+#: en/user_overview.ssi:80 en/user_overview.ssi:88
msgid "code{"
msgstr "code{"
#. type: Plain text
-#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:121 en/about_manual.ssi:134 en/about_manual.ssi:142
+#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:165
#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
@@ -99,46 +101,48 @@ msgstr "code{"
#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
#: en/other_live-environment.ssi:138 en/other_procedures.ssi:16
#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
-#: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
-#: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
-#: en/other_use-cases.ssi:137 en/user_basics.ssi:38 en/user_basics.ssi:48
-#: en/user_basics.ssi:62 en/user_basics.ssi:72 en/user_basics.ssi:86
-#: en/user_basics.ssi:98 en/user_basics.ssi:110 en/user_basics.ssi:118
-#: en/user_basics.ssi:126 en/user_basics.ssi:136 en/user_basics.ssi:150
-#: en/user_basics.ssi:160 en/user_basics.ssi:168 en/user_basics.ssi:176
-#: en/user_basics.ssi:190 en/user_basics.ssi:198 en/user_basics.ssi:208
-#: en/user_basics.ssi:249 en/user_basics.ssi:261 en/user_basics.ssi:277
-#: en/user_basics.ssi:285 en/user_basics.ssi:312 en/user_basics.ssi:351
+#: en/project_bugs.ssi:62 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:60 en/user_basics.ssi:72 en/user_basics.ssi:82
+#: en/user_basics.ssi:94 en/user_basics.ssi:106 en/user_basics.ssi:114
+#: en/user_basics.ssi:122 en/user_basics.ssi:132 en/user_basics.ssi:148
+#: en/user_basics.ssi:158 en/user_basics.ssi:166 en/user_basics.ssi:174
+#: en/user_basics.ssi:188 en/user_basics.ssi:196 en/user_basics.ssi:206
+#: en/user_basics.ssi:247 en/user_basics.ssi:259 en/user_basics.ssi:275
+#: en/user_basics.ssi:283 en/user_basics.ssi:310 en/user_basics.ssi:349
#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
#: en/user_customization-contents.ssi:70
#: en/user_customization-internationalization.ssi:14
#: en/user_customization-internationalization.ssi:22
#: en/user_customization-internationalization.ssi:30
#: en/user_customization-internationalization.ssi:42
-#: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
-#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
-#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
-#: en/user_customization-packages.ssi:107
-#: en/user_customization-packages.ssi:115
-#: en/user_customization-packages.ssi:135
-#: en/user_customization-packages.ssi:172
-#: en/user_customization-packages.ssi:182
-#: en/user_customization-packages.ssi:192
-#: en/user_customization-packages.ssi:202 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 en/user_installation.ssi:108
-#: en/user_installation.ssi:123 en/user_installation.ssi:138
-#: en/user_managing_a_configuration.ssi:31
+#: en/user_customization-packages.ssi:23 en/user_customization-packages.ssi:36
+#: en/user_customization-packages.ssi:48 en/user_customization-packages.ssi:62
+#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:94
+#: en/user_customization-packages.ssi:125
+#: en/user_customization-packages.ssi:139
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:159
+#: en/user_customization-packages.ssi:169
+#: en/user_customization-packages.ssi:181
+#: en/user_customization-packages.ssi:197
+#: en/user_customization-packages.ssi:265
+#: en/user_customization-packages.ssi:277
+#: en/user_customization-packages.ssi:287 en/user_examples.ssi:17
+#: en/user_examples.ssi:31 en/user_examples.ssi:41 en/user_examples.ssi:84
+#: 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
+#: en/user_installation.ssi:108 en/user_installation.ssi:123
+#: en/user_installation.ssi:138 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
-#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:84
-#: en/user_overview.ssi:94 en/user_overview.ssi:102
+#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:74
+#: en/user_overview.ssi:84 en/user_overview.ssi:92
msgid "}code"
msgstr "}code"
#. type: Plain text
#: en/user_customization-contents.ssi:2 en/user_customization-overview.ssi:2
-msgid "B~ Customizing contents"
+msgid ":B~ Customizing contents"
msgstr ""
#. type: Plain text
diff --git a/manual/po/fr/user_customization-internationalization.ssi.po b/manual/po/fr/user_customization-internationalization.ssi.po
index fc5dced..ebc8f6b 100644
--- a/manual/po/fr/user_customization-internationalization.ssi.po
+++ b/manual/po/fr/user_customization-internationalization.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-28 09:15-0200\n"
+"POT-Creation-Date: 2010-11-27 09:40-0400\n"
"PO-Revision-Date: 2010-10-16 15:48-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -17,9 +17,9 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
#. type: Plain text
-#: en/about_manual.ssi:80 en/about_manual.ssi:88 en/about_manual.ssi:96
-#: en/about_manual.ssi:108 en/about_manual.ssi:121 en/about_manual.ssi:134
-#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
+#: en/about_manual.ssi:112 en/about_manual.ssi:125 en/about_manual.ssi:138
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
#: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
#: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
#: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
@@ -39,48 +39,49 @@ msgstr ""
#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
-#: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
-#: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
-#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111
-#: en/project_bugs.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
-#: en/user_basics.ssi:54 en/user_basics.ssi:66 en/user_basics.ssi:78
-#: en/user_basics.ssi:88 en/user_basics.ssi:102 en/user_basics.ssi:110
-#: en/user_basics.ssi:118 en/user_basics.ssi:128 en/user_basics.ssi:140
-#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
-#: en/user_basics.ssi:182 en/user_basics.ssi:190 en/user_basics.ssi:200
-#: en/user_basics.ssi:220 en/user_basics.ssi:253 en/user_basics.ssi:269
-#: en/user_basics.ssi:277 en/user_basics.ssi:297 en/user_basics.ssi:322
-#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
-#: en/user_customization-contents.ssi:66
+#: en/other_procedures.ssi:58 en/project_bugs.ssi:58 en/user_basics.ssi:32
+#: en/user_basics.ssi:42 en/user_basics.ssi:54 en/user_basics.ssi:66
+#: en/user_basics.ssi:78 en/user_basics.ssi:88 en/user_basics.ssi:102
+#: en/user_basics.ssi:110 en/user_basics.ssi:118 en/user_basics.ssi:128
+#: en/user_basics.ssi:142 en/user_basics.ssi:154 en/user_basics.ssi:162
+#: en/user_basics.ssi:170 en/user_basics.ssi:184 en/user_basics.ssi:192
+#: en/user_basics.ssi:202 en/user_basics.ssi:222 en/user_basics.ssi:255
+#: en/user_basics.ssi:271 en/user_basics.ssi:279 en/user_basics.ssi:299
+#: en/user_basics.ssi:324 en/user_customization-contents.ssi:34
+#: en/user_customization-contents.ssi:43 en/user_customization-contents.ssi:66
#: en/user_customization-internationalization.ssi:10
#: en/user_customization-internationalization.ssi:18
#: en/user_customization-internationalization.ssi:26
#: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:16 en/user_customization-packages.ssi:24
-#: en/user_customization-packages.ssi:36 en/user_customization-packages.ssi:45
-#: en/user_customization-packages.ssi:59 en/user_customization-packages.ssi:73
-#: en/user_customization-packages.ssi:103
-#: en/user_customization-packages.ssi:111
-#: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:166
-#: en/user_customization-packages.ssi:176
-#: en/user_customization-packages.ssi:186
-#: en/user_customization-packages.ssi:196 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:104
-#: en/user_installation.ssi:118 en/user_installation.ssi:135
-#: en/user_managing_a_configuration.ssi:24
+#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
+#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
+#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:90
+#: en/user_customization-packages.ssi:120
+#: en/user_customization-packages.ssi:133
+#: en/user_customization-packages.ssi:143
+#: en/user_customization-packages.ssi:153
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:261
+#: en/user_customization-packages.ssi:273
+#: en/user_customization-packages.ssi:283 en/user_examples.ssi:12
+#: en/user_examples.ssi:27 en/user_examples.ssi:37 en/user_examples.ssi:75
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:76 en/user_installation.ssi:84
+#: en/user_installation.ssi:104 en/user_installation.ssi:118
+#: en/user_installation.ssi:135 en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
-#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:46
-#: en/user_overview.ssi:90 en/user_overview.ssi:98
+#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:36
+#: en/user_overview.ssi:80 en/user_overview.ssi:88
msgid "code{"
msgstr "code{"
#. type: Plain text
-#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:121 en/about_manual.ssi:134 en/about_manual.ssi:142
+#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:165
#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
@@ -100,46 +101,48 @@ msgstr "code{"
#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
#: en/other_live-environment.ssi:138 en/other_procedures.ssi:16
#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
-#: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
-#: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
-#: en/other_use-cases.ssi:137 en/project_bugs.ssi:62 en/user_basics.ssi:36
-#: en/user_basics.ssi:46 en/user_basics.ssi:60 en/user_basics.ssi:72
-#: en/user_basics.ssi:82 en/user_basics.ssi:94 en/user_basics.ssi:106
-#: en/user_basics.ssi:114 en/user_basics.ssi:122 en/user_basics.ssi:132
-#: en/user_basics.ssi:146 en/user_basics.ssi:156 en/user_basics.ssi:164
-#: en/user_basics.ssi:172 en/user_basics.ssi:186 en/user_basics.ssi:194
-#: en/user_basics.ssi:204 en/user_basics.ssi:245 en/user_basics.ssi:257
-#: en/user_basics.ssi:273 en/user_basics.ssi:281 en/user_basics.ssi:308
-#: en/user_basics.ssi:347 en/user_customization-contents.ssi:39
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:70
+#: en/project_bugs.ssi:62 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:60 en/user_basics.ssi:72 en/user_basics.ssi:82
+#: en/user_basics.ssi:94 en/user_basics.ssi:106 en/user_basics.ssi:114
+#: en/user_basics.ssi:122 en/user_basics.ssi:132 en/user_basics.ssi:148
+#: en/user_basics.ssi:158 en/user_basics.ssi:166 en/user_basics.ssi:174
+#: en/user_basics.ssi:188 en/user_basics.ssi:196 en/user_basics.ssi:206
+#: en/user_basics.ssi:247 en/user_basics.ssi:259 en/user_basics.ssi:275
+#: en/user_basics.ssi:283 en/user_basics.ssi:310 en/user_basics.ssi:349
+#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:70
#: en/user_customization-internationalization.ssi:14
#: en/user_customization-internationalization.ssi:22
#: en/user_customization-internationalization.ssi:30
#: en/user_customization-internationalization.ssi:42
-#: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
-#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
-#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
-#: en/user_customization-packages.ssi:107
-#: en/user_customization-packages.ssi:115
-#: en/user_customization-packages.ssi:135
-#: en/user_customization-packages.ssi:172
-#: en/user_customization-packages.ssi:182
-#: en/user_customization-packages.ssi:192
-#: en/user_customization-packages.ssi:202 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 en/user_installation.ssi:108
-#: en/user_installation.ssi:123 en/user_installation.ssi:138
-#: en/user_managing_a_configuration.ssi:31
+#: en/user_customization-packages.ssi:23 en/user_customization-packages.ssi:36
+#: en/user_customization-packages.ssi:48 en/user_customization-packages.ssi:62
+#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:94
+#: en/user_customization-packages.ssi:125
+#: en/user_customization-packages.ssi:139
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:159
+#: en/user_customization-packages.ssi:169
+#: en/user_customization-packages.ssi:181
+#: en/user_customization-packages.ssi:197
+#: en/user_customization-packages.ssi:265
+#: en/user_customization-packages.ssi:277
+#: en/user_customization-packages.ssi:287 en/user_examples.ssi:17
+#: en/user_examples.ssi:31 en/user_examples.ssi:41 en/user_examples.ssi:84
+#: 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
+#: en/user_installation.ssi:108 en/user_installation.ssi:123
+#: en/user_installation.ssi:138 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
-#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:84
-#: en/user_overview.ssi:94 en/user_overview.ssi:102
+#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:74
+#: en/user_overview.ssi:84 en/user_overview.ssi:92
msgid "}code"
msgstr "}code"
#. type: Plain text
#: en/user_customization-internationalization.ssi:2
-msgid "B~ Customizing locale and language"
+msgid ":B~ Customizing locale and language"
msgstr ""
#. type: Plain text
diff --git a/manual/po/fr/user_customization-overview.ssi.po b/manual/po/fr/user_customization-overview.ssi.po
index 58afc9c..d442da7 100644
--- a/manual/po/fr/user_customization-overview.ssi.po
+++ b/manual/po/fr/user_customization-overview.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-11-11 11:58-0400\n"
+"POT-Creation-Date: 2010-11-27 09:40-0400\n"
"PO-Revision-Date: 2010-10-22 07:52-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -18,7 +18,7 @@ msgstr ""
#. type: Plain text
#: en/user_customization-contents.ssi:2 en/user_customization-overview.ssi:2
-msgid "B~ Customizing contents"
+msgid ":B~ Customizing contents"
msgstr ""
#. type: Plain text
diff --git a/manual/po/fr/user_customization-packages.ssi.po b/manual/po/fr/user_customization-packages.ssi.po
index e9e129d..9802b34 100644
--- a/manual/po/fr/user_customization-packages.ssi.po
+++ b/manual/po/fr/user_customization-packages.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-11-12 16:21-0400\n"
+"POT-Creation-Date: 2010-11-28 08:44-0400\n"
"PO-Revision-Date: 2010-10-16 14:45-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -17,52 +17,61 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
#. type: Plain text
-#: en/about_manual.ssi:80 en/about_manual.ssi:88 en/about_manual.ssi:96
-#: en/about_manual.ssi:108 en/about_manual.ssi:121 en/about_manual.ssi:134
-#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
-#: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
-#: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
-#: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
-#: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
-#: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
-#: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
-#: en/other_faq.ssi:41 en/other_faq.ssi:83 en/other_faq.ssi:103
-#: en/other_faq.ssi:117 en/other_faq.ssi:137 en/other_faq.ssi:151
-#: en/other_faq.ssi:198 en/other_faq.ssi:245 en/other_faq.ssi:261
-#: en/other_faq.ssi:287 en/other_faq.ssi:299 en/other_faq.ssi:314
-#: en/other_faq.ssi:333 en/other_faq.ssi:345 en/other_faq.ssi:353
-#: en/other_faq.ssi:364 en/other_faq.ssi:374 en/other_howtos.ssi:16
-#: en/other_howtos.ssi:43 en/other_live-environment.ssi:14
-#: en/other_live-environment.ssi:30 en/other_live-environment.ssi:51
-#: en/other_live-environment.ssi:61 en/other_live-environment.ssi:69
-#: en/other_live-environment.ssi:77 en/other_live-environment.ssi:85
-#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
-#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
-#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
-#: en/other_procedures.ssi:58 en/project_bugs.ssi:58 en/user_basics.ssi:32
-#: en/user_basics.ssi:42 en/user_basics.ssi:54 en/user_basics.ssi:66
-#: en/user_basics.ssi:78 en/user_basics.ssi:88 en/user_basics.ssi:102
-#: en/user_basics.ssi:110 en/user_basics.ssi:118 en/user_basics.ssi:128
-#: en/user_basics.ssi:140 en/user_basics.ssi:152 en/user_basics.ssi:160
-#: en/user_basics.ssi:168 en/user_basics.ssi:182 en/user_basics.ssi:190
-#: en/user_basics.ssi:200 en/user_basics.ssi:220 en/user_basics.ssi:253
-#: en/user_basics.ssi:269 en/user_basics.ssi:277 en/user_basics.ssi:297
-#: en/user_basics.ssi:322 en/user_customization-contents.ssi:34
-#: en/user_customization-contents.ssi:43 en/user_customization-contents.ssi:66
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
+#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
+#: en/about_manual.ssi:170 en/other_coding-style.ssi:28
+#: en/other_coding-style.ssi:38 en/other_coding-style.ssi:51
+#: en/other_coding-style.ssi:61 en/other_coding-style.ssi:88
+#: en/other_coding-style.ssi:96 en/other_coding-style.ssi:106
+#: en/other_coding-style.ssi:117 en/other_common-tasks.ssi:32
+#: en/other_customization-backports.ssi:8 en/other_customization-bootup.ssi:30
+#: en/other_customization-bootup.ssi:39 en/other_faq.ssi:41
+#: en/other_faq.ssi:83 en/other_faq.ssi:103 en/other_faq.ssi:117
+#: en/other_faq.ssi:137 en/other_faq.ssi:151 en/other_faq.ssi:198
+#: en/other_faq.ssi:245 en/other_faq.ssi:261 en/other_faq.ssi:287
+#: en/other_faq.ssi:299 en/other_faq.ssi:314 en/other_faq.ssi:333
+#: en/other_faq.ssi:345 en/other_faq.ssi:353 en/other_faq.ssi:364
+#: en/other_faq.ssi:374 en/other_howtos.ssi:16 en/other_howtos.ssi:43
+#: en/other_live-environment.ssi:14 en/other_live-environment.ssi:30
+#: en/other_live-environment.ssi:51 en/other_live-environment.ssi:61
+#: en/other_live-environment.ssi:69 en/other_live-environment.ssi:77
+#: en/other_live-environment.ssi:85 en/other_live-environment.ssi:93
+#: en/other_live-environment.ssi:116 en/other_live-environment.ssi:124
+#: en/other_live-environment.ssi:133 en/other_procedures.ssi:12
+#: en/other_procedures.ssi:46 en/other_procedures.ssi:58
+#: en/project_bugs.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/user_basics.ssi:54 en/user_basics.ssi:66 en/user_basics.ssi:78
+#: en/user_basics.ssi:88 en/user_basics.ssi:102 en/user_basics.ssi:110
+#: en/user_basics.ssi:118 en/user_basics.ssi:128 en/user_basics.ssi:142
+#: en/user_basics.ssi:154 en/user_basics.ssi:162 en/user_basics.ssi:170
+#: en/user_basics.ssi:184 en/user_basics.ssi:192 en/user_basics.ssi:202
+#: en/user_basics.ssi:222 en/user_basics.ssi:255 en/user_basics.ssi:271
+#: en/user_basics.ssi:279 en/user_basics.ssi:299 en/user_basics.ssi:324
+#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
+#: en/user_customization-contents.ssi:66
#: en/user_customization-internationalization.ssi:10
#: en/user_customization-internationalization.ssi:18
#: en/user_customization-internationalization.ssi:26
#: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:26
-#: en/user_customization-packages.ssi:38 en/user_customization-packages.ssi:47
-#: en/user_customization-packages.ssi:61 en/user_customization-packages.ssi:75
-#: en/user_customization-packages.ssi:105
-#: en/user_customization-packages.ssi:113
+#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
+#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
+#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:90
+#: en/user_customization-packages.ssi:120
#: en/user_customization-packages.ssi:133
-#: en/user_customization-packages.ssi:168
-#: en/user_customization-packages.ssi:178
-#: en/user_customization-packages.ssi:188
-#: en/user_customization-packages.ssi:198 en/user_examples.ssi:24
+#: en/user_customization-packages.ssi:143
+#: en/user_customization-packages.ssi:153
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:261
+#: en/user_customization-packages.ssi:273
+#: en/user_customization-packages.ssi:283 en/user_examples.ssi:14
+#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
+#: en/user_examples.ssi:64 en/user_examples.ssi:80 en/user_examples.ssi:90
+#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:131
+#: en/user_examples.ssi:139 en/user_examples.ssi:154 en/user_examples.ssi:162
+#: en/user_examples.ssi:188 en/user_examples.ssi:209 en/user_examples.ssi:217
#: 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
@@ -75,14 +84,15 @@ msgid "code{"
msgstr "code{"
#. type: Plain text
-#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
-#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
-#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
-#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
-#: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
-#: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
+#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:166
+#: en/about_manual.ssi:173 en/other_coding-style.ssi:34
+#: en/other_coding-style.ssi:45 en/other_coding-style.ssi:57
+#: en/other_coding-style.ssi:68 en/other_coding-style.ssi:92
+#: en/other_coding-style.ssi:100 en/other_coding-style.ssi:113
+#: en/other_coding-style.ssi:124 en/other_common-tasks.ssi:36
+#: en/other_customization-backports.ssi:16
#: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
#: en/other_faq.ssi:37 en/other_faq.ssi:46 en/other_faq.ssi:92
#: en/other_faq.ssi:108 en/other_faq.ssi:141 en/other_faq.ssi:155
@@ -100,27 +110,35 @@ msgstr "code{"
#: en/project_bugs.ssi:62 en/user_basics.ssi:36 en/user_basics.ssi:46
#: en/user_basics.ssi:60 en/user_basics.ssi:72 en/user_basics.ssi:82
#: en/user_basics.ssi:94 en/user_basics.ssi:106 en/user_basics.ssi:114
-#: en/user_basics.ssi:122 en/user_basics.ssi:132 en/user_basics.ssi:146
-#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
-#: en/user_basics.ssi:186 en/user_basics.ssi:194 en/user_basics.ssi:204
-#: en/user_basics.ssi:245 en/user_basics.ssi:257 en/user_basics.ssi:273
-#: en/user_basics.ssi:281 en/user_basics.ssi:308 en/user_basics.ssi:347
+#: en/user_basics.ssi:122 en/user_basics.ssi:132 en/user_basics.ssi:148
+#: en/user_basics.ssi:158 en/user_basics.ssi:166 en/user_basics.ssi:174
+#: en/user_basics.ssi:188 en/user_basics.ssi:196 en/user_basics.ssi:206
+#: en/user_basics.ssi:247 en/user_basics.ssi:259 en/user_basics.ssi:275
+#: en/user_basics.ssi:283 en/user_basics.ssi:310 en/user_basics.ssi:349
#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
#: en/user_customization-contents.ssi:70
#: en/user_customization-internationalization.ssi:14
#: en/user_customization-internationalization.ssi:22
#: en/user_customization-internationalization.ssi:30
#: en/user_customization-internationalization.ssi:42
-#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:30
-#: en/user_customization-packages.ssi:43 en/user_customization-packages.ssi:51
-#: en/user_customization-packages.ssi:65 en/user_customization-packages.ssi:79
-#: en/user_customization-packages.ssi:109
-#: en/user_customization-packages.ssi:117
-#: en/user_customization-packages.ssi:137
-#: en/user_customization-packages.ssi:174
-#: en/user_customization-packages.ssi:184
-#: en/user_customization-packages.ssi:194
-#: en/user_customization-packages.ssi:204 en/user_examples.ssi:33
+#: en/user_customization-packages.ssi:23 en/user_customization-packages.ssi:36
+#: en/user_customization-packages.ssi:48 en/user_customization-packages.ssi:62
+#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:94
+#: en/user_customization-packages.ssi:125
+#: en/user_customization-packages.ssi:139
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:159
+#: en/user_customization-packages.ssi:169
+#: en/user_customization-packages.ssi:181
+#: en/user_customization-packages.ssi:197
+#: en/user_customization-packages.ssi:265
+#: en/user_customization-packages.ssi:277
+#: en/user_customization-packages.ssi:287 en/user_examples.ssi:20
+#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:58
+#: en/user_examples.ssi:68 en/user_examples.ssi:86 en/user_examples.ssi:101
+#: en/user_examples.ssi:111 en/user_examples.ssi:123 en/user_examples.ssi:135
+#: en/user_examples.ssi:150 en/user_examples.ssi:158 en/user_examples.ssi:166
+#: en/user_examples.ssi:197 en/user_examples.ssi:213 en/user_examples.ssi:221
#: en/user_installation.ssi:42 en/user_installation.ssi:50
#: en/user_installation.ssi:60 en/user_installation.ssi:72
#: en/user_installation.ssi:80 en/user_installation.ssi:88
@@ -133,11 +151,6 @@ msgid "}code"
msgstr "}code"
#. type: Plain text
-#: en/user_basics.ssi:218 en/user_customization-packages.ssi:155
-msgid "% FIXME"
-msgstr ""
-
-#. type: Plain text
#: en/user_customization-packages.ssi:2
msgid ":B~ Customizing package installation"
msgstr ""
@@ -161,7 +174,7 @@ msgid ""
"options give some control over apt, or if you prefer, aptitude, at build "
"time when packages are installed. You may find these handy if you use a "
"proxy, want to disable installation of recommended packages to save space, "
-"or need to control which versions of packages are installed via apt pinning, "
+"or need to control which versions of packages are installed via APT pinning, "
"to name a few possibilities."
msgstr ""
@@ -172,431 +185,486 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:10
-msgid "3~ Debian repositories"
+msgid "3~ Distribution mirrors"
msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:12
-msgid "To set a local mirror to be used to at build time:"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:16
-msgid "$ lb config --mirror-bootstrap http://localhost/debian/"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:20
msgid ""
-"The chroot repository, specified by --mirror-chroot, defaults to the same as "
-"--mirror-bootstrap."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:22
-msgid ""
-"Each of the --mirror-* options governs which repository is used at various "
-"stages of the build. Recall from {Stages of the build}#stages-of-the-build "
-"that the *bootstrap* stage is when the chroot is initially populated by "
-"debootstrap with a minimal system, and the *chroot* stage is when the chroot "
-"used to construct the live system's filesystem is built. Thus, the "
-"corresponding mirror switches are used for those stages, and later, when the "
-"binary image is constructed, the --mirror-binary value is used, superceding "
-"any earlier repositories."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:24
-msgid "The generic mirror is added to the live system's /etc/apt/sources.list."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:28
-msgid "$ lb config --mirror-binary http://ftp.debian.org/debian/"
+"Each of the #{--mirror-*}# options governs which distribution mirror is used "
+"at various stages of the build. Recall from {Stages of the build}#stages-of-"
+"the-build that the *bootstrap* stage is when the chroot is initially "
+"populated by debootstrap with a minimal system, and the *chroot* stage is "
+"when the chroot used to construct the live system's filesystem is built. "
+"Thus, the corresponding mirror switches are used for those stages, and "
+"later, in the *binary* stage, the #{--mirror-binary}# and #{--mirror-binary-"
+"security}# values are used, superceding any mirrors used in an earlier stage."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:32
+#: en/user_customization-packages.ssi:14
msgid ""
-"Note: It is not used for building the live system but to install new "
-"software while using the live system."
+"3~distribution-mirrors-build-time Distribution mirrors used at build time"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:34
+#: en/user_customization-packages.ssi:16
msgid ""
-"It can be disabled by setting the binary mirror to the same value as the "
-"chroot mirror."
+"To set the distribution mirrors used at build time to point at a local "
+"mirror, it is sufficient to set #{--mirror-bootstrap}# and #{--mirror-chroot-"
+"security}# as follows."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:36
+#: en/user_customization-packages.ssi:21
+#, no-wrap
msgid ""
-"Note: the same applies for mirror chroot security and mirror binary security"
+"$ lb config --mirror-bootstrap http://localhost/debian/ \\\n"
+" --mirror-chroot-security http://localhost/debian-security/\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:41
+#: en/user_customization-packages.ssi:25
msgid ""
-"$ lb config --mirror-chroot-security {URL} $ lb config --mirror-binary-"
-"security {URL}"
+"The chroot mirror, specified by #{--mirror-chroot}#, defaults to the #{--"
+"mirror-bootstrap}# value."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:45
-msgid "If you don't want to include apt indices, you can skip those with:"
+#: en/user_customization-packages.ssi:27
+msgid "3~ Distribution mirrors used at run time"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:49
-msgid "$ lb config --binary-indices false"
+#: en/user_customization-packages.ssi:29
+msgid ""
+"The #{--mirror-binary*}# options govern the distribution mirrors placed in "
+"the binary image. These may be used to install additional packages while "
+"running the live system. The 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
-#: en/user_customization-packages.ssi:53
+#: en/user_customization-packages.ssi:34
+#, no-wrap
msgid ""
-"This will not influence the entries in /etc/apt/sources.list, but only if /"
-"var/lib/apt contains the indices files or not (and by that making the image "
-"smaller)."
+"$ lb config --mirror-binary http://mirror/debian/ \\\n"
+" --mirror-binary-security http://mirror/debian-security/\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:55
-msgid "3~ Own repository"
+#: en/user_customization-packages.ssi:38
+msgid "3~ Additional repositories"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:57
+#: en/user_customization-packages.ssi:40
msgid ""
"To add more repositories (e.g. backports, experimental or custom packages, "
"etc.), create #{config/chroot_sources/your-repository.{chroot,binary}}# "
-"files."
+"files. As with the #{--mirror-*}# options, these govern the repositories "
+"used in the *chroot* stage when building the image, and in the *binary* "
+"stage, i.e. for use when running the live system."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:59
+#: en/user_customization-packages.ssi:42
msgid ""
-"e.g. #{config/chroot_sources/live.chroot}# allows you to install packages "
-"from the debian live snapshot repository at live system build time (you have "
-"to add the packages in your package list):"
+"For example, #{config/chroot_sources/live.chroot}# allows you to install "
+"packages from the debian live snapshot repository at live system build time."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:63
+#: en/user_customization-packages.ssi:46
msgid "deb http://live.debian.net/ sid-snapshots main contrib non-free"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:67
+#: en/user_customization-packages.ssi:50
msgid ""
-"If you add the line to #{config/chroot_sources/live.binary}# the repository "
-"will be added to your live-system's #{/etc/apt/sources.list}#."
+"If you add the same line to #{config/chroot_sources/live.binary}#, the "
+"repository will be added to your live system's #{/etc/apt/sources.list.d/}# "
+"directory."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:69
+#: en/user_customization-packages.ssi:52
msgid "If such files exist, they will be picked up automatically."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:71
+#: en/user_customization-packages.ssi:54
msgid ""
-"You can also put the gpg-key used to sign the repository into config/"
-"chroot_sources/your-repository.{binary,chroot}.gpg"
+"You should also put the GPG key used to sign the repository into #{config/"
+"chroot_sources/your-repository.{binary,chroot}.gpg}# files."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:73
+#: en/user_customization-packages.ssi:56
msgid ""
"Note: some preconfigured package repositories are available for easy "
-"selection through the --repository switch, e.g. for enabling live snapshots, "
-"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
-#: en/user_customization-packages.ssi:77
+#: en/user_customization-packages.ssi:60
msgid "$ lb config --repository live.debian.net"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:81
-msgid "3~ Package installation"
+#: en/user_customization-packages.ssi:64
+msgid "2~choosing-packages-to-install Choosing packages to install"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:83
+#: en/user_customization-packages.ssi:66
msgid ""
-"You can elect to use either #{apt}# or #{aptitude}# when installing "
-"packages. Which utility is used is governed by the #{LB_APT}# variable in #"
-"{config/chroot}# or by the #{--apt}# argument to #{lb config}#:"
+"There are a number of ways to choose which packages live-build will install "
+"in your image, covering a variety of different needs. You can simply name "
+"individual packages to install, either with the #{--packages}# option for a "
+"few packages, or in a package list of your own for larger numbers. You can "
+"also choose larger predefined lists of packages, or use APT tasks. And "
+"finally, you may place package files in your #{config/}# tree, which is well "
+"suited to testing of new or experimental packages before they are available "
+"from a repository."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:85
-msgid ""
-"_* #{apt}#: Specifying a missing package causes package installation to "
-"fail, which may not be the desired behaviour. This is the default setting "
-"for building images for Lenny or later."
+#: en/user_customization-packages.ssi:68
+msgid "3~ Choosing a few packages"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:87
+#: en/user_customization-packages.ssi:70
msgid ""
-"_* #{aptitude}#: Specifying a missing package causes package installation to "
-"succeed, which may not be the desired behaviour. This is the default setting "
-"for building images for Etch."
+"When the number of packages added is small, simply specify #{--packages}#. "
+"For example:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:89
-msgid "2~ Installing additional packages"
+#: en/user_customization-packages.ssi:74
+msgid "$ lb config --packages \"package1 package2 package3\""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:91
+#: en/user_customization-packages.ssi:78
msgid ""
-"live-helper has a number of mechanisms for indicating that additional "
-"packages should be installed, including:"
+"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."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:93
-msgid "_* The #{LB_PACKAGES}# variable"
+#: en/user_customization-packages.ssi:80
+msgid ""
+"If you need to specify a large number of packages to be installed or you "
+"need flexibility regarding which packages to install, use package lists as "
+"discussed in the following section, {Package lists}#package-lists."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:95
-msgid "_* Package lists"
+#: en/user_customization-packages.ssi:82
+msgid "3~package-lists Package lists"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:97
-msgid "_* Local packages (#{chroot_local-packages/}#)"
+#: en/user_customization-packages.ssi:84
+msgid ""
+"Package lists are a powerful way of expressing which packages should be "
+"installed. The list syntax supports included files and conditional sections "
+"which makes it easy to build lists from other lists and adapt them for use "
+"in multiple configurations. You can use predefined package lists, providing "
+"in a modular fashion package selections from each of the major desktop "
+"environments and some special purpose lists, as well as standard lists the "
+"others are based upon. You can also provide your own package lists, or use a "
+"combination of both."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:99
-msgid "_* Tasks"
+#: en/user_customization-packages.ssi:86
+msgid "3~ Predefined package lists"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:101
-msgid "3~ The #{LB_PACKAGES}# variable"
+#: en/user_customization-packages.ssi:88
+msgid ""
+"The simplest way to use lists is to specify one or more predefined lists "
+"with the #{--packages-lists}# option. For example:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:103
-msgid ""
-"To install additional packages, simply add them to the #{LB_PACKAGES}# "
-"variable in #{config/chroot}#. For example:"
+#: en/user_customization-packages.ssi:92
+msgid "$ lb config --packages-lists \"gnome-core rescue\""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:107
-msgid "LB_PACKAGES=\"package1 package2 package3 ... \""
+#: en/user_customization-packages.ssi:96
+msgid ""
+"In addition to these lists, live-build supports four virtual package lists: #"
+"{gnome-desktop}#, #{kde-desktop}#, #{lxde-desktop}# and #{xfce-desktop}#, "
+"each of which provide a more extensive selection of packages that "
+"corresponds with Debian Installer defaults for these desktop environments. "
+"See {Desktop and language tasks}#desktop-and-language-tasks for more details."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:111
-msgid "You can also specify initial values on the command line:"
+#: en/user_customization-packages.ssi:98
+msgid ""
+"Note: The prebuilt GNOME, KDE, LXDE and XFCE images available for download "
+"at http://live.debian.net are built using the corresponding virtual #{*-"
+"desktop}# lists."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:115
-msgid "$ lb config --packages \"package1 package2 package3\""
+#: en/user_customization-packages.ssi:100
+msgid ""
+"The default location for the list files on your system is #{/usr/share/live/"
+"build/lists/}#. To determine the packages in a given list, read the "
+"corresponding file, paying attention to included files and conditionals as "
+"described in the following sections."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:119
-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."
+#: en/user_customization-packages.ssi:102
+msgid "3~ Local package lists"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:121
-msgid "% FIXME: <xref linkend=\"package-installation\"/>"
+#: en/user_customization-packages.ssi:104
+msgid ""
+"You may supplement or replace entirely the supplied lists using local "
+"package lists stored in #{config/chroot_local-packageslists/}#."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:123
+#: en/user_customization-packages.ssi:106
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."
+"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."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:125
-msgid "% FIXME: <xref linkend=\"package-lists\"/>"
+#: en/user_customization-packages.ssi:108
+msgid "3~ Local binary package lists"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:127
-msgid "3~ Package lists"
+#: en/user_customization-packages.ssi:110
+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 "
+"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."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:129
+#: en/user_customization-packages.ssi:112
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 "
-"provide sensible default package selections for the major desktop "
-"environments, as well as standard systems."
+"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:131
-msgid "To specify one or more package list, you can use:"
+#: en/user_customization-packages.ssi:114
+msgid "3~ Extending a provided package list using includes"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:135
-msgid "$ lb config --packages-lists \"list1 list2 list3\""
+#: en/user_customization-packages.ssi:116
+msgid ""
+"The package lists that are included with live-build make extensive use of "
+"includes. Refer to these in the #{/usr/share/live/build/lists/}# directory, "
+"as they serve as good examples of how to write your own lists."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:139
+#: en/user_customization-packages.ssi:118
msgid ""
-"Note: Package lists that are distributed with live-build reside in the #{/"
-"usr/share/live/build/lists}# directory."
+"For example, to make a list that includes the predefined #{gnome}# list plus "
+"iceweasel, create #{config/chroot_local-packageslists/mygnome.list}# with "
+"the following contents:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:141
-#, no-wrap
-msgid "*{Local packages lists}*\n"
+#: en/user_customization-packages.ssi:123
+msgid "#include <gnome> iceweasel"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:143
+#: en/user_customization-packages.ssi:127
+msgid "3~ Using conditionals inside package lists"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:129
msgid ""
-"You may supplement the supplied lists using local package lists stored in #"
-"{config/chroot_local-packageslists}#."
+"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:145
+#: en/user_customization-packages.ssi:131
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 "
-"distributed with live-build. This can cause undesired effects, we therefore "
-"recommend to use unique names for local packages lists."
+"For example, to install #{ia32-libs}# if the #{--architecture amd64}# is "
+"specified:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:147
-#, no-wrap
-msgid "*{Local binary packages lists}*\n"
+#: en/user_customization-packages.ssi:137
+msgid "#if ARCHITECTURE amd64 ia32-libs #endif"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:141
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 "
-"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."
+"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
+#: en/user_customization-packages.ssi:147
+msgid "#if ARCHITECTURE i386 amd64 memtest86+ #endif"
msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:151
msgid ""
-"Package lists that exist in this directory need to have a .list suffix in "
-"order to be processed."
+"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
-#: en/user_customization-packages.ssi:153
-#, no-wrap
-msgid "*{Extending a provided package list using includes}*\n"
+#: en/user_customization-packages.ssi:157
+msgid "#if ARCHIVE_AREAS contrib non-free vrms #endif"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:162
-msgid "% code{ % % #include <gnome> % iceweasel % % }code"
+#: en/user_customization-packages.ssi:161
+msgid "A conditional may surround an #{#include}# directive:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:164
-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}# "
-"directory."
+#: en/user_customization-packages.ssi:167
+msgid "#if ARCHITECTURE amd64 #include <gnome-full> #endif"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:166
-#, no-wrap
-msgid "*{Using conditionals inside packages lists}*\n"
+#: en/user_customization-packages.ssi:171
+msgid "The nesting of conditionals is not supported."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:172
-msgid "#if ARCHITECTURE amd64 ia32-libs #endif"
+#: en/user_customization-packages.ssi:173
+msgid "3~ Tasks"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:176
-msgid "or if #{LB_ARCHITECTURE}# is set to #{i386}# or #{amd64}#:"
+#: en/user_customization-packages.ssi:175
+msgid ""
+"The Debian Installer offers the user choices of a number of preselected "
+"lists of packages, each one focused on a particular kind of system, or task "
+"a system may be used for, such as \"Graphical desktop environment\", \"Mail "
+"server\" or \"Laptop\". These lists are called \"tasks\" and are supported "
+"by APT through the \"Task:\" field. You can specify one or more tasks in "
+"live-build via the #{--tasks}# option, as in the example below."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:182
-msgid "#if ARCHITECTURE i386 amd64 memtest86+ #endif"
+#: en/user_customization-packages.ssi:179
+msgid "$ lb config --tasks \"mail-server file-server\""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:186
-msgid "or if #{LB_ARCHIVE_AREAS}# contains either #{contrib}# or #{non-free}#:"
+#: en/user_customization-packages.ssi:183
+msgid ""
+"The primary tasks available in the Debian Installer can be listed with #"
+"{tasksel --list-tasks}# in the live system. The contents of any task, "
+"including ones not included in this list, may be examined with #{tasksel --"
+"task-packages}#."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:192
-msgid "#if ARCHIVE_AREAS contrib non-free vrms #endif"
+#: en/user_customization-packages.ssi:185
+msgid "3~desktop-and-language-tasks Desktop and language tasks"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:196
-msgid "A conditional may surround an #{#include}# directive:"
+#: en/user_customization-packages.ssi:187
+msgid ""
+"Desktop and language tasks are special cases. In the Debian Installer, if "
+"the medium was prepared for a particular desktop environment flavour, the "
+"corresponding task will be automatically installed. Thus, there are there "
+"are #{gnome-desktop}#, #{kde-desktop}#, #{lxde-desktop}# and #{xfce-desktop}"
+"# tasks, none of which are offered in #{tasksel}#'s menu. Likewise, there "
+"are no menu entries for tasks for languages, but the user's language choice "
+"during the install influences the selection of corresponding language tasks."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:202
-msgid "#if ARCHITECTURE amd64 #include <gnome-full> #endif"
+#: en/user_customization-packages.ssi:189
+msgid ""
+"In live-build, therefore, these special cases are also given special "
+"consideration, but with three notable differences at the time of writing."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:206
+#: en/user_customization-packages.ssi:191
msgid ""
-"Any live-build configuration variable that begins with #{LB_}# can be tested "
-"in this way."
+"First, there is no provision made yet automatically for language tasks, "
+"although a subset of those packages are included if you specify #{lb config "
+"--language}#. If you need those tasks, which include such things as language-"
+"specific fonts and input-method packages, you need to specify them in your "
+"configuration. For example:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:208
-msgid "The nesting of conditionals is not supported."
+#: en/user_customization-packages.ssi:195
+msgid ""
+"$ lb config --tasks \"japanese japanese-desktop japanese-gnome-desktop\""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:210
-msgid "3~ Tasks"
+#: en/user_customization-packages.ssi:199
+msgid ""
+"Second, live-build supports #{*-desktop}# virtual package lists for each of "
+"the desktop flavours mentioned above, which select the #{standard-x11}# "
+"predefined package list, the corresponding #{*-desktop}# task and three "
+"additional tasks: #{desktop}#, #{standard}# and #{laptop}#. So, for example, "
+"if you specify #{--packages gnome-desktop}#, it is equivalent to specifying #"
+"{--packages standard-x11 --tasks \"gnome-desktop desktop standard laptop\"}#."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:212
-msgid "%FIXME"
+#: en/user_customization-packages.ssi:201
+msgid ""
+"Third, if any of the tasks for these desktop flavours are selected, either "
+"explicitly through #{--tasks}# or implicitly by #{--packages}#, live-build "
+"will preseed the corresponding desktop value for Debian Installer (if it is "
+"included) to ensure it follows its own rules for installing different "
+"desktop flavours."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:214
+#: en/user_customization-packages.ssi:203
msgid "2~ Installing modified or third-party packages"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:205
msgid ""
"Whilst it is against the philosophy of Debian Live, it may sometimes be "
"necessary to build a Live system with modified versions of packages that are "
@@ -607,7 +675,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:218
+#: en/user_customization-packages.ssi:207
msgid ""
"This section does not cover advice regarding building or maintaining "
"modified packages. Joachim Breitner's 'How to fork privately' method from "
@@ -618,95 +686,90 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:220
+#: en/user_customization-packages.ssi:209
msgid "There are two ways of installing modified custom packages:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:222
+#: en/user_customization-packages.ssi:211
msgid "_* #{chroot_local-packages}#"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:224
+#: en/user_customization-packages.ssi:213
msgid "_* Using a custom APT repository"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:226
+#: en/user_customization-packages.ssi:215
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:228
+#: en/user_customization-packages.ssi:217
msgid "3~ Using #{chroot_local-packages}# to install custom packages"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:230
+#: en/user_customization-packages.ssi:219
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:232
+#: en/user_customization-packages.ssi:221
msgid ""
"Packages *{must}* be named in the prescribed way. One simple way to do this "
"is to use #{dpkg-name}#."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:234
+#: en/user_customization-packages.ssi:223
msgid ""
"Using #{chroot_local-packages}# for installation of custom packages has "
"disadvantages:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:236
-msgid "_* It is not possible to use secure APT"
+#: en/user_customization-packages.ssi:225
+msgid "_* It is not possible to use secure APT."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:238
+#: en/user_customization-packages.ssi:227
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:240
+#: en/user_customization-packages.ssi:229
msgid ""
"_* It does not lend itself to storing Debian Live configurations in revision "
-"control"
+"control."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:242
+#: en/user_customization-packages.ssi:231
msgid "3~ Using an APT repository to install custom packages"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:244
+#: en/user_customization-packages.ssi:233
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."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:246
-msgid "% FIXME: <xref linkend=\"lb-packages\"/>"
+"you must ensure that you specify the packages elsewhere. See {Choosing "
+"packages to install}#choosing-packages-to-install for details."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:248
+#: en/user_customization-packages.ssi:235
msgid ""
"Whilst it may seem unnecessary effort to create an APT repository to install "
"custom packages, the infrastructure can be easily re-used at a later date to "
@@ -714,12 +777,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:250
+#: en/user_customization-packages.ssi:237
msgid "3~ Custom packages and APT"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:252
+#: en/user_customization-packages.ssi:239
msgid ""
"live-build uses APT to install all packages into the live system so will "
"therefore inherit behaviours from this program. One relevant example is that "
@@ -729,7 +792,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:254
+#: en/user_customization-packages.ssi:241
msgid ""
"Because of this, you may wish to increment the version number in your custom "
"packages' #{debian/changelog}# files to ensure that your modified version is "
@@ -739,19 +802,152 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:256
+#: en/user_customization-packages.ssi:243
msgid "% FIXME: <xref linkend=\"apt-preferences\"/>"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:258
-msgid "3~ Altering APT preferences during Live system"
+#: en/user_customization-packages.ssi:245
+msgid "2~ Configuring APT at build time"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:247
+msgid ""
+"You can configure APT through a number of options applied only at build "
+"time. (APT configuration used in the running live system may be configured "
+"in the normal way for live system contents, that is, by including the "
+"appropriate configurations through #{config/chroot_local_includes/}#.) For a "
+"complete list, look for options starting with #{apt}# in the #{lb_config}# "
+"man page."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:249
+msgid "3~choosing-apt-or-aptitude Choosing apt or aptitude"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:251
+msgid ""
+"You can elect to use either #{apt}# or #{aptitude}# when installing packages "
+"at build time. Which utility is used is governed by the #{--apt}# argument "
+"to #{lb config}#. Choose the method implementing the preferred behaviour for "
+"package installation, the notable difference being how missing packages are "
+"handled."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:253
+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:255
+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:257
+msgid "3~ Using a proxy with APT"
msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:259
msgid ""
-"Whilst it may seem unnecessary effort to create an APT repository to install "
-"custom packages, the infrastructure can be easily re-used at a later date to "
-"offer updates of the modified package."
+"One commonly required APT configuration is to deal with building an image "
+"behind a proxy. You may specify your APT proxy with the #{--apt-ftp-proxy}# "
+"or #{--apt-http-proxy}# options as needed, e.g."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:263
+msgid "lb config --apt-http-proxy http://proxy/"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:267
+msgid "3~ Tweaking APT to save space"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:269
+msgid ""
+"You may find yourself needing to save some space on the image media, in "
+"which case one or the other or both of the following options may be of "
+"interest."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:271
+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:275
+msgid "$ lb config --binary-indices false"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:279
+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 "
+"APT needs those indices in order to operate in the live system, so before "
+"performing #{apt-cache search}# or #{apt-get install}#, for instance, the "
+"user must #{apt-get update}# first to create those indices."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:281
+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:285
+msgid "$ lb config -apt-recommends false"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:289
+msgid ""
+"The tradeoff here is that recommended packages are defined as \"packages "
+"that would be found together with this one in all but unusual installations"
+"\" (Debian Policy Manual, 7.2). This may lead to some packages that you "
+"actually need being omitted, so we suggest you review the difference this "
+"makes to your packages list (see the #{binary.packages}# file generated by #"
+"{lb build}#) and re-include in your list any missing packages that you still "
+"want installed."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:291
+msgid "3~ Passing options to apt or aptitude"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:293
+msgid ""
+"If there is not an #{lb config}# option to alter APT's behaviour in the way "
+"you need, use #{--apt-options}# or #{--aptitude-options}# to pass any "
+"options through to your configured APT tool. See the man pages for #{apt}# "
+"and #{aptitude}# for details."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:295
+msgid "3~ APT pinning"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:297
+msgid "% FIXME: needs content"
msgstr ""
diff --git a/manual/po/fr/user_examples.ssi.po b/manual/po/fr/user_examples.ssi.po
index 8e8b835..6ebf1a3 100644
--- a/manual/po/fr/user_examples.ssi.po
+++ b/manual/po/fr/user_examples.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-11-04 16:34-0400\n"
+"POT-Creation-Date: 2010-11-28 07:51-0400\n"
"PO-Revision-Date: 2010-11-04 16:34-0400\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -17,52 +17,61 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
#. type: Plain text
-#: en/about_manual.ssi:80 en/about_manual.ssi:88 en/about_manual.ssi:96
-#: en/about_manual.ssi:108 en/about_manual.ssi:121 en/about_manual.ssi:134
-#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
-#: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
-#: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
-#: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
-#: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
-#: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
-#: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
-#: en/other_faq.ssi:41 en/other_faq.ssi:83 en/other_faq.ssi:103
-#: en/other_faq.ssi:117 en/other_faq.ssi:137 en/other_faq.ssi:151
-#: en/other_faq.ssi:198 en/other_faq.ssi:245 en/other_faq.ssi:261
-#: en/other_faq.ssi:287 en/other_faq.ssi:299 en/other_faq.ssi:314
-#: en/other_faq.ssi:333 en/other_faq.ssi:345 en/other_faq.ssi:353
-#: en/other_faq.ssi:364 en/other_faq.ssi:374 en/other_howtos.ssi:16
-#: en/other_howtos.ssi:43 en/other_live-environment.ssi:14
-#: en/other_live-environment.ssi:30 en/other_live-environment.ssi:51
-#: en/other_live-environment.ssi:61 en/other_live-environment.ssi:69
-#: en/other_live-environment.ssi:77 en/other_live-environment.ssi:85
-#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
-#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
-#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
-#: en/other_procedures.ssi:58 en/project_bugs.ssi:58 en/user_basics.ssi:32
-#: en/user_basics.ssi:42 en/user_basics.ssi:54 en/user_basics.ssi:66
-#: en/user_basics.ssi:78 en/user_basics.ssi:88 en/user_basics.ssi:102
-#: en/user_basics.ssi:110 en/user_basics.ssi:118 en/user_basics.ssi:128
-#: en/user_basics.ssi:140 en/user_basics.ssi:152 en/user_basics.ssi:160
-#: en/user_basics.ssi:168 en/user_basics.ssi:182 en/user_basics.ssi:190
-#: en/user_basics.ssi:200 en/user_basics.ssi:220 en/user_basics.ssi:253
-#: en/user_basics.ssi:269 en/user_basics.ssi:277 en/user_basics.ssi:297
-#: en/user_basics.ssi:322 en/user_customization-contents.ssi:34
-#: en/user_customization-contents.ssi:43 en/user_customization-contents.ssi:66
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
+#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
+#: en/about_manual.ssi:170 en/other_coding-style.ssi:28
+#: en/other_coding-style.ssi:38 en/other_coding-style.ssi:51
+#: en/other_coding-style.ssi:61 en/other_coding-style.ssi:88
+#: en/other_coding-style.ssi:96 en/other_coding-style.ssi:106
+#: en/other_coding-style.ssi:117 en/other_common-tasks.ssi:32
+#: en/other_customization-backports.ssi:8 en/other_customization-bootup.ssi:30
+#: en/other_customization-bootup.ssi:39 en/other_faq.ssi:41
+#: en/other_faq.ssi:83 en/other_faq.ssi:103 en/other_faq.ssi:117
+#: en/other_faq.ssi:137 en/other_faq.ssi:151 en/other_faq.ssi:198
+#: en/other_faq.ssi:245 en/other_faq.ssi:261 en/other_faq.ssi:287
+#: en/other_faq.ssi:299 en/other_faq.ssi:314 en/other_faq.ssi:333
+#: en/other_faq.ssi:345 en/other_faq.ssi:353 en/other_faq.ssi:364
+#: en/other_faq.ssi:374 en/other_howtos.ssi:16 en/other_howtos.ssi:43
+#: en/other_live-environment.ssi:14 en/other_live-environment.ssi:30
+#: en/other_live-environment.ssi:51 en/other_live-environment.ssi:61
+#: en/other_live-environment.ssi:69 en/other_live-environment.ssi:77
+#: en/other_live-environment.ssi:85 en/other_live-environment.ssi:93
+#: en/other_live-environment.ssi:116 en/other_live-environment.ssi:124
+#: en/other_live-environment.ssi:133 en/other_procedures.ssi:12
+#: en/other_procedures.ssi:46 en/other_procedures.ssi:58
+#: en/project_bugs.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/user_basics.ssi:54 en/user_basics.ssi:66 en/user_basics.ssi:78
+#: en/user_basics.ssi:88 en/user_basics.ssi:102 en/user_basics.ssi:110
+#: en/user_basics.ssi:118 en/user_basics.ssi:128 en/user_basics.ssi:142
+#: en/user_basics.ssi:154 en/user_basics.ssi:162 en/user_basics.ssi:170
+#: en/user_basics.ssi:184 en/user_basics.ssi:192 en/user_basics.ssi:202
+#: en/user_basics.ssi:222 en/user_basics.ssi:255 en/user_basics.ssi:271
+#: en/user_basics.ssi:279 en/user_basics.ssi:299 en/user_basics.ssi:324
+#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
+#: en/user_customization-contents.ssi:66
#: en/user_customization-internationalization.ssi:10
#: en/user_customization-internationalization.ssi:18
#: en/user_customization-internationalization.ssi:26
#: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:16 en/user_customization-packages.ssi:24
-#: en/user_customization-packages.ssi:36 en/user_customization-packages.ssi:45
-#: en/user_customization-packages.ssi:59 en/user_customization-packages.ssi:73
-#: en/user_customization-packages.ssi:103
-#: en/user_customization-packages.ssi:111
-#: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:166
-#: en/user_customization-packages.ssi:176
-#: en/user_customization-packages.ssi:186
-#: en/user_customization-packages.ssi:196 en/user_examples.ssi:24
+#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
+#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
+#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:90
+#: en/user_customization-packages.ssi:120
+#: en/user_customization-packages.ssi:133
+#: en/user_customization-packages.ssi:143
+#: en/user_customization-packages.ssi:153
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:261
+#: en/user_customization-packages.ssi:273
+#: en/user_customization-packages.ssi:283 en/user_examples.ssi:14
+#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
+#: en/user_examples.ssi:64 en/user_examples.ssi:80 en/user_examples.ssi:90
+#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:131
+#: en/user_examples.ssi:139 en/user_examples.ssi:154 en/user_examples.ssi:162
+#: en/user_examples.ssi:188 en/user_examples.ssi:209 en/user_examples.ssi:217
#: 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
@@ -75,14 +84,15 @@ msgid "code{"
msgstr "code{"
#. type: Plain text
-#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
-#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
-#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
-#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
-#: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
-#: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
+#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:166
+#: en/about_manual.ssi:173 en/other_coding-style.ssi:34
+#: en/other_coding-style.ssi:45 en/other_coding-style.ssi:57
+#: en/other_coding-style.ssi:68 en/other_coding-style.ssi:92
+#: en/other_coding-style.ssi:100 en/other_coding-style.ssi:113
+#: en/other_coding-style.ssi:124 en/other_common-tasks.ssi:36
+#: en/other_customization-backports.ssi:16
#: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
#: en/other_faq.ssi:37 en/other_faq.ssi:46 en/other_faq.ssi:92
#: en/other_faq.ssi:108 en/other_faq.ssi:141 en/other_faq.ssi:155
@@ -100,27 +110,35 @@ msgstr "code{"
#: en/project_bugs.ssi:62 en/user_basics.ssi:36 en/user_basics.ssi:46
#: en/user_basics.ssi:60 en/user_basics.ssi:72 en/user_basics.ssi:82
#: en/user_basics.ssi:94 en/user_basics.ssi:106 en/user_basics.ssi:114
-#: en/user_basics.ssi:122 en/user_basics.ssi:132 en/user_basics.ssi:146
-#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
-#: en/user_basics.ssi:186 en/user_basics.ssi:194 en/user_basics.ssi:204
-#: en/user_basics.ssi:245 en/user_basics.ssi:257 en/user_basics.ssi:273
-#: en/user_basics.ssi:281 en/user_basics.ssi:308 en/user_basics.ssi:347
+#: en/user_basics.ssi:122 en/user_basics.ssi:132 en/user_basics.ssi:148
+#: en/user_basics.ssi:158 en/user_basics.ssi:166 en/user_basics.ssi:174
+#: en/user_basics.ssi:188 en/user_basics.ssi:196 en/user_basics.ssi:206
+#: en/user_basics.ssi:247 en/user_basics.ssi:259 en/user_basics.ssi:275
+#: en/user_basics.ssi:283 en/user_basics.ssi:310 en/user_basics.ssi:349
#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
#: en/user_customization-contents.ssi:70
#: en/user_customization-internationalization.ssi:14
#: en/user_customization-internationalization.ssi:22
#: en/user_customization-internationalization.ssi:30
#: en/user_customization-internationalization.ssi:42
-#: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
-#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
-#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
-#: en/user_customization-packages.ssi:107
-#: en/user_customization-packages.ssi:115
-#: en/user_customization-packages.ssi:135
-#: en/user_customization-packages.ssi:172
-#: en/user_customization-packages.ssi:182
-#: en/user_customization-packages.ssi:192
-#: en/user_customization-packages.ssi:202 en/user_examples.ssi:33
+#: en/user_customization-packages.ssi:23 en/user_customization-packages.ssi:36
+#: en/user_customization-packages.ssi:48 en/user_customization-packages.ssi:62
+#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:94
+#: en/user_customization-packages.ssi:125
+#: en/user_customization-packages.ssi:139
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:159
+#: en/user_customization-packages.ssi:169
+#: en/user_customization-packages.ssi:181
+#: en/user_customization-packages.ssi:197
+#: en/user_customization-packages.ssi:265
+#: en/user_customization-packages.ssi:277
+#: en/user_customization-packages.ssi:287 en/user_examples.ssi:20
+#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:58
+#: en/user_examples.ssi:68 en/user_examples.ssi:86 en/user_examples.ssi:101
+#: en/user_examples.ssi:111 en/user_examples.ssi:123 en/user_examples.ssi:135
+#: en/user_examples.ssi:150 en/user_examples.ssi:158 en/user_examples.ssi:166
+#: en/user_examples.ssi:197 en/user_examples.ssi:213 en/user_examples.ssi:221
#: en/user_installation.ssi:42 en/user_installation.ssi:50
#: en/user_installation.ssi:60 en/user_installation.ssi:72
#: en/user_installation.ssi:80 en/user_installation.ssi:88
@@ -133,95 +151,474 @@ msgid "}code"
msgstr "}code"
#. type: Plain text
-#: en/other_faq.ssi:85 en/other_faq.ssi:247 en/user_examples.ssi:26
+#: en/other_faq.ssi:85 en/other_faq.ssi:247 en/user_examples.ssi:92
+#: en/user_examples.ssi:141 en/user_examples.ssi:190
msgid "#!/bin/sh"
msgstr ""
#. type: Plain text
+#: en/user_basics.ssi:44 en/user_basics.ssi:120 en/user_basics.ssi:204
+#: en/user_examples.ssi:109 en/user_examples.ssi:156
+msgid "# lb build"
+msgstr ""
+
+#. type: Plain text
#: en/user_examples.ssi:2
-msgid "B~ Examples"
+msgid ":B~ Examples"
msgstr ""
#. type: Plain text
#: en/user_examples.ssi:4
-msgid "1~ Use Case Builds"
+msgid "1~examples Examples"
msgstr ""
#. type: Plain text
#: en/user_examples.ssi:6
msgid ""
-"This chapter covers example builds for specific use cases with Debian Live."
+"This chapter covers example builds for specific use cases with Debian Live. "
+"If you are new to building your own Debian Live images, we recommend you "
+"first look at the three tutorials in sequence, as each one teaches new "
+"techniques that will help you use and understand the remaining examples."
msgstr ""
#. type: Plain text
#: en/user_examples.ssi:8
-msgid "2~ VNC Kiosk Client"
+msgid "2~using-the-examples Using the examples"
msgstr ""
#. type: Plain text
#: en/user_examples.ssi:10
-msgid "Create an image with live-build to boot directly to a VNC server."
+msgid ""
+"To use these examples you need a system to build them on that meets the "
+"requirements listed in {Requirements}#requirements and has live-build "
+"installed as described in {Installing live-build}#installing-live-build."
msgstr ""
#. type: Plain text
#: en/user_examples.ssi:12
+msgid ""
+"Note that, for the sake of brevity, in these examples we do not specify a "
+"local mirror to use for the build. You can speed up downloads considerably "
+"if you use a local mirror. You may specify the options when you use #{lb "
+"config}#, as described in {Distribution mirrors used at build time}"
+"#distribution-mirrors-build-time, or for more convenience, set the default "
+"for your build system in #{/etc/live/build.conf}#. Simply create this file "
+"and in it, set the corresponding #{LB_MIRROR_*}# variables to your preferred "
+"mirror. For example:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:18
+msgid ""
+"LB_MIRROR_BOOTSTRAP=\"http://mirror/debian\" LB_MIRROR_CHROOT=\"http://"
+"mirror/debian\" LB_MIRROR_CHROOT_SECURITY=\"http://mirror/debian-security\""
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:22
+msgid "2~tutorial-1 Tutorial 1: A standard image"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:24
+#, no-wrap
+msgid "*{Use case:}* Create a simple first image, learning the basics of live-build\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:26
+msgid ""
+"In this tutorial, we will build a default ISO hybrid Debian Live image "
+"containing only base packages (no Xorg) and some Debian Live support "
+"packages, as a first exercise in using live-build."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:28
+msgid "You can't get much simpler than this:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:32
+msgid "$ mkdir tutorial1 ; cd tutorial1 ; lb config"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:36
+msgid ""
+"Examine the contents of the #{config/}# directory if you wish. You will see "
+"stored here a skeletal configuration, ready to customize or, in this case, "
+"use immediately to build a default image."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:38
+msgid ""
+"Now, as superuser, build the image, saving a log as you build with #{tee}#."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:42
+msgid "# lb_build 2>&1 | tee binary.log"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:46
+msgid ""
+"Assuming all goes well, after a while, the current directory will contain #"
+"{binary-hybrid.iso}#. This ISO hybrid image can be booted directly in a "
+"virtual machine as described in {Testing an ISO image with Qemu}#testing-iso-"
+"with-qemu and {Testing an ISO image with virtualbox-ose}#testing-iso-with-"
+"virtualbox, or else imaged onto optical media or a USB flash device as "
+"described in {Burning an ISO image to a physical medium}#burning-iso-image "
+"and {Copying USB/HDD image to a USB stick}#copying-usb-hdd-image, "
+"respectively."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:48
+msgid "2~tutorial-2 Tutorial 2: A web browser utility"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:50
+#, no-wrap
+msgid "*{Use case}* Create a web browser utility image, learning how to apply customizations\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:52
+msgid ""
+"In this tutorial, we will create an image suitable for use as a web browser "
+"utility, serving as an introduction to customizing Debian Live images."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:56
+msgid "mkdir tutorial2 ; cd tutorial2 ; lb config -p lxde --packages iceweasel"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:60
+msgid ""
+"Our choice of LXDE for this example reflects our desire to provide a minimal "
+"desktop environment, since the focus of the image is the single use we have "
+"in mind, the web browser. We could go even further and provide a default "
+"configuration for the web browser in #{config/chroot_local-includes/etc/"
+"iceweasel/profile/}#, or additional support packages for viewing various "
+"kinds of web content, but we leave this as an exercise for the reader."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:62
+msgid ""
+"Build the image, again as superuser, keeping a log as in {Tutorial 1}"
+"#tutorial-1:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:66 en/user_examples.ssi:219
+msgid "# lb build 2>&1 | tee binary.log"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:70
+msgid "Again, verify the image is OK and test, as in {Tutorial 1}#tutorial-1."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:72
+msgid "2~tutorial-3 Tutorial 3: A personalized image"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:74
+#, no-wrap
+msgid "*{Use case}* Create a project to build a personalized image, containing your favourite software to take with you on a USB stick wherever you go, and evolving in successive revisions as your needs and preferences change.\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:76
+msgid ""
+"Since we will be changing our personalized image over a number of revisions, "
+"and we want to track those changes, trying things experimentally and "
+"possibly reverting them if things don't work out, we will keep our "
+"configuration in the popular #{git}# version control system. We will also "
+"use the best practice of autoconfiguration via #{auto}# scripts as described "
+"in {Managing a configuration}#managing-a-configuration."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:78
+msgid "3~ First revision"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:84
+msgid ""
+"$ mkdir -p tutorial3/auto $ cp /usr/share/live/examples/auto/* tutorial3/"
+"auto/ $ cd tutorial3"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:88
+msgid "Edit #{auto/config}# to read as follows:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:99
+#, no-wrap
+msgid ""
+"lb config noauto \\\n"
+" --architecture i386 \\\n"
+" --linux-flavours 686 \\\n"
+" --packages-lists lxde \\\n"
+" --packages \"iceweasel xchat\" \\\n"
+" \"${@}\"\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:103
+msgid ""
+"First, #{--architecture i386}# ensures that on our #{amd64}# build system, "
+"we build a 32-bit version suitable for use on most machines. Second, we use #"
+"{--linux-flavours 686}# because we don't anticipate using this image on much "
+"older systems. Third, we've chosen the #{lxde}# package list to give us a "
+"minimal desktop. And finally, we have added two initial favourite packages: #"
+"{iceweasel}# and #{xchat}#."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:105
+msgid "Now, build the image:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:113
+msgid ""
+"Note that unlike in the first two tutorials, we no longer have to type #"
+"{2>&1 | tee binary.log}# as that is now included in #{auto/build}#."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:115
+msgid ""
+"Once you've tested the image (as in {Tutorial 1}#tutorial-1) and are "
+"satisfied it works, it's time to initialize our #{git}# repository, adding "
+"only the auto scripts we just created, and then make the first commit:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:121
+msgid "$ git init $ git add auto $ git commit -a -m \"Initial import.\""
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:125
+msgid "3~ Second revision"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:127
+msgid ""
+"In this revision, we're going to clean up from the first build, add the #"
+"{vlc}# package to our configuration, rebuild, test and commit."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:129
+msgid ""
+"The #{lb clean}# command will clean up all generated files from the previous "
+"build except for the cache, which saves having to re-download packages. This "
+"ensures that the subsequent #{lb build}# will re-run all stages to "
+"regenerate the files from our new configuration."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:133
+msgid "# lb clean"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:137
+msgid "Now edit #{auto/config}# to add the #{vlc}# package:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:148
+#, no-wrap
+msgid ""
+"lb config noauto \\\n"
+" --architecture i386 \\\n"
+" --linux-flavours 686 \\\n"
+" --packages-lists lxde \\\n"
+" --packages \"iceweasel xchat vlc\" \\\n"
+" \"${@}\"\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:152
+msgid "Build again:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:160
+msgid "Test, and when you're satisfied, commit the next revision:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:164
+msgid "$ git commit -a -m \"Adding vlc media player.\""
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:168
+msgid ""
+"Of course, more complicated changes to the configuration are possible, "
+"perhaps adding files in subdirectories of #{config/}#. When you commit new "
+"revisions, just take care not to hand edit or commit the top-level files in #"
+"{config}# containing #{LB_*}# variables, as these are build products, too, "
+"and are always cleaned up by #{lb clean}# and re-created with #{lb config}# "
+"via their respective #{auto}# scripts."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:170
+msgid ""
+"We've come to the end of our tutorial series. While many more kinds of "
+"customization are possible, even just using the few features explored in "
+"these simple examples, an almost infinite variety of different images can be "
+"created. The remaining examples in this section cover several other use "
+"cases drawn from the collected experiences of users of Debian Live."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:172
+msgid "2~ A VNC Kiosk Client"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:174
+msgid "Create an image with live-build to boot directly to a VNC server."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:176
msgid "_* Make a build directory: #{$ mkdir vncBuild}#"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:14
+#: en/user_examples.ssi:178
msgid "_* Move to the build directory: #{$ cd vncBuild}#"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:16
+#: en/user_examples.ssi:180
msgid ""
"Example to config the build directory to include gdm metacity "
"xtightvncviewer: #{$ lb config --packages \"gdm3 metacity xtightvncviewer\"}#"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:18
+#: en/user_examples.ssi:182
msgid ""
"Create a folder /etc/skel folder for a custom .xsession for the default "
"user: #{$ mkdir -p config/chroot_local-includes/etc/skel}#"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:20
+#: en/user_examples.ssi:184
msgid ""
"Create the .xsession for the default user: #{$ touch config/chroot_local-"
"includes/etc/skel/.xsession}#"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:22
+#: en/user_examples.ssi:186
msgid ""
"Edit the .xsession file to launch metacity and start xvncviewer with "
"something similar to the below:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:29
+#: en/user_examples.ssi:193
msgid "/usr/bin/metacity & /usr/bin/vncviewer xxx.xxx.xxx.xxx:PORT"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:31
+#: en/user_examples.ssi:195
msgid "exit"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:35
+#: en/user_examples.ssi:199
msgid "_* Build the image: #{# lb build}#"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:37
+#: en/user_examples.ssi:201
msgid "_* Enjoy."
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:39
-msgid "2~ Next Example FIXME"
+#: en/user_examples.ssi:203
+msgid "2~ A base image for a 128M USB key"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:205
+#, no-wrap
+msgid "*{Use case}* Create a standard image with some components removed in order to fit on a 128M USB key with space left over to use as you see fit.\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:207
+msgid ""
+"When optimizing an image to fit a certain media size, you need to understand "
+"the tradeoffs you are making between size and functionality. In this "
+"example, we trim only so much as to make room for additional material within "
+"a 128M media size, but without doing anything to destroy integrity of the "
+"packages contained within, such as the purging of locale data via the #"
+"{localepurge}# package, or other such \"intrusive\" optimizations. Of "
+"particular note, you should not use #{--bootstrap-flavour minimal}# unless "
+"you really know what you're doing, as omitting priority #{important}# "
+"packages will most likely produce a broken live system."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:211
+msgid ""
+"$ lb config -k 486 -p minimal --binary-indices false --memtest none --apt-"
+"recommends false --includes none"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:215
+msgid "Now, build the image in the usual way:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:223
+msgid ""
+"On the author's system at time of writing, the above configuration produced "
+"a 78Mbyte image. This compares favourably with the 166Mbyte image produced "
+"by the default configuration in {Tutorial 1}#tutorial-1."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:225
+msgid ""
+"The biggest space-saver here, compared to building a standard image on an #"
+"{i386}# architecture system, is to select only the #{486}# kernel flavour "
+"instead of the default #{-k \"486 686\"}#. Leaving off APT's indices with #"
+"{--binary-indices false}# also saves a fair amount of space, the tradeoff "
+"being that you need to #{apt-get update}# before using apt in the live "
+"system. Choosing the #{minimal}# package list leaves out the large #{locales}"
+"# package and associated utilities. Dropping recommended packages with #{--"
+"apt-recommends false}# saves some additional space, at the expense of "
+"omitting some packages you might otherwise expect to be there, such as #"
+"{firmware-linux-free}# which may be needed to support certain hardware. The "
+"remaining options shave off additional small amounts of space. It's up to "
+"you to decide if the functionality that is sacrificed with each optimization "
+"is worth the loss in functionality."
msgstr ""
diff --git a/manual/po/fr/user_installation.ssi.po b/manual/po/fr/user_installation.ssi.po
index 4d54cc3..8ac11ce 100644
--- a/manual/po/fr/user_installation.ssi.po
+++ b/manual/po/fr/user_installation.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-23 16:43+0300\n"
+"POT-Creation-Date: 2010-11-29 14:16-0400\n"
"PO-Revision-Date: 2010-10-16 20:36-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -17,74 +17,82 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
#. type: Plain text
-#: en/about_manual.ssi:80 en/about_manual.ssi:88 en/about_manual.ssi:96
-#: en/about_manual.ssi:108 en/about_manual.ssi:121 en/about_manual.ssi:134
-#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
-#: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
-#: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
-#: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
-#: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
-#: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
-#: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
-#: en/other_faq.ssi:41 en/other_faq.ssi:83 en/other_faq.ssi:103
-#: en/other_faq.ssi:117 en/other_faq.ssi:137 en/other_faq.ssi:151
-#: en/other_faq.ssi:198 en/other_faq.ssi:245 en/other_faq.ssi:261
-#: en/other_faq.ssi:287 en/other_faq.ssi:299 en/other_faq.ssi:314
-#: en/other_faq.ssi:333 en/other_faq.ssi:345 en/other_faq.ssi:353
-#: en/other_faq.ssi:364 en/other_faq.ssi:374 en/other_howtos.ssi:16
-#: en/other_howtos.ssi:43 en/other_live-environment.ssi:14
-#: en/other_live-environment.ssi:30 en/other_live-environment.ssi:51
-#: en/other_live-environment.ssi:61 en/other_live-environment.ssi:69
-#: en/other_live-environment.ssi:77 en/other_live-environment.ssi:85
-#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
-#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
-#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
-#: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
-#: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
-#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111 en/user_basics.ssi:34
-#: en/user_basics.ssi:44 en/user_basics.ssi:56 en/user_basics.ssi:68
-#: en/user_basics.ssi:80 en/user_basics.ssi:92 en/user_basics.ssi:106
-#: en/user_basics.ssi:114 en/user_basics.ssi:122 en/user_basics.ssi:132
-#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
-#: en/user_basics.ssi:172 en/user_basics.ssi:186 en/user_basics.ssi:194
-#: en/user_basics.ssi:204 en/user_basics.ssi:224 en/user_basics.ssi:257
-#: en/user_basics.ssi:273 en/user_basics.ssi:281 en/user_basics.ssi:301
-#: en/user_basics.ssi:326 en/user_customization-contents.ssi:34
-#: en/user_customization-contents.ssi:43 en/user_customization-contents.ssi:66
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
+#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
+#: en/about_manual.ssi:170 en/other_coding-style.ssi:28
+#: en/other_coding-style.ssi:38 en/other_coding-style.ssi:51
+#: en/other_coding-style.ssi:61 en/other_coding-style.ssi:88
+#: en/other_coding-style.ssi:96 en/other_coding-style.ssi:106
+#: en/other_coding-style.ssi:117 en/other_common-tasks.ssi:32
+#: en/other_customization-backports.ssi:8 en/other_customization-bootup.ssi:30
+#: en/other_customization-bootup.ssi:39 en/other_faq.ssi:41
+#: en/other_faq.ssi:83 en/other_faq.ssi:103 en/other_faq.ssi:117
+#: en/other_faq.ssi:137 en/other_faq.ssi:151 en/other_faq.ssi:198
+#: en/other_faq.ssi:245 en/other_faq.ssi:261 en/other_faq.ssi:287
+#: en/other_faq.ssi:299 en/other_faq.ssi:314 en/other_faq.ssi:333
+#: en/other_faq.ssi:345 en/other_faq.ssi:353 en/other_faq.ssi:364
+#: en/other_faq.ssi:374 en/other_howtos.ssi:16 en/other_howtos.ssi:43
+#: en/other_live-environment.ssi:14 en/other_live-environment.ssi:30
+#: en/other_live-environment.ssi:51 en/other_live-environment.ssi:61
+#: en/other_live-environment.ssi:69 en/other_live-environment.ssi:77
+#: en/other_live-environment.ssi:85 en/other_live-environment.ssi:93
+#: en/other_live-environment.ssi:116 en/other_live-environment.ssi:124
+#: en/other_live-environment.ssi:133 en/other_procedures.ssi:12
+#: en/other_procedures.ssi:46 en/other_procedures.ssi:58
+#: en/project_bugs.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/user_basics.ssi:54 en/user_basics.ssi:66 en/user_basics.ssi:78
+#: en/user_basics.ssi:88 en/user_basics.ssi:102 en/user_basics.ssi:110
+#: en/user_basics.ssi:118 en/user_basics.ssi:128 en/user_basics.ssi:142
+#: en/user_basics.ssi:154 en/user_basics.ssi:162 en/user_basics.ssi:170
+#: en/user_basics.ssi:184 en/user_basics.ssi:192 en/user_basics.ssi:202
+#: en/user_basics.ssi:222 en/user_basics.ssi:255 en/user_basics.ssi:271
+#: en/user_basics.ssi:279 en/user_basics.ssi:299 en/user_basics.ssi:324
+#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
+#: en/user_customization-contents.ssi:66
#: en/user_customization-internationalization.ssi:10
#: en/user_customization-internationalization.ssi:18
#: en/user_customization-internationalization.ssi:26
#: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:16 en/user_customization-packages.ssi:24
-#: en/user_customization-packages.ssi:36 en/user_customization-packages.ssi:45
-#: en/user_customization-packages.ssi:59 en/user_customization-packages.ssi:73
-#: en/user_customization-packages.ssi:103
-#: en/user_customization-packages.ssi:111
-#: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:166
-#: en/user_customization-packages.ssi:176
-#: en/user_customization-packages.ssi:186
-#: en/user_customization-packages.ssi:196 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:104
-#: en/user_installation.ssi:118 en/user_installation.ssi:135
-#: en/user_managing_a_configuration.ssi:24
+#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
+#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
+#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:90
+#: en/user_customization-packages.ssi:120
+#: en/user_customization-packages.ssi:133
+#: en/user_customization-packages.ssi:143
+#: en/user_customization-packages.ssi:153
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:261
+#: en/user_customization-packages.ssi:273
+#: en/user_customization-packages.ssi:283 en/user_examples.ssi:14
+#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
+#: en/user_examples.ssi:64 en/user_examples.ssi:80 en/user_examples.ssi:90
+#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:131
+#: en/user_examples.ssi:139 en/user_examples.ssi:154 en/user_examples.ssi:162
+#: en/user_examples.ssi:188 en/user_examples.ssi:209 en/user_examples.ssi:217
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:76 en/user_installation.ssi:84
+#: en/user_installation.ssi:108 en/user_installation.ssi:126
+#: en/user_installation.ssi:144 en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
-#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:46
-#: en/user_overview.ssi:90 en/user_overview.ssi:98
+#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:36
+#: en/user_overview.ssi:80 en/user_overview.ssi:88
msgid "code{"
msgstr "code{"
#. type: Plain text
-#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
-#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
-#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
-#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
-#: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
-#: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
+#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:166
+#: en/about_manual.ssi:173 en/other_coding-style.ssi:34
+#: en/other_coding-style.ssi:45 en/other_coding-style.ssi:57
+#: en/other_coding-style.ssi:68 en/other_coding-style.ssi:92
+#: en/other_coding-style.ssi:100 en/other_coding-style.ssi:113
+#: en/other_coding-style.ssi:124 en/other_common-tasks.ssi:36
+#: en/other_customization-backports.ssi:16
#: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
#: en/other_faq.ssi:37 en/other_faq.ssi:46 en/other_faq.ssi:92
#: en/other_faq.ssi:108 en/other_faq.ssi:141 en/other_faq.ssi:155
@@ -99,40 +107,46 @@ msgstr "code{"
#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
#: en/other_live-environment.ssi:138 en/other_procedures.ssi:16
#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
-#: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
-#: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
-#: en/other_use-cases.ssi:137 en/user_basics.ssi:38 en/user_basics.ssi:48
-#: en/user_basics.ssi:62 en/user_basics.ssi:72 en/user_basics.ssi:86
-#: en/user_basics.ssi:98 en/user_basics.ssi:110 en/user_basics.ssi:118
-#: en/user_basics.ssi:126 en/user_basics.ssi:136 en/user_basics.ssi:150
-#: en/user_basics.ssi:160 en/user_basics.ssi:168 en/user_basics.ssi:176
-#: en/user_basics.ssi:190 en/user_basics.ssi:198 en/user_basics.ssi:208
-#: en/user_basics.ssi:249 en/user_basics.ssi:261 en/user_basics.ssi:277
-#: en/user_basics.ssi:285 en/user_basics.ssi:312 en/user_basics.ssi:351
+#: en/project_bugs.ssi:62 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:60 en/user_basics.ssi:72 en/user_basics.ssi:82
+#: en/user_basics.ssi:94 en/user_basics.ssi:106 en/user_basics.ssi:114
+#: en/user_basics.ssi:122 en/user_basics.ssi:132 en/user_basics.ssi:148
+#: en/user_basics.ssi:158 en/user_basics.ssi:166 en/user_basics.ssi:174
+#: en/user_basics.ssi:188 en/user_basics.ssi:196 en/user_basics.ssi:206
+#: en/user_basics.ssi:247 en/user_basics.ssi:259 en/user_basics.ssi:275
+#: en/user_basics.ssi:283 en/user_basics.ssi:310 en/user_basics.ssi:349
#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
#: en/user_customization-contents.ssi:70
#: en/user_customization-internationalization.ssi:14
#: en/user_customization-internationalization.ssi:22
#: en/user_customization-internationalization.ssi:30
#: en/user_customization-internationalization.ssi:42
-#: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
-#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
-#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
-#: en/user_customization-packages.ssi:107
-#: en/user_customization-packages.ssi:115
-#: en/user_customization-packages.ssi:135
-#: en/user_customization-packages.ssi:172
-#: en/user_customization-packages.ssi:182
-#: en/user_customization-packages.ssi:192
-#: en/user_customization-packages.ssi:202 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 en/user_installation.ssi:108
-#: en/user_installation.ssi:123 en/user_installation.ssi:138
-#: en/user_managing_a_configuration.ssi:31
+#: en/user_customization-packages.ssi:23 en/user_customization-packages.ssi:36
+#: en/user_customization-packages.ssi:48 en/user_customization-packages.ssi:62
+#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:94
+#: en/user_customization-packages.ssi:125
+#: en/user_customization-packages.ssi:139
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:159
+#: en/user_customization-packages.ssi:169
+#: en/user_customization-packages.ssi:181
+#: en/user_customization-packages.ssi:197
+#: en/user_customization-packages.ssi:265
+#: en/user_customization-packages.ssi:277
+#: en/user_customization-packages.ssi:287 en/user_examples.ssi:20
+#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:58
+#: en/user_examples.ssi:68 en/user_examples.ssi:86 en/user_examples.ssi:101
+#: en/user_examples.ssi:111 en/user_examples.ssi:123 en/user_examples.ssi:135
+#: en/user_examples.ssi:150 en/user_examples.ssi:158 en/user_examples.ssi:166
+#: en/user_examples.ssi:197 en/user_examples.ssi:213 en/user_examples.ssi:221
+#: 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
+#: en/user_installation.ssi:112 en/user_installation.ssi:131
+#: en/user_installation.ssi:147 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
-#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:84
-#: en/user_overview.ssi:94 en/user_overview.ssi:102
+#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:74
+#: en/user_overview.ssi:84 en/user_overview.ssi:92
msgid "}code"
msgstr "}code"
@@ -148,7 +162,7 @@ msgstr ""
#. type: Plain text
#: en/user_installation.ssi:6
-msgid "2~ Requirements"
+msgid "2~requirements Requirements"
msgstr ""
#. type: Plain text
@@ -190,7 +204,7 @@ msgstr ""
#. type: Plain text
#: en/user_installation.ssi:22
-msgid "2~ Installing live-build"
+msgid "2~installing-live-build Installing live-build"
msgstr ""
#. type: Plain text
@@ -324,33 +338,53 @@ msgstr ""
#. type: Plain text
#: en/user_installation.ssi:98
-msgid "3~ Using a customized live-boot"
+msgid "% FIXME: we also need to mention live-config"
msgstr ""
#. type: Plain text
#: en/user_installation.ssi:100
+msgid "3~ Using a customized live-boot"
+msgstr ""
+
+#. type: Plain text
+#: en/user_installation.ssi:102
+msgid ""
+"% FIXME: should follow the structure for live-build above (i.e. \"from source"
+"\", not \"customized\" -- we should not get into customization now, but "
+"should reserve that discussion for later."
+msgstr ""
+
+#. type: Plain text
+#: en/user_installation.ssi:104
msgid ""
"To modify the code you can follow the process below. Please ensure you are "
-"familiar with the terms mentioned in {Terms}#terms ."
+"familiar with the terms mentioned in {Terms}#terms."
msgstr ""
#. type: Plain text
-#: en/user_installation.ssi:102
+#: en/user_installation.ssi:106
msgid "_* Checkout the live-boot source"
msgstr ""
#. type: Plain text
-#: en/user_installation.ssi:106
+#: en/user_installation.ssi:110
msgid "$ git clone git://live.debian.net/git/live-boot.git"
msgstr ""
#. type: Plain text
-#: en/user_installation.ssi:110
+#: en/user_installation.ssi:114
msgid "_* Make changes to your local copy"
msgstr ""
#. type: Plain text
-#: en/user_installation.ssi:112
+#: en/user_installation.ssi:116
+msgid ""
+"% FIXME: as indicated above, it's too early for this topic. Move to later in "
+"the manual."
+msgstr ""
+
+#. type: Plain text
+#: en/user_installation.ssi:118
msgid ""
"And beware that if you want to add your pre-init script in live-bottom, you "
"should name it without dashes '-', e.g: call it \"99new_feature\" and not "
@@ -358,12 +392,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_installation.ssi:114
+#: en/user_installation.ssi:120
msgid "_* Build a live-boot .deb"
msgstr ""
#. type: Plain text
-#: en/user_installation.ssi:116
+#: en/user_installation.ssi:122
+msgid ""
+"% FIXME: not strictly true? building sid on squeeze is usually OK. also, "
+"building lenny on squeeze or sid is fine. clarify."
+msgstr ""
+
+#. type: Plain text
+#: en/user_installation.ssi:124
msgid ""
"You must build either on your target distribution or in a chroot containing "
"your target platform: this means if your target is Squeeze then you should "
@@ -374,17 +415,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_installation.ssi:121
-msgid "$ cd live-boot $ dpkg-buildpackage -rfakeroot -b -uc -us"
+#: en/user_installation.ssi:129
+msgid "$ cd live-boot $ dpkg-buildpackage -b -uc -us"
msgstr ""
#. type: Plain text
-#: en/user_installation.ssi:125
+#: en/user_installation.ssi:133
msgid "_* Use the generated live-boot .deb"
msgstr ""
#. type: Plain text
-#: en/user_installation.ssi:127
+#: en/user_installation.ssi:135
msgid ""
"As live-boot is installed by live-build system, installing the package in "
"the host system is not sufficient: you should treat the generated .deb like "
@@ -393,19 +434,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_installation.ssi:129
+#: en/user_installation.ssi:138
msgid ""
"% FIXME: <xref linkend=\"custom-packages\"/> <xref linkend=\"custom-packages-"
-"apt\"/>"
+"apt\"/> % Ben> What is the latter reference for? I can't see the relevance."
msgstr ""
#. type: Plain text
-#: en/user_installation.ssi:131
+#: en/user_installation.ssi:140
msgid "3~ Using live-boot snapshots"
msgstr ""
#. type: Plain text
-#: en/user_installation.ssi:133
+#: en/user_installation.ssi:142
msgid ""
"You can let live-build automatically use the latest snapshot of live-boot by "
"configuring a third-party repository in your live-build configuration "
@@ -414,6 +455,6 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_installation.ssi:137
+#: en/user_installation.ssi:146
msgid "lb config --repository live.debian.net"
msgstr ""
diff --git a/manual/po/fr/user_managing_a_configuration.ssi.po b/manual/po/fr/user_managing_a_configuration.ssi.po
index a2ca66a..f3c43e2 100644
--- a/manual/po/fr/user_managing_a_configuration.ssi.po
+++ b/manual/po/fr/user_managing_a_configuration.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-28 16:34-0200\n"
+"POT-Creation-Date: 2010-11-27 19:55-0400\n"
"PO-Revision-Date: 2010-10-13 17:00+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -17,9 +17,9 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
#. type: Plain text
-#: en/about_manual.ssi:80 en/about_manual.ssi:88 en/about_manual.ssi:96
-#: en/about_manual.ssi:108 en/about_manual.ssi:121 en/about_manual.ssi:134
-#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
+#: en/about_manual.ssi:112 en/about_manual.ssi:125 en/about_manual.ssi:138
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
#: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
#: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
#: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
@@ -39,38 +39,43 @@ msgstr ""
#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
-#: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
-#: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
-#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111
-#: en/project_bugs.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
-#: en/user_basics.ssi:54 en/user_basics.ssi:66 en/user_basics.ssi:78
-#: en/user_basics.ssi:88 en/user_basics.ssi:102 en/user_basics.ssi:110
-#: en/user_basics.ssi:118 en/user_basics.ssi:128 en/user_basics.ssi:140
-#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
-#: en/user_basics.ssi:182 en/user_basics.ssi:190 en/user_basics.ssi:200
-#: en/user_basics.ssi:220 en/user_basics.ssi:253 en/user_basics.ssi:269
-#: en/user_basics.ssi:277 en/user_basics.ssi:297 en/user_basics.ssi:322
-#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
-#: en/user_customization-contents.ssi:66
+#: en/other_procedures.ssi:58 en/project_bugs.ssi:58 en/user_basics.ssi:32
+#: en/user_basics.ssi:42 en/user_basics.ssi:54 en/user_basics.ssi:66
+#: en/user_basics.ssi:78 en/user_basics.ssi:88 en/user_basics.ssi:102
+#: en/user_basics.ssi:110 en/user_basics.ssi:118 en/user_basics.ssi:128
+#: en/user_basics.ssi:142 en/user_basics.ssi:154 en/user_basics.ssi:162
+#: en/user_basics.ssi:170 en/user_basics.ssi:184 en/user_basics.ssi:192
+#: en/user_basics.ssi:202 en/user_basics.ssi:222 en/user_basics.ssi:255
+#: en/user_basics.ssi:271 en/user_basics.ssi:279 en/user_basics.ssi:299
+#: en/user_basics.ssi:324 en/user_customization-contents.ssi:34
+#: en/user_customization-contents.ssi:43 en/user_customization-contents.ssi:66
#: en/user_customization-internationalization.ssi:10
#: en/user_customization-internationalization.ssi:18
#: en/user_customization-internationalization.ssi:26
#: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:16 en/user_customization-packages.ssi:24
-#: en/user_customization-packages.ssi:36 en/user_customization-packages.ssi:45
-#: en/user_customization-packages.ssi:59 en/user_customization-packages.ssi:73
-#: en/user_customization-packages.ssi:103
-#: en/user_customization-packages.ssi:111
-#: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:166
-#: en/user_customization-packages.ssi:176
-#: en/user_customization-packages.ssi:186
-#: en/user_customization-packages.ssi:196 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:104
-#: en/user_installation.ssi:118 en/user_installation.ssi:135
-#: en/user_managing_a_configuration.ssi:24
+#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
+#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
+#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:90
+#: en/user_customization-packages.ssi:120
+#: en/user_customization-packages.ssi:133
+#: en/user_customization-packages.ssi:143
+#: en/user_customization-packages.ssi:153
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:261
+#: en/user_customization-packages.ssi:273
+#: en/user_customization-packages.ssi:283 en/user_examples.ssi:12
+#: en/user_examples.ssi:27 en/user_examples.ssi:37 en/user_examples.ssi:51
+#: en/user_examples.ssi:61 en/user_examples.ssi:77 en/user_examples.ssi:87
+#: en/user_examples.ssi:104 en/user_examples.ssi:114 en/user_examples.ssi:128
+#: en/user_examples.ssi:136 en/user_examples.ssi:151 en/user_examples.ssi:159
+#: en/user_examples.ssi:185 en/user_examples.ssi:206 en/user_examples.ssi:214
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:76 en/user_installation.ssi:84
+#: en/user_installation.ssi:104 en/user_installation.ssi:118
+#: en/user_installation.ssi:135 en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:36
#: en/user_overview.ssi:80 en/user_overview.ssi:88
@@ -78,9 +83,9 @@ msgid "code{"
msgstr "code{"
#. type: Plain text
-#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:121 en/about_manual.ssi:134 en/about_manual.ssi:142
+#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:165
#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
@@ -100,37 +105,43 @@ msgstr "code{"
#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
#: en/other_live-environment.ssi:138 en/other_procedures.ssi:16
#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
-#: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
-#: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
-#: en/other_use-cases.ssi:137 en/project_bugs.ssi:62 en/user_basics.ssi:36
-#: en/user_basics.ssi:46 en/user_basics.ssi:60 en/user_basics.ssi:72
-#: en/user_basics.ssi:82 en/user_basics.ssi:94 en/user_basics.ssi:106
-#: en/user_basics.ssi:114 en/user_basics.ssi:122 en/user_basics.ssi:132
-#: en/user_basics.ssi:146 en/user_basics.ssi:156 en/user_basics.ssi:164
-#: en/user_basics.ssi:172 en/user_basics.ssi:186 en/user_basics.ssi:194
-#: en/user_basics.ssi:204 en/user_basics.ssi:245 en/user_basics.ssi:257
-#: en/user_basics.ssi:273 en/user_basics.ssi:281 en/user_basics.ssi:308
-#: en/user_basics.ssi:347 en/user_customization-contents.ssi:39
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:70
+#: en/project_bugs.ssi:62 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:60 en/user_basics.ssi:72 en/user_basics.ssi:82
+#: en/user_basics.ssi:94 en/user_basics.ssi:106 en/user_basics.ssi:114
+#: en/user_basics.ssi:122 en/user_basics.ssi:132 en/user_basics.ssi:148
+#: en/user_basics.ssi:158 en/user_basics.ssi:166 en/user_basics.ssi:174
+#: en/user_basics.ssi:188 en/user_basics.ssi:196 en/user_basics.ssi:206
+#: en/user_basics.ssi:247 en/user_basics.ssi:259 en/user_basics.ssi:275
+#: en/user_basics.ssi:283 en/user_basics.ssi:310 en/user_basics.ssi:349
+#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:70
#: en/user_customization-internationalization.ssi:14
#: en/user_customization-internationalization.ssi:22
#: en/user_customization-internationalization.ssi:30
#: en/user_customization-internationalization.ssi:42
-#: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
-#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
-#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
-#: en/user_customization-packages.ssi:107
-#: en/user_customization-packages.ssi:115
-#: en/user_customization-packages.ssi:135
-#: en/user_customization-packages.ssi:172
-#: en/user_customization-packages.ssi:182
-#: en/user_customization-packages.ssi:192
-#: en/user_customization-packages.ssi:202 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 en/user_installation.ssi:108
-#: en/user_installation.ssi:123 en/user_installation.ssi:138
-#: en/user_managing_a_configuration.ssi:31
+#: en/user_customization-packages.ssi:23 en/user_customization-packages.ssi:36
+#: en/user_customization-packages.ssi:48 en/user_customization-packages.ssi:62
+#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:94
+#: en/user_customization-packages.ssi:125
+#: en/user_customization-packages.ssi:139
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:159
+#: en/user_customization-packages.ssi:169
+#: en/user_customization-packages.ssi:181
+#: en/user_customization-packages.ssi:197
+#: en/user_customization-packages.ssi:265
+#: en/user_customization-packages.ssi:277
+#: en/user_customization-packages.ssi:287 en/user_examples.ssi:17
+#: en/user_examples.ssi:31 en/user_examples.ssi:41 en/user_examples.ssi:55
+#: en/user_examples.ssi:65 en/user_examples.ssi:83 en/user_examples.ssi:98
+#: en/user_examples.ssi:108 en/user_examples.ssi:120 en/user_examples.ssi:132
+#: en/user_examples.ssi:147 en/user_examples.ssi:155 en/user_examples.ssi:163
+#: en/user_examples.ssi:194 en/user_examples.ssi:210 en/user_examples.ssi:218
+#: 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
+#: en/user_installation.ssi:108 en/user_installation.ssi:123
+#: en/user_installation.ssi:138 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:74
#: en/user_overview.ssi:84 en/user_overview.ssi:92
@@ -229,8 +240,8 @@ msgstr ""
msgid ""
"#!/bin/sh\n"
"lb config noauto \\\n"
-"\t--architecture i386 \\\n"
-"\t${@}\n"
+"\t--packages-lists \"standard\" \\\n"
+"\t\"${@}\"\n"
msgstr ""
#. type: Plain text
@@ -243,7 +254,7 @@ msgstr ""
#, no-wrap
msgid ""
"#!/bin/sh\n"
-"lb clean noauto ${@}\n"
+"lb clean noauto \"${@}\"\n"
"rm -f config/binary config/bootstrap \\\n"
"\tconfig/chroot config/common config/source\n"
"rm -f binary.log\n"
@@ -256,16 +267,15 @@ msgstr ""
#. type: Plain text
#: en/user_managing_a_configuration.ssi:50
-msgid "#!/bin/sh lb build noauto ${@} 2>&1 | tee binary.log"
+msgid "#!/bin/sh lb build noauto \"${@}\" 2>&1 | tee binary.log"
msgstr ""
#. type: Plain text
#: en/user_managing_a_configuration.ssi:54
msgid ""
-"Edit auto/config, changing or adding any options as you see fit. In the "
-"example above, --architecture is set to i386 so that when the image is built "
-"on an amd64 system, it will not default to building amd64 images. Change "
-"this to an appropriate value for your image (or delete it if you want to use "
-"the default) and add any additional options in continuation lines that "
-"follow."
+"Edit #{auto/config}#, changing or adding any options as you see fit. In the "
+"example above, #{--packages-lists standard}# is set to the default value. "
+"Change this to an appropriate value for your image (or delete it if you want "
+"to use the default) and add any additional options in continuation lines "
+"that follow."
msgstr ""
diff --git a/manual/po/pt_BR/about_manual.ssi.po b/manual/po/pt_BR/about_manual.ssi.po
index 2427f5a..c6419bb 100644
--- a/manual/po/pt_BR/about_manual.ssi.po
+++ b/manual/po/pt_BR/about_manual.ssi.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0~a8\n"
-"POT-Creation-Date: 2010-10-23 16:43+0300\n"
+"POT-Creation-Date: 2010-11-28 07:21-0400\n"
"PO-Revision-Date: 2010-10-22 18:16-0300\n"
"Last-Translator: Bruno Gurgel <bruno.gurgel at gmail.com>\n"
"Language-Team: none\n"
@@ -57,11 +57,37 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:10
+msgid "2~ For the impatient"
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:12
+msgid ""
+"While we believe that everything in this manual is important to at least "
+"some of our users, we realize it is a lot of material to cover and that you "
+"may wish to experience early success using the software before delving into "
+"the details. Therefore, we have provided three tutorials in the {Examples}"
+"#examples section designed to teach you image building and customization "
+"basics. Read {Using the examples}#using-the-examples first, followed by "
+"{Tutorial 1: A standard image}#tutorial-1, {Tutorial 2: A web browser "
+"utility}#tutorial-2 and finally {Tutorial 3: A personal travelling companion}"
+"#tutorial-3. By the end of these tutorials, you will have a taste of what "
+"can be done with Debian Live. We encourage you to return to more in-depth "
+"study of the manual, perhaps next reading {The basics}#the-basics, skimming "
+"or skipping {Building a netboot image}#building-netboot-image, and finishing "
+"by reading the {Customization overview}#customization-overview and the "
+"chapters that follow it. By this point, we hope you are thoroughly excited "
+"by what can be done with Debian Live and motivated to read the rest of the "
+"manual, cover-to-cover."
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:14
msgid "2~terms Terms"
msgstr "2~terms Terminologia"
#. type: Plain text
-#: en/about_manual.ssi:12
+#: en/about_manual.ssi:16
msgid ""
"_* *{Live system}*: An operating system that can boot without installation "
"to a hard drive. Live systems do not alter local operating system(s) or file"
@@ -77,7 +103,7 @@ msgstr ""
"(s). Alguns também podem inicializar através da rede."
#. type: Plain text
-#: en/about_manual.ssi:14
+#: en/about_manual.ssi:18
msgid ""
"_* *{Debian Live}*: The Debian sub-project which maintains the live-boot, "
"live-build, live-config, and live-manual packages."
@@ -86,7 +112,7 @@ msgstr ""
"live-build, live-config, e live-manual."
#. type: Plain text
-#: en/about_manual.ssi:16
+#: en/about_manual.ssi:20
msgid ""
"_* *{Debian Live system}*: A live system that uses software from the Debian "
"operating system that may be booted from CDs, DVDs, USB sticks, over the "
@@ -99,17 +125,17 @@ msgstr ""
"(via parametro de boot #{fetch=URL}#)."
#. type: Plain text
-#: en/about_manual.ssi:18
+#: en/about_manual.ssi:22
msgid "_* *{Host system}*: The environment used to create the live system."
msgstr "_* *{Host system}*: O ambiente usado para criar o sistema live."
#. type: Plain text
-#: en/about_manual.ssi:20
+#: en/about_manual.ssi:24
msgid "_* *{Target system}*: The environment used to run the live system."
msgstr "_* *{Target system}*: O ambiente usado para rodar o sistema live."
#. type: Plain text
-#: en/about_manual.ssi:22
+#: en/about_manual.ssi:26
msgid ""
"_* *{live-boot}*: A collection of scripts used to boot live systems. live-"
"boot was formerly a part of live-initramfs."
@@ -118,7 +144,7 @@ msgstr ""
"live. live-boot era formalmente parte do live-initramfs."
#. type: Plain text
-#: en/about_manual.ssi:24
+#: en/about_manual.ssi:28
msgid ""
"_* *{live-build}*: A collection of scripts used to build customized Debian "
"Live systems. live-build was formerly known as live-helper, and even earlier "
@@ -129,7 +155,7 @@ msgstr ""
"helper, e ainda antes conhecido como live-package."
#. type: Plain text
-#: en/about_manual.ssi:26
+#: en/about_manual.ssi:30
msgid ""
"_* *{live-config}*: A collection of scripts used to configure a live system "
"during the boot process. live-config was formerly a part of live-initramfs."
@@ -139,7 +165,7 @@ msgstr ""
"initramfs."
#. type: Plain text
-#: en/about_manual.ssi:28
+#: en/about_manual.ssi:32
msgid ""
"_* *{live-manual}*: This document is maintained in a package called live-"
"manual."
@@ -148,7 +174,7 @@ msgstr ""
"manual."
#. type: Plain text
-#: en/about_manual.ssi:30
+#: en/about_manual.ssi:34
msgid ""
"_* *{Debian Installer (d-i)}*: The official installation system for the "
"Debian distribution."
@@ -157,7 +183,7 @@ msgstr ""
"distribuição Debian."
#. type: Plain text
-#: en/about_manual.ssi:32
+#: en/about_manual.ssi:36
msgid ""
"_* *{Boot parameters}*: Parameters that can be entered at the bootloader "
"prompt to influence the kernel or live-config."
@@ -166,18 +192,18 @@ msgstr ""
"bootloader para influenciar o kernel ou o live-config."
#. type: Plain text
-#: en/about_manual.ssi:34
+#: en/about_manual.ssi:38
msgid ""
-"_* *{chroot}*: The chroot program, chroot(8), enables us to run different "
-"instances of the GNU/Linux environment on a single system simultaneously "
-"without rebooting."
+"_* *{chroot}*: The chroot program, #{chroot(8)}#, enables us to run "
+"different instances of the GNU/Linux environment on a single system "
+"simultaneously without rebooting."
msgstr ""
-"_* *{chroot}*: O programa chroot, chroot(8), nos habilita a rodar "
+"_* *{chroot}*: O programa chroot, #{chroot(8)}#, nos habilita a rodar "
"simultâneamente diferentes instâncias do ambiente do GNU/Linux em um único "
"sistema sem reinicialização."
#. type: Plain text
-#: en/about_manual.ssi:36
+#: en/about_manual.ssi:40
msgid ""
"_* *{Binary image}*: A file containing the live system, such as binary.iso "
"or binary.img."
@@ -186,7 +212,7 @@ msgstr ""
"binary.img."
#. type: Plain text
-#: en/about_manual.ssi:38
+#: en/about_manual.ssi:42
msgid ""
"_* *{Target distribution}*: The distribution upon which your live system "
"will be based. This can differ from the distribution of your host system."
@@ -195,112 +221,112 @@ msgstr ""
"baseado. Isso pode diferir da distribuição do seu sistema host."
#. type: Plain text
-#: en/about_manual.ssi:40
+#: en/about_manual.ssi:44
msgid ""
-"_* *{Squeeze/Wheezy/Sid (stable/testing/unstable)}*: The stable distribution "
-"contains the latest officially released distribution of Debian. The testing "
-"distribution is the staging area for the next stable release. A major "
-"advantage of using this distribution is that it has more recent versions of "
-"software relative to the stable release. The unstable distribution is where "
-"active development of Debian occurs. Generally, this distribution is run by "
-"developers and those who like to live on the edge."
+"_* *{Squeeze/Wheezy/Sid (stable/testing/unstable)}*: Debian codenames for "
+"releases. At the time of writing, Squeeze is the current *{stable}* release "
+"and Wheezy is the current *{testing}* release. Sid will always be a synonym "
+"for the *{unstable}* release. Throughout the manual, we tend to use "
+"codenames for the releases, as that is what is supported by the tools "
+"themselves."
msgstr ""
-"_* *{Squeeze/Wheezy/Sid (stable/testing/unstable)}*: A distribuição estável"
-"(stable) contem a última versão oficial lançada do Debian. A distribuição "
-"\"Testing\" é a ária de estágio para a próxima versão estável(stable). A "
-"maior vantagem de usar essa distribuição é que ela tem versões mais recentes "
-"de software relacionado com a versão estável(stable). A distribuição instável"
-"(unstable) é onde ocorre o desenvolvimento ativo do Debian. Geralmente, essa "
-"distribuição é mantida por desenvolvedores e aqueles que vivem no limite."
#. type: Plain text
-#: en/about_manual.ssi:42
+#: en/about_manual.ssi:46
msgid ""
-"At the time of writing, Squeeze is the current stable release and Wheezy is "
-"the current testing release. Sid will always be a synonym for the unstable "
-"release."
+"The *{stable}* distribution contains the latest officially released "
+"distribution of Debian. The *{testing}* distribution is the staging area for "
+"the next *{stable}* release. A major advantage of using this distribution is "
+"that it has more recent versions of software relative to the *{stable}* "
+"release. The *{unstable}* distribution is where active development of Debian "
+"occurs. Generally, this distribution is run by developers and those who like "
+"to live on the edge."
msgstr ""
-"No tempo da escrita, Squeeze é o a atual versão estável(stable) e Wheezy é a "
-"atual versão testing. Sid sempre será um sinônimo para a versão instável"
-"(unstable)."
+"A distribuição estável (*{stable}*) contem a última versão oficial lançada "
+"do Debian. A distribuição *{testing}* é a ária de estágio para a próxima "
+"versão estável(stable). A maior vantagem de usar essa distribuição é que ela "
+"tem versões mais recentes de software relacionado com a versão estável (*"
+"{stable}*). A distribuição instável (*{unstable}*) é onde ocorre o "
+"desenvolvimento ativo do Debian. Geralmente, essa distribuição é mantida por "
+"desenvolvedores e aqueles que vivem no limite."
#. type: Plain text
-#: en/about_manual.ssi:44
+#: en/about_manual.ssi:48
msgid "2~ Authors"
msgstr "2~Autores"
#. type: Plain text
-#: en/about_manual.ssi:46
+#: en/about_manual.ssi:50
msgid "A list of authors (in alphabetical order):"
msgstr "A lista de autores (em ordem alfabética)"
#. type: Plain text
-#: en/about_manual.ssi:48
+#: en/about_manual.ssi:52
msgid "_* Ben Armstrong"
msgstr "_* Ben Armstrong"
#. type: Plain text
-#: en/about_manual.ssi:50
+#: en/about_manual.ssi:54
msgid "_* Brendan Sleight"
msgstr "_* Brendan Sleight"
#. type: Plain text
-#: en/about_manual.ssi:52
+#: en/about_manual.ssi:56
msgid "_* Chris Lamb"
msgstr "_* Chris Lamb"
#. type: Plain text
-#: en/about_manual.ssi:54
+#: en/about_manual.ssi:58
msgid "_* Daniel Baumann"
msgstr "_* Daniel Baumann"
#. type: Plain text
-#: en/about_manual.ssi:56
+#: en/about_manual.ssi:60
msgid "_* Franklin Piat"
msgstr "_* Franklin Piat"
#. type: Plain text
-#: en/about_manual.ssi:58
+#: en/about_manual.ssi:62
msgid "_* Jonas Stein"
msgstr "_* Jonas Stein"
#. type: Plain text
-#: en/about_manual.ssi:60
+#: en/about_manual.ssi:64
msgid "_* Kai Hendry"
msgstr "_* Kai Hendry"
#. type: Plain text
-#: en/about_manual.ssi:62
+#: en/about_manual.ssi:66
msgid "_* Marco Amadori"
msgstr "_* Marco Amadori"
#. type: Plain text
-#: en/about_manual.ssi:64
+#: en/about_manual.ssi:68
msgid "_* Mathieu Geli"
msgstr "_* Mathieu Geli"
#. type: Plain text
-#: en/about_manual.ssi:66
+#: en/about_manual.ssi:70
msgid "_* Matthias Kirschner"
msgstr "_* Matthias Kirschner"
#. type: Plain text
-#: en/about_manual.ssi:68
+#: en/about_manual.ssi:72
msgid "_* Richard Nelson"
msgstr "_* Richard Nelson"
#. type: Plain text
-#: en/about_manual.ssi:70
+#: en/about_manual.ssi:74
msgid "_* Trent W. Buck"
msgstr "_* Trent W. Buck"
#. type: Plain text
-#: en/about_manual.ssi:72
+#: en/about_manual.ssi:76
msgid "2~ Contributing to this document"
msgstr "2~ Contribuindo com esse documento"
#. type: Plain text
-#: en/about_manual.ssi:74
+#: en/about_manual.ssi:78
msgid ""
"This manual is intended as a community project and all proposals for "
"improvements and contributions are extremely welcome. The preferred way to "
@@ -309,7 +335,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:76
+#: en/about_manual.ssi:80
msgid ""
"When submitting a contribution, please clearly identify its copyright holder "
"and include the licensing statement. Note that to be accepted, the "
@@ -322,7 +348,7 @@ msgstr ""
"licenças do resto do documento, ou seja, GPL versão 3 ou superior."
#. type: Plain text
-#: en/about_manual.ssi:78
+#: en/about_manual.ssi:82
msgid ""
"The sources for this manual are maintained using the Git version control "
"system. You can checkout the latest copy by executing:"
@@ -331,79 +357,87 @@ msgstr ""
"versão Git. Você pode fazer o checkout da ultima cópia executando:"
#. type: Plain text
-#: en/about_manual.ssi:80 en/about_manual.ssi:88 en/about_manual.ssi:96
-#: en/about_manual.ssi:108 en/about_manual.ssi:121 en/about_manual.ssi:134
-#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
-#: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
-#: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
-#: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
-#: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
-#: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
-#: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
-#: en/other_faq.ssi:41 en/other_faq.ssi:83 en/other_faq.ssi:103
-#: en/other_faq.ssi:117 en/other_faq.ssi:137 en/other_faq.ssi:151
-#: en/other_faq.ssi:198 en/other_faq.ssi:245 en/other_faq.ssi:261
-#: en/other_faq.ssi:287 en/other_faq.ssi:299 en/other_faq.ssi:314
-#: en/other_faq.ssi:333 en/other_faq.ssi:345 en/other_faq.ssi:353
-#: en/other_faq.ssi:364 en/other_faq.ssi:374 en/other_howtos.ssi:16
-#: en/other_howtos.ssi:43 en/other_live-environment.ssi:14
-#: en/other_live-environment.ssi:30 en/other_live-environment.ssi:51
-#: en/other_live-environment.ssi:61 en/other_live-environment.ssi:69
-#: en/other_live-environment.ssi:77 en/other_live-environment.ssi:85
-#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
-#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
-#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
-#: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
-#: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
-#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111 en/user_basics.ssi:34
-#: en/user_basics.ssi:44 en/user_basics.ssi:56 en/user_basics.ssi:68
-#: en/user_basics.ssi:80 en/user_basics.ssi:92 en/user_basics.ssi:106
-#: en/user_basics.ssi:114 en/user_basics.ssi:122 en/user_basics.ssi:132
-#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
-#: en/user_basics.ssi:172 en/user_basics.ssi:186 en/user_basics.ssi:194
-#: en/user_basics.ssi:204 en/user_basics.ssi:224 en/user_basics.ssi:257
-#: en/user_basics.ssi:273 en/user_basics.ssi:281 en/user_basics.ssi:301
-#: en/user_basics.ssi:326 en/user_customization-contents.ssi:34
-#: en/user_customization-contents.ssi:43 en/user_customization-contents.ssi:66
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
+#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
+#: en/about_manual.ssi:170 en/other_coding-style.ssi:28
+#: en/other_coding-style.ssi:38 en/other_coding-style.ssi:51
+#: en/other_coding-style.ssi:61 en/other_coding-style.ssi:88
+#: en/other_coding-style.ssi:96 en/other_coding-style.ssi:106
+#: en/other_coding-style.ssi:117 en/other_common-tasks.ssi:32
+#: en/other_customization-backports.ssi:8 en/other_customization-bootup.ssi:30
+#: en/other_customization-bootup.ssi:39 en/other_faq.ssi:41
+#: en/other_faq.ssi:83 en/other_faq.ssi:103 en/other_faq.ssi:117
+#: en/other_faq.ssi:137 en/other_faq.ssi:151 en/other_faq.ssi:198
+#: en/other_faq.ssi:245 en/other_faq.ssi:261 en/other_faq.ssi:287
+#: en/other_faq.ssi:299 en/other_faq.ssi:314 en/other_faq.ssi:333
+#: en/other_faq.ssi:345 en/other_faq.ssi:353 en/other_faq.ssi:364
+#: en/other_faq.ssi:374 en/other_howtos.ssi:16 en/other_howtos.ssi:43
+#: en/other_live-environment.ssi:14 en/other_live-environment.ssi:30
+#: en/other_live-environment.ssi:51 en/other_live-environment.ssi:61
+#: en/other_live-environment.ssi:69 en/other_live-environment.ssi:77
+#: en/other_live-environment.ssi:85 en/other_live-environment.ssi:93
+#: en/other_live-environment.ssi:116 en/other_live-environment.ssi:124
+#: en/other_live-environment.ssi:133 en/other_procedures.ssi:12
+#: en/other_procedures.ssi:46 en/other_procedures.ssi:58
+#: en/project_bugs.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/user_basics.ssi:54 en/user_basics.ssi:66 en/user_basics.ssi:78
+#: en/user_basics.ssi:88 en/user_basics.ssi:102 en/user_basics.ssi:110
+#: en/user_basics.ssi:118 en/user_basics.ssi:128 en/user_basics.ssi:142
+#: en/user_basics.ssi:154 en/user_basics.ssi:162 en/user_basics.ssi:170
+#: en/user_basics.ssi:184 en/user_basics.ssi:192 en/user_basics.ssi:202
+#: en/user_basics.ssi:222 en/user_basics.ssi:255 en/user_basics.ssi:271
+#: en/user_basics.ssi:279 en/user_basics.ssi:299 en/user_basics.ssi:324
+#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
+#: en/user_customization-contents.ssi:66
#: en/user_customization-internationalization.ssi:10
#: en/user_customization-internationalization.ssi:18
#: en/user_customization-internationalization.ssi:26
#: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:16 en/user_customization-packages.ssi:24
-#: en/user_customization-packages.ssi:36 en/user_customization-packages.ssi:45
-#: en/user_customization-packages.ssi:59 en/user_customization-packages.ssi:73
-#: en/user_customization-packages.ssi:103
-#: en/user_customization-packages.ssi:111
-#: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:166
-#: en/user_customization-packages.ssi:176
-#: en/user_customization-packages.ssi:186
-#: en/user_customization-packages.ssi:196 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:104
-#: en/user_installation.ssi:118 en/user_installation.ssi:135
-#: en/user_managing_a_configuration.ssi:24
+#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
+#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
+#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:90
+#: en/user_customization-packages.ssi:120
+#: en/user_customization-packages.ssi:133
+#: en/user_customization-packages.ssi:143
+#: en/user_customization-packages.ssi:153
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:261
+#: en/user_customization-packages.ssi:273
+#: en/user_customization-packages.ssi:283 en/user_examples.ssi:12
+#: en/user_examples.ssi:27 en/user_examples.ssi:37 en/user_examples.ssi:51
+#: en/user_examples.ssi:61 en/user_examples.ssi:77 en/user_examples.ssi:87
+#: en/user_examples.ssi:104 en/user_examples.ssi:114 en/user_examples.ssi:128
+#: en/user_examples.ssi:136 en/user_examples.ssi:151 en/user_examples.ssi:159
+#: en/user_examples.ssi:185 en/user_examples.ssi:206 en/user_examples.ssi:214
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:76 en/user_installation.ssi:84
+#: en/user_installation.ssi:104 en/user_installation.ssi:118
+#: en/user_installation.ssi:135 en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
-#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:46
-#: en/user_overview.ssi:90 en/user_overview.ssi:98
+#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:36
+#: en/user_overview.ssi:80 en/user_overview.ssi:88
msgid "code{"
msgstr "code{"
#. type: Plain text
-#: en/about_manual.ssi:82
+#: en/about_manual.ssi:86
msgid "$ git clone git://live.debian.net/git/live-manual.git"
msgstr "$ git clone git://live.debian.net/git/live-manual.git"
#. type: Plain text
-#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
-#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
-#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
-#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
-#: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
-#: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
+#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:166
+#: en/about_manual.ssi:173 en/other_coding-style.ssi:34
+#: en/other_coding-style.ssi:45 en/other_coding-style.ssi:57
+#: en/other_coding-style.ssi:68 en/other_coding-style.ssi:92
+#: en/other_coding-style.ssi:100 en/other_coding-style.ssi:113
+#: en/other_coding-style.ssi:124 en/other_common-tasks.ssi:36
+#: en/other_customization-backports.ssi:16
#: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
#: en/other_faq.ssi:37 en/other_faq.ssi:46 en/other_faq.ssi:92
#: en/other_faq.ssi:108 en/other_faq.ssi:141 en/other_faq.ssi:155
@@ -418,45 +452,51 @@ msgstr "$ git clone git://live.debian.net/git/live-manual.git"
#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
#: en/other_live-environment.ssi:138 en/other_procedures.ssi:16
#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
-#: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
-#: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
-#: en/other_use-cases.ssi:137 en/user_basics.ssi:38 en/user_basics.ssi:48
-#: en/user_basics.ssi:62 en/user_basics.ssi:72 en/user_basics.ssi:86
-#: en/user_basics.ssi:98 en/user_basics.ssi:110 en/user_basics.ssi:118
-#: en/user_basics.ssi:126 en/user_basics.ssi:136 en/user_basics.ssi:150
-#: en/user_basics.ssi:160 en/user_basics.ssi:168 en/user_basics.ssi:176
-#: en/user_basics.ssi:190 en/user_basics.ssi:198 en/user_basics.ssi:208
-#: en/user_basics.ssi:249 en/user_basics.ssi:261 en/user_basics.ssi:277
-#: en/user_basics.ssi:285 en/user_basics.ssi:312 en/user_basics.ssi:351
+#: en/project_bugs.ssi:62 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:60 en/user_basics.ssi:72 en/user_basics.ssi:82
+#: en/user_basics.ssi:94 en/user_basics.ssi:106 en/user_basics.ssi:114
+#: en/user_basics.ssi:122 en/user_basics.ssi:132 en/user_basics.ssi:148
+#: en/user_basics.ssi:158 en/user_basics.ssi:166 en/user_basics.ssi:174
+#: en/user_basics.ssi:188 en/user_basics.ssi:196 en/user_basics.ssi:206
+#: en/user_basics.ssi:247 en/user_basics.ssi:259 en/user_basics.ssi:275
+#: en/user_basics.ssi:283 en/user_basics.ssi:310 en/user_basics.ssi:349
#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
#: en/user_customization-contents.ssi:70
#: en/user_customization-internationalization.ssi:14
#: en/user_customization-internationalization.ssi:22
#: en/user_customization-internationalization.ssi:30
#: en/user_customization-internationalization.ssi:42
-#: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
-#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
-#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
-#: en/user_customization-packages.ssi:107
-#: en/user_customization-packages.ssi:115
-#: en/user_customization-packages.ssi:135
-#: en/user_customization-packages.ssi:172
-#: en/user_customization-packages.ssi:182
-#: en/user_customization-packages.ssi:192
-#: en/user_customization-packages.ssi:202 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 en/user_installation.ssi:108
-#: en/user_installation.ssi:123 en/user_installation.ssi:138
-#: en/user_managing_a_configuration.ssi:31
+#: en/user_customization-packages.ssi:23 en/user_customization-packages.ssi:36
+#: en/user_customization-packages.ssi:48 en/user_customization-packages.ssi:62
+#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:94
+#: en/user_customization-packages.ssi:125
+#: en/user_customization-packages.ssi:139
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:159
+#: en/user_customization-packages.ssi:169
+#: en/user_customization-packages.ssi:181
+#: en/user_customization-packages.ssi:197
+#: en/user_customization-packages.ssi:265
+#: en/user_customization-packages.ssi:277
+#: en/user_customization-packages.ssi:287 en/user_examples.ssi:17
+#: en/user_examples.ssi:31 en/user_examples.ssi:41 en/user_examples.ssi:55
+#: en/user_examples.ssi:65 en/user_examples.ssi:83 en/user_examples.ssi:98
+#: en/user_examples.ssi:108 en/user_examples.ssi:120 en/user_examples.ssi:132
+#: en/user_examples.ssi:147 en/user_examples.ssi:155 en/user_examples.ssi:163
+#: en/user_examples.ssi:194 en/user_examples.ssi:210 en/user_examples.ssi:218
+#: 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
+#: en/user_installation.ssi:108 en/user_installation.ssi:123
+#: en/user_installation.ssi:138 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
-#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:84
-#: en/user_overview.ssi:94 en/user_overview.ssi:102
+#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:74
+#: en/user_overview.ssi:84 en/user_overview.ssi:92
msgid "}code"
msgstr "}code"
#. type: Plain text
-#: en/about_manual.ssi:86
+#: en/about_manual.ssi:90
msgid ""
"Prior to submission of your contribution, please preview your work. To "
"preview the live-manual, ensure the packages needed for building are "
@@ -467,12 +507,12 @@ msgstr ""
"para contruir estão instalados executando:"
#. type: Plain text
-#: en/about_manual.ssi:90
+#: en/about_manual.ssi:94
msgid "# apt-get install make po4a sisu-complete"
msgstr "# apt-get install make po4a sisu-complete"
#. type: Plain text
-#: en/about_manual.ssi:94
+#: en/about_manual.ssi:98
msgid ""
"You may build the live-manual from the top level directory of your git "
"checkout by executing:"
@@ -481,17 +521,30 @@ msgstr ""
"diretório do seu git checkout executando:"
#. type: Plain text
-#: en/about_manual.ssi:98
+#: en/about_manual.ssi:102
msgid "$ make build"
msgstr "$ make build"
#. type: Plain text
-#: en/about_manual.ssi:102
+#: en/about_manual.ssi:106
+msgid ""
+"Since it takes a while to build the manual in all supported languages, you "
+"may find it convenient when proofing to build for only one language, e.g. by "
+"executing:"
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:110
+msgid "$ make build LANGUAGES=en"
+msgstr "$ make build LANGUAGES=en"
+
+#. type: Plain text
+#: en/about_manual.ssi:114
msgid "3~ Applying patches"
msgstr "3~ Aplicando patches"
#. type: Plain text
-#: en/about_manual.ssi:104
+#: en/about_manual.ssi:116
msgid ""
"Directly commiting to the repository is possible by anyone. However, we ask "
"you to send bigger changes to the mailing list to discuss them first. In "
@@ -503,79 +556,79 @@ msgstr ""
"necessários:"
#. type: Plain text
-#: en/about_manual.ssi:106
+#: en/about_manual.ssi:118
msgid "_* Fetch the public commit key:"
msgstr "_* Obter a chave publica de commit:"
#. type: Plain text
-#: en/about_manual.ssi:115
+#: en/about_manual.ssi:127
#, no-wrap
msgid ""
"$ mkdir -p ~/.ssh/identity.d\n"
-"$ wget http://live.debian.net/other/keys/live-manual@debian-live \\\n"
-"\t-O ~/.ssh/identity.d/live-manual at debian-live\n"
-"$ wget http://live.debian.net/other/keys/live-manual@debian-live.pub \\\n"
-"\t-O ~/.ssh/identity.d/live-manual at debian-live.pub\n"
-"$ chmod 0600 ~/.ssh/identity.d/live-manual at debian-live*\n"
+"$ wget http://live.debian.net/other/keys/gitosis@live.debian.net \\\n"
+"\t-O ~/.ssh/identity.d/live.debian.net\n"
+"$ wget http://live.debian.net/other/keys/gitosis@live.debian.net.pub \\\n"
+"\t-O ~/.ssh/identity.d/live.debian.net.pub\n"
+"$ chmod 0600 ~/.ssh/identity.d/live.debian.net*\n"
msgstr ""
"$ mkdir -p ~/.ssh/identity.d\n"
-"$ wget http://live.debian.net/other/keys/live-manual@debian-live \\\n"
-"\t-O ~/.ssh/identity.d/live-manual at debian-live\n"
-"$ wget http://live.debian.net/other/keys/live-manual@debian-live.pub \\\n"
-"\t-O ~/.ssh/identity.d/live-manual at debian-live.pub\n"
-"$ chmod 0600 ~/.ssh/identity.d/live-manual at debian-live*\n"
+"$ wget http://live.debian.net/other/keys/gitosis@live.debian.net \\\n"
+"\t-O ~/.ssh/identity.d/gitosis at live.debian.net\n"
+"$ wget http://live.debian.net/other/keys/gitosis@live.debian.net.pub \\\n"
+"\t-O ~/.ssh/identity.d/gitosis at live.debian.net.pub\n"
+"$ chmod 0600 ~/.ssh/identity.d/gitosis at live.debian.net*\n"
#. type: Plain text
-#: en/about_manual.ssi:119
+#: en/about_manual.ssi:131
msgid "_* Add the following section to your openssh-client config:"
msgstr "_* Adicione a seguinte sessão na configuração do seu openssh-client:"
#. type: Plain text
-#: en/about_manual.ssi:128
+#: en/about_manual.ssi:140
#, no-wrap
msgid ""
"$ cat >> ~/.ssh/config << EOF\n"
"Host live.debian.net\n"
" Hostname live.debian.net\n"
" User gitosis\n"
-" IdentityFile ~/.ssh/identity.d/live-manual at debian-live\n"
+" IdentityFile ~/.ssh/identity.d/gitosis at live.debian.net\n"
"EOF\n"
msgstr ""
"$ cat >> ~/.ssh/config << EOF\n"
"Host live.debian.net\n"
" Hostname live.debian.net\n"
" User gitosis\n"
-" IdentityFile ~/.ssh/identity.d/live-manual at debian-live\n"
+" IdentityFile ~/.ssh/identity.d/gitosis at live.debian.net\n"
"EOF\n"
#. type: Plain text
-#: en/about_manual.ssi:132
+#: en/about_manual.ssi:144
msgid "_* Checkout a clone of the manual through ssh:"
msgstr "_* Fazer o checkout de um clone do manual por ssh:"
#. type: Plain text
-#: en/about_manual.ssi:136
+#: en/about_manual.ssi:148
msgid "$ git clone gitosis at live.debian.net:/live-manual.git"
msgstr "$ git clone gitosis at live.debian.net:/live-manual.git"
#. type: Plain text
-#: en/about_manual.ssi:140
+#: en/about_manual.ssi:152
msgid ""
"_* After editing the files in manual/en/, please call the 'commit' target in "
"the top level directory to sanitize the files and update the translation "
"files:"
msgstr ""
-"_* Depoi de editar os arquivos no manual/en/, por favor chame o alvo "
+"_* Depois de editar os arquivos no manual/en/, por favor chame o alvo "
"'commit' no nível superior do diretório para higiênizar os arquivos e "
"atualizar os arquivos de tradução. "
#. type: Plain text
-#: en/about_manual.ssi:144
+#: en/about_manual.ssi:156
msgid "$ make commit"
msgstr "$ make commit"
#. type: Plain text
-#: en/about_manual.ssi:148
+#: en/about_manual.ssi:160
msgid ""
"_* After sanitizing commit the changes. Write commit messages, that consist "
"of full useful sentences, starting with a capital letter and ending with a "
@@ -588,16 +641,16 @@ msgstr ""
"Adding/Removing/Correcting/':"
#. type: Plain text
-#: en/about_manual.ssi:152
+#: en/about_manual.ssi:164
msgid "$ git commit -a"
msgstr "$ git commit -a"
#. type: Plain text
-#: en/about_manual.ssi:156
+#: en/about_manual.ssi:168
msgid "_* Push the commit to the server:"
msgstr "_* Enviar as submissões para os servidor."
#. type: Plain text
-#: en/about_manual.ssi:160
+#: en/about_manual.ssi:172
msgid "$ git push"
msgstr "$ git push"
diff --git a/manual/po/pt_BR/about_project.ssi.po b/manual/po/pt_BR/about_project.ssi.po
index ee490b7..35d76f9 100644
--- a/manual/po/pt_BR/about_project.ssi.po
+++ b/manual/po/pt_BR/about_project.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-22 07:52-0200\n"
+"POT-Creation-Date: 2010-11-27 10:30-0400\n"
"PO-Revision-Date: 2010-10-22 07:52-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -51,7 +51,7 @@ msgstr ""
#. type: Plain text
#: en/about_project.ssi:14
-msgid "_* They mix different distributions, e.g. testing and unstable."
+msgid "_* They mix different distributions, e.g. *{testing}* and *{unstable}*."
msgstr ""
#. type: Plain text
diff --git a/manual/po/pt_BR/live-manual.ssm.po b/manual/po/pt_BR/live-manual.ssm.po
index d234391..d4bf897 100644
--- a/manual/po/pt_BR/live-manual.ssm.po
+++ b/manual/po/pt_BR/live-manual.ssm.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-11-13 16:15+0100\n"
+"POT-Creation-Date: 2010-11-29 14:16-0400\n"
"PO-Revision-Date: 2010-10-22 07:52-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -45,7 +45,7 @@ msgstr ""
#, no-wrap
msgid ""
"@date:\n"
-" :published: 2010-11-13\n"
+" :published: 2010-11-29\n"
msgstr ""
#. type: Plain text
@@ -58,7 +58,7 @@ msgstr ""
#, no-wrap
msgid ""
"@make:\n"
-" :bold: /Squeeze|squeeze|Stable|stable|Wheezy|wheezy|Testing|testing|Sid|sid|Unstable|unstable/\n"
+" :bold: /Squeeze|squeeze|Wheezy|wheezy|Sid|sid/\n"
" :italics: /live-boot|live-build|live-config|live-magic|live-manual|live-installer|debian-installer-launcher/\n"
" :num_top: 1\n"
" :skin: skin_debian-live\n"
diff --git a/manual/po/pt_BR/project_bugs.ssi.po b/manual/po/pt_BR/project_bugs.ssi.po
index 553bccf..c06bd20 100644
--- a/manual/po/pt_BR/project_bugs.ssi.po
+++ b/manual/po/pt_BR/project_bugs.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-27 21:40-0200\n"
+"POT-Creation-Date: 2010-11-27 10:30-0400\n"
"PO-Revision-Date: 2010-10-25 23:27+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -17,9 +17,9 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
#. type: Plain text
-#: en/about_manual.ssi:80 en/about_manual.ssi:88 en/about_manual.ssi:96
-#: en/about_manual.ssi:108 en/about_manual.ssi:121 en/about_manual.ssi:134
-#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
+#: en/about_manual.ssi:112 en/about_manual.ssi:125 en/about_manual.ssi:138
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
#: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
#: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
#: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
@@ -39,48 +39,49 @@ msgstr ""
#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
-#: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
-#: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
-#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111
-#: en/project_bugs.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
-#: en/user_basics.ssi:54 en/user_basics.ssi:66 en/user_basics.ssi:78
-#: en/user_basics.ssi:88 en/user_basics.ssi:102 en/user_basics.ssi:110
-#: en/user_basics.ssi:118 en/user_basics.ssi:128 en/user_basics.ssi:140
-#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
-#: en/user_basics.ssi:182 en/user_basics.ssi:190 en/user_basics.ssi:200
-#: en/user_basics.ssi:220 en/user_basics.ssi:253 en/user_basics.ssi:269
-#: en/user_basics.ssi:277 en/user_basics.ssi:297 en/user_basics.ssi:322
-#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
-#: en/user_customization-contents.ssi:66
+#: en/other_procedures.ssi:58 en/project_bugs.ssi:58 en/user_basics.ssi:32
+#: en/user_basics.ssi:42 en/user_basics.ssi:54 en/user_basics.ssi:66
+#: en/user_basics.ssi:78 en/user_basics.ssi:88 en/user_basics.ssi:102
+#: en/user_basics.ssi:110 en/user_basics.ssi:118 en/user_basics.ssi:128
+#: en/user_basics.ssi:142 en/user_basics.ssi:154 en/user_basics.ssi:162
+#: en/user_basics.ssi:170 en/user_basics.ssi:184 en/user_basics.ssi:192
+#: en/user_basics.ssi:202 en/user_basics.ssi:222 en/user_basics.ssi:255
+#: en/user_basics.ssi:271 en/user_basics.ssi:279 en/user_basics.ssi:299
+#: en/user_basics.ssi:324 en/user_customization-contents.ssi:34
+#: en/user_customization-contents.ssi:43 en/user_customization-contents.ssi:66
#: en/user_customization-internationalization.ssi:10
#: en/user_customization-internationalization.ssi:18
#: en/user_customization-internationalization.ssi:26
#: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:16 en/user_customization-packages.ssi:24
-#: en/user_customization-packages.ssi:36 en/user_customization-packages.ssi:45
-#: en/user_customization-packages.ssi:59 en/user_customization-packages.ssi:73
-#: en/user_customization-packages.ssi:103
-#: en/user_customization-packages.ssi:111
-#: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:166
-#: en/user_customization-packages.ssi:176
-#: en/user_customization-packages.ssi:186
-#: en/user_customization-packages.ssi:196 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:104
-#: en/user_installation.ssi:118 en/user_installation.ssi:135
-#: en/user_managing_a_configuration.ssi:24
+#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
+#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
+#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:90
+#: en/user_customization-packages.ssi:120
+#: en/user_customization-packages.ssi:133
+#: en/user_customization-packages.ssi:143
+#: en/user_customization-packages.ssi:153
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:261
+#: en/user_customization-packages.ssi:273
+#: en/user_customization-packages.ssi:283 en/user_examples.ssi:12
+#: en/user_examples.ssi:27 en/user_examples.ssi:37 en/user_examples.ssi:75
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:76 en/user_installation.ssi:84
+#: en/user_installation.ssi:104 en/user_installation.ssi:118
+#: en/user_installation.ssi:135 en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
-#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:46
-#: en/user_overview.ssi:90 en/user_overview.ssi:98
+#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:36
+#: en/user_overview.ssi:80 en/user_overview.ssi:88
msgid "code{"
msgstr "code{"
#. type: Plain text
-#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:121 en/about_manual.ssi:134 en/about_manual.ssi:142
+#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:165
#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
@@ -100,40 +101,42 @@ msgstr "code{"
#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
#: en/other_live-environment.ssi:138 en/other_procedures.ssi:16
#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
-#: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
-#: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
-#: en/other_use-cases.ssi:137 en/project_bugs.ssi:62 en/user_basics.ssi:36
-#: en/user_basics.ssi:46 en/user_basics.ssi:60 en/user_basics.ssi:72
-#: en/user_basics.ssi:82 en/user_basics.ssi:94 en/user_basics.ssi:106
-#: en/user_basics.ssi:114 en/user_basics.ssi:122 en/user_basics.ssi:132
-#: en/user_basics.ssi:146 en/user_basics.ssi:156 en/user_basics.ssi:164
-#: en/user_basics.ssi:172 en/user_basics.ssi:186 en/user_basics.ssi:194
-#: en/user_basics.ssi:204 en/user_basics.ssi:245 en/user_basics.ssi:257
-#: en/user_basics.ssi:273 en/user_basics.ssi:281 en/user_basics.ssi:308
-#: en/user_basics.ssi:347 en/user_customization-contents.ssi:39
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:70
+#: en/project_bugs.ssi:62 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:60 en/user_basics.ssi:72 en/user_basics.ssi:82
+#: en/user_basics.ssi:94 en/user_basics.ssi:106 en/user_basics.ssi:114
+#: en/user_basics.ssi:122 en/user_basics.ssi:132 en/user_basics.ssi:148
+#: en/user_basics.ssi:158 en/user_basics.ssi:166 en/user_basics.ssi:174
+#: en/user_basics.ssi:188 en/user_basics.ssi:196 en/user_basics.ssi:206
+#: en/user_basics.ssi:247 en/user_basics.ssi:259 en/user_basics.ssi:275
+#: en/user_basics.ssi:283 en/user_basics.ssi:310 en/user_basics.ssi:349
+#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:70
#: en/user_customization-internationalization.ssi:14
#: en/user_customization-internationalization.ssi:22
#: en/user_customization-internationalization.ssi:30
#: en/user_customization-internationalization.ssi:42
-#: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
-#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
-#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
-#: en/user_customization-packages.ssi:107
-#: en/user_customization-packages.ssi:115
-#: en/user_customization-packages.ssi:135
-#: en/user_customization-packages.ssi:172
-#: en/user_customization-packages.ssi:182
-#: en/user_customization-packages.ssi:192
-#: en/user_customization-packages.ssi:202 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 en/user_installation.ssi:108
-#: en/user_installation.ssi:123 en/user_installation.ssi:138
-#: en/user_managing_a_configuration.ssi:31
+#: en/user_customization-packages.ssi:23 en/user_customization-packages.ssi:36
+#: en/user_customization-packages.ssi:48 en/user_customization-packages.ssi:62
+#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:94
+#: en/user_customization-packages.ssi:125
+#: en/user_customization-packages.ssi:139
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:159
+#: en/user_customization-packages.ssi:169
+#: en/user_customization-packages.ssi:181
+#: en/user_customization-packages.ssi:197
+#: en/user_customization-packages.ssi:265
+#: en/user_customization-packages.ssi:277
+#: en/user_customization-packages.ssi:287 en/user_examples.ssi:17
+#: en/user_examples.ssi:31 en/user_examples.ssi:41 en/user_examples.ssi:84
+#: 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
+#: en/user_installation.ssi:108 en/user_installation.ssi:123
+#: en/user_installation.ssi:138 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
-#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:84
-#: en/user_overview.ssi:94 en/user_overview.ssi:102
+#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:74
+#: en/user_overview.ssi:84 en/user_overview.ssi:92
msgid "}code"
msgstr "}code"
@@ -191,16 +194,17 @@ msgstr ""
#. type: Plain text
#: en/project_bugs.ssi:18
msgid ""
-"Due to the nature of Debian testing and Debian unstable distributions being "
-"a moving target, building a live system may not always be possible."
+"Due to the nature of Debian *{testing}* and Debian *{unstable}* "
+"distributions being a moving target, building a live system may not always "
+"be possible."
msgstr ""
#. type: Plain text
#: en/project_bugs.ssi:20
msgid ""
-"If this is a problem, do not build a system based on testing or unstable, "
-"but go with stable. live-build does always default to the current stable "
-"release."
+"If this is a problem, do not build a system based on *{testing}* or *"
+"{unstable}*, but go with *{stable}*. live-build does always default to the "
+"current *{stable}* release."
msgstr ""
#. type: Plain text
@@ -215,9 +219,10 @@ msgstr ""
msgid ""
"It is out of the scope of this manual to train you in correctly identifying "
"and fixing problems in packages of the development distributions, however, "
-"there are two things you can always try: When not succeeding to build "
-"testing, try if unstable works. If unstable does not work either, revert to "
-"testing and pinning the newer version of the failing package from unstable."
+"there are two things you can always try: When not succeeding to build *"
+"{testing}*, try if *{unstable}* works. If *{unstable}* does not work either, "
+"revert to *{testing}* and pinning the newer version of the failing package "
+"from *{unstable}*."
msgstr ""
#. type: Plain text
diff --git a/manual/po/pt_BR/user_basics.ssi.po b/manual/po/pt_BR/user_basics.ssi.po
index 0ab51a8..e0dac47 100644
--- a/manual/po/pt_BR/user_basics.ssi.po
+++ b/manual/po/pt_BR/user_basics.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-11-01 06:47-0200\n"
+"POT-Creation-Date: 2010-11-28 07:16-0400\n"
"PO-Revision-Date: 2010-10-20 06:53-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -17,9 +17,9 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
#. type: Plain text
-#: en/about_manual.ssi:80 en/about_manual.ssi:88 en/about_manual.ssi:96
-#: en/about_manual.ssi:108 en/about_manual.ssi:121 en/about_manual.ssi:134
-#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
+#: en/about_manual.ssi:112 en/about_manual.ssi:125 en/about_manual.ssi:138
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
#: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
#: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
#: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
@@ -39,38 +39,43 @@ msgstr ""
#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
-#: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
-#: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
-#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111
-#: en/project_bugs.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
-#: en/user_basics.ssi:54 en/user_basics.ssi:66 en/user_basics.ssi:78
-#: en/user_basics.ssi:88 en/user_basics.ssi:102 en/user_basics.ssi:110
-#: en/user_basics.ssi:118 en/user_basics.ssi:128 en/user_basics.ssi:140
-#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
-#: en/user_basics.ssi:182 en/user_basics.ssi:190 en/user_basics.ssi:200
-#: en/user_basics.ssi:220 en/user_basics.ssi:253 en/user_basics.ssi:269
-#: en/user_basics.ssi:277 en/user_basics.ssi:297 en/user_basics.ssi:322
-#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
-#: en/user_customization-contents.ssi:66
+#: en/other_procedures.ssi:58 en/project_bugs.ssi:58 en/user_basics.ssi:32
+#: en/user_basics.ssi:42 en/user_basics.ssi:54 en/user_basics.ssi:66
+#: en/user_basics.ssi:78 en/user_basics.ssi:88 en/user_basics.ssi:102
+#: en/user_basics.ssi:110 en/user_basics.ssi:118 en/user_basics.ssi:128
+#: en/user_basics.ssi:142 en/user_basics.ssi:154 en/user_basics.ssi:162
+#: en/user_basics.ssi:170 en/user_basics.ssi:184 en/user_basics.ssi:192
+#: en/user_basics.ssi:202 en/user_basics.ssi:222 en/user_basics.ssi:255
+#: en/user_basics.ssi:271 en/user_basics.ssi:279 en/user_basics.ssi:299
+#: en/user_basics.ssi:324 en/user_customization-contents.ssi:34
+#: en/user_customization-contents.ssi:43 en/user_customization-contents.ssi:66
#: en/user_customization-internationalization.ssi:10
#: en/user_customization-internationalization.ssi:18
#: en/user_customization-internationalization.ssi:26
#: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:16 en/user_customization-packages.ssi:24
-#: en/user_customization-packages.ssi:36 en/user_customization-packages.ssi:45
-#: en/user_customization-packages.ssi:59 en/user_customization-packages.ssi:73
-#: en/user_customization-packages.ssi:103
-#: en/user_customization-packages.ssi:111
-#: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:166
-#: en/user_customization-packages.ssi:176
-#: en/user_customization-packages.ssi:186
-#: en/user_customization-packages.ssi:196 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:104
-#: en/user_installation.ssi:118 en/user_installation.ssi:135
-#: en/user_managing_a_configuration.ssi:24
+#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
+#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
+#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:90
+#: en/user_customization-packages.ssi:120
+#: en/user_customization-packages.ssi:133
+#: en/user_customization-packages.ssi:143
+#: en/user_customization-packages.ssi:153
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:261
+#: en/user_customization-packages.ssi:273
+#: en/user_customization-packages.ssi:283 en/user_examples.ssi:12
+#: en/user_examples.ssi:27 en/user_examples.ssi:37 en/user_examples.ssi:51
+#: en/user_examples.ssi:61 en/user_examples.ssi:77 en/user_examples.ssi:87
+#: en/user_examples.ssi:104 en/user_examples.ssi:114 en/user_examples.ssi:128
+#: en/user_examples.ssi:136 en/user_examples.ssi:151 en/user_examples.ssi:159
+#: en/user_examples.ssi:185 en/user_examples.ssi:206 en/user_examples.ssi:214
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:76 en/user_installation.ssi:84
+#: en/user_installation.ssi:104 en/user_installation.ssi:118
+#: en/user_installation.ssi:135 en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:36
#: en/user_overview.ssi:80 en/user_overview.ssi:88
@@ -78,9 +83,9 @@ msgid "code{"
msgstr "code{"
#. type: Plain text
-#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:121 en/about_manual.ssi:134 en/about_manual.ssi:142
+#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:165
#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
@@ -100,37 +105,43 @@ msgstr "code{"
#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
#: en/other_live-environment.ssi:138 en/other_procedures.ssi:16
#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
-#: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
-#: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
-#: en/other_use-cases.ssi:137 en/project_bugs.ssi:62 en/user_basics.ssi:36
-#: en/user_basics.ssi:46 en/user_basics.ssi:60 en/user_basics.ssi:72
-#: en/user_basics.ssi:82 en/user_basics.ssi:94 en/user_basics.ssi:106
-#: en/user_basics.ssi:114 en/user_basics.ssi:122 en/user_basics.ssi:132
-#: en/user_basics.ssi:146 en/user_basics.ssi:156 en/user_basics.ssi:164
-#: en/user_basics.ssi:172 en/user_basics.ssi:186 en/user_basics.ssi:194
-#: en/user_basics.ssi:204 en/user_basics.ssi:245 en/user_basics.ssi:257
-#: en/user_basics.ssi:273 en/user_basics.ssi:281 en/user_basics.ssi:308
-#: en/user_basics.ssi:347 en/user_customization-contents.ssi:39
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:70
+#: en/project_bugs.ssi:62 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:60 en/user_basics.ssi:72 en/user_basics.ssi:82
+#: en/user_basics.ssi:94 en/user_basics.ssi:106 en/user_basics.ssi:114
+#: en/user_basics.ssi:122 en/user_basics.ssi:132 en/user_basics.ssi:148
+#: en/user_basics.ssi:158 en/user_basics.ssi:166 en/user_basics.ssi:174
+#: en/user_basics.ssi:188 en/user_basics.ssi:196 en/user_basics.ssi:206
+#: en/user_basics.ssi:247 en/user_basics.ssi:259 en/user_basics.ssi:275
+#: en/user_basics.ssi:283 en/user_basics.ssi:310 en/user_basics.ssi:349
+#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:70
#: en/user_customization-internationalization.ssi:14
#: en/user_customization-internationalization.ssi:22
#: en/user_customization-internationalization.ssi:30
#: en/user_customization-internationalization.ssi:42
-#: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
-#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
-#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
-#: en/user_customization-packages.ssi:107
-#: en/user_customization-packages.ssi:115
-#: en/user_customization-packages.ssi:135
-#: en/user_customization-packages.ssi:172
-#: en/user_customization-packages.ssi:182
-#: en/user_customization-packages.ssi:192
-#: en/user_customization-packages.ssi:202 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 en/user_installation.ssi:108
-#: en/user_installation.ssi:123 en/user_installation.ssi:138
-#: en/user_managing_a_configuration.ssi:31
+#: en/user_customization-packages.ssi:23 en/user_customization-packages.ssi:36
+#: en/user_customization-packages.ssi:48 en/user_customization-packages.ssi:62
+#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:94
+#: en/user_customization-packages.ssi:125
+#: en/user_customization-packages.ssi:139
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:159
+#: en/user_customization-packages.ssi:169
+#: en/user_customization-packages.ssi:181
+#: en/user_customization-packages.ssi:197
+#: en/user_customization-packages.ssi:265
+#: en/user_customization-packages.ssi:277
+#: en/user_customization-packages.ssi:287 en/user_examples.ssi:17
+#: en/user_examples.ssi:31 en/user_examples.ssi:41 en/user_examples.ssi:55
+#: en/user_examples.ssi:65 en/user_examples.ssi:83 en/user_examples.ssi:98
+#: en/user_examples.ssi:108 en/user_examples.ssi:120 en/user_examples.ssi:132
+#: en/user_examples.ssi:147 en/user_examples.ssi:155 en/user_examples.ssi:163
+#: en/user_examples.ssi:194 en/user_examples.ssi:210 en/user_examples.ssi:218
+#: 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
+#: en/user_installation.ssi:108 en/user_installation.ssi:123
+#: en/user_installation.ssi:138 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:74
#: en/user_overview.ssi:84 en/user_overview.ssi:92
@@ -144,14 +155,23 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:4
-msgid "1~ The basics"
+msgid "1~the-basics The basics"
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:6
msgid ""
"This chapter contains a brief overview of the build process and instructions "
-"for booting the various binary image types."
+"for using the three most commonly used image types. The most versatile image "
+"type, #{iso-hybrid}#, may be used on a virtual machine, optical media or USB "
+"portable storage device. In certain special cases, #{usb-hdd}# may be more "
+"suitable for USB devices. The chapter finishes with instructions for "
+"building and using a #{net}# type image, which is a bit more involved due to "
+"the setup required on the server. This is a slightly advanced topic for "
+"anyone who is not familiar already with netbooting, but is included here "
+"because once the setup is done, it is a very convenient way to test and "
+"deploy images for booting on the local network without the hassle of dealing "
+"with image media."
msgstr ""
#. type: Plain text
@@ -269,7 +289,8 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:44 en/user_basics.ssi:120 en/user_basics.ssi:202
+#: en/user_basics.ssi:44 en/user_basics.ssi:120 en/user_basics.ssi:204
+#: en/user_examples.ssi:106 en/user_examples.ssi:153
msgid "# lb build"
msgstr ""
@@ -282,7 +303,7 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:50
-msgid "3~ Testing an ISO image with Qemu"
+msgid "3~testing-iso-with-qemu Testing an ISO image with Qemu"
msgstr ""
#. type: Plain text
@@ -291,7 +312,7 @@ msgid "Testing an ISO is simple:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:56 en/user_basics.ssi:142
+#: en/user_basics.ssi:56 en/user_basics.ssi:144
msgid "# apt-get install qemu"
msgstr ""
@@ -302,7 +323,7 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:62
-msgid "3~ Testing an ISO image with virtualbox-ose"
+msgid "3~testing-iso-with-virtualbox Testing an ISO image with virtualbox-ose"
msgstr ""
#. type: Plain text
@@ -343,7 +364,7 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:84
-msgid "3~ Burning an ISO image to a physical medium"
+msgid "3~burning-iso-image Burning an ISO image to a physical medium"
msgstr ""
#. type: Plain text
@@ -382,20 +403,20 @@ msgstr ""
#: en/user_basics.ssi:100
msgid ""
"Note: if you created an ISO image with the previous example, you will need "
-"to clean up your working directory with the #{lb clean} command (see {The lb "
-"clean command}#lb-clean):"
+"to clean up your working directory with the #{lb clean}# command (see {The "
+"lb clean command}#lb-clean):"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:104 en/user_basics.ssi:184
+#: en/user_basics.ssi:104 en/user_basics.ssi:186
msgid "$ lb clean --binary"
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:108
msgid ""
-"Run the #{lb config}# command with the parameters to configure the \"config/"
-"\" hierarchy to create a USB/HDD image type:"
+"Run the #{lb config}# command with the parameters to configure the #{config/}"
+"# hierarchy to create a USB/HDD image type:"
msgstr ""
#. type: Plain text
@@ -443,21 +464,28 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:138
-msgid "3~ Testing a USB/HDD image with Qemu"
+msgid ""
+"Note: As discussed earlier, this same process can be used for #{iso-hybrid}# "
+"type images, (suffixed #{-hybrid.iso}#,) but not #{iso}# type images."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:144
+#: en/user_basics.ssi:140
+msgid "3~testing-usb-hdd-with-qemu Testing a USB/HDD image with Qemu"
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:146
msgid "$ qemu -hda binary.img"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:148
+#: en/user_basics.ssi:150
msgid "3~ Using the space left on a USB stick"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:150
+#: en/user_basics.ssi:152
msgid ""
"If you want to use the remaining free space after you have installed the "
"binary.img, you can use a partitioning tool such as #{gparted}# or #{parted}"
@@ -466,45 +494,45 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:154
+#: en/user_basics.ssi:156
msgid "# gparted ${USBSTICK}"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:158
+#: en/user_basics.ssi:160
msgid ""
"After the creation of the partition, you have to create a filesystem on it. "
"One possible choice would be ext4."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:162
+#: en/user_basics.ssi:164
msgid "# mkfs.ext4 ${USBSTICK}"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:166
+#: en/user_basics.ssi:168
msgid "If you want to use this data partition with Windows, use FAT32."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:170
+#: en/user_basics.ssi:172
msgid "# mkfs.vfat -F 32"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:174
+#: en/user_basics.ssi:176
#, no-wrap
msgid "*{Remember: Every time you install a new binary.img on the stick, all data on the stick will be lost because the partition table is overwritten by the contents of the image.}*\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:176
-msgid "2~ Building a netboot image"
+#: en/user_basics.ssi:178
+msgid "2~building-netboot-image Building a netboot image"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:178
+#: en/user_basics.ssi:180
msgid ""
"The following sequence of commands will create a basic netboot image "
"containing the Debian standard system without X.org. It is suitable for "
@@ -512,28 +540,28 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:180
+#: en/user_basics.ssi:182
msgid ""
"Note: if you performed any previous examples, you will need to clean up your "
"working directory with the #{lb clean}# command:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:188
+#: en/user_basics.ssi:190
msgid ""
"Run the #{lb config}# command with the parameters to configure the \"config/"
"\" hierarchy to create our netboot image:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:192
+#: en/user_basics.ssi:194
msgid ""
"$ lb config -b net --net-root-path \"/srv/debian-live\" --net-root-server "
"\"192.168.0.1\""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:196
+#: en/user_basics.ssi:198
msgid ""
"In contrast with the ISO and USB/HDD images, netbooting does not support "
"serving a filesystem image with the client, so the files must be served via "
@@ -543,12 +571,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:198
+#: en/user_basics.ssi:200
msgid "Now build the image with the #{lb build}# command:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:206
+#: en/user_basics.ssi:208
msgid ""
"In a network boot, the client runs a small piece of software which usually "
"resides on the EPROM of the Ethernet card. This program sends a DHCP request "
@@ -559,7 +587,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:208
+#: en/user_basics.ssi:210
msgid ""
"For example, if you unpack the generated binary-net.tar.gz archive in the /"
"srv/debian-live directory, you'll find the filesystem image in live/"
@@ -568,17 +596,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:210
+#: en/user_basics.ssi:212
msgid "We must now configure three services on the server to enable netboot."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:212
+#: en/user_basics.ssi:214
msgid "3~ DHCP server"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:214
+#: en/user_basics.ssi:216
msgid ""
"We must configure our network's DHCP server to be sure to give an IP address "
"to the netbooting client system, and to advertise the location of the PXE "
@@ -586,25 +614,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:216
+#: en/user_basics.ssi:218
msgid ""
"Here is an example for inspiration, written for the ISC DHCP server #{isc-"
"dhcp-server}# in the /etc/dhcp/dhcpd.conf configuration file;"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:218 en/user_customization-packages.ssi:153
+#: en/user_basics.ssi:220
msgid "% FIXME"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:222
+#: en/user_basics.ssi:224
#, no-wrap
msgid "subnet 192.168.1.0 netmask 255.255.255.0 { # 192.168.1.0/24\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:225
+#: en/user_basics.ssi:227
#, no-wrap
msgid ""
" # IP addresses available for guests\n"
@@ -612,7 +640,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:228
+#: en/user_basics.ssi:230
#, no-wrap
msgid ""
" # allow booting from the net\n"
@@ -620,7 +648,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:233
+#: en/user_basics.ssi:235
#, no-wrap
msgid ""
" # for net booting, server where the first file to be loaded (by TFTP\n"
@@ -630,7 +658,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:237
+#: en/user_basics.ssi:239
#, no-wrap
msgid ""
" # net boot configuration for guests with a PXE client:\n"
@@ -639,7 +667,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:240
+#: en/user_basics.ssi:242
#, no-wrap
msgid ""
" # PXE bootloader (first program to be loaded, by TFTP)\n"
@@ -647,7 +675,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:243
+#: en/user_basics.ssi:245
#, no-wrap
msgid ""
" }\n"
@@ -655,17 +683,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:247
+#: en/user_basics.ssi:249
msgid "3~ TFTP server"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:249
+#: en/user_basics.ssi:251
msgid "This serves the kernel and initial ramdisk to the system at run time."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:251
+#: en/user_basics.ssi:253
msgid ""
"You should install the tftpd-hpa package. It can serve all files contained "
"inside a root directory, usually /srv/tftp. To let it serve files inside /"
@@ -673,22 +701,22 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:255
+#: en/user_basics.ssi:257
msgid "dpkg-reconfigure -plow tftpd-hpa"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:259
+#: en/user_basics.ssi:261
msgid "and fill in the new tftp server directory when being asked about it."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:261
+#: en/user_basics.ssi:263
msgid "3~ NFS server"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:263
+#: en/user_basics.ssi:265
msgid ""
"Once the guest computer has downloaded and booted a Linux kernel and loaded "
"its initrd, it will try to mount the Live filesystem image through a NFS "
@@ -696,35 +724,35 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:265
+#: en/user_basics.ssi:267
msgid "You need to install the nfs-kernel-server package."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:267
+#: en/user_basics.ssi:269
msgid ""
"Then, make the filesystem image available through NFS by adding a line like "
"the following to /etc/exports:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:271
+#: en/user_basics.ssi:273
msgid "/srv/debian-live *(ro,async,no_root_squash,no_subtree_check)"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:275
+#: en/user_basics.ssi:277
msgid ""
"and tell the NFS server about this new export with the following command:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:279
+#: en/user_basics.ssi:281
msgid "# exportfs -rv"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:283
+#: en/user_basics.ssi:285
msgid ""
"Setting up these three services can be a little tricky. You might need some "
"patience to get all of them working together. The Debian Installer Manual's "
@@ -733,40 +761,40 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:285
+#: en/user_basics.ssi:287
msgid "3~ Netboot testing HowTo"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:287
+#: en/user_basics.ssi:289
msgid ""
"Netboot image creation is made easy with live-build magic, but testing the "
"images on physical machines can be really time consuming."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:289
+#: en/user_basics.ssi:291
msgid ""
"To make our life easier, we can use virtualization. There are two solutions."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:291
+#: en/user_basics.ssi:293
msgid "3~ Qemu"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:293
+#: en/user_basics.ssi:295
msgid "_* Install qemu, bridge-utils, sudo."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:295
+#: en/user_basics.ssi:297
msgid "Edit /etc/qemu-ifup:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:306
+#: en/user_basics.ssi:308
msgid ""
"#!/bin/sh sudo -p \"Password for $0:\" /sbin/ifconfig $1 172.20.0.1 echo "
"\"Executing /etc/qemu-ifup\" echo \"Bringing up $1 for bridged mode...\" "
@@ -775,62 +803,62 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:310
+#: en/user_basics.ssi:312
msgid "Get, or build a grub-floppy-netboot (in the svn)."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:312
+#: en/user_basics.ssi:314
msgid "Launch qemu with \"-net nic,vlan=0 -net tap,vlan=0,ifname=tun0\""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:314
+#: en/user_basics.ssi:316
msgid "3~ VMWare Player"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:316
+#: en/user_basics.ssi:318
msgid "_* Install VMWare Player (\"free as in beer\" edition)"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:318
+#: en/user_basics.ssi:320
msgid ""
"_* Create a PXETester directory, and create a text file called pxe.vwx inside"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:320
+#: en/user_basics.ssi:322
msgid "_* Paste this text inside:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:328
+#: en/user_basics.ssi:330
msgid ""
"#!/usr/bin/vmware config.version = \"8\" virtualHW.version = \"4\" memsize = "
"\"512\" MemAllowAutoScaleDown = \"FALSE\""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:334
+#: en/user_basics.ssi:336
msgid ""
"ide0:0.present = \"FALSE\" ide1:0.present = \"FALSE\" floppy0.present = "
"\"FALSE\" sound.present = \"FALSE\" tools.remindInstall = \"FALSE\""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:337
+#: en/user_basics.ssi:339
msgid "ethernet0.present = \"TRUE\" ethernet0.addressType = \"generated\""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:340
+#: en/user_basics.ssi:342
msgid "displayName = \"Test Boot PXE\" guestOS = \"other\""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:345
+#: en/user_basics.ssi:347
msgid ""
"ethernet0.generatedAddress = \"00:0c:29:8d:71:3b\" uuid.location = \"56 4d "
"83 72 5c c4 de 3f-ae 9e 07 91 1d 8d 71 3b\" uuid.bios = \"56 4d 83 72 5c c4 "
@@ -838,19 +866,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:349
+#: en/user_basics.ssi:351
msgid ""
"_* You can play with this configuration file (i.e. change memory limit to "
"256)"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:351
+#: en/user_basics.ssi:353
msgid ""
"_* Double click on this file (or run VMWare player and select this file)."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:352
+#: en/user_basics.ssi:354
msgid "_* When running just press space if that strange question comes up..."
msgstr ""
diff --git a/manual/po/pt_BR/user_customization-contents.ssi.po b/manual/po/pt_BR/user_customization-contents.ssi.po
index 11c52cf..408fb9e 100644
--- a/manual/po/pt_BR/user_customization-contents.ssi.po
+++ b/manual/po/pt_BR/user_customization-contents.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-23 16:43+0300\n"
+"POT-Creation-Date: 2010-11-27 09:40-0400\n"
"PO-Revision-Date: 2010-10-22 07:52-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -17,9 +17,9 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
#. type: Plain text
-#: en/about_manual.ssi:80 en/about_manual.ssi:88 en/about_manual.ssi:96
-#: en/about_manual.ssi:108 en/about_manual.ssi:121 en/about_manual.ssi:134
-#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
+#: en/about_manual.ssi:112 en/about_manual.ssi:125 en/about_manual.ssi:138
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
#: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
#: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
#: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
@@ -39,47 +39,49 @@ msgstr ""
#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
-#: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
-#: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
-#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111 en/user_basics.ssi:34
-#: en/user_basics.ssi:44 en/user_basics.ssi:56 en/user_basics.ssi:68
-#: en/user_basics.ssi:80 en/user_basics.ssi:92 en/user_basics.ssi:106
-#: en/user_basics.ssi:114 en/user_basics.ssi:122 en/user_basics.ssi:132
-#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
-#: en/user_basics.ssi:172 en/user_basics.ssi:186 en/user_basics.ssi:194
-#: en/user_basics.ssi:204 en/user_basics.ssi:224 en/user_basics.ssi:257
-#: en/user_basics.ssi:273 en/user_basics.ssi:281 en/user_basics.ssi:301
-#: en/user_basics.ssi:326 en/user_customization-contents.ssi:34
+#: en/other_procedures.ssi:58 en/project_bugs.ssi:58 en/user_basics.ssi:32
+#: en/user_basics.ssi:42 en/user_basics.ssi:54 en/user_basics.ssi:66
+#: en/user_basics.ssi:78 en/user_basics.ssi:88 en/user_basics.ssi:102
+#: en/user_basics.ssi:110 en/user_basics.ssi:118 en/user_basics.ssi:128
+#: en/user_basics.ssi:142 en/user_basics.ssi:154 en/user_basics.ssi:162
+#: en/user_basics.ssi:170 en/user_basics.ssi:184 en/user_basics.ssi:192
+#: en/user_basics.ssi:202 en/user_basics.ssi:222 en/user_basics.ssi:255
+#: en/user_basics.ssi:271 en/user_basics.ssi:279 en/user_basics.ssi:299
+#: en/user_basics.ssi:324 en/user_customization-contents.ssi:34
#: en/user_customization-contents.ssi:43 en/user_customization-contents.ssi:66
#: en/user_customization-internationalization.ssi:10
#: en/user_customization-internationalization.ssi:18
#: en/user_customization-internationalization.ssi:26
#: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:16 en/user_customization-packages.ssi:24
-#: en/user_customization-packages.ssi:36 en/user_customization-packages.ssi:45
-#: en/user_customization-packages.ssi:59 en/user_customization-packages.ssi:73
-#: en/user_customization-packages.ssi:103
-#: en/user_customization-packages.ssi:111
-#: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:166
-#: en/user_customization-packages.ssi:176
-#: en/user_customization-packages.ssi:186
-#: en/user_customization-packages.ssi:196 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:104
-#: en/user_installation.ssi:118 en/user_installation.ssi:135
-#: en/user_managing_a_configuration.ssi:24
+#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
+#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
+#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:90
+#: en/user_customization-packages.ssi:120
+#: en/user_customization-packages.ssi:133
+#: en/user_customization-packages.ssi:143
+#: en/user_customization-packages.ssi:153
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:261
+#: en/user_customization-packages.ssi:273
+#: en/user_customization-packages.ssi:283 en/user_examples.ssi:12
+#: en/user_examples.ssi:27 en/user_examples.ssi:37 en/user_examples.ssi:75
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:76 en/user_installation.ssi:84
+#: en/user_installation.ssi:104 en/user_installation.ssi:118
+#: en/user_installation.ssi:135 en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
-#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:46
-#: en/user_overview.ssi:90 en/user_overview.ssi:98
+#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:36
+#: en/user_overview.ssi:80 en/user_overview.ssi:88
msgid "code{"
msgstr "code{"
#. type: Plain text
-#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:121 en/about_manual.ssi:134 en/about_manual.ssi:142
+#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:165
#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
@@ -99,46 +101,48 @@ msgstr "code{"
#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
#: en/other_live-environment.ssi:138 en/other_procedures.ssi:16
#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
-#: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
-#: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
-#: en/other_use-cases.ssi:137 en/user_basics.ssi:38 en/user_basics.ssi:48
-#: en/user_basics.ssi:62 en/user_basics.ssi:72 en/user_basics.ssi:86
-#: en/user_basics.ssi:98 en/user_basics.ssi:110 en/user_basics.ssi:118
-#: en/user_basics.ssi:126 en/user_basics.ssi:136 en/user_basics.ssi:150
-#: en/user_basics.ssi:160 en/user_basics.ssi:168 en/user_basics.ssi:176
-#: en/user_basics.ssi:190 en/user_basics.ssi:198 en/user_basics.ssi:208
-#: en/user_basics.ssi:249 en/user_basics.ssi:261 en/user_basics.ssi:277
-#: en/user_basics.ssi:285 en/user_basics.ssi:312 en/user_basics.ssi:351
+#: en/project_bugs.ssi:62 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:60 en/user_basics.ssi:72 en/user_basics.ssi:82
+#: en/user_basics.ssi:94 en/user_basics.ssi:106 en/user_basics.ssi:114
+#: en/user_basics.ssi:122 en/user_basics.ssi:132 en/user_basics.ssi:148
+#: en/user_basics.ssi:158 en/user_basics.ssi:166 en/user_basics.ssi:174
+#: en/user_basics.ssi:188 en/user_basics.ssi:196 en/user_basics.ssi:206
+#: en/user_basics.ssi:247 en/user_basics.ssi:259 en/user_basics.ssi:275
+#: en/user_basics.ssi:283 en/user_basics.ssi:310 en/user_basics.ssi:349
#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
#: en/user_customization-contents.ssi:70
#: en/user_customization-internationalization.ssi:14
#: en/user_customization-internationalization.ssi:22
#: en/user_customization-internationalization.ssi:30
#: en/user_customization-internationalization.ssi:42
-#: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
-#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
-#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
-#: en/user_customization-packages.ssi:107
-#: en/user_customization-packages.ssi:115
-#: en/user_customization-packages.ssi:135
-#: en/user_customization-packages.ssi:172
-#: en/user_customization-packages.ssi:182
-#: en/user_customization-packages.ssi:192
-#: en/user_customization-packages.ssi:202 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 en/user_installation.ssi:108
-#: en/user_installation.ssi:123 en/user_installation.ssi:138
-#: en/user_managing_a_configuration.ssi:31
+#: en/user_customization-packages.ssi:23 en/user_customization-packages.ssi:36
+#: en/user_customization-packages.ssi:48 en/user_customization-packages.ssi:62
+#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:94
+#: en/user_customization-packages.ssi:125
+#: en/user_customization-packages.ssi:139
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:159
+#: en/user_customization-packages.ssi:169
+#: en/user_customization-packages.ssi:181
+#: en/user_customization-packages.ssi:197
+#: en/user_customization-packages.ssi:265
+#: en/user_customization-packages.ssi:277
+#: en/user_customization-packages.ssi:287 en/user_examples.ssi:17
+#: en/user_examples.ssi:31 en/user_examples.ssi:41 en/user_examples.ssi:84
+#: 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
+#: en/user_installation.ssi:108 en/user_installation.ssi:123
+#: en/user_installation.ssi:138 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
-#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:84
-#: en/user_overview.ssi:94 en/user_overview.ssi:102
+#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:74
+#: en/user_overview.ssi:84 en/user_overview.ssi:92
msgid "}code"
msgstr "}code"
#. type: Plain text
#: en/user_customization-contents.ssi:2 en/user_customization-overview.ssi:2
-msgid "B~ Customizing contents"
+msgid ":B~ Customizing contents"
msgstr ""
#. type: Plain text
diff --git a/manual/po/pt_BR/user_customization-internationalization.ssi.po b/manual/po/pt_BR/user_customization-internationalization.ssi.po
index 1b95502..34543e2 100644
--- a/manual/po/pt_BR/user_customization-internationalization.ssi.po
+++ b/manual/po/pt_BR/user_customization-internationalization.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-28 09:15-0200\n"
+"POT-Creation-Date: 2010-11-27 09:40-0400\n"
"PO-Revision-Date: 2010-10-22 08:57-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -17,9 +17,9 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
#. type: Plain text
-#: en/about_manual.ssi:80 en/about_manual.ssi:88 en/about_manual.ssi:96
-#: en/about_manual.ssi:108 en/about_manual.ssi:121 en/about_manual.ssi:134
-#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
+#: en/about_manual.ssi:112 en/about_manual.ssi:125 en/about_manual.ssi:138
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
#: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
#: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
#: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
@@ -39,48 +39,49 @@ msgstr ""
#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
-#: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
-#: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
-#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111
-#: en/project_bugs.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
-#: en/user_basics.ssi:54 en/user_basics.ssi:66 en/user_basics.ssi:78
-#: en/user_basics.ssi:88 en/user_basics.ssi:102 en/user_basics.ssi:110
-#: en/user_basics.ssi:118 en/user_basics.ssi:128 en/user_basics.ssi:140
-#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
-#: en/user_basics.ssi:182 en/user_basics.ssi:190 en/user_basics.ssi:200
-#: en/user_basics.ssi:220 en/user_basics.ssi:253 en/user_basics.ssi:269
-#: en/user_basics.ssi:277 en/user_basics.ssi:297 en/user_basics.ssi:322
-#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
-#: en/user_customization-contents.ssi:66
+#: en/other_procedures.ssi:58 en/project_bugs.ssi:58 en/user_basics.ssi:32
+#: en/user_basics.ssi:42 en/user_basics.ssi:54 en/user_basics.ssi:66
+#: en/user_basics.ssi:78 en/user_basics.ssi:88 en/user_basics.ssi:102
+#: en/user_basics.ssi:110 en/user_basics.ssi:118 en/user_basics.ssi:128
+#: en/user_basics.ssi:142 en/user_basics.ssi:154 en/user_basics.ssi:162
+#: en/user_basics.ssi:170 en/user_basics.ssi:184 en/user_basics.ssi:192
+#: en/user_basics.ssi:202 en/user_basics.ssi:222 en/user_basics.ssi:255
+#: en/user_basics.ssi:271 en/user_basics.ssi:279 en/user_basics.ssi:299
+#: en/user_basics.ssi:324 en/user_customization-contents.ssi:34
+#: en/user_customization-contents.ssi:43 en/user_customization-contents.ssi:66
#: en/user_customization-internationalization.ssi:10
#: en/user_customization-internationalization.ssi:18
#: en/user_customization-internationalization.ssi:26
#: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:16 en/user_customization-packages.ssi:24
-#: en/user_customization-packages.ssi:36 en/user_customization-packages.ssi:45
-#: en/user_customization-packages.ssi:59 en/user_customization-packages.ssi:73
-#: en/user_customization-packages.ssi:103
-#: en/user_customization-packages.ssi:111
-#: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:166
-#: en/user_customization-packages.ssi:176
-#: en/user_customization-packages.ssi:186
-#: en/user_customization-packages.ssi:196 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:104
-#: en/user_installation.ssi:118 en/user_installation.ssi:135
-#: en/user_managing_a_configuration.ssi:24
+#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
+#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
+#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:90
+#: en/user_customization-packages.ssi:120
+#: en/user_customization-packages.ssi:133
+#: en/user_customization-packages.ssi:143
+#: en/user_customization-packages.ssi:153
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:261
+#: en/user_customization-packages.ssi:273
+#: en/user_customization-packages.ssi:283 en/user_examples.ssi:12
+#: en/user_examples.ssi:27 en/user_examples.ssi:37 en/user_examples.ssi:75
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:76 en/user_installation.ssi:84
+#: en/user_installation.ssi:104 en/user_installation.ssi:118
+#: en/user_installation.ssi:135 en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
-#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:46
-#: en/user_overview.ssi:90 en/user_overview.ssi:98
+#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:36
+#: en/user_overview.ssi:80 en/user_overview.ssi:88
msgid "code{"
msgstr "code{"
#. type: Plain text
-#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:121 en/about_manual.ssi:134 en/about_manual.ssi:142
+#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:165
#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
@@ -100,46 +101,48 @@ msgstr "code{"
#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
#: en/other_live-environment.ssi:138 en/other_procedures.ssi:16
#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
-#: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
-#: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
-#: en/other_use-cases.ssi:137 en/project_bugs.ssi:62 en/user_basics.ssi:36
-#: en/user_basics.ssi:46 en/user_basics.ssi:60 en/user_basics.ssi:72
-#: en/user_basics.ssi:82 en/user_basics.ssi:94 en/user_basics.ssi:106
-#: en/user_basics.ssi:114 en/user_basics.ssi:122 en/user_basics.ssi:132
-#: en/user_basics.ssi:146 en/user_basics.ssi:156 en/user_basics.ssi:164
-#: en/user_basics.ssi:172 en/user_basics.ssi:186 en/user_basics.ssi:194
-#: en/user_basics.ssi:204 en/user_basics.ssi:245 en/user_basics.ssi:257
-#: en/user_basics.ssi:273 en/user_basics.ssi:281 en/user_basics.ssi:308
-#: en/user_basics.ssi:347 en/user_customization-contents.ssi:39
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:70
+#: en/project_bugs.ssi:62 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:60 en/user_basics.ssi:72 en/user_basics.ssi:82
+#: en/user_basics.ssi:94 en/user_basics.ssi:106 en/user_basics.ssi:114
+#: en/user_basics.ssi:122 en/user_basics.ssi:132 en/user_basics.ssi:148
+#: en/user_basics.ssi:158 en/user_basics.ssi:166 en/user_basics.ssi:174
+#: en/user_basics.ssi:188 en/user_basics.ssi:196 en/user_basics.ssi:206
+#: en/user_basics.ssi:247 en/user_basics.ssi:259 en/user_basics.ssi:275
+#: en/user_basics.ssi:283 en/user_basics.ssi:310 en/user_basics.ssi:349
+#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:70
#: en/user_customization-internationalization.ssi:14
#: en/user_customization-internationalization.ssi:22
#: en/user_customization-internationalization.ssi:30
#: en/user_customization-internationalization.ssi:42
-#: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
-#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
-#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
-#: en/user_customization-packages.ssi:107
-#: en/user_customization-packages.ssi:115
-#: en/user_customization-packages.ssi:135
-#: en/user_customization-packages.ssi:172
-#: en/user_customization-packages.ssi:182
-#: en/user_customization-packages.ssi:192
-#: en/user_customization-packages.ssi:202 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 en/user_installation.ssi:108
-#: en/user_installation.ssi:123 en/user_installation.ssi:138
-#: en/user_managing_a_configuration.ssi:31
+#: en/user_customization-packages.ssi:23 en/user_customization-packages.ssi:36
+#: en/user_customization-packages.ssi:48 en/user_customization-packages.ssi:62
+#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:94
+#: en/user_customization-packages.ssi:125
+#: en/user_customization-packages.ssi:139
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:159
+#: en/user_customization-packages.ssi:169
+#: en/user_customization-packages.ssi:181
+#: en/user_customization-packages.ssi:197
+#: en/user_customization-packages.ssi:265
+#: en/user_customization-packages.ssi:277
+#: en/user_customization-packages.ssi:287 en/user_examples.ssi:17
+#: en/user_examples.ssi:31 en/user_examples.ssi:41 en/user_examples.ssi:84
+#: 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
+#: en/user_installation.ssi:108 en/user_installation.ssi:123
+#: en/user_installation.ssi:138 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
-#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:84
-#: en/user_overview.ssi:94 en/user_overview.ssi:102
+#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:74
+#: en/user_overview.ssi:84 en/user_overview.ssi:92
msgid "}code"
msgstr "}code"
#. type: Plain text
#: en/user_customization-internationalization.ssi:2
-msgid "B~ Customizing locale and language"
+msgid ":B~ Customizing locale and language"
msgstr ""
#. type: Plain text
diff --git a/manual/po/pt_BR/user_customization-overview.ssi.po b/manual/po/pt_BR/user_customization-overview.ssi.po
index 96e386a..16412af 100644
--- a/manual/po/pt_BR/user_customization-overview.ssi.po
+++ b/manual/po/pt_BR/user_customization-overview.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-11-11 11:58-0400\n"
+"POT-Creation-Date: 2010-11-27 09:40-0400\n"
"PO-Revision-Date: 2010-10-22 08:57-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -18,7 +18,7 @@ msgstr ""
#. type: Plain text
#: en/user_customization-contents.ssi:2 en/user_customization-overview.ssi:2
-msgid "B~ Customizing contents"
+msgid ":B~ Customizing contents"
msgstr ""
#. type: Plain text
diff --git a/manual/po/pt_BR/user_customization-packages.ssi.po b/manual/po/pt_BR/user_customization-packages.ssi.po
index 241b965..2f32f60 100644
--- a/manual/po/pt_BR/user_customization-packages.ssi.po
+++ b/manual/po/pt_BR/user_customization-packages.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-11-12 16:21-0400\n"
+"POT-Creation-Date: 2010-11-28 08:44-0400\n"
"PO-Revision-Date: 2010-10-22 08:58-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -17,52 +17,61 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
#. type: Plain text
-#: en/about_manual.ssi:80 en/about_manual.ssi:88 en/about_manual.ssi:96
-#: en/about_manual.ssi:108 en/about_manual.ssi:121 en/about_manual.ssi:134
-#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
-#: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
-#: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
-#: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
-#: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
-#: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
-#: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
-#: en/other_faq.ssi:41 en/other_faq.ssi:83 en/other_faq.ssi:103
-#: en/other_faq.ssi:117 en/other_faq.ssi:137 en/other_faq.ssi:151
-#: en/other_faq.ssi:198 en/other_faq.ssi:245 en/other_faq.ssi:261
-#: en/other_faq.ssi:287 en/other_faq.ssi:299 en/other_faq.ssi:314
-#: en/other_faq.ssi:333 en/other_faq.ssi:345 en/other_faq.ssi:353
-#: en/other_faq.ssi:364 en/other_faq.ssi:374 en/other_howtos.ssi:16
-#: en/other_howtos.ssi:43 en/other_live-environment.ssi:14
-#: en/other_live-environment.ssi:30 en/other_live-environment.ssi:51
-#: en/other_live-environment.ssi:61 en/other_live-environment.ssi:69
-#: en/other_live-environment.ssi:77 en/other_live-environment.ssi:85
-#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
-#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
-#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
-#: en/other_procedures.ssi:58 en/project_bugs.ssi:58 en/user_basics.ssi:32
-#: en/user_basics.ssi:42 en/user_basics.ssi:54 en/user_basics.ssi:66
-#: en/user_basics.ssi:78 en/user_basics.ssi:88 en/user_basics.ssi:102
-#: en/user_basics.ssi:110 en/user_basics.ssi:118 en/user_basics.ssi:128
-#: en/user_basics.ssi:140 en/user_basics.ssi:152 en/user_basics.ssi:160
-#: en/user_basics.ssi:168 en/user_basics.ssi:182 en/user_basics.ssi:190
-#: en/user_basics.ssi:200 en/user_basics.ssi:220 en/user_basics.ssi:253
-#: en/user_basics.ssi:269 en/user_basics.ssi:277 en/user_basics.ssi:297
-#: en/user_basics.ssi:322 en/user_customization-contents.ssi:34
-#: en/user_customization-contents.ssi:43 en/user_customization-contents.ssi:66
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
+#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
+#: en/about_manual.ssi:170 en/other_coding-style.ssi:28
+#: en/other_coding-style.ssi:38 en/other_coding-style.ssi:51
+#: en/other_coding-style.ssi:61 en/other_coding-style.ssi:88
+#: en/other_coding-style.ssi:96 en/other_coding-style.ssi:106
+#: en/other_coding-style.ssi:117 en/other_common-tasks.ssi:32
+#: en/other_customization-backports.ssi:8 en/other_customization-bootup.ssi:30
+#: en/other_customization-bootup.ssi:39 en/other_faq.ssi:41
+#: en/other_faq.ssi:83 en/other_faq.ssi:103 en/other_faq.ssi:117
+#: en/other_faq.ssi:137 en/other_faq.ssi:151 en/other_faq.ssi:198
+#: en/other_faq.ssi:245 en/other_faq.ssi:261 en/other_faq.ssi:287
+#: en/other_faq.ssi:299 en/other_faq.ssi:314 en/other_faq.ssi:333
+#: en/other_faq.ssi:345 en/other_faq.ssi:353 en/other_faq.ssi:364
+#: en/other_faq.ssi:374 en/other_howtos.ssi:16 en/other_howtos.ssi:43
+#: en/other_live-environment.ssi:14 en/other_live-environment.ssi:30
+#: en/other_live-environment.ssi:51 en/other_live-environment.ssi:61
+#: en/other_live-environment.ssi:69 en/other_live-environment.ssi:77
+#: en/other_live-environment.ssi:85 en/other_live-environment.ssi:93
+#: en/other_live-environment.ssi:116 en/other_live-environment.ssi:124
+#: en/other_live-environment.ssi:133 en/other_procedures.ssi:12
+#: en/other_procedures.ssi:46 en/other_procedures.ssi:58
+#: en/project_bugs.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/user_basics.ssi:54 en/user_basics.ssi:66 en/user_basics.ssi:78
+#: en/user_basics.ssi:88 en/user_basics.ssi:102 en/user_basics.ssi:110
+#: en/user_basics.ssi:118 en/user_basics.ssi:128 en/user_basics.ssi:142
+#: en/user_basics.ssi:154 en/user_basics.ssi:162 en/user_basics.ssi:170
+#: en/user_basics.ssi:184 en/user_basics.ssi:192 en/user_basics.ssi:202
+#: en/user_basics.ssi:222 en/user_basics.ssi:255 en/user_basics.ssi:271
+#: en/user_basics.ssi:279 en/user_basics.ssi:299 en/user_basics.ssi:324
+#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
+#: en/user_customization-contents.ssi:66
#: en/user_customization-internationalization.ssi:10
#: en/user_customization-internationalization.ssi:18
#: en/user_customization-internationalization.ssi:26
#: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:26
-#: en/user_customization-packages.ssi:38 en/user_customization-packages.ssi:47
-#: en/user_customization-packages.ssi:61 en/user_customization-packages.ssi:75
-#: en/user_customization-packages.ssi:105
-#: en/user_customization-packages.ssi:113
+#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
+#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
+#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:90
+#: en/user_customization-packages.ssi:120
#: en/user_customization-packages.ssi:133
-#: en/user_customization-packages.ssi:168
-#: en/user_customization-packages.ssi:178
-#: en/user_customization-packages.ssi:188
-#: en/user_customization-packages.ssi:198 en/user_examples.ssi:24
+#: en/user_customization-packages.ssi:143
+#: en/user_customization-packages.ssi:153
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:261
+#: en/user_customization-packages.ssi:273
+#: en/user_customization-packages.ssi:283 en/user_examples.ssi:14
+#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
+#: en/user_examples.ssi:64 en/user_examples.ssi:80 en/user_examples.ssi:90
+#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:131
+#: en/user_examples.ssi:139 en/user_examples.ssi:154 en/user_examples.ssi:162
+#: en/user_examples.ssi:188 en/user_examples.ssi:209 en/user_examples.ssi:217
#: 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
@@ -75,14 +84,15 @@ msgid "code{"
msgstr "code{"
#. type: Plain text
-#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
-#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
-#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
-#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
-#: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
-#: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
+#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:166
+#: en/about_manual.ssi:173 en/other_coding-style.ssi:34
+#: en/other_coding-style.ssi:45 en/other_coding-style.ssi:57
+#: en/other_coding-style.ssi:68 en/other_coding-style.ssi:92
+#: en/other_coding-style.ssi:100 en/other_coding-style.ssi:113
+#: en/other_coding-style.ssi:124 en/other_common-tasks.ssi:36
+#: en/other_customization-backports.ssi:16
#: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
#: en/other_faq.ssi:37 en/other_faq.ssi:46 en/other_faq.ssi:92
#: en/other_faq.ssi:108 en/other_faq.ssi:141 en/other_faq.ssi:155
@@ -100,27 +110,35 @@ msgstr "code{"
#: en/project_bugs.ssi:62 en/user_basics.ssi:36 en/user_basics.ssi:46
#: en/user_basics.ssi:60 en/user_basics.ssi:72 en/user_basics.ssi:82
#: en/user_basics.ssi:94 en/user_basics.ssi:106 en/user_basics.ssi:114
-#: en/user_basics.ssi:122 en/user_basics.ssi:132 en/user_basics.ssi:146
-#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
-#: en/user_basics.ssi:186 en/user_basics.ssi:194 en/user_basics.ssi:204
-#: en/user_basics.ssi:245 en/user_basics.ssi:257 en/user_basics.ssi:273
-#: en/user_basics.ssi:281 en/user_basics.ssi:308 en/user_basics.ssi:347
+#: en/user_basics.ssi:122 en/user_basics.ssi:132 en/user_basics.ssi:148
+#: en/user_basics.ssi:158 en/user_basics.ssi:166 en/user_basics.ssi:174
+#: en/user_basics.ssi:188 en/user_basics.ssi:196 en/user_basics.ssi:206
+#: en/user_basics.ssi:247 en/user_basics.ssi:259 en/user_basics.ssi:275
+#: en/user_basics.ssi:283 en/user_basics.ssi:310 en/user_basics.ssi:349
#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
#: en/user_customization-contents.ssi:70
#: en/user_customization-internationalization.ssi:14
#: en/user_customization-internationalization.ssi:22
#: en/user_customization-internationalization.ssi:30
#: en/user_customization-internationalization.ssi:42
-#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:30
-#: en/user_customization-packages.ssi:43 en/user_customization-packages.ssi:51
-#: en/user_customization-packages.ssi:65 en/user_customization-packages.ssi:79
-#: en/user_customization-packages.ssi:109
-#: en/user_customization-packages.ssi:117
-#: en/user_customization-packages.ssi:137
-#: en/user_customization-packages.ssi:174
-#: en/user_customization-packages.ssi:184
-#: en/user_customization-packages.ssi:194
-#: en/user_customization-packages.ssi:204 en/user_examples.ssi:33
+#: en/user_customization-packages.ssi:23 en/user_customization-packages.ssi:36
+#: en/user_customization-packages.ssi:48 en/user_customization-packages.ssi:62
+#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:94
+#: en/user_customization-packages.ssi:125
+#: en/user_customization-packages.ssi:139
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:159
+#: en/user_customization-packages.ssi:169
+#: en/user_customization-packages.ssi:181
+#: en/user_customization-packages.ssi:197
+#: en/user_customization-packages.ssi:265
+#: en/user_customization-packages.ssi:277
+#: en/user_customization-packages.ssi:287 en/user_examples.ssi:20
+#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:58
+#: en/user_examples.ssi:68 en/user_examples.ssi:86 en/user_examples.ssi:101
+#: en/user_examples.ssi:111 en/user_examples.ssi:123 en/user_examples.ssi:135
+#: en/user_examples.ssi:150 en/user_examples.ssi:158 en/user_examples.ssi:166
+#: en/user_examples.ssi:197 en/user_examples.ssi:213 en/user_examples.ssi:221
#: en/user_installation.ssi:42 en/user_installation.ssi:50
#: en/user_installation.ssi:60 en/user_installation.ssi:72
#: en/user_installation.ssi:80 en/user_installation.ssi:88
@@ -133,11 +151,6 @@ msgid "}code"
msgstr "}code"
#. type: Plain text
-#: en/user_basics.ssi:218 en/user_customization-packages.ssi:155
-msgid "% FIXME"
-msgstr ""
-
-#. type: Plain text
#: en/user_customization-packages.ssi:2
msgid ":B~ Customizing package installation"
msgstr ""
@@ -161,7 +174,7 @@ msgid ""
"options give some control over apt, or if you prefer, aptitude, at build "
"time when packages are installed. You may find these handy if you use a "
"proxy, want to disable installation of recommended packages to save space, "
-"or need to control which versions of packages are installed via apt pinning, "
+"or need to control which versions of packages are installed via APT pinning, "
"to name a few possibilities."
msgstr ""
@@ -172,431 +185,486 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:10
-msgid "3~ Debian repositories"
+msgid "3~ Distribution mirrors"
msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:12
-msgid "To set a local mirror to be used to at build time:"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:16
-msgid "$ lb config --mirror-bootstrap http://localhost/debian/"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:20
msgid ""
-"The chroot repository, specified by --mirror-chroot, defaults to the same as "
-"--mirror-bootstrap."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:22
-msgid ""
-"Each of the --mirror-* options governs which repository is used at various "
-"stages of the build. Recall from {Stages of the build}#stages-of-the-build "
-"that the *bootstrap* stage is when the chroot is initially populated by "
-"debootstrap with a minimal system, and the *chroot* stage is when the chroot "
-"used to construct the live system's filesystem is built. Thus, the "
-"corresponding mirror switches are used for those stages, and later, when the "
-"binary image is constructed, the --mirror-binary value is used, superceding "
-"any earlier repositories."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:24
-msgid "The generic mirror is added to the live system's /etc/apt/sources.list."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:28
-msgid "$ lb config --mirror-binary http://ftp.debian.org/debian/"
+"Each of the #{--mirror-*}# options governs which distribution mirror is used "
+"at various stages of the build. Recall from {Stages of the build}#stages-of-"
+"the-build that the *bootstrap* stage is when the chroot is initially "
+"populated by debootstrap with a minimal system, and the *chroot* stage is "
+"when the chroot used to construct the live system's filesystem is built. "
+"Thus, the corresponding mirror switches are used for those stages, and "
+"later, in the *binary* stage, the #{--mirror-binary}# and #{--mirror-binary-"
+"security}# values are used, superceding any mirrors used in an earlier stage."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:32
+#: en/user_customization-packages.ssi:14
msgid ""
-"Note: It is not used for building the live system but to install new "
-"software while using the live system."
+"3~distribution-mirrors-build-time Distribution mirrors used at build time"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:34
+#: en/user_customization-packages.ssi:16
msgid ""
-"It can be disabled by setting the binary mirror to the same value as the "
-"chroot mirror."
+"To set the distribution mirrors used at build time to point at a local "
+"mirror, it is sufficient to set #{--mirror-bootstrap}# and #{--mirror-chroot-"
+"security}# as follows."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:36
+#: en/user_customization-packages.ssi:21
+#, no-wrap
msgid ""
-"Note: the same applies for mirror chroot security and mirror binary security"
+"$ lb config --mirror-bootstrap http://localhost/debian/ \\\n"
+" --mirror-chroot-security http://localhost/debian-security/\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:41
+#: en/user_customization-packages.ssi:25
msgid ""
-"$ lb config --mirror-chroot-security {URL} $ lb config --mirror-binary-"
-"security {URL}"
+"The chroot mirror, specified by #{--mirror-chroot}#, defaults to the #{--"
+"mirror-bootstrap}# value."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:45
-msgid "If you don't want to include apt indices, you can skip those with:"
+#: en/user_customization-packages.ssi:27
+msgid "3~ Distribution mirrors used at run time"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:49
-msgid "$ lb config --binary-indices false"
+#: en/user_customization-packages.ssi:29
+msgid ""
+"The #{--mirror-binary*}# options govern the distribution mirrors placed in "
+"the binary image. These may be used to install additional packages while "
+"running the live system. The 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
-#: en/user_customization-packages.ssi:53
+#: en/user_customization-packages.ssi:34
+#, no-wrap
msgid ""
-"This will not influence the entries in /etc/apt/sources.list, but only if /"
-"var/lib/apt contains the indices files or not (and by that making the image "
-"smaller)."
+"$ lb config --mirror-binary http://mirror/debian/ \\\n"
+" --mirror-binary-security http://mirror/debian-security/\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:55
-msgid "3~ Own repository"
+#: en/user_customization-packages.ssi:38
+msgid "3~ Additional repositories"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:57
+#: en/user_customization-packages.ssi:40
msgid ""
"To add more repositories (e.g. backports, experimental or custom packages, "
"etc.), create #{config/chroot_sources/your-repository.{chroot,binary}}# "
-"files."
+"files. As with the #{--mirror-*}# options, these govern the repositories "
+"used in the *chroot* stage when building the image, and in the *binary* "
+"stage, i.e. for use when running the live system."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:59
+#: en/user_customization-packages.ssi:42
msgid ""
-"e.g. #{config/chroot_sources/live.chroot}# allows you to install packages "
-"from the debian live snapshot repository at live system build time (you have "
-"to add the packages in your package list):"
+"For example, #{config/chroot_sources/live.chroot}# allows you to install "
+"packages from the debian live snapshot repository at live system build time."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:63
+#: en/user_customization-packages.ssi:46
msgid "deb http://live.debian.net/ sid-snapshots main contrib non-free"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:67
+#: en/user_customization-packages.ssi:50
msgid ""
-"If you add the line to #{config/chroot_sources/live.binary}# the repository "
-"will be added to your live-system's #{/etc/apt/sources.list}#."
+"If you add the same line to #{config/chroot_sources/live.binary}#, the "
+"repository will be added to your live system's #{/etc/apt/sources.list.d/}# "
+"directory."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:69
+#: en/user_customization-packages.ssi:52
msgid "If such files exist, they will be picked up automatically."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:71
+#: en/user_customization-packages.ssi:54
msgid ""
-"You can also put the gpg-key used to sign the repository into config/"
-"chroot_sources/your-repository.{binary,chroot}.gpg"
+"You should also put the GPG key used to sign the repository into #{config/"
+"chroot_sources/your-repository.{binary,chroot}.gpg}# files."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:73
+#: en/user_customization-packages.ssi:56
msgid ""
"Note: some preconfigured package repositories are available for easy "
-"selection through the --repository switch, e.g. for enabling live snapshots, "
-"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
-#: en/user_customization-packages.ssi:77
+#: en/user_customization-packages.ssi:60
msgid "$ lb config --repository live.debian.net"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:81
-msgid "3~ Package installation"
+#: en/user_customization-packages.ssi:64
+msgid "2~choosing-packages-to-install Choosing packages to install"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:83
+#: en/user_customization-packages.ssi:66
msgid ""
-"You can elect to use either #{apt}# or #{aptitude}# when installing "
-"packages. Which utility is used is governed by the #{LB_APT}# variable in #"
-"{config/chroot}# or by the #{--apt}# argument to #{lb config}#:"
+"There are a number of ways to choose which packages live-build will install "
+"in your image, covering a variety of different needs. You can simply name "
+"individual packages to install, either with the #{--packages}# option for a "
+"few packages, or in a package list of your own for larger numbers. You can "
+"also choose larger predefined lists of packages, or use APT tasks. And "
+"finally, you may place package files in your #{config/}# tree, which is well "
+"suited to testing of new or experimental packages before they are available "
+"from a repository."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:85
-msgid ""
-"_* #{apt}#: Specifying a missing package causes package installation to "
-"fail, which may not be the desired behaviour. This is the default setting "
-"for building images for Lenny or later."
+#: en/user_customization-packages.ssi:68
+msgid "3~ Choosing a few packages"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:87
+#: en/user_customization-packages.ssi:70
msgid ""
-"_* #{aptitude}#: Specifying a missing package causes package installation to "
-"succeed, which may not be the desired behaviour. This is the default setting "
-"for building images for Etch."
+"When the number of packages added is small, simply specify #{--packages}#. "
+"For example:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:89
-msgid "2~ Installing additional packages"
+#: en/user_customization-packages.ssi:74
+msgid "$ lb config --packages \"package1 package2 package3\""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:91
+#: en/user_customization-packages.ssi:78
msgid ""
-"live-helper has a number of mechanisms for indicating that additional "
-"packages should be installed, including:"
+"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."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:93
-msgid "_* The #{LB_PACKAGES}# variable"
+#: en/user_customization-packages.ssi:80
+msgid ""
+"If you need to specify a large number of packages to be installed or you "
+"need flexibility regarding which packages to install, use package lists as "
+"discussed in the following section, {Package lists}#package-lists."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:95
-msgid "_* Package lists"
+#: en/user_customization-packages.ssi:82
+msgid "3~package-lists Package lists"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:97
-msgid "_* Local packages (#{chroot_local-packages/}#)"
+#: en/user_customization-packages.ssi:84
+msgid ""
+"Package lists are a powerful way of expressing which packages should be "
+"installed. The list syntax supports included files and conditional sections "
+"which makes it easy to build lists from other lists and adapt them for use "
+"in multiple configurations. You can use predefined package lists, providing "
+"in a modular fashion package selections from each of the major desktop "
+"environments and some special purpose lists, as well as standard lists the "
+"others are based upon. You can also provide your own package lists, or use a "
+"combination of both."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:99
-msgid "_* Tasks"
+#: en/user_customization-packages.ssi:86
+msgid "3~ Predefined package lists"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:101
-msgid "3~ The #{LB_PACKAGES}# variable"
+#: en/user_customization-packages.ssi:88
+msgid ""
+"The simplest way to use lists is to specify one or more predefined lists "
+"with the #{--packages-lists}# option. For example:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:103
-msgid ""
-"To install additional packages, simply add them to the #{LB_PACKAGES}# "
-"variable in #{config/chroot}#. For example:"
+#: en/user_customization-packages.ssi:92
+msgid "$ lb config --packages-lists \"gnome-core rescue\""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:107
-msgid "LB_PACKAGES=\"package1 package2 package3 ... \""
+#: en/user_customization-packages.ssi:96
+msgid ""
+"In addition to these lists, live-build supports four virtual package lists: #"
+"{gnome-desktop}#, #{kde-desktop}#, #{lxde-desktop}# and #{xfce-desktop}#, "
+"each of which provide a more extensive selection of packages that "
+"corresponds with Debian Installer defaults for these desktop environments. "
+"See {Desktop and language tasks}#desktop-and-language-tasks for more details."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:111
-msgid "You can also specify initial values on the command line:"
+#: en/user_customization-packages.ssi:98
+msgid ""
+"Note: The prebuilt GNOME, KDE, LXDE and XFCE images available for download "
+"at http://live.debian.net are built using the corresponding virtual #{*-"
+"desktop}# lists."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:115
-msgid "$ lb config --packages \"package1 package2 package3\""
+#: en/user_customization-packages.ssi:100
+msgid ""
+"The default location for the list files on your system is #{/usr/share/live/"
+"build/lists/}#. To determine the packages in a given list, read the "
+"corresponding file, paying attention to included files and conditionals as "
+"described in the following sections."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:119
-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."
+#: en/user_customization-packages.ssi:102
+msgid "3~ Local package lists"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:121
-msgid "% FIXME: <xref linkend=\"package-installation\"/>"
+#: en/user_customization-packages.ssi:104
+msgid ""
+"You may supplement or replace entirely the supplied lists using local "
+"package lists stored in #{config/chroot_local-packageslists/}#."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:123
+#: en/user_customization-packages.ssi:106
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."
+"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."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:125
-msgid "% FIXME: <xref linkend=\"package-lists\"/>"
+#: en/user_customization-packages.ssi:108
+msgid "3~ Local binary package lists"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:127
-msgid "3~ Package lists"
+#: en/user_customization-packages.ssi:110
+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 "
+"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."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:129
+#: en/user_customization-packages.ssi:112
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 "
-"provide sensible default package selections for the major desktop "
-"environments, as well as standard systems."
+"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:131
-msgid "To specify one or more package list, you can use:"
+#: en/user_customization-packages.ssi:114
+msgid "3~ Extending a provided package list using includes"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:135
-msgid "$ lb config --packages-lists \"list1 list2 list3\""
+#: en/user_customization-packages.ssi:116
+msgid ""
+"The package lists that are included with live-build make extensive use of "
+"includes. Refer to these in the #{/usr/share/live/build/lists/}# directory, "
+"as they serve as good examples of how to write your own lists."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:139
+#: en/user_customization-packages.ssi:118
msgid ""
-"Note: Package lists that are distributed with live-build reside in the #{/"
-"usr/share/live/build/lists}# directory."
+"For example, to make a list that includes the predefined #{gnome}# list plus "
+"iceweasel, create #{config/chroot_local-packageslists/mygnome.list}# with "
+"the following contents:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:141
-#, no-wrap
-msgid "*{Local packages lists}*\n"
+#: en/user_customization-packages.ssi:123
+msgid "#include <gnome> iceweasel"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:143
+#: en/user_customization-packages.ssi:127
+msgid "3~ Using conditionals inside package lists"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:129
msgid ""
-"You may supplement the supplied lists using local package lists stored in #"
-"{config/chroot_local-packageslists}#."
+"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:145
+#: en/user_customization-packages.ssi:131
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 "
-"distributed with live-build. This can cause undesired effects, we therefore "
-"recommend to use unique names for local packages lists."
+"For example, to install #{ia32-libs}# if the #{--architecture amd64}# is "
+"specified:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:147
-#, no-wrap
-msgid "*{Local binary packages lists}*\n"
+#: en/user_customization-packages.ssi:137
+msgid "#if ARCHITECTURE amd64 ia32-libs #endif"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:141
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 "
-"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."
+"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
+#: en/user_customization-packages.ssi:147
+msgid "#if ARCHITECTURE i386 amd64 memtest86+ #endif"
msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:151
msgid ""
-"Package lists that exist in this directory need to have a .list suffix in "
-"order to be processed."
+"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
-#: en/user_customization-packages.ssi:153
-#, no-wrap
-msgid "*{Extending a provided package list using includes}*\n"
+#: en/user_customization-packages.ssi:157
+msgid "#if ARCHIVE_AREAS contrib non-free vrms #endif"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:162
-msgid "% code{ % % #include <gnome> % iceweasel % % }code"
+#: en/user_customization-packages.ssi:161
+msgid "A conditional may surround an #{#include}# directive:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:164
-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}# "
-"directory."
+#: en/user_customization-packages.ssi:167
+msgid "#if ARCHITECTURE amd64 #include <gnome-full> #endif"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:166
-#, no-wrap
-msgid "*{Using conditionals inside packages lists}*\n"
+#: en/user_customization-packages.ssi:171
+msgid "The nesting of conditionals is not supported."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:172
-msgid "#if ARCHITECTURE amd64 ia32-libs #endif"
+#: en/user_customization-packages.ssi:173
+msgid "3~ Tasks"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:176
-msgid "or if #{LB_ARCHITECTURE}# is set to #{i386}# or #{amd64}#:"
+#: en/user_customization-packages.ssi:175
+msgid ""
+"The Debian Installer offers the user choices of a number of preselected "
+"lists of packages, each one focused on a particular kind of system, or task "
+"a system may be used for, such as \"Graphical desktop environment\", \"Mail "
+"server\" or \"Laptop\". These lists are called \"tasks\" and are supported "
+"by APT through the \"Task:\" field. You can specify one or more tasks in "
+"live-build via the #{--tasks}# option, as in the example below."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:182
-msgid "#if ARCHITECTURE i386 amd64 memtest86+ #endif"
+#: en/user_customization-packages.ssi:179
+msgid "$ lb config --tasks \"mail-server file-server\""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:186
-msgid "or if #{LB_ARCHIVE_AREAS}# contains either #{contrib}# or #{non-free}#:"
+#: en/user_customization-packages.ssi:183
+msgid ""
+"The primary tasks available in the Debian Installer can be listed with #"
+"{tasksel --list-tasks}# in the live system. The contents of any task, "
+"including ones not included in this list, may be examined with #{tasksel --"
+"task-packages}#."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:192
-msgid "#if ARCHIVE_AREAS contrib non-free vrms #endif"
+#: en/user_customization-packages.ssi:185
+msgid "3~desktop-and-language-tasks Desktop and language tasks"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:196
-msgid "A conditional may surround an #{#include}# directive:"
+#: en/user_customization-packages.ssi:187
+msgid ""
+"Desktop and language tasks are special cases. In the Debian Installer, if "
+"the medium was prepared for a particular desktop environment flavour, the "
+"corresponding task will be automatically installed. Thus, there are there "
+"are #{gnome-desktop}#, #{kde-desktop}#, #{lxde-desktop}# and #{xfce-desktop}"
+"# tasks, none of which are offered in #{tasksel}#'s menu. Likewise, there "
+"are no menu entries for tasks for languages, but the user's language choice "
+"during the install influences the selection of corresponding language tasks."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:202
-msgid "#if ARCHITECTURE amd64 #include <gnome-full> #endif"
+#: en/user_customization-packages.ssi:189
+msgid ""
+"In live-build, therefore, these special cases are also given special "
+"consideration, but with three notable differences at the time of writing."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:206
+#: en/user_customization-packages.ssi:191
msgid ""
-"Any live-build configuration variable that begins with #{LB_}# can be tested "
-"in this way."
+"First, there is no provision made yet automatically for language tasks, "
+"although a subset of those packages are included if you specify #{lb config "
+"--language}#. If you need those tasks, which include such things as language-"
+"specific fonts and input-method packages, you need to specify them in your "
+"configuration. For example:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:208
-msgid "The nesting of conditionals is not supported."
+#: en/user_customization-packages.ssi:195
+msgid ""
+"$ lb config --tasks \"japanese japanese-desktop japanese-gnome-desktop\""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:210
-msgid "3~ Tasks"
+#: en/user_customization-packages.ssi:199
+msgid ""
+"Second, live-build supports #{*-desktop}# virtual package lists for each of "
+"the desktop flavours mentioned above, which select the #{standard-x11}# "
+"predefined package list, the corresponding #{*-desktop}# task and three "
+"additional tasks: #{desktop}#, #{standard}# and #{laptop}#. So, for example, "
+"if you specify #{--packages gnome-desktop}#, it is equivalent to specifying #"
+"{--packages standard-x11 --tasks \"gnome-desktop desktop standard laptop\"}#."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:212
-msgid "%FIXME"
+#: en/user_customization-packages.ssi:201
+msgid ""
+"Third, if any of the tasks for these desktop flavours are selected, either "
+"explicitly through #{--tasks}# or implicitly by #{--packages}#, live-build "
+"will preseed the corresponding desktop value for Debian Installer (if it is "
+"included) to ensure it follows its own rules for installing different "
+"desktop flavours."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:214
+#: en/user_customization-packages.ssi:203
msgid "2~ Installing modified or third-party packages"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:205
msgid ""
"Whilst it is against the philosophy of Debian Live, it may sometimes be "
"necessary to build a Live system with modified versions of packages that are "
@@ -607,7 +675,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:218
+#: en/user_customization-packages.ssi:207
msgid ""
"This section does not cover advice regarding building or maintaining "
"modified packages. Joachim Breitner's 'How to fork privately' method from "
@@ -618,95 +686,90 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:220
+#: en/user_customization-packages.ssi:209
msgid "There are two ways of installing modified custom packages:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:222
+#: en/user_customization-packages.ssi:211
msgid "_* #{chroot_local-packages}#"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:224
+#: en/user_customization-packages.ssi:213
msgid "_* Using a custom APT repository"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:226
+#: en/user_customization-packages.ssi:215
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:228
+#: en/user_customization-packages.ssi:217
msgid "3~ Using #{chroot_local-packages}# to install custom packages"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:230
+#: en/user_customization-packages.ssi:219
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:232
+#: en/user_customization-packages.ssi:221
msgid ""
"Packages *{must}* be named in the prescribed way. One simple way to do this "
"is to use #{dpkg-name}#."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:234
+#: en/user_customization-packages.ssi:223
msgid ""
"Using #{chroot_local-packages}# for installation of custom packages has "
"disadvantages:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:236
-msgid "_* It is not possible to use secure APT"
+#: en/user_customization-packages.ssi:225
+msgid "_* It is not possible to use secure APT."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:238
+#: en/user_customization-packages.ssi:227
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:240
+#: en/user_customization-packages.ssi:229
msgid ""
"_* It does not lend itself to storing Debian Live configurations in revision "
-"control"
+"control."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:242
+#: en/user_customization-packages.ssi:231
msgid "3~ Using an APT repository to install custom packages"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:244
+#: en/user_customization-packages.ssi:233
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."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:246
-msgid "% FIXME: <xref linkend=\"lb-packages\"/>"
+"you must ensure that you specify the packages elsewhere. See {Choosing "
+"packages to install}#choosing-packages-to-install for details."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:248
+#: en/user_customization-packages.ssi:235
msgid ""
"Whilst it may seem unnecessary effort to create an APT repository to install "
"custom packages, the infrastructure can be easily re-used at a later date to "
@@ -714,12 +777,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:250
+#: en/user_customization-packages.ssi:237
msgid "3~ Custom packages and APT"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:252
+#: en/user_customization-packages.ssi:239
msgid ""
"live-build uses APT to install all packages into the live system so will "
"therefore inherit behaviours from this program. One relevant example is that "
@@ -729,7 +792,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:254
+#: en/user_customization-packages.ssi:241
msgid ""
"Because of this, you may wish to increment the version number in your custom "
"packages' #{debian/changelog}# files to ensure that your modified version is "
@@ -739,19 +802,152 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:256
+#: en/user_customization-packages.ssi:243
msgid "% FIXME: <xref linkend=\"apt-preferences\"/>"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:258
-msgid "3~ Altering APT preferences during Live system"
+#: en/user_customization-packages.ssi:245
+msgid "2~ Configuring APT at build time"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:247
+msgid ""
+"You can configure APT through a number of options applied only at build "
+"time. (APT configuration used in the running live system may be configured "
+"in the normal way for live system contents, that is, by including the "
+"appropriate configurations through #{config/chroot_local_includes/}#.) For a "
+"complete list, look for options starting with #{apt}# in the #{lb_config}# "
+"man page."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:249
+msgid "3~choosing-apt-or-aptitude Choosing apt or aptitude"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:251
+msgid ""
+"You can elect to use either #{apt}# or #{aptitude}# when installing packages "
+"at build time. Which utility is used is governed by the #{--apt}# argument "
+"to #{lb config}#. Choose the method implementing the preferred behaviour for "
+"package installation, the notable difference being how missing packages are "
+"handled."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:253
+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:255
+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:257
+msgid "3~ Using a proxy with APT"
msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:259
msgid ""
-"Whilst it may seem unnecessary effort to create an APT repository to install "
-"custom packages, the infrastructure can be easily re-used at a later date to "
-"offer updates of the modified package."
+"One commonly required APT configuration is to deal with building an image "
+"behind a proxy. You may specify your APT proxy with the #{--apt-ftp-proxy}# "
+"or #{--apt-http-proxy}# options as needed, e.g."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:263
+msgid "lb config --apt-http-proxy http://proxy/"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:267
+msgid "3~ Tweaking APT to save space"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:269
+msgid ""
+"You may find yourself needing to save some space on the image media, in "
+"which case one or the other or both of the following options may be of "
+"interest."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:271
+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:275
+msgid "$ lb config --binary-indices false"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:279
+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 "
+"APT needs those indices in order to operate in the live system, so before "
+"performing #{apt-cache search}# or #{apt-get install}#, for instance, the "
+"user must #{apt-get update}# first to create those indices."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:281
+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:285
+msgid "$ lb config -apt-recommends false"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:289
+msgid ""
+"The tradeoff here is that recommended packages are defined as \"packages "
+"that would be found together with this one in all but unusual installations"
+"\" (Debian Policy Manual, 7.2). This may lead to some packages that you "
+"actually need being omitted, so we suggest you review the difference this "
+"makes to your packages list (see the #{binary.packages}# file generated by #"
+"{lb build}#) and re-include in your list any missing packages that you still "
+"want installed."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:291
+msgid "3~ Passing options to apt or aptitude"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:293
+msgid ""
+"If there is not an #{lb config}# option to alter APT's behaviour in the way "
+"you need, use #{--apt-options}# or #{--aptitude-options}# to pass any "
+"options through to your configured APT tool. See the man pages for #{apt}# "
+"and #{aptitude}# for details."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:295
+msgid "3~ APT pinning"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:297
+msgid "% FIXME: needs content"
msgstr ""
diff --git a/manual/po/pt_BR/user_examples.ssi.po b/manual/po/pt_BR/user_examples.ssi.po
index 2f6115a..7615a7d 100644
--- a/manual/po/pt_BR/user_examples.ssi.po
+++ b/manual/po/pt_BR/user_examples.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-11-04 16:34-0400\n"
+"POT-Creation-Date: 2010-11-28 07:51-0400\n"
"PO-Revision-Date: 2010-11-04 16:34-0400\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -17,52 +17,61 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
#. type: Plain text
-#: en/about_manual.ssi:80 en/about_manual.ssi:88 en/about_manual.ssi:96
-#: en/about_manual.ssi:108 en/about_manual.ssi:121 en/about_manual.ssi:134
-#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
-#: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
-#: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
-#: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
-#: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
-#: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
-#: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
-#: en/other_faq.ssi:41 en/other_faq.ssi:83 en/other_faq.ssi:103
-#: en/other_faq.ssi:117 en/other_faq.ssi:137 en/other_faq.ssi:151
-#: en/other_faq.ssi:198 en/other_faq.ssi:245 en/other_faq.ssi:261
-#: en/other_faq.ssi:287 en/other_faq.ssi:299 en/other_faq.ssi:314
-#: en/other_faq.ssi:333 en/other_faq.ssi:345 en/other_faq.ssi:353
-#: en/other_faq.ssi:364 en/other_faq.ssi:374 en/other_howtos.ssi:16
-#: en/other_howtos.ssi:43 en/other_live-environment.ssi:14
-#: en/other_live-environment.ssi:30 en/other_live-environment.ssi:51
-#: en/other_live-environment.ssi:61 en/other_live-environment.ssi:69
-#: en/other_live-environment.ssi:77 en/other_live-environment.ssi:85
-#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
-#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
-#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
-#: en/other_procedures.ssi:58 en/project_bugs.ssi:58 en/user_basics.ssi:32
-#: en/user_basics.ssi:42 en/user_basics.ssi:54 en/user_basics.ssi:66
-#: en/user_basics.ssi:78 en/user_basics.ssi:88 en/user_basics.ssi:102
-#: en/user_basics.ssi:110 en/user_basics.ssi:118 en/user_basics.ssi:128
-#: en/user_basics.ssi:140 en/user_basics.ssi:152 en/user_basics.ssi:160
-#: en/user_basics.ssi:168 en/user_basics.ssi:182 en/user_basics.ssi:190
-#: en/user_basics.ssi:200 en/user_basics.ssi:220 en/user_basics.ssi:253
-#: en/user_basics.ssi:269 en/user_basics.ssi:277 en/user_basics.ssi:297
-#: en/user_basics.ssi:322 en/user_customization-contents.ssi:34
-#: en/user_customization-contents.ssi:43 en/user_customization-contents.ssi:66
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
+#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
+#: en/about_manual.ssi:170 en/other_coding-style.ssi:28
+#: en/other_coding-style.ssi:38 en/other_coding-style.ssi:51
+#: en/other_coding-style.ssi:61 en/other_coding-style.ssi:88
+#: en/other_coding-style.ssi:96 en/other_coding-style.ssi:106
+#: en/other_coding-style.ssi:117 en/other_common-tasks.ssi:32
+#: en/other_customization-backports.ssi:8 en/other_customization-bootup.ssi:30
+#: en/other_customization-bootup.ssi:39 en/other_faq.ssi:41
+#: en/other_faq.ssi:83 en/other_faq.ssi:103 en/other_faq.ssi:117
+#: en/other_faq.ssi:137 en/other_faq.ssi:151 en/other_faq.ssi:198
+#: en/other_faq.ssi:245 en/other_faq.ssi:261 en/other_faq.ssi:287
+#: en/other_faq.ssi:299 en/other_faq.ssi:314 en/other_faq.ssi:333
+#: en/other_faq.ssi:345 en/other_faq.ssi:353 en/other_faq.ssi:364
+#: en/other_faq.ssi:374 en/other_howtos.ssi:16 en/other_howtos.ssi:43
+#: en/other_live-environment.ssi:14 en/other_live-environment.ssi:30
+#: en/other_live-environment.ssi:51 en/other_live-environment.ssi:61
+#: en/other_live-environment.ssi:69 en/other_live-environment.ssi:77
+#: en/other_live-environment.ssi:85 en/other_live-environment.ssi:93
+#: en/other_live-environment.ssi:116 en/other_live-environment.ssi:124
+#: en/other_live-environment.ssi:133 en/other_procedures.ssi:12
+#: en/other_procedures.ssi:46 en/other_procedures.ssi:58
+#: en/project_bugs.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/user_basics.ssi:54 en/user_basics.ssi:66 en/user_basics.ssi:78
+#: en/user_basics.ssi:88 en/user_basics.ssi:102 en/user_basics.ssi:110
+#: en/user_basics.ssi:118 en/user_basics.ssi:128 en/user_basics.ssi:142
+#: en/user_basics.ssi:154 en/user_basics.ssi:162 en/user_basics.ssi:170
+#: en/user_basics.ssi:184 en/user_basics.ssi:192 en/user_basics.ssi:202
+#: en/user_basics.ssi:222 en/user_basics.ssi:255 en/user_basics.ssi:271
+#: en/user_basics.ssi:279 en/user_basics.ssi:299 en/user_basics.ssi:324
+#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
+#: en/user_customization-contents.ssi:66
#: en/user_customization-internationalization.ssi:10
#: en/user_customization-internationalization.ssi:18
#: en/user_customization-internationalization.ssi:26
#: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:16 en/user_customization-packages.ssi:24
-#: en/user_customization-packages.ssi:36 en/user_customization-packages.ssi:45
-#: en/user_customization-packages.ssi:59 en/user_customization-packages.ssi:73
-#: en/user_customization-packages.ssi:103
-#: en/user_customization-packages.ssi:111
-#: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:166
-#: en/user_customization-packages.ssi:176
-#: en/user_customization-packages.ssi:186
-#: en/user_customization-packages.ssi:196 en/user_examples.ssi:24
+#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
+#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
+#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:90
+#: en/user_customization-packages.ssi:120
+#: en/user_customization-packages.ssi:133
+#: en/user_customization-packages.ssi:143
+#: en/user_customization-packages.ssi:153
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:261
+#: en/user_customization-packages.ssi:273
+#: en/user_customization-packages.ssi:283 en/user_examples.ssi:14
+#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
+#: en/user_examples.ssi:64 en/user_examples.ssi:80 en/user_examples.ssi:90
+#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:131
+#: en/user_examples.ssi:139 en/user_examples.ssi:154 en/user_examples.ssi:162
+#: en/user_examples.ssi:188 en/user_examples.ssi:209 en/user_examples.ssi:217
#: 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
@@ -75,14 +84,15 @@ msgid "code{"
msgstr "code{"
#. type: Plain text
-#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
-#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
-#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
-#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
-#: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
-#: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
+#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:166
+#: en/about_manual.ssi:173 en/other_coding-style.ssi:34
+#: en/other_coding-style.ssi:45 en/other_coding-style.ssi:57
+#: en/other_coding-style.ssi:68 en/other_coding-style.ssi:92
+#: en/other_coding-style.ssi:100 en/other_coding-style.ssi:113
+#: en/other_coding-style.ssi:124 en/other_common-tasks.ssi:36
+#: en/other_customization-backports.ssi:16
#: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
#: en/other_faq.ssi:37 en/other_faq.ssi:46 en/other_faq.ssi:92
#: en/other_faq.ssi:108 en/other_faq.ssi:141 en/other_faq.ssi:155
@@ -100,27 +110,35 @@ msgstr "code{"
#: en/project_bugs.ssi:62 en/user_basics.ssi:36 en/user_basics.ssi:46
#: en/user_basics.ssi:60 en/user_basics.ssi:72 en/user_basics.ssi:82
#: en/user_basics.ssi:94 en/user_basics.ssi:106 en/user_basics.ssi:114
-#: en/user_basics.ssi:122 en/user_basics.ssi:132 en/user_basics.ssi:146
-#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
-#: en/user_basics.ssi:186 en/user_basics.ssi:194 en/user_basics.ssi:204
-#: en/user_basics.ssi:245 en/user_basics.ssi:257 en/user_basics.ssi:273
-#: en/user_basics.ssi:281 en/user_basics.ssi:308 en/user_basics.ssi:347
+#: en/user_basics.ssi:122 en/user_basics.ssi:132 en/user_basics.ssi:148
+#: en/user_basics.ssi:158 en/user_basics.ssi:166 en/user_basics.ssi:174
+#: en/user_basics.ssi:188 en/user_basics.ssi:196 en/user_basics.ssi:206
+#: en/user_basics.ssi:247 en/user_basics.ssi:259 en/user_basics.ssi:275
+#: en/user_basics.ssi:283 en/user_basics.ssi:310 en/user_basics.ssi:349
#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
#: en/user_customization-contents.ssi:70
#: en/user_customization-internationalization.ssi:14
#: en/user_customization-internationalization.ssi:22
#: en/user_customization-internationalization.ssi:30
#: en/user_customization-internationalization.ssi:42
-#: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
-#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
-#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
-#: en/user_customization-packages.ssi:107
-#: en/user_customization-packages.ssi:115
-#: en/user_customization-packages.ssi:135
-#: en/user_customization-packages.ssi:172
-#: en/user_customization-packages.ssi:182
-#: en/user_customization-packages.ssi:192
-#: en/user_customization-packages.ssi:202 en/user_examples.ssi:33
+#: en/user_customization-packages.ssi:23 en/user_customization-packages.ssi:36
+#: en/user_customization-packages.ssi:48 en/user_customization-packages.ssi:62
+#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:94
+#: en/user_customization-packages.ssi:125
+#: en/user_customization-packages.ssi:139
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:159
+#: en/user_customization-packages.ssi:169
+#: en/user_customization-packages.ssi:181
+#: en/user_customization-packages.ssi:197
+#: en/user_customization-packages.ssi:265
+#: en/user_customization-packages.ssi:277
+#: en/user_customization-packages.ssi:287 en/user_examples.ssi:20
+#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:58
+#: en/user_examples.ssi:68 en/user_examples.ssi:86 en/user_examples.ssi:101
+#: en/user_examples.ssi:111 en/user_examples.ssi:123 en/user_examples.ssi:135
+#: en/user_examples.ssi:150 en/user_examples.ssi:158 en/user_examples.ssi:166
+#: en/user_examples.ssi:197 en/user_examples.ssi:213 en/user_examples.ssi:221
#: en/user_installation.ssi:42 en/user_installation.ssi:50
#: en/user_installation.ssi:60 en/user_installation.ssi:72
#: en/user_installation.ssi:80 en/user_installation.ssi:88
@@ -133,95 +151,474 @@ msgid "}code"
msgstr "}code"
#. type: Plain text
-#: en/other_faq.ssi:85 en/other_faq.ssi:247 en/user_examples.ssi:26
+#: en/other_faq.ssi:85 en/other_faq.ssi:247 en/user_examples.ssi:92
+#: en/user_examples.ssi:141 en/user_examples.ssi:190
msgid "#!/bin/sh"
msgstr ""
#. type: Plain text
+#: en/user_basics.ssi:44 en/user_basics.ssi:120 en/user_basics.ssi:204
+#: en/user_examples.ssi:109 en/user_examples.ssi:156
+msgid "# lb build"
+msgstr ""
+
+#. type: Plain text
#: en/user_examples.ssi:2
-msgid "B~ Examples"
+msgid ":B~ Examples"
msgstr ""
#. type: Plain text
#: en/user_examples.ssi:4
-msgid "1~ Use Case Builds"
+msgid "1~examples Examples"
msgstr ""
#. type: Plain text
#: en/user_examples.ssi:6
msgid ""
-"This chapter covers example builds for specific use cases with Debian Live."
+"This chapter covers example builds for specific use cases with Debian Live. "
+"If you are new to building your own Debian Live images, we recommend you "
+"first look at the three tutorials in sequence, as each one teaches new "
+"techniques that will help you use and understand the remaining examples."
msgstr ""
#. type: Plain text
#: en/user_examples.ssi:8
-msgid "2~ VNC Kiosk Client"
+msgid "2~using-the-examples Using the examples"
msgstr ""
#. type: Plain text
#: en/user_examples.ssi:10
-msgid "Create an image with live-build to boot directly to a VNC server."
+msgid ""
+"To use these examples you need a system to build them on that meets the "
+"requirements listed in {Requirements}#requirements and has live-build "
+"installed as described in {Installing live-build}#installing-live-build."
msgstr ""
#. type: Plain text
#: en/user_examples.ssi:12
+msgid ""
+"Note that, for the sake of brevity, in these examples we do not specify a "
+"local mirror to use for the build. You can speed up downloads considerably "
+"if you use a local mirror. You may specify the options when you use #{lb "
+"config}#, as described in {Distribution mirrors used at build time}"
+"#distribution-mirrors-build-time, or for more convenience, set the default "
+"for your build system in #{/etc/live/build.conf}#. Simply create this file "
+"and in it, set the corresponding #{LB_MIRROR_*}# variables to your preferred "
+"mirror. For example:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:18
+msgid ""
+"LB_MIRROR_BOOTSTRAP=\"http://mirror/debian\" LB_MIRROR_CHROOT=\"http://"
+"mirror/debian\" LB_MIRROR_CHROOT_SECURITY=\"http://mirror/debian-security\""
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:22
+msgid "2~tutorial-1 Tutorial 1: A standard image"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:24
+#, no-wrap
+msgid "*{Use case:}* Create a simple first image, learning the basics of live-build\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:26
+msgid ""
+"In this tutorial, we will build a default ISO hybrid Debian Live image "
+"containing only base packages (no Xorg) and some Debian Live support "
+"packages, as a first exercise in using live-build."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:28
+msgid "You can't get much simpler than this:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:32
+msgid "$ mkdir tutorial1 ; cd tutorial1 ; lb config"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:36
+msgid ""
+"Examine the contents of the #{config/}# directory if you wish. You will see "
+"stored here a skeletal configuration, ready to customize or, in this case, "
+"use immediately to build a default image."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:38
+msgid ""
+"Now, as superuser, build the image, saving a log as you build with #{tee}#."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:42
+msgid "# lb_build 2>&1 | tee binary.log"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:46
+msgid ""
+"Assuming all goes well, after a while, the current directory will contain #"
+"{binary-hybrid.iso}#. This ISO hybrid image can be booted directly in a "
+"virtual machine as described in {Testing an ISO image with Qemu}#testing-iso-"
+"with-qemu and {Testing an ISO image with virtualbox-ose}#testing-iso-with-"
+"virtualbox, or else imaged onto optical media or a USB flash device as "
+"described in {Burning an ISO image to a physical medium}#burning-iso-image "
+"and {Copying USB/HDD image to a USB stick}#copying-usb-hdd-image, "
+"respectively."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:48
+msgid "2~tutorial-2 Tutorial 2: A web browser utility"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:50
+#, no-wrap
+msgid "*{Use case}* Create a web browser utility image, learning how to apply customizations\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:52
+msgid ""
+"In this tutorial, we will create an image suitable for use as a web browser "
+"utility, serving as an introduction to customizing Debian Live images."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:56
+msgid "mkdir tutorial2 ; cd tutorial2 ; lb config -p lxde --packages iceweasel"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:60
+msgid ""
+"Our choice of LXDE for this example reflects our desire to provide a minimal "
+"desktop environment, since the focus of the image is the single use we have "
+"in mind, the web browser. We could go even further and provide a default "
+"configuration for the web browser in #{config/chroot_local-includes/etc/"
+"iceweasel/profile/}#, or additional support packages for viewing various "
+"kinds of web content, but we leave this as an exercise for the reader."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:62
+msgid ""
+"Build the image, again as superuser, keeping a log as in {Tutorial 1}"
+"#tutorial-1:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:66 en/user_examples.ssi:219
+msgid "# lb build 2>&1 | tee binary.log"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:70
+msgid "Again, verify the image is OK and test, as in {Tutorial 1}#tutorial-1."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:72
+msgid "2~tutorial-3 Tutorial 3: A personalized image"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:74
+#, no-wrap
+msgid "*{Use case}* Create a project to build a personalized image, containing your favourite software to take with you on a USB stick wherever you go, and evolving in successive revisions as your needs and preferences change.\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:76
+msgid ""
+"Since we will be changing our personalized image over a number of revisions, "
+"and we want to track those changes, trying things experimentally and "
+"possibly reverting them if things don't work out, we will keep our "
+"configuration in the popular #{git}# version control system. We will also "
+"use the best practice of autoconfiguration via #{auto}# scripts as described "
+"in {Managing a configuration}#managing-a-configuration."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:78
+msgid "3~ First revision"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:84
+msgid ""
+"$ mkdir -p tutorial3/auto $ cp /usr/share/live/examples/auto/* tutorial3/"
+"auto/ $ cd tutorial3"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:88
+msgid "Edit #{auto/config}# to read as follows:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:99
+#, no-wrap
+msgid ""
+"lb config noauto \\\n"
+" --architecture i386 \\\n"
+" --linux-flavours 686 \\\n"
+" --packages-lists lxde \\\n"
+" --packages \"iceweasel xchat\" \\\n"
+" \"${@}\"\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:103
+msgid ""
+"First, #{--architecture i386}# ensures that on our #{amd64}# build system, "
+"we build a 32-bit version suitable for use on most machines. Second, we use #"
+"{--linux-flavours 686}# because we don't anticipate using this image on much "
+"older systems. Third, we've chosen the #{lxde}# package list to give us a "
+"minimal desktop. And finally, we have added two initial favourite packages: #"
+"{iceweasel}# and #{xchat}#."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:105
+msgid "Now, build the image:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:113
+msgid ""
+"Note that unlike in the first two tutorials, we no longer have to type #"
+"{2>&1 | tee binary.log}# as that is now included in #{auto/build}#."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:115
+msgid ""
+"Once you've tested the image (as in {Tutorial 1}#tutorial-1) and are "
+"satisfied it works, it's time to initialize our #{git}# repository, adding "
+"only the auto scripts we just created, and then make the first commit:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:121
+msgid "$ git init $ git add auto $ git commit -a -m \"Initial import.\""
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:125
+msgid "3~ Second revision"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:127
+msgid ""
+"In this revision, we're going to clean up from the first build, add the #"
+"{vlc}# package to our configuration, rebuild, test and commit."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:129
+msgid ""
+"The #{lb clean}# command will clean up all generated files from the previous "
+"build except for the cache, which saves having to re-download packages. This "
+"ensures that the subsequent #{lb build}# will re-run all stages to "
+"regenerate the files from our new configuration."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:133
+msgid "# lb clean"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:137
+msgid "Now edit #{auto/config}# to add the #{vlc}# package:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:148
+#, no-wrap
+msgid ""
+"lb config noauto \\\n"
+" --architecture i386 \\\n"
+" --linux-flavours 686 \\\n"
+" --packages-lists lxde \\\n"
+" --packages \"iceweasel xchat vlc\" \\\n"
+" \"${@}\"\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:152
+msgid "Build again:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:160
+msgid "Test, and when you're satisfied, commit the next revision:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:164
+msgid "$ git commit -a -m \"Adding vlc media player.\""
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:168
+msgid ""
+"Of course, more complicated changes to the configuration are possible, "
+"perhaps adding files in subdirectories of #{config/}#. When you commit new "
+"revisions, just take care not to hand edit or commit the top-level files in #"
+"{config}# containing #{LB_*}# variables, as these are build products, too, "
+"and are always cleaned up by #{lb clean}# and re-created with #{lb config}# "
+"via their respective #{auto}# scripts."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:170
+msgid ""
+"We've come to the end of our tutorial series. While many more kinds of "
+"customization are possible, even just using the few features explored in "
+"these simple examples, an almost infinite variety of different images can be "
+"created. The remaining examples in this section cover several other use "
+"cases drawn from the collected experiences of users of Debian Live."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:172
+msgid "2~ A VNC Kiosk Client"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:174
+msgid "Create an image with live-build to boot directly to a VNC server."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:176
msgid "_* Make a build directory: #{$ mkdir vncBuild}#"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:14
+#: en/user_examples.ssi:178
msgid "_* Move to the build directory: #{$ cd vncBuild}#"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:16
+#: en/user_examples.ssi:180
msgid ""
"Example to config the build directory to include gdm metacity "
"xtightvncviewer: #{$ lb config --packages \"gdm3 metacity xtightvncviewer\"}#"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:18
+#: en/user_examples.ssi:182
msgid ""
"Create a folder /etc/skel folder for a custom .xsession for the default "
"user: #{$ mkdir -p config/chroot_local-includes/etc/skel}#"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:20
+#: en/user_examples.ssi:184
msgid ""
"Create the .xsession for the default user: #{$ touch config/chroot_local-"
"includes/etc/skel/.xsession}#"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:22
+#: en/user_examples.ssi:186
msgid ""
"Edit the .xsession file to launch metacity and start xvncviewer with "
"something similar to the below:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:29
+#: en/user_examples.ssi:193
msgid "/usr/bin/metacity & /usr/bin/vncviewer xxx.xxx.xxx.xxx:PORT"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:31
+#: en/user_examples.ssi:195
msgid "exit"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:35
+#: en/user_examples.ssi:199
msgid "_* Build the image: #{# lb build}#"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:37
+#: en/user_examples.ssi:201
msgid "_* Enjoy."
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:39
-msgid "2~ Next Example FIXME"
+#: en/user_examples.ssi:203
+msgid "2~ A base image for a 128M USB key"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:205
+#, no-wrap
+msgid "*{Use case}* Create a standard image with some components removed in order to fit on a 128M USB key with space left over to use as you see fit.\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:207
+msgid ""
+"When optimizing an image to fit a certain media size, you need to understand "
+"the tradeoffs you are making between size and functionality. In this "
+"example, we trim only so much as to make room for additional material within "
+"a 128M media size, but without doing anything to destroy integrity of the "
+"packages contained within, such as the purging of locale data via the #"
+"{localepurge}# package, or other such \"intrusive\" optimizations. Of "
+"particular note, you should not use #{--bootstrap-flavour minimal}# unless "
+"you really know what you're doing, as omitting priority #{important}# "
+"packages will most likely produce a broken live system."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:211
+msgid ""
+"$ lb config -k 486 -p minimal --binary-indices false --memtest none --apt-"
+"recommends false --includes none"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:215
+msgid "Now, build the image in the usual way:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:223
+msgid ""
+"On the author's system at time of writing, the above configuration produced "
+"a 78Mbyte image. This compares favourably with the 166Mbyte image produced "
+"by the default configuration in {Tutorial 1}#tutorial-1."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:225
+msgid ""
+"The biggest space-saver here, compared to building a standard image on an #"
+"{i386}# architecture system, is to select only the #{486}# kernel flavour "
+"instead of the default #{-k \"486 686\"}#. Leaving off APT's indices with #"
+"{--binary-indices false}# also saves a fair amount of space, the tradeoff "
+"being that you need to #{apt-get update}# before using apt in the live "
+"system. Choosing the #{minimal}# package list leaves out the large #{locales}"
+"# package and associated utilities. Dropping recommended packages with #{--"
+"apt-recommends false}# saves some additional space, at the expense of "
+"omitting some packages you might otherwise expect to be there, such as #"
+"{firmware-linux-free}# which may be needed to support certain hardware. The "
+"remaining options shave off additional small amounts of space. It's up to "
+"you to decide if the functionality that is sacrificed with each optimization "
+"is worth the loss in functionality."
msgstr ""
diff --git a/manual/po/pt_BR/user_installation.ssi.po b/manual/po/pt_BR/user_installation.ssi.po
index 042d164..e4a2dd2 100644
--- a/manual/po/pt_BR/user_installation.ssi.po
+++ b/manual/po/pt_BR/user_installation.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-23 16:43+0300\n"
+"POT-Creation-Date: 2010-11-29 14:16-0400\n"
"PO-Revision-Date: 2010-10-16 20:36-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -17,74 +17,82 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
#. type: Plain text
-#: en/about_manual.ssi:80 en/about_manual.ssi:88 en/about_manual.ssi:96
-#: en/about_manual.ssi:108 en/about_manual.ssi:121 en/about_manual.ssi:134
-#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
-#: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
-#: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
-#: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
-#: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
-#: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
-#: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
-#: en/other_faq.ssi:41 en/other_faq.ssi:83 en/other_faq.ssi:103
-#: en/other_faq.ssi:117 en/other_faq.ssi:137 en/other_faq.ssi:151
-#: en/other_faq.ssi:198 en/other_faq.ssi:245 en/other_faq.ssi:261
-#: en/other_faq.ssi:287 en/other_faq.ssi:299 en/other_faq.ssi:314
-#: en/other_faq.ssi:333 en/other_faq.ssi:345 en/other_faq.ssi:353
-#: en/other_faq.ssi:364 en/other_faq.ssi:374 en/other_howtos.ssi:16
-#: en/other_howtos.ssi:43 en/other_live-environment.ssi:14
-#: en/other_live-environment.ssi:30 en/other_live-environment.ssi:51
-#: en/other_live-environment.ssi:61 en/other_live-environment.ssi:69
-#: en/other_live-environment.ssi:77 en/other_live-environment.ssi:85
-#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
-#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
-#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
-#: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
-#: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
-#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111 en/user_basics.ssi:34
-#: en/user_basics.ssi:44 en/user_basics.ssi:56 en/user_basics.ssi:68
-#: en/user_basics.ssi:80 en/user_basics.ssi:92 en/user_basics.ssi:106
-#: en/user_basics.ssi:114 en/user_basics.ssi:122 en/user_basics.ssi:132
-#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
-#: en/user_basics.ssi:172 en/user_basics.ssi:186 en/user_basics.ssi:194
-#: en/user_basics.ssi:204 en/user_basics.ssi:224 en/user_basics.ssi:257
-#: en/user_basics.ssi:273 en/user_basics.ssi:281 en/user_basics.ssi:301
-#: en/user_basics.ssi:326 en/user_customization-contents.ssi:34
-#: en/user_customization-contents.ssi:43 en/user_customization-contents.ssi:66
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
+#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
+#: en/about_manual.ssi:170 en/other_coding-style.ssi:28
+#: en/other_coding-style.ssi:38 en/other_coding-style.ssi:51
+#: en/other_coding-style.ssi:61 en/other_coding-style.ssi:88
+#: en/other_coding-style.ssi:96 en/other_coding-style.ssi:106
+#: en/other_coding-style.ssi:117 en/other_common-tasks.ssi:32
+#: en/other_customization-backports.ssi:8 en/other_customization-bootup.ssi:30
+#: en/other_customization-bootup.ssi:39 en/other_faq.ssi:41
+#: en/other_faq.ssi:83 en/other_faq.ssi:103 en/other_faq.ssi:117
+#: en/other_faq.ssi:137 en/other_faq.ssi:151 en/other_faq.ssi:198
+#: en/other_faq.ssi:245 en/other_faq.ssi:261 en/other_faq.ssi:287
+#: en/other_faq.ssi:299 en/other_faq.ssi:314 en/other_faq.ssi:333
+#: en/other_faq.ssi:345 en/other_faq.ssi:353 en/other_faq.ssi:364
+#: en/other_faq.ssi:374 en/other_howtos.ssi:16 en/other_howtos.ssi:43
+#: en/other_live-environment.ssi:14 en/other_live-environment.ssi:30
+#: en/other_live-environment.ssi:51 en/other_live-environment.ssi:61
+#: en/other_live-environment.ssi:69 en/other_live-environment.ssi:77
+#: en/other_live-environment.ssi:85 en/other_live-environment.ssi:93
+#: en/other_live-environment.ssi:116 en/other_live-environment.ssi:124
+#: en/other_live-environment.ssi:133 en/other_procedures.ssi:12
+#: en/other_procedures.ssi:46 en/other_procedures.ssi:58
+#: en/project_bugs.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/user_basics.ssi:54 en/user_basics.ssi:66 en/user_basics.ssi:78
+#: en/user_basics.ssi:88 en/user_basics.ssi:102 en/user_basics.ssi:110
+#: en/user_basics.ssi:118 en/user_basics.ssi:128 en/user_basics.ssi:142
+#: en/user_basics.ssi:154 en/user_basics.ssi:162 en/user_basics.ssi:170
+#: en/user_basics.ssi:184 en/user_basics.ssi:192 en/user_basics.ssi:202
+#: en/user_basics.ssi:222 en/user_basics.ssi:255 en/user_basics.ssi:271
+#: en/user_basics.ssi:279 en/user_basics.ssi:299 en/user_basics.ssi:324
+#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
+#: en/user_customization-contents.ssi:66
#: en/user_customization-internationalization.ssi:10
#: en/user_customization-internationalization.ssi:18
#: en/user_customization-internationalization.ssi:26
#: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:16 en/user_customization-packages.ssi:24
-#: en/user_customization-packages.ssi:36 en/user_customization-packages.ssi:45
-#: en/user_customization-packages.ssi:59 en/user_customization-packages.ssi:73
-#: en/user_customization-packages.ssi:103
-#: en/user_customization-packages.ssi:111
-#: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:166
-#: en/user_customization-packages.ssi:176
-#: en/user_customization-packages.ssi:186
-#: en/user_customization-packages.ssi:196 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:104
-#: en/user_installation.ssi:118 en/user_installation.ssi:135
-#: en/user_managing_a_configuration.ssi:24
+#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
+#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
+#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:90
+#: en/user_customization-packages.ssi:120
+#: en/user_customization-packages.ssi:133
+#: en/user_customization-packages.ssi:143
+#: en/user_customization-packages.ssi:153
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:261
+#: en/user_customization-packages.ssi:273
+#: en/user_customization-packages.ssi:283 en/user_examples.ssi:14
+#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
+#: en/user_examples.ssi:64 en/user_examples.ssi:80 en/user_examples.ssi:90
+#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:131
+#: en/user_examples.ssi:139 en/user_examples.ssi:154 en/user_examples.ssi:162
+#: en/user_examples.ssi:188 en/user_examples.ssi:209 en/user_examples.ssi:217
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:76 en/user_installation.ssi:84
+#: en/user_installation.ssi:108 en/user_installation.ssi:126
+#: en/user_installation.ssi:144 en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
-#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:46
-#: en/user_overview.ssi:90 en/user_overview.ssi:98
+#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:36
+#: en/user_overview.ssi:80 en/user_overview.ssi:88
msgid "code{"
msgstr "code{"
#. type: Plain text
-#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
-#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
-#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
-#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
-#: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
-#: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
+#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:166
+#: en/about_manual.ssi:173 en/other_coding-style.ssi:34
+#: en/other_coding-style.ssi:45 en/other_coding-style.ssi:57
+#: en/other_coding-style.ssi:68 en/other_coding-style.ssi:92
+#: en/other_coding-style.ssi:100 en/other_coding-style.ssi:113
+#: en/other_coding-style.ssi:124 en/other_common-tasks.ssi:36
+#: en/other_customization-backports.ssi:16
#: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
#: en/other_faq.ssi:37 en/other_faq.ssi:46 en/other_faq.ssi:92
#: en/other_faq.ssi:108 en/other_faq.ssi:141 en/other_faq.ssi:155
@@ -99,40 +107,46 @@ msgstr "code{"
#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
#: en/other_live-environment.ssi:138 en/other_procedures.ssi:16
#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
-#: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
-#: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
-#: en/other_use-cases.ssi:137 en/user_basics.ssi:38 en/user_basics.ssi:48
-#: en/user_basics.ssi:62 en/user_basics.ssi:72 en/user_basics.ssi:86
-#: en/user_basics.ssi:98 en/user_basics.ssi:110 en/user_basics.ssi:118
-#: en/user_basics.ssi:126 en/user_basics.ssi:136 en/user_basics.ssi:150
-#: en/user_basics.ssi:160 en/user_basics.ssi:168 en/user_basics.ssi:176
-#: en/user_basics.ssi:190 en/user_basics.ssi:198 en/user_basics.ssi:208
-#: en/user_basics.ssi:249 en/user_basics.ssi:261 en/user_basics.ssi:277
-#: en/user_basics.ssi:285 en/user_basics.ssi:312 en/user_basics.ssi:351
+#: en/project_bugs.ssi:62 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:60 en/user_basics.ssi:72 en/user_basics.ssi:82
+#: en/user_basics.ssi:94 en/user_basics.ssi:106 en/user_basics.ssi:114
+#: en/user_basics.ssi:122 en/user_basics.ssi:132 en/user_basics.ssi:148
+#: en/user_basics.ssi:158 en/user_basics.ssi:166 en/user_basics.ssi:174
+#: en/user_basics.ssi:188 en/user_basics.ssi:196 en/user_basics.ssi:206
+#: en/user_basics.ssi:247 en/user_basics.ssi:259 en/user_basics.ssi:275
+#: en/user_basics.ssi:283 en/user_basics.ssi:310 en/user_basics.ssi:349
#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
#: en/user_customization-contents.ssi:70
#: en/user_customization-internationalization.ssi:14
#: en/user_customization-internationalization.ssi:22
#: en/user_customization-internationalization.ssi:30
#: en/user_customization-internationalization.ssi:42
-#: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
-#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
-#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
-#: en/user_customization-packages.ssi:107
-#: en/user_customization-packages.ssi:115
-#: en/user_customization-packages.ssi:135
-#: en/user_customization-packages.ssi:172
-#: en/user_customization-packages.ssi:182
-#: en/user_customization-packages.ssi:192
-#: en/user_customization-packages.ssi:202 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 en/user_installation.ssi:108
-#: en/user_installation.ssi:123 en/user_installation.ssi:138
-#: en/user_managing_a_configuration.ssi:31
+#: en/user_customization-packages.ssi:23 en/user_customization-packages.ssi:36
+#: en/user_customization-packages.ssi:48 en/user_customization-packages.ssi:62
+#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:94
+#: en/user_customization-packages.ssi:125
+#: en/user_customization-packages.ssi:139
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:159
+#: en/user_customization-packages.ssi:169
+#: en/user_customization-packages.ssi:181
+#: en/user_customization-packages.ssi:197
+#: en/user_customization-packages.ssi:265
+#: en/user_customization-packages.ssi:277
+#: en/user_customization-packages.ssi:287 en/user_examples.ssi:20
+#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:58
+#: en/user_examples.ssi:68 en/user_examples.ssi:86 en/user_examples.ssi:101
+#: en/user_examples.ssi:111 en/user_examples.ssi:123 en/user_examples.ssi:135
+#: en/user_examples.ssi:150 en/user_examples.ssi:158 en/user_examples.ssi:166
+#: en/user_examples.ssi:197 en/user_examples.ssi:213 en/user_examples.ssi:221
+#: 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
+#: en/user_installation.ssi:112 en/user_installation.ssi:131
+#: en/user_installation.ssi:147 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
-#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:84
-#: en/user_overview.ssi:94 en/user_overview.ssi:102
+#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:74
+#: en/user_overview.ssi:84 en/user_overview.ssi:92
msgid "}code"
msgstr "}code"
@@ -148,7 +162,7 @@ msgstr ""
#. type: Plain text
#: en/user_installation.ssi:6
-msgid "2~ Requirements"
+msgid "2~requirements Requirements"
msgstr ""
#. type: Plain text
@@ -190,7 +204,7 @@ msgstr ""
#. type: Plain text
#: en/user_installation.ssi:22
-msgid "2~ Installing live-build"
+msgid "2~installing-live-build Installing live-build"
msgstr ""
#. type: Plain text
@@ -324,33 +338,53 @@ msgstr ""
#. type: Plain text
#: en/user_installation.ssi:98
-msgid "3~ Using a customized live-boot"
+msgid "% FIXME: we also need to mention live-config"
msgstr ""
#. type: Plain text
#: en/user_installation.ssi:100
+msgid "3~ Using a customized live-boot"
+msgstr ""
+
+#. type: Plain text
+#: en/user_installation.ssi:102
+msgid ""
+"% FIXME: should follow the structure for live-build above (i.e. \"from source"
+"\", not \"customized\" -- we should not get into customization now, but "
+"should reserve that discussion for later."
+msgstr ""
+
+#. type: Plain text
+#: en/user_installation.ssi:104
msgid ""
"To modify the code you can follow the process below. Please ensure you are "
-"familiar with the terms mentioned in {Terms}#terms ."
+"familiar with the terms mentioned in {Terms}#terms."
msgstr ""
#. type: Plain text
-#: en/user_installation.ssi:102
+#: en/user_installation.ssi:106
msgid "_* Checkout the live-boot source"
msgstr ""
#. type: Plain text
-#: en/user_installation.ssi:106
+#: en/user_installation.ssi:110
msgid "$ git clone git://live.debian.net/git/live-boot.git"
msgstr ""
#. type: Plain text
-#: en/user_installation.ssi:110
+#: en/user_installation.ssi:114
msgid "_* Make changes to your local copy"
msgstr ""
#. type: Plain text
-#: en/user_installation.ssi:112
+#: en/user_installation.ssi:116
+msgid ""
+"% FIXME: as indicated above, it's too early for this topic. Move to later in "
+"the manual."
+msgstr ""
+
+#. type: Plain text
+#: en/user_installation.ssi:118
msgid ""
"And beware that if you want to add your pre-init script in live-bottom, you "
"should name it without dashes '-', e.g: call it \"99new_feature\" and not "
@@ -358,12 +392,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_installation.ssi:114
+#: en/user_installation.ssi:120
msgid "_* Build a live-boot .deb"
msgstr ""
#. type: Plain text
-#: en/user_installation.ssi:116
+#: en/user_installation.ssi:122
+msgid ""
+"% FIXME: not strictly true? building sid on squeeze is usually OK. also, "
+"building lenny on squeeze or sid is fine. clarify."
+msgstr ""
+
+#. type: Plain text
+#: en/user_installation.ssi:124
msgid ""
"You must build either on your target distribution or in a chroot containing "
"your target platform: this means if your target is Squeeze then you should "
@@ -374,17 +415,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_installation.ssi:121
-msgid "$ cd live-boot $ dpkg-buildpackage -rfakeroot -b -uc -us"
+#: en/user_installation.ssi:129
+msgid "$ cd live-boot $ dpkg-buildpackage -b -uc -us"
msgstr ""
#. type: Plain text
-#: en/user_installation.ssi:125
+#: en/user_installation.ssi:133
msgid "_* Use the generated live-boot .deb"
msgstr ""
#. type: Plain text
-#: en/user_installation.ssi:127
+#: en/user_installation.ssi:135
msgid ""
"As live-boot is installed by live-build system, installing the package in "
"the host system is not sufficient: you should treat the generated .deb like "
@@ -393,19 +434,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_installation.ssi:129
+#: en/user_installation.ssi:138
msgid ""
"% FIXME: <xref linkend=\"custom-packages\"/> <xref linkend=\"custom-packages-"
-"apt\"/>"
+"apt\"/> % Ben> What is the latter reference for? I can't see the relevance."
msgstr ""
#. type: Plain text
-#: en/user_installation.ssi:131
+#: en/user_installation.ssi:140
msgid "3~ Using live-boot snapshots"
msgstr ""
#. type: Plain text
-#: en/user_installation.ssi:133
+#: en/user_installation.ssi:142
msgid ""
"You can let live-build automatically use the latest snapshot of live-boot by "
"configuring a third-party repository in your live-build configuration "
@@ -414,6 +455,6 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_installation.ssi:137
+#: en/user_installation.ssi:146
msgid "lb config --repository live.debian.net"
msgstr ""
diff --git a/manual/po/pt_BR/user_managing_a_configuration.ssi.po b/manual/po/pt_BR/user_managing_a_configuration.ssi.po
index dc370cb..5bf2c97 100644
--- a/manual/po/pt_BR/user_managing_a_configuration.ssi.po
+++ b/manual/po/pt_BR/user_managing_a_configuration.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-28 16:34-0200\n"
+"POT-Creation-Date: 2010-11-27 19:55-0400\n"
"PO-Revision-Date: 2010-10-13 17:00+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -17,9 +17,9 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
#. type: Plain text
-#: en/about_manual.ssi:80 en/about_manual.ssi:88 en/about_manual.ssi:96
-#: en/about_manual.ssi:108 en/about_manual.ssi:121 en/about_manual.ssi:134
-#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
+#: en/about_manual.ssi:112 en/about_manual.ssi:125 en/about_manual.ssi:138
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
#: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
#: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
#: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
@@ -39,38 +39,43 @@ msgstr ""
#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
-#: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
-#: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
-#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111
-#: en/project_bugs.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
-#: en/user_basics.ssi:54 en/user_basics.ssi:66 en/user_basics.ssi:78
-#: en/user_basics.ssi:88 en/user_basics.ssi:102 en/user_basics.ssi:110
-#: en/user_basics.ssi:118 en/user_basics.ssi:128 en/user_basics.ssi:140
-#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
-#: en/user_basics.ssi:182 en/user_basics.ssi:190 en/user_basics.ssi:200
-#: en/user_basics.ssi:220 en/user_basics.ssi:253 en/user_basics.ssi:269
-#: en/user_basics.ssi:277 en/user_basics.ssi:297 en/user_basics.ssi:322
-#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
-#: en/user_customization-contents.ssi:66
+#: en/other_procedures.ssi:58 en/project_bugs.ssi:58 en/user_basics.ssi:32
+#: en/user_basics.ssi:42 en/user_basics.ssi:54 en/user_basics.ssi:66
+#: en/user_basics.ssi:78 en/user_basics.ssi:88 en/user_basics.ssi:102
+#: en/user_basics.ssi:110 en/user_basics.ssi:118 en/user_basics.ssi:128
+#: en/user_basics.ssi:142 en/user_basics.ssi:154 en/user_basics.ssi:162
+#: en/user_basics.ssi:170 en/user_basics.ssi:184 en/user_basics.ssi:192
+#: en/user_basics.ssi:202 en/user_basics.ssi:222 en/user_basics.ssi:255
+#: en/user_basics.ssi:271 en/user_basics.ssi:279 en/user_basics.ssi:299
+#: en/user_basics.ssi:324 en/user_customization-contents.ssi:34
+#: en/user_customization-contents.ssi:43 en/user_customization-contents.ssi:66
#: en/user_customization-internationalization.ssi:10
#: en/user_customization-internationalization.ssi:18
#: en/user_customization-internationalization.ssi:26
#: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:16 en/user_customization-packages.ssi:24
-#: en/user_customization-packages.ssi:36 en/user_customization-packages.ssi:45
-#: en/user_customization-packages.ssi:59 en/user_customization-packages.ssi:73
-#: en/user_customization-packages.ssi:103
-#: en/user_customization-packages.ssi:111
-#: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:166
-#: en/user_customization-packages.ssi:176
-#: en/user_customization-packages.ssi:186
-#: en/user_customization-packages.ssi:196 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:104
-#: en/user_installation.ssi:118 en/user_installation.ssi:135
-#: en/user_managing_a_configuration.ssi:24
+#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
+#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
+#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:90
+#: en/user_customization-packages.ssi:120
+#: en/user_customization-packages.ssi:133
+#: en/user_customization-packages.ssi:143
+#: en/user_customization-packages.ssi:153
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:261
+#: en/user_customization-packages.ssi:273
+#: en/user_customization-packages.ssi:283 en/user_examples.ssi:12
+#: en/user_examples.ssi:27 en/user_examples.ssi:37 en/user_examples.ssi:51
+#: en/user_examples.ssi:61 en/user_examples.ssi:77 en/user_examples.ssi:87
+#: en/user_examples.ssi:104 en/user_examples.ssi:114 en/user_examples.ssi:128
+#: en/user_examples.ssi:136 en/user_examples.ssi:151 en/user_examples.ssi:159
+#: en/user_examples.ssi:185 en/user_examples.ssi:206 en/user_examples.ssi:214
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:76 en/user_installation.ssi:84
+#: en/user_installation.ssi:104 en/user_installation.ssi:118
+#: en/user_installation.ssi:135 en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:36
#: en/user_overview.ssi:80 en/user_overview.ssi:88
@@ -78,9 +83,9 @@ msgid "code{"
msgstr "code{"
#. type: Plain text
-#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:121 en/about_manual.ssi:134 en/about_manual.ssi:142
+#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:165
#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
@@ -100,37 +105,43 @@ msgstr "code{"
#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
#: en/other_live-environment.ssi:138 en/other_procedures.ssi:16
#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
-#: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
-#: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
-#: en/other_use-cases.ssi:137 en/project_bugs.ssi:62 en/user_basics.ssi:36
-#: en/user_basics.ssi:46 en/user_basics.ssi:60 en/user_basics.ssi:72
-#: en/user_basics.ssi:82 en/user_basics.ssi:94 en/user_basics.ssi:106
-#: en/user_basics.ssi:114 en/user_basics.ssi:122 en/user_basics.ssi:132
-#: en/user_basics.ssi:146 en/user_basics.ssi:156 en/user_basics.ssi:164
-#: en/user_basics.ssi:172 en/user_basics.ssi:186 en/user_basics.ssi:194
-#: en/user_basics.ssi:204 en/user_basics.ssi:245 en/user_basics.ssi:257
-#: en/user_basics.ssi:273 en/user_basics.ssi:281 en/user_basics.ssi:308
-#: en/user_basics.ssi:347 en/user_customization-contents.ssi:39
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:70
+#: en/project_bugs.ssi:62 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:60 en/user_basics.ssi:72 en/user_basics.ssi:82
+#: en/user_basics.ssi:94 en/user_basics.ssi:106 en/user_basics.ssi:114
+#: en/user_basics.ssi:122 en/user_basics.ssi:132 en/user_basics.ssi:148
+#: en/user_basics.ssi:158 en/user_basics.ssi:166 en/user_basics.ssi:174
+#: en/user_basics.ssi:188 en/user_basics.ssi:196 en/user_basics.ssi:206
+#: en/user_basics.ssi:247 en/user_basics.ssi:259 en/user_basics.ssi:275
+#: en/user_basics.ssi:283 en/user_basics.ssi:310 en/user_basics.ssi:349
+#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:70
#: en/user_customization-internationalization.ssi:14
#: en/user_customization-internationalization.ssi:22
#: en/user_customization-internationalization.ssi:30
#: en/user_customization-internationalization.ssi:42
-#: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
-#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
-#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
-#: en/user_customization-packages.ssi:107
-#: en/user_customization-packages.ssi:115
-#: en/user_customization-packages.ssi:135
-#: en/user_customization-packages.ssi:172
-#: en/user_customization-packages.ssi:182
-#: en/user_customization-packages.ssi:192
-#: en/user_customization-packages.ssi:202 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 en/user_installation.ssi:108
-#: en/user_installation.ssi:123 en/user_installation.ssi:138
-#: en/user_managing_a_configuration.ssi:31
+#: en/user_customization-packages.ssi:23 en/user_customization-packages.ssi:36
+#: en/user_customization-packages.ssi:48 en/user_customization-packages.ssi:62
+#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:94
+#: en/user_customization-packages.ssi:125
+#: en/user_customization-packages.ssi:139
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:159
+#: en/user_customization-packages.ssi:169
+#: en/user_customization-packages.ssi:181
+#: en/user_customization-packages.ssi:197
+#: en/user_customization-packages.ssi:265
+#: en/user_customization-packages.ssi:277
+#: en/user_customization-packages.ssi:287 en/user_examples.ssi:17
+#: en/user_examples.ssi:31 en/user_examples.ssi:41 en/user_examples.ssi:55
+#: en/user_examples.ssi:65 en/user_examples.ssi:83 en/user_examples.ssi:98
+#: en/user_examples.ssi:108 en/user_examples.ssi:120 en/user_examples.ssi:132
+#: en/user_examples.ssi:147 en/user_examples.ssi:155 en/user_examples.ssi:163
+#: en/user_examples.ssi:194 en/user_examples.ssi:210 en/user_examples.ssi:218
+#: 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
+#: en/user_installation.ssi:108 en/user_installation.ssi:123
+#: en/user_installation.ssi:138 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:74
#: en/user_overview.ssi:84 en/user_overview.ssi:92
@@ -229,8 +240,8 @@ msgstr ""
msgid ""
"#!/bin/sh\n"
"lb config noauto \\\n"
-"\t--architecture i386 \\\n"
-"\t${@}\n"
+"\t--packages-lists \"standard\" \\\n"
+"\t\"${@}\"\n"
msgstr ""
#. type: Plain text
@@ -243,7 +254,7 @@ msgstr ""
#, no-wrap
msgid ""
"#!/bin/sh\n"
-"lb clean noauto ${@}\n"
+"lb clean noauto \"${@}\"\n"
"rm -f config/binary config/bootstrap \\\n"
"\tconfig/chroot config/common config/source\n"
"rm -f binary.log\n"
@@ -256,16 +267,15 @@ msgstr ""
#. type: Plain text
#: en/user_managing_a_configuration.ssi:50
-msgid "#!/bin/sh lb build noauto ${@} 2>&1 | tee binary.log"
+msgid "#!/bin/sh lb build noauto \"${@}\" 2>&1 | tee binary.log"
msgstr ""
#. type: Plain text
#: en/user_managing_a_configuration.ssi:54
msgid ""
-"Edit auto/config, changing or adding any options as you see fit. In the "
-"example above, --architecture is set to i386 so that when the image is built "
-"on an amd64 system, it will not default to building amd64 images. Change "
-"this to an appropriate value for your image (or delete it if you want to use "
-"the default) and add any additional options in continuation lines that "
-"follow."
+"Edit #{auto/config}#, changing or adding any options as you see fit. In the "
+"example above, #{--packages-lists standard}# is set to the default value. "
+"Change this to an appropriate value for your image (or delete it if you want "
+"to use the default) and add any additional options in continuation lines "
+"that follow."
msgstr ""
diff --git a/manual/po/ro/about_manual.ssi.po b/manual/po/ro/about_manual.ssi.po
index e10d22b..89d535d 100644
--- a/manual/po/ro/about_manual.ssi.po
+++ b/manual/po/ro/about_manual.ssi.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0~a8\n"
-"POT-Creation-Date: 2010-10-23 16:43+0300\n"
+"POT-Creation-Date: 2010-11-28 07:21-0400\n"
"PO-Revision-Date: 2010-10-23 10:34-0200\n"
"Last-Translator: Eugen Paiuc <linux51 at bluewin.ch>\n"
"Language-Team: none\n"
@@ -54,11 +54,37 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:10
+msgid "2~ For the impatient"
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:12
+msgid ""
+"While we believe that everything in this manual is important to at least "
+"some of our users, we realize it is a lot of material to cover and that you "
+"may wish to experience early success using the software before delving into "
+"the details. Therefore, we have provided three tutorials in the {Examples}"
+"#examples section designed to teach you image building and customization "
+"basics. Read {Using the examples}#using-the-examples first, followed by "
+"{Tutorial 1: A standard image}#tutorial-1, {Tutorial 2: A web browser "
+"utility}#tutorial-2 and finally {Tutorial 3: A personal travelling companion}"
+"#tutorial-3. By the end of these tutorials, you will have a taste of what "
+"can be done with Debian Live. We encourage you to return to more in-depth "
+"study of the manual, perhaps next reading {The basics}#the-basics, skimming "
+"or skipping {Building a netboot image}#building-netboot-image, and finishing "
+"by reading the {Customization overview}#customization-overview and the "
+"chapters that follow it. By this point, we hope you are thoroughly excited "
+"by what can be done with Debian Live and motivated to read the rest of the "
+"manual, cover-to-cover."
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:14
msgid "2~terms Terms"
msgstr "2~terms Termeni"
#. type: Plain text
-#: en/about_manual.ssi:12
+#: en/about_manual.ssi:16
msgid ""
"_* *{Live system}*: An operating system that can boot without installation "
"to a hard drive. Live systems do not alter local operating system(s) or file"
@@ -73,7 +99,7 @@ msgstr ""
"USB. Unele chiar pot porni prin retaua de net."
#. type: Plain text
-#: en/about_manual.ssi:14
+#: en/about_manual.ssi:18
msgid ""
"_* *{Debian Live}*: The Debian sub-project which maintains the live-boot, "
"live-build, live-config, and live-manual packages."
@@ -82,7 +108,7 @@ msgstr ""
"live-build, live-config, si live-manual."
#. type: Plain text
-#: en/about_manual.ssi:16
+#: en/about_manual.ssi:20
msgid ""
"_* *{Debian Live system}*: A live system that uses software from the Debian "
"operating system that may be booted from CDs, DVDs, USB sticks, over the "
@@ -95,19 +121,19 @@ msgstr ""
"parameter #{fetch=URL}#)."
#. type: Plain text
-#: en/about_manual.ssi:18
+#: en/about_manual.ssi:22
msgid "_* *{Host system}*: The environment used to create the live system."
msgstr ""
"_* *{Host system}*: Mediul folosit pentru crearea sistemului live pe un "
"sistem dat."
#. type: Plain text
-#: en/about_manual.ssi:20
+#: en/about_manual.ssi:24
msgid "_* *{Target system}*: The environment used to run the live system."
msgstr "_* *{Target system}*: Mediul folosit pentru rularea sistemului live."
#. type: Plain text
-#: en/about_manual.ssi:22
+#: en/about_manual.ssi:26
msgid ""
"_* *{live-boot}*: A collection of scripts used to boot live systems. live-"
"boot was formerly a part of live-initramfs."
@@ -116,7 +142,7 @@ msgstr ""
"live. live-boot a facul parte formal din live-initramfs."
#. type: Plain text
-#: en/about_manual.ssi:24
+#: en/about_manual.ssi:28
msgid ""
"_* *{live-build}*: A collection of scripts used to build customized Debian "
"Live systems. live-build was formerly known as live-helper, and even earlier "
@@ -127,7 +153,7 @@ msgstr ""
"inainte ca live-package."
#. type: Plain text
-#: en/about_manual.ssi:26
+#: en/about_manual.ssi:30
msgid ""
"_* *{live-config}*: A collection of scripts used to configure a live system "
"during the boot process. live-config was formerly a part of live-initramfs."
@@ -137,7 +163,7 @@ msgstr ""
"din live-initramfs."
#. type: Plain text
-#: en/about_manual.ssi:28
+#: en/about_manual.ssi:32
msgid ""
"_* *{live-manual}*: This document is maintained in a package called live-"
"manual."
@@ -145,7 +171,7 @@ msgstr ""
"_* *{live-manual}*: Acest document face parte din pachetul numit live-manual."
#. type: Plain text
-#: en/about_manual.ssi:30
+#: en/about_manual.ssi:34
msgid ""
"_* *{Debian Installer (d-i)}*: The official installation system for the "
"Debian distribution."
@@ -154,7 +180,7 @@ msgstr ""
"distributia Debian."
#. type: Plain text
-#: en/about_manual.ssi:32
+#: en/about_manual.ssi:36
msgid ""
"_* *{Boot parameters}*: Parameters that can be entered at the bootloader "
"prompt to influence the kernel or live-config."
@@ -163,18 +189,18 @@ msgstr ""
"ului care sa infuenteze kernelul sau live-config."
#. type: Plain text
-#: en/about_manual.ssi:34
+#: en/about_manual.ssi:38
msgid ""
-"_* *{chroot}*: The chroot program, chroot(8), enables us to run different "
-"instances of the GNU/Linux environment on a single system simultaneously "
-"without rebooting."
+"_* *{chroot}*: The chroot program, #{chroot(8)}#, enables us to run "
+"different instances of the GNU/Linux environment on a single system "
+"simultaneously without rebooting."
msgstr ""
-"_* *{chroot}*: Programul chroot , chroot(8), permite rularea a diferite "
+"_* *{chroot}*: Programul chroot, #{chroot(8)}#, permite rularea a diferite "
"instante din mediul GNU/Linux pe un singur sistem si in simultan fara a "
"necesita o repornire a sistemului."
#. type: Plain text
-#: en/about_manual.ssi:36
+#: en/about_manual.ssi:40
msgid ""
"_* *{Binary image}*: A file containing the live system, such as binary.iso "
"or binary.img."
@@ -183,7 +209,7 @@ msgstr ""
"binary.iso sau binary.img."
#. type: Plain text
-#: en/about_manual.ssi:38
+#: en/about_manual.ssi:42
msgid ""
"_* *{Target distribution}*: The distribution upon which your live system "
"will be based. This can differ from the distribution of your host system."
@@ -192,112 +218,111 @@ msgstr ""
"distributie poate fi diferita de cea a sistemului gazda."
#. type: Plain text
-#: en/about_manual.ssi:40
+#: en/about_manual.ssi:44
msgid ""
-"_* *{Squeeze/Wheezy/Sid (stable/testing/unstable)}*: The stable distribution "
-"contains the latest officially released distribution of Debian. The testing "
-"distribution is the staging area for the next stable release. A major "
-"advantage of using this distribution is that it has more recent versions of "
-"software relative to the stable release. The unstable distribution is where "
-"active development of Debian occurs. Generally, this distribution is run by "
-"developers and those who like to live on the edge."
+"_* *{Squeeze/Wheezy/Sid (stable/testing/unstable)}*: Debian codenames for "
+"releases. At the time of writing, Squeeze is the current *{stable}* release "
+"and Wheezy is the current *{testing}* release. Sid will always be a synonym "
+"for the *{unstable}* release. Throughout the manual, we tend to use "
+"codenames for the releases, as that is what is supported by the tools "
+"themselves."
msgstr ""
-"_* *{Squeeze/Wheezy/Sid (stable/testing/unstable)}*: stable contine ultima "
-"versiune oficiala a distributiei Debian. testing este sursa pentru "
-"urmatoarea versiune stable. Pricipalul avantaj la folosirea distibutiei "
-"testing este folosirea programelor mai noi decat cele din stable. "
-"Distributia unstable este locul unde au loc activ dezvoltarile din Debian. "
-"In general ea este folosita de dezvoltatori sau de cei ce le place "
-"riscul ... ."
#. type: Plain text
-#: en/about_manual.ssi:42
+#: en/about_manual.ssi:46
msgid ""
-"At the time of writing, Squeeze is the current stable release and Wheezy is "
-"the current testing release. Sid will always be a synonym for the unstable "
-"release."
+"The *{stable}* distribution contains the latest officially released "
+"distribution of Debian. The *{testing}* distribution is the staging area for "
+"the next *{stable}* release. A major advantage of using this distribution is "
+"that it has more recent versions of software relative to the *{stable}* "
+"release. The *{unstable}* distribution is where active development of Debian "
+"occurs. Generally, this distribution is run by developers and those who like "
+"to live on the edge."
msgstr ""
-"La momentul in care au fost scrise aceste randurei, versiunea stable este "
-"Squeeze, Wheezy estei versiunea testing. Sid va fi mereu simbolul versiunii "
-"unstable."
+"*{stable}* contine ultima versiune oficiala a distributiei Debian. *{testing}"
+"* este sursa pentru urmatoarea versiune *{stable}*. Pricipalul avantaj la "
+"folosirea distibutiei *{testing}* este folosirea programelor mai noi decat "
+"cele din *{stable}*. Distributia *{unstable}* este locul unde au loc activ "
+"dezvoltarile din Debian. In general ea este folosita de dezvoltatori sau de "
+"cei ce le place riscul ... ."
#. type: Plain text
-#: en/about_manual.ssi:44
+#: en/about_manual.ssi:48
msgid "2~ Authors"
msgstr "2~ Autori"
#. type: Plain text
-#: en/about_manual.ssi:46
+#: en/about_manual.ssi:50
msgid "A list of authors (in alphabetical order):"
msgstr "Lista autorilor (in ordine alfabetica):"
#. type: Plain text
-#: en/about_manual.ssi:48
+#: en/about_manual.ssi:52
msgid "_* Ben Armstrong"
msgstr "_* Ben Armstrong"
#. type: Plain text
-#: en/about_manual.ssi:50
+#: en/about_manual.ssi:54
msgid "_* Brendan Sleight"
msgstr "_* Brendan Sleight"
#. type: Plain text
-#: en/about_manual.ssi:52
+#: en/about_manual.ssi:56
msgid "_* Chris Lamb"
msgstr "_* Chris Lamb"
#. type: Plain text
-#: en/about_manual.ssi:54
+#: en/about_manual.ssi:58
msgid "_* Daniel Baumann"
msgstr "_* Daniel Baumann"
#. type: Plain text
-#: en/about_manual.ssi:56
+#: en/about_manual.ssi:60
msgid "_* Franklin Piat"
msgstr "_* Franklin Piat"
#. type: Plain text
-#: en/about_manual.ssi:58
+#: en/about_manual.ssi:62
msgid "_* Jonas Stein"
msgstr "_* Jonas Stein"
#. type: Plain text
-#: en/about_manual.ssi:60
+#: en/about_manual.ssi:64
msgid "_* Kai Hendry"
msgstr "_* Kai Hendry"
#. type: Plain text
-#: en/about_manual.ssi:62
+#: en/about_manual.ssi:66
msgid "_* Marco Amadori"
msgstr "_* Marco Amadori"
#. type: Plain text
-#: en/about_manual.ssi:64
+#: en/about_manual.ssi:68
msgid "_* Mathieu Geli"
msgstr "_* Mathieu Geli"
#. type: Plain text
-#: en/about_manual.ssi:66
+#: en/about_manual.ssi:70
msgid "_* Matthias Kirschner"
msgstr "_* Matthias Kirschner"
#. type: Plain text
-#: en/about_manual.ssi:68
+#: en/about_manual.ssi:72
msgid "_* Richard Nelson"
msgstr "_* Richard Nelson"
#. type: Plain text
-#: en/about_manual.ssi:70
+#: en/about_manual.ssi:74
msgid "_* Trent W. Buck"
msgstr "_* Trent W. Buck"
#. type: Plain text
-#: en/about_manual.ssi:72
+#: en/about_manual.ssi:76
msgid "2~ Contributing to this document"
msgstr "2~ Cum se poate contribui la acest document"
#. type: Plain text
-#: en/about_manual.ssi:74
+#: en/about_manual.ssi:78
msgid ""
"This manual is intended as a community project and all proposals for "
"improvements and contributions are extremely welcome. The preferred way to "
@@ -310,7 +335,7 @@ msgstr ""
"#contact pentru mai multe informatii."
#. type: Plain text
-#: en/about_manual.ssi:76
+#: en/about_manual.ssi:80
msgid ""
"When submitting a contribution, please clearly identify its copyright holder "
"and include the licensing statement. Note that to be accepted, the "
@@ -323,7 +348,7 @@ msgstr ""
"documentului , adica GPL version 3 or later."
#. type: Plain text
-#: en/about_manual.ssi:78
+#: en/about_manual.ssi:82
msgid ""
"The sources for this manual are maintained using the Git version control "
"system. You can checkout the latest copy by executing:"
@@ -332,79 +357,87 @@ msgstr ""
"ti checkout ultima copie prin executarea :"
#. type: Plain text
-#: en/about_manual.ssi:80 en/about_manual.ssi:88 en/about_manual.ssi:96
-#: en/about_manual.ssi:108 en/about_manual.ssi:121 en/about_manual.ssi:134
-#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
-#: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
-#: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
-#: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
-#: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
-#: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
-#: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
-#: en/other_faq.ssi:41 en/other_faq.ssi:83 en/other_faq.ssi:103
-#: en/other_faq.ssi:117 en/other_faq.ssi:137 en/other_faq.ssi:151
-#: en/other_faq.ssi:198 en/other_faq.ssi:245 en/other_faq.ssi:261
-#: en/other_faq.ssi:287 en/other_faq.ssi:299 en/other_faq.ssi:314
-#: en/other_faq.ssi:333 en/other_faq.ssi:345 en/other_faq.ssi:353
-#: en/other_faq.ssi:364 en/other_faq.ssi:374 en/other_howtos.ssi:16
-#: en/other_howtos.ssi:43 en/other_live-environment.ssi:14
-#: en/other_live-environment.ssi:30 en/other_live-environment.ssi:51
-#: en/other_live-environment.ssi:61 en/other_live-environment.ssi:69
-#: en/other_live-environment.ssi:77 en/other_live-environment.ssi:85
-#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
-#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
-#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
-#: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
-#: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
-#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111 en/user_basics.ssi:34
-#: en/user_basics.ssi:44 en/user_basics.ssi:56 en/user_basics.ssi:68
-#: en/user_basics.ssi:80 en/user_basics.ssi:92 en/user_basics.ssi:106
-#: en/user_basics.ssi:114 en/user_basics.ssi:122 en/user_basics.ssi:132
-#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
-#: en/user_basics.ssi:172 en/user_basics.ssi:186 en/user_basics.ssi:194
-#: en/user_basics.ssi:204 en/user_basics.ssi:224 en/user_basics.ssi:257
-#: en/user_basics.ssi:273 en/user_basics.ssi:281 en/user_basics.ssi:301
-#: en/user_basics.ssi:326 en/user_customization-contents.ssi:34
-#: en/user_customization-contents.ssi:43 en/user_customization-contents.ssi:66
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
+#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
+#: en/about_manual.ssi:170 en/other_coding-style.ssi:28
+#: en/other_coding-style.ssi:38 en/other_coding-style.ssi:51
+#: en/other_coding-style.ssi:61 en/other_coding-style.ssi:88
+#: en/other_coding-style.ssi:96 en/other_coding-style.ssi:106
+#: en/other_coding-style.ssi:117 en/other_common-tasks.ssi:32
+#: en/other_customization-backports.ssi:8 en/other_customization-bootup.ssi:30
+#: en/other_customization-bootup.ssi:39 en/other_faq.ssi:41
+#: en/other_faq.ssi:83 en/other_faq.ssi:103 en/other_faq.ssi:117
+#: en/other_faq.ssi:137 en/other_faq.ssi:151 en/other_faq.ssi:198
+#: en/other_faq.ssi:245 en/other_faq.ssi:261 en/other_faq.ssi:287
+#: en/other_faq.ssi:299 en/other_faq.ssi:314 en/other_faq.ssi:333
+#: en/other_faq.ssi:345 en/other_faq.ssi:353 en/other_faq.ssi:364
+#: en/other_faq.ssi:374 en/other_howtos.ssi:16 en/other_howtos.ssi:43
+#: en/other_live-environment.ssi:14 en/other_live-environment.ssi:30
+#: en/other_live-environment.ssi:51 en/other_live-environment.ssi:61
+#: en/other_live-environment.ssi:69 en/other_live-environment.ssi:77
+#: en/other_live-environment.ssi:85 en/other_live-environment.ssi:93
+#: en/other_live-environment.ssi:116 en/other_live-environment.ssi:124
+#: en/other_live-environment.ssi:133 en/other_procedures.ssi:12
+#: en/other_procedures.ssi:46 en/other_procedures.ssi:58
+#: en/project_bugs.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/user_basics.ssi:54 en/user_basics.ssi:66 en/user_basics.ssi:78
+#: en/user_basics.ssi:88 en/user_basics.ssi:102 en/user_basics.ssi:110
+#: en/user_basics.ssi:118 en/user_basics.ssi:128 en/user_basics.ssi:142
+#: en/user_basics.ssi:154 en/user_basics.ssi:162 en/user_basics.ssi:170
+#: en/user_basics.ssi:184 en/user_basics.ssi:192 en/user_basics.ssi:202
+#: en/user_basics.ssi:222 en/user_basics.ssi:255 en/user_basics.ssi:271
+#: en/user_basics.ssi:279 en/user_basics.ssi:299 en/user_basics.ssi:324
+#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
+#: en/user_customization-contents.ssi:66
#: en/user_customization-internationalization.ssi:10
#: en/user_customization-internationalization.ssi:18
#: en/user_customization-internationalization.ssi:26
#: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:16 en/user_customization-packages.ssi:24
-#: en/user_customization-packages.ssi:36 en/user_customization-packages.ssi:45
-#: en/user_customization-packages.ssi:59 en/user_customization-packages.ssi:73
-#: en/user_customization-packages.ssi:103
-#: en/user_customization-packages.ssi:111
-#: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:166
-#: en/user_customization-packages.ssi:176
-#: en/user_customization-packages.ssi:186
-#: en/user_customization-packages.ssi:196 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:104
-#: en/user_installation.ssi:118 en/user_installation.ssi:135
-#: en/user_managing_a_configuration.ssi:24
+#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
+#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
+#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:90
+#: en/user_customization-packages.ssi:120
+#: en/user_customization-packages.ssi:133
+#: en/user_customization-packages.ssi:143
+#: en/user_customization-packages.ssi:153
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:261
+#: en/user_customization-packages.ssi:273
+#: en/user_customization-packages.ssi:283 en/user_examples.ssi:12
+#: en/user_examples.ssi:27 en/user_examples.ssi:37 en/user_examples.ssi:51
+#: en/user_examples.ssi:61 en/user_examples.ssi:77 en/user_examples.ssi:87
+#: en/user_examples.ssi:104 en/user_examples.ssi:114 en/user_examples.ssi:128
+#: en/user_examples.ssi:136 en/user_examples.ssi:151 en/user_examples.ssi:159
+#: en/user_examples.ssi:185 en/user_examples.ssi:206 en/user_examples.ssi:214
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:76 en/user_installation.ssi:84
+#: en/user_installation.ssi:104 en/user_installation.ssi:118
+#: en/user_installation.ssi:135 en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
-#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:46
-#: en/user_overview.ssi:90 en/user_overview.ssi:98
+#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:36
+#: en/user_overview.ssi:80 en/user_overview.ssi:88
msgid "code{"
msgstr "code{"
#. type: Plain text
-#: en/about_manual.ssi:82
+#: en/about_manual.ssi:86
msgid "$ git clone git://live.debian.net/git/live-manual.git"
msgstr "$ git clone git://live.debian.net/git/live-manual.git"
#. type: Plain text
-#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
-#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
-#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
-#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
-#: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
-#: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
+#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:166
+#: en/about_manual.ssi:173 en/other_coding-style.ssi:34
+#: en/other_coding-style.ssi:45 en/other_coding-style.ssi:57
+#: en/other_coding-style.ssi:68 en/other_coding-style.ssi:92
+#: en/other_coding-style.ssi:100 en/other_coding-style.ssi:113
+#: en/other_coding-style.ssi:124 en/other_common-tasks.ssi:36
+#: en/other_customization-backports.ssi:16
#: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
#: en/other_faq.ssi:37 en/other_faq.ssi:46 en/other_faq.ssi:92
#: en/other_faq.ssi:108 en/other_faq.ssi:141 en/other_faq.ssi:155
@@ -419,45 +452,51 @@ msgstr "$ git clone git://live.debian.net/git/live-manual.git"
#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
#: en/other_live-environment.ssi:138 en/other_procedures.ssi:16
#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
-#: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
-#: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
-#: en/other_use-cases.ssi:137 en/user_basics.ssi:38 en/user_basics.ssi:48
-#: en/user_basics.ssi:62 en/user_basics.ssi:72 en/user_basics.ssi:86
-#: en/user_basics.ssi:98 en/user_basics.ssi:110 en/user_basics.ssi:118
-#: en/user_basics.ssi:126 en/user_basics.ssi:136 en/user_basics.ssi:150
-#: en/user_basics.ssi:160 en/user_basics.ssi:168 en/user_basics.ssi:176
-#: en/user_basics.ssi:190 en/user_basics.ssi:198 en/user_basics.ssi:208
-#: en/user_basics.ssi:249 en/user_basics.ssi:261 en/user_basics.ssi:277
-#: en/user_basics.ssi:285 en/user_basics.ssi:312 en/user_basics.ssi:351
+#: en/project_bugs.ssi:62 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:60 en/user_basics.ssi:72 en/user_basics.ssi:82
+#: en/user_basics.ssi:94 en/user_basics.ssi:106 en/user_basics.ssi:114
+#: en/user_basics.ssi:122 en/user_basics.ssi:132 en/user_basics.ssi:148
+#: en/user_basics.ssi:158 en/user_basics.ssi:166 en/user_basics.ssi:174
+#: en/user_basics.ssi:188 en/user_basics.ssi:196 en/user_basics.ssi:206
+#: en/user_basics.ssi:247 en/user_basics.ssi:259 en/user_basics.ssi:275
+#: en/user_basics.ssi:283 en/user_basics.ssi:310 en/user_basics.ssi:349
#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
#: en/user_customization-contents.ssi:70
#: en/user_customization-internationalization.ssi:14
#: en/user_customization-internationalization.ssi:22
#: en/user_customization-internationalization.ssi:30
#: en/user_customization-internationalization.ssi:42
-#: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
-#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
-#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
-#: en/user_customization-packages.ssi:107
-#: en/user_customization-packages.ssi:115
-#: en/user_customization-packages.ssi:135
-#: en/user_customization-packages.ssi:172
-#: en/user_customization-packages.ssi:182
-#: en/user_customization-packages.ssi:192
-#: en/user_customization-packages.ssi:202 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 en/user_installation.ssi:108
-#: en/user_installation.ssi:123 en/user_installation.ssi:138
-#: en/user_managing_a_configuration.ssi:31
+#: en/user_customization-packages.ssi:23 en/user_customization-packages.ssi:36
+#: en/user_customization-packages.ssi:48 en/user_customization-packages.ssi:62
+#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:94
+#: en/user_customization-packages.ssi:125
+#: en/user_customization-packages.ssi:139
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:159
+#: en/user_customization-packages.ssi:169
+#: en/user_customization-packages.ssi:181
+#: en/user_customization-packages.ssi:197
+#: en/user_customization-packages.ssi:265
+#: en/user_customization-packages.ssi:277
+#: en/user_customization-packages.ssi:287 en/user_examples.ssi:17
+#: en/user_examples.ssi:31 en/user_examples.ssi:41 en/user_examples.ssi:55
+#: en/user_examples.ssi:65 en/user_examples.ssi:83 en/user_examples.ssi:98
+#: en/user_examples.ssi:108 en/user_examples.ssi:120 en/user_examples.ssi:132
+#: en/user_examples.ssi:147 en/user_examples.ssi:155 en/user_examples.ssi:163
+#: en/user_examples.ssi:194 en/user_examples.ssi:210 en/user_examples.ssi:218
+#: 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
+#: en/user_installation.ssi:108 en/user_installation.ssi:123
+#: en/user_installation.ssi:138 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
-#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:84
-#: en/user_overview.ssi:94 en/user_overview.ssi:102
+#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:74
+#: en/user_overview.ssi:84 en/user_overview.ssi:92
msgid "}code"
msgstr "}code"
#. type: Plain text
-#: en/about_manual.ssi:86
+#: en/about_manual.ssi:90
msgid ""
"Prior to submission of your contribution, please preview your work. To "
"preview the live-manual, ensure the packages needed for building are "
@@ -468,12 +507,12 @@ msgstr ""
"pentru 'building' sunt instalate, prin executatea comenzii:"
#. type: Plain text
-#: en/about_manual.ssi:90
+#: en/about_manual.ssi:94
msgid "# apt-get install make po4a sisu-complete"
msgstr "# apt-get install make po4a sisu-complete"
#. type: Plain text
-#: en/about_manual.ssi:94
+#: en/about_manual.ssi:98
msgid ""
"You may build the live-manual from the top level directory of your git "
"checkout by executing:"
@@ -482,17 +521,30 @@ msgstr ""
"al dvs, prin executatea:"
#. type: Plain text
-#: en/about_manual.ssi:98
+#: en/about_manual.ssi:102
msgid "$ make build"
msgstr "$ make build"
#. type: Plain text
-#: en/about_manual.ssi:102
+#: en/about_manual.ssi:106
+msgid ""
+"Since it takes a while to build the manual in all supported languages, you "
+"may find it convenient when proofing to build for only one language, e.g. by "
+"executing:"
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:110
+msgid "$ make build LANGUAGES=en"
+msgstr "$ make build LANGUAGES=en"
+
+#. type: Plain text
+#: en/about_manual.ssi:114
msgid "3~ Applying patches"
msgstr "3~ Aplicarea de patch-uri"
#. type: Plain text
-#: en/about_manual.ssi:104
+#: en/about_manual.ssi:116
msgid ""
"Directly commiting to the repository is possible by anyone. However, we ask "
"you to send bigger changes to the mailing list to discuss them first. In "
@@ -503,63 +555,63 @@ msgstr ""
"contibutiile la repository, pasii urmatori sunt necesari:"
#. type: Plain text
-#: en/about_manual.ssi:106
+#: en/about_manual.ssi:118
msgid "_* Fetch the public commit key:"
msgstr "_* Fetch the public commit key:"
#. type: Plain text
-#: en/about_manual.ssi:115
+#: en/about_manual.ssi:127
#, no-wrap
msgid ""
"$ mkdir -p ~/.ssh/identity.d\n"
-"$ wget http://live.debian.net/other/keys/live-manual@debian-live \\\n"
-"\t-O ~/.ssh/identity.d/live-manual at debian-live\n"
-"$ wget http://live.debian.net/other/keys/live-manual@debian-live.pub \\\n"
-"\t-O ~/.ssh/identity.d/live-manual at debian-live.pub\n"
-"$ chmod 0600 ~/.ssh/identity.d/live-manual at debian-live*\n"
+"$ wget http://live.debian.net/other/keys/gitosis@live.debian.net \\\n"
+"\t-O ~/.ssh/identity.d/live.debian.net\n"
+"$ wget http://live.debian.net/other/keys/gitosis@live.debian.net.pub \\\n"
+"\t-O ~/.ssh/identity.d/live.debian.net.pub\n"
+"$ chmod 0600 ~/.ssh/identity.d/live.debian.net*\n"
msgstr ""
"$ mkdir -p ~/.ssh/identity.d\n"
-"$ wget http://live.debian.net/other/keys/live-manual@debian-live \\\n"
-"\t-O ~/.ssh/identity.d/live-manual at debian-live\n"
-"$ wget http://live.debian.net/other/keys/live-manual@debian-live.pub \\\n"
-"\t-O ~/.ssh/identity.d/live-manual at debian-live.pub\n"
-"$ chmod 0600 ~/.ssh/identity.d/live-manual at debian-live*\n"
+"$ wget http://live.debian.net/other/keys/gitosis@live.debian.net \\\n"
+"\t-O ~/.ssh/identity.d/gitosis at live.debian.net\n"
+"$ wget http://live.debian.net/other/keys/gitosis@live.debian.net.pub \\\n"
+"\t-O ~/.ssh/identity.d/gitosis at live.debian.net.pub\n"
+"$ chmod 0600 ~/.ssh/identity.d/gitosis at live.debian.net*\n"
#. type: Plain text
-#: en/about_manual.ssi:119
+#: en/about_manual.ssi:131
msgid "_* Add the following section to your openssh-client config:"
msgstr "_* Adaugati urmatoarea sectiuna la openssh-client config:"
#. type: Plain text
-#: en/about_manual.ssi:128
+#: en/about_manual.ssi:140
#, no-wrap
msgid ""
"$ cat >> ~/.ssh/config << EOF\n"
"Host live.debian.net\n"
" Hostname live.debian.net\n"
" User gitosis\n"
-" IdentityFile ~/.ssh/identity.d/live-manual at debian-live\n"
+" IdentityFile ~/.ssh/identity.d/gitosis at live.debian.net\n"
"EOF\n"
msgstr ""
"$ cat >> ~/.ssh/config << EOF\n"
"Host live.debian.net\n"
" Hostname live.debian.net\n"
" User gitosis\n"
-" IdentityFile ~/.ssh/identity.d/live-manual at debian-live\n"
+" IdentityFile ~/.ssh/identity.d/gitosis at live.debian.net\n"
"EOF\n"
#. type: Plain text
-#: en/about_manual.ssi:132
+#: en/about_manual.ssi:144
msgid "_* Checkout a clone of the manual through ssh:"
msgstr "_* Checkout un clon al manualului prin ssh:"
#. type: Plain text
-#: en/about_manual.ssi:136
+#: en/about_manual.ssi:148
msgid "$ git clone gitosis at live.debian.net:/live-manual.git"
msgstr "$ git clone gitosis at live.debian.net:/live-manual.git"
#. type: Plain text
-#: en/about_manual.ssi:140
+#: en/about_manual.ssi:152
msgid ""
"_* After editing the files in manual/en/, please call the 'commit' target in "
"the top level directory to sanitize the files and update the translation "
@@ -569,12 +621,12 @@ msgstr ""
"top level directory to sanitize the files and update the translation files:"
#. type: Plain text
-#: en/about_manual.ssi:144
+#: en/about_manual.ssi:156
msgid "$ make commit"
msgstr "$ make commit"
#. type: Plain text
-#: en/about_manual.ssi:148
+#: en/about_manual.ssi:160
msgid ""
"_* After sanitizing commit the changes. Write commit messages, that consist "
"of full useful sentences, starting with a capital letter and ending with a "
@@ -587,16 +639,16 @@ msgstr ""
"Correcting/':"
#. type: Plain text
-#: en/about_manual.ssi:152
+#: en/about_manual.ssi:164
msgid "$ git commit -a"
msgstr "$ git commit -a"
#. type: Plain text
-#: en/about_manual.ssi:156
+#: en/about_manual.ssi:168
msgid "_* Push the commit to the server:"
msgstr "_* Primite commit-ul la server:"
#. type: Plain text
-#: en/about_manual.ssi:160
+#: en/about_manual.ssi:172
msgid "$ git push"
msgstr "$ git push"
diff --git a/manual/po/ro/about_project.ssi.po b/manual/po/ro/about_project.ssi.po
index 215cc92..b1976b9 100644
--- a/manual/po/ro/about_project.ssi.po
+++ b/manual/po/ro/about_project.ssi.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: 2.0~a8\n"
-"POT-Creation-Date: 2010-10-22 07:52-0200\n"
+"POT-Creation-Date: 2010-11-27 10:30-0400\n"
"Last-Translator: Eugen Paiuc <linux51 at bluewin.ch>\n"
#. type: Plain text
@@ -46,8 +46,9 @@ msgstr "_* Sunt proiecte neoficiale, dezvoltate in afara proiectului Debian."
#. type: Plain text
#: en/about_project.ssi:14
-msgid "_* They mix different distributions, e.g. testing and unstable."
-msgstr "_* Ele amalgameaza diferite distributii, ca testing si unstable."
+msgid "_* They mix different distributions, e.g. *{testing}* and *{unstable}*."
+msgstr ""
+"_* Ele amalgameaza diferite distributii, ca *{testing}* si *{unstable}*."
#. type: Plain text
#: en/about_project.ssi:16
diff --git a/manual/po/ro/live-manual.ssm.po b/manual/po/ro/live-manual.ssm.po
index b02b796..4585f02 100644
--- a/manual/po/ro/live-manual.ssm.po
+++ b/manual/po/ro/live-manual.ssm.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-11-13 16:15+0100\n"
+"POT-Creation-Date: 2010-11-29 14:16-0400\n"
"PO-Revision-Date: 2010-10-23 00:04+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -46,7 +46,7 @@ msgstr ""
#, no-wrap
msgid ""
"@date:\n"
-" :published: 2010-11-13\n"
+" :published: 2010-11-29\n"
msgstr ""
#. type: Plain text
@@ -59,7 +59,7 @@ msgstr ""
#, no-wrap
msgid ""
"@make:\n"
-" :bold: /Squeeze|squeeze|Stable|stable|Wheezy|wheezy|Testing|testing|Sid|sid|Unstable|unstable/\n"
+" :bold: /Squeeze|squeeze|Wheezy|wheezy|Sid|sid/\n"
" :italics: /live-boot|live-build|live-config|live-magic|live-manual|live-installer|debian-installer-launcher/\n"
" :num_top: 1\n"
" :skin: skin_debian-live\n"
diff --git a/manual/po/ro/project_bugs.ssi.po b/manual/po/ro/project_bugs.ssi.po
index 011847e..e36f4c3 100644
--- a/manual/po/ro/project_bugs.ssi.po
+++ b/manual/po/ro/project_bugs.ssi.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-27 21:40-0200\n"
+"POT-Creation-Date: 2010-11-27 10:30-0400\n"
"PO-Revision-Date: 2010-10-27 22:56+0200\n"
"Last-Translator: Creak <romain.failliot at foolstep.com>\n"
"Language-Team: Français <debian-live at lists.debian.org>\n"
@@ -18,9 +18,9 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n > 1)\n"
#. type: Plain text
-#: en/about_manual.ssi:80 en/about_manual.ssi:88 en/about_manual.ssi:96
-#: en/about_manual.ssi:108 en/about_manual.ssi:121 en/about_manual.ssi:134
-#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
+#: en/about_manual.ssi:112 en/about_manual.ssi:125 en/about_manual.ssi:138
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
#: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
#: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
#: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
@@ -40,48 +40,49 @@ msgstr ""
#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
-#: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
-#: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
-#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111
-#: en/project_bugs.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
-#: en/user_basics.ssi:54 en/user_basics.ssi:66 en/user_basics.ssi:78
-#: en/user_basics.ssi:88 en/user_basics.ssi:102 en/user_basics.ssi:110
-#: en/user_basics.ssi:118 en/user_basics.ssi:128 en/user_basics.ssi:140
-#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
-#: en/user_basics.ssi:182 en/user_basics.ssi:190 en/user_basics.ssi:200
-#: en/user_basics.ssi:220 en/user_basics.ssi:253 en/user_basics.ssi:269
-#: en/user_basics.ssi:277 en/user_basics.ssi:297 en/user_basics.ssi:322
-#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
-#: en/user_customization-contents.ssi:66
+#: en/other_procedures.ssi:58 en/project_bugs.ssi:58 en/user_basics.ssi:32
+#: en/user_basics.ssi:42 en/user_basics.ssi:54 en/user_basics.ssi:66
+#: en/user_basics.ssi:78 en/user_basics.ssi:88 en/user_basics.ssi:102
+#: en/user_basics.ssi:110 en/user_basics.ssi:118 en/user_basics.ssi:128
+#: en/user_basics.ssi:142 en/user_basics.ssi:154 en/user_basics.ssi:162
+#: en/user_basics.ssi:170 en/user_basics.ssi:184 en/user_basics.ssi:192
+#: en/user_basics.ssi:202 en/user_basics.ssi:222 en/user_basics.ssi:255
+#: en/user_basics.ssi:271 en/user_basics.ssi:279 en/user_basics.ssi:299
+#: en/user_basics.ssi:324 en/user_customization-contents.ssi:34
+#: en/user_customization-contents.ssi:43 en/user_customization-contents.ssi:66
#: en/user_customization-internationalization.ssi:10
#: en/user_customization-internationalization.ssi:18
#: en/user_customization-internationalization.ssi:26
#: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:16 en/user_customization-packages.ssi:24
-#: en/user_customization-packages.ssi:36 en/user_customization-packages.ssi:45
-#: en/user_customization-packages.ssi:59 en/user_customization-packages.ssi:73
-#: en/user_customization-packages.ssi:103
-#: en/user_customization-packages.ssi:111
-#: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:166
-#: en/user_customization-packages.ssi:176
-#: en/user_customization-packages.ssi:186
-#: en/user_customization-packages.ssi:196 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:104
-#: en/user_installation.ssi:118 en/user_installation.ssi:135
-#: en/user_managing_a_configuration.ssi:24
+#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
+#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
+#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:90
+#: en/user_customization-packages.ssi:120
+#: en/user_customization-packages.ssi:133
+#: en/user_customization-packages.ssi:143
+#: en/user_customization-packages.ssi:153
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:261
+#: en/user_customization-packages.ssi:273
+#: en/user_customization-packages.ssi:283 en/user_examples.ssi:12
+#: en/user_examples.ssi:27 en/user_examples.ssi:37 en/user_examples.ssi:75
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:76 en/user_installation.ssi:84
+#: en/user_installation.ssi:104 en/user_installation.ssi:118
+#: en/user_installation.ssi:135 en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
-#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:46
-#: en/user_overview.ssi:90 en/user_overview.ssi:98
+#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:36
+#: en/user_overview.ssi:80 en/user_overview.ssi:88
msgid "code{"
msgstr "code{"
#. type: Plain text
-#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:121 en/about_manual.ssi:134 en/about_manual.ssi:142
+#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:165
#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
@@ -101,40 +102,42 @@ msgstr "code{"
#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
#: en/other_live-environment.ssi:138 en/other_procedures.ssi:16
#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
-#: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
-#: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
-#: en/other_use-cases.ssi:137 en/project_bugs.ssi:62 en/user_basics.ssi:36
-#: en/user_basics.ssi:46 en/user_basics.ssi:60 en/user_basics.ssi:72
-#: en/user_basics.ssi:82 en/user_basics.ssi:94 en/user_basics.ssi:106
-#: en/user_basics.ssi:114 en/user_basics.ssi:122 en/user_basics.ssi:132
-#: en/user_basics.ssi:146 en/user_basics.ssi:156 en/user_basics.ssi:164
-#: en/user_basics.ssi:172 en/user_basics.ssi:186 en/user_basics.ssi:194
-#: en/user_basics.ssi:204 en/user_basics.ssi:245 en/user_basics.ssi:257
-#: en/user_basics.ssi:273 en/user_basics.ssi:281 en/user_basics.ssi:308
-#: en/user_basics.ssi:347 en/user_customization-contents.ssi:39
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:70
+#: en/project_bugs.ssi:62 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:60 en/user_basics.ssi:72 en/user_basics.ssi:82
+#: en/user_basics.ssi:94 en/user_basics.ssi:106 en/user_basics.ssi:114
+#: en/user_basics.ssi:122 en/user_basics.ssi:132 en/user_basics.ssi:148
+#: en/user_basics.ssi:158 en/user_basics.ssi:166 en/user_basics.ssi:174
+#: en/user_basics.ssi:188 en/user_basics.ssi:196 en/user_basics.ssi:206
+#: en/user_basics.ssi:247 en/user_basics.ssi:259 en/user_basics.ssi:275
+#: en/user_basics.ssi:283 en/user_basics.ssi:310 en/user_basics.ssi:349
+#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:70
#: en/user_customization-internationalization.ssi:14
#: en/user_customization-internationalization.ssi:22
#: en/user_customization-internationalization.ssi:30
#: en/user_customization-internationalization.ssi:42
-#: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
-#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
-#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
-#: en/user_customization-packages.ssi:107
-#: en/user_customization-packages.ssi:115
-#: en/user_customization-packages.ssi:135
-#: en/user_customization-packages.ssi:172
-#: en/user_customization-packages.ssi:182
-#: en/user_customization-packages.ssi:192
-#: en/user_customization-packages.ssi:202 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 en/user_installation.ssi:108
-#: en/user_installation.ssi:123 en/user_installation.ssi:138
-#: en/user_managing_a_configuration.ssi:31
+#: en/user_customization-packages.ssi:23 en/user_customization-packages.ssi:36
+#: en/user_customization-packages.ssi:48 en/user_customization-packages.ssi:62
+#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:94
+#: en/user_customization-packages.ssi:125
+#: en/user_customization-packages.ssi:139
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:159
+#: en/user_customization-packages.ssi:169
+#: en/user_customization-packages.ssi:181
+#: en/user_customization-packages.ssi:197
+#: en/user_customization-packages.ssi:265
+#: en/user_customization-packages.ssi:277
+#: en/user_customization-packages.ssi:287 en/user_examples.ssi:17
+#: en/user_examples.ssi:31 en/user_examples.ssi:41 en/user_examples.ssi:84
+#: 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
+#: en/user_installation.ssi:108 en/user_installation.ssi:123
+#: en/user_installation.ssi:138 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
-#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:84
-#: en/user_overview.ssi:94 en/user_overview.ssi:102
+#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:74
+#: en/user_overview.ssi:84 en/user_overview.ssi:92
msgid "}code"
msgstr "}code"
@@ -192,16 +195,17 @@ msgstr ""
#. type: Plain text
#: en/project_bugs.ssi:18
msgid ""
-"Due to the nature of Debian testing and Debian unstable distributions being "
-"a moving target, building a live system may not always be possible."
+"Due to the nature of Debian *{testing}* and Debian *{unstable}* "
+"distributions being a moving target, building a live system may not always "
+"be possible."
msgstr ""
#. type: Plain text
#: en/project_bugs.ssi:20
msgid ""
-"If this is a problem, do not build a system based on testing or unstable, "
-"but go with stable. live-build does always default to the current stable "
-"release."
+"If this is a problem, do not build a system based on *{testing}* or *"
+"{unstable}*, but go with *{stable}*. live-build does always default to the "
+"current *{stable}* release."
msgstr ""
#. type: Plain text
@@ -216,9 +220,10 @@ msgstr ""
msgid ""
"It is out of the scope of this manual to train you in correctly identifying "
"and fixing problems in packages of the development distributions, however, "
-"there are two things you can always try: When not succeeding to build "
-"testing, try if unstable works. If unstable does not work either, revert to "
-"testing and pinning the newer version of the failing package from unstable."
+"there are two things you can always try: When not succeeding to build *"
+"{testing}*, try if *{unstable}* works. If *{unstable}* does not work either, "
+"revert to *{testing}* and pinning the newer version of the failing package "
+"from *{unstable}*."
msgstr ""
#. type: Plain text
diff --git a/manual/po/ro/user_basics.ssi.po b/manual/po/ro/user_basics.ssi.po
index e038be8..6a7d9fb 100644
--- a/manual/po/ro/user_basics.ssi.po
+++ b/manual/po/ro/user_basics.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-11-01 06:47-0200\n"
+"POT-Creation-Date: 2010-11-28 07:16-0400\n"
"PO-Revision-Date: 2010-10-23 16:43+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -18,9 +18,9 @@ msgstr ""
"20)) ? 1 : 2;\n"
#. type: Plain text
-#: en/about_manual.ssi:80 en/about_manual.ssi:88 en/about_manual.ssi:96
-#: en/about_manual.ssi:108 en/about_manual.ssi:121 en/about_manual.ssi:134
-#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
+#: en/about_manual.ssi:112 en/about_manual.ssi:125 en/about_manual.ssi:138
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
#: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
#: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
#: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
@@ -40,38 +40,43 @@ msgstr ""
#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
-#: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
-#: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
-#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111
-#: en/project_bugs.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
-#: en/user_basics.ssi:54 en/user_basics.ssi:66 en/user_basics.ssi:78
-#: en/user_basics.ssi:88 en/user_basics.ssi:102 en/user_basics.ssi:110
-#: en/user_basics.ssi:118 en/user_basics.ssi:128 en/user_basics.ssi:140
-#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
-#: en/user_basics.ssi:182 en/user_basics.ssi:190 en/user_basics.ssi:200
-#: en/user_basics.ssi:220 en/user_basics.ssi:253 en/user_basics.ssi:269
-#: en/user_basics.ssi:277 en/user_basics.ssi:297 en/user_basics.ssi:322
-#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
-#: en/user_customization-contents.ssi:66
+#: en/other_procedures.ssi:58 en/project_bugs.ssi:58 en/user_basics.ssi:32
+#: en/user_basics.ssi:42 en/user_basics.ssi:54 en/user_basics.ssi:66
+#: en/user_basics.ssi:78 en/user_basics.ssi:88 en/user_basics.ssi:102
+#: en/user_basics.ssi:110 en/user_basics.ssi:118 en/user_basics.ssi:128
+#: en/user_basics.ssi:142 en/user_basics.ssi:154 en/user_basics.ssi:162
+#: en/user_basics.ssi:170 en/user_basics.ssi:184 en/user_basics.ssi:192
+#: en/user_basics.ssi:202 en/user_basics.ssi:222 en/user_basics.ssi:255
+#: en/user_basics.ssi:271 en/user_basics.ssi:279 en/user_basics.ssi:299
+#: en/user_basics.ssi:324 en/user_customization-contents.ssi:34
+#: en/user_customization-contents.ssi:43 en/user_customization-contents.ssi:66
#: en/user_customization-internationalization.ssi:10
#: en/user_customization-internationalization.ssi:18
#: en/user_customization-internationalization.ssi:26
#: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:16 en/user_customization-packages.ssi:24
-#: en/user_customization-packages.ssi:36 en/user_customization-packages.ssi:45
-#: en/user_customization-packages.ssi:59 en/user_customization-packages.ssi:73
-#: en/user_customization-packages.ssi:103
-#: en/user_customization-packages.ssi:111
-#: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:166
-#: en/user_customization-packages.ssi:176
-#: en/user_customization-packages.ssi:186
-#: en/user_customization-packages.ssi:196 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:104
-#: en/user_installation.ssi:118 en/user_installation.ssi:135
-#: en/user_managing_a_configuration.ssi:24
+#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
+#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
+#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:90
+#: en/user_customization-packages.ssi:120
+#: en/user_customization-packages.ssi:133
+#: en/user_customization-packages.ssi:143
+#: en/user_customization-packages.ssi:153
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:261
+#: en/user_customization-packages.ssi:273
+#: en/user_customization-packages.ssi:283 en/user_examples.ssi:12
+#: en/user_examples.ssi:27 en/user_examples.ssi:37 en/user_examples.ssi:51
+#: en/user_examples.ssi:61 en/user_examples.ssi:77 en/user_examples.ssi:87
+#: en/user_examples.ssi:104 en/user_examples.ssi:114 en/user_examples.ssi:128
+#: en/user_examples.ssi:136 en/user_examples.ssi:151 en/user_examples.ssi:159
+#: en/user_examples.ssi:185 en/user_examples.ssi:206 en/user_examples.ssi:214
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:76 en/user_installation.ssi:84
+#: en/user_installation.ssi:104 en/user_installation.ssi:118
+#: en/user_installation.ssi:135 en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:36
#: en/user_overview.ssi:80 en/user_overview.ssi:88
@@ -79,9 +84,9 @@ msgid "code{"
msgstr "code{"
#. type: Plain text
-#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:121 en/about_manual.ssi:134 en/about_manual.ssi:142
+#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:165
#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
@@ -101,37 +106,43 @@ msgstr "code{"
#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
#: en/other_live-environment.ssi:138 en/other_procedures.ssi:16
#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
-#: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
-#: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
-#: en/other_use-cases.ssi:137 en/project_bugs.ssi:62 en/user_basics.ssi:36
-#: en/user_basics.ssi:46 en/user_basics.ssi:60 en/user_basics.ssi:72
-#: en/user_basics.ssi:82 en/user_basics.ssi:94 en/user_basics.ssi:106
-#: en/user_basics.ssi:114 en/user_basics.ssi:122 en/user_basics.ssi:132
-#: en/user_basics.ssi:146 en/user_basics.ssi:156 en/user_basics.ssi:164
-#: en/user_basics.ssi:172 en/user_basics.ssi:186 en/user_basics.ssi:194
-#: en/user_basics.ssi:204 en/user_basics.ssi:245 en/user_basics.ssi:257
-#: en/user_basics.ssi:273 en/user_basics.ssi:281 en/user_basics.ssi:308
-#: en/user_basics.ssi:347 en/user_customization-contents.ssi:39
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:70
+#: en/project_bugs.ssi:62 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:60 en/user_basics.ssi:72 en/user_basics.ssi:82
+#: en/user_basics.ssi:94 en/user_basics.ssi:106 en/user_basics.ssi:114
+#: en/user_basics.ssi:122 en/user_basics.ssi:132 en/user_basics.ssi:148
+#: en/user_basics.ssi:158 en/user_basics.ssi:166 en/user_basics.ssi:174
+#: en/user_basics.ssi:188 en/user_basics.ssi:196 en/user_basics.ssi:206
+#: en/user_basics.ssi:247 en/user_basics.ssi:259 en/user_basics.ssi:275
+#: en/user_basics.ssi:283 en/user_basics.ssi:310 en/user_basics.ssi:349
+#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:70
#: en/user_customization-internationalization.ssi:14
#: en/user_customization-internationalization.ssi:22
#: en/user_customization-internationalization.ssi:30
#: en/user_customization-internationalization.ssi:42
-#: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
-#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
-#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
-#: en/user_customization-packages.ssi:107
-#: en/user_customization-packages.ssi:115
-#: en/user_customization-packages.ssi:135
-#: en/user_customization-packages.ssi:172
-#: en/user_customization-packages.ssi:182
-#: en/user_customization-packages.ssi:192
-#: en/user_customization-packages.ssi:202 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 en/user_installation.ssi:108
-#: en/user_installation.ssi:123 en/user_installation.ssi:138
-#: en/user_managing_a_configuration.ssi:31
+#: en/user_customization-packages.ssi:23 en/user_customization-packages.ssi:36
+#: en/user_customization-packages.ssi:48 en/user_customization-packages.ssi:62
+#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:94
+#: en/user_customization-packages.ssi:125
+#: en/user_customization-packages.ssi:139
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:159
+#: en/user_customization-packages.ssi:169
+#: en/user_customization-packages.ssi:181
+#: en/user_customization-packages.ssi:197
+#: en/user_customization-packages.ssi:265
+#: en/user_customization-packages.ssi:277
+#: en/user_customization-packages.ssi:287 en/user_examples.ssi:17
+#: en/user_examples.ssi:31 en/user_examples.ssi:41 en/user_examples.ssi:55
+#: en/user_examples.ssi:65 en/user_examples.ssi:83 en/user_examples.ssi:98
+#: en/user_examples.ssi:108 en/user_examples.ssi:120 en/user_examples.ssi:132
+#: en/user_examples.ssi:147 en/user_examples.ssi:155 en/user_examples.ssi:163
+#: en/user_examples.ssi:194 en/user_examples.ssi:210 en/user_examples.ssi:218
+#: 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
+#: en/user_installation.ssi:108 en/user_installation.ssi:123
+#: en/user_installation.ssi:138 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:74
#: en/user_overview.ssi:84 en/user_overview.ssi:92
@@ -145,14 +156,23 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:4
-msgid "1~ The basics"
+msgid "1~the-basics The basics"
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:6
msgid ""
"This chapter contains a brief overview of the build process and instructions "
-"for booting the various binary image types."
+"for using the three most commonly used image types. The most versatile image "
+"type, #{iso-hybrid}#, may be used on a virtual machine, optical media or USB "
+"portable storage device. In certain special cases, #{usb-hdd}# may be more "
+"suitable for USB devices. The chapter finishes with instructions for "
+"building and using a #{net}# type image, which is a bit more involved due to "
+"the setup required on the server. This is a slightly advanced topic for "
+"anyone who is not familiar already with netbooting, but is included here "
+"because once the setup is done, it is a very convenient way to test and "
+"deploy images for booting on the local network without the hassle of dealing "
+"with image media."
msgstr ""
#. type: Plain text
@@ -270,7 +290,8 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:44 en/user_basics.ssi:120 en/user_basics.ssi:202
+#: en/user_basics.ssi:44 en/user_basics.ssi:120 en/user_basics.ssi:204
+#: en/user_examples.ssi:106 en/user_examples.ssi:153
msgid "# lb build"
msgstr ""
@@ -283,7 +304,7 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:50
-msgid "3~ Testing an ISO image with Qemu"
+msgid "3~testing-iso-with-qemu Testing an ISO image with Qemu"
msgstr ""
#. type: Plain text
@@ -292,7 +313,7 @@ msgid "Testing an ISO is simple:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:56 en/user_basics.ssi:142
+#: en/user_basics.ssi:56 en/user_basics.ssi:144
msgid "# apt-get install qemu"
msgstr ""
@@ -303,7 +324,7 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:62
-msgid "3~ Testing an ISO image with virtualbox-ose"
+msgid "3~testing-iso-with-virtualbox Testing an ISO image with virtualbox-ose"
msgstr ""
#. type: Plain text
@@ -344,7 +365,7 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:84
-msgid "3~ Burning an ISO image to a physical medium"
+msgid "3~burning-iso-image Burning an ISO image to a physical medium"
msgstr ""
#. type: Plain text
@@ -383,20 +404,20 @@ msgstr ""
#: en/user_basics.ssi:100
msgid ""
"Note: if you created an ISO image with the previous example, you will need "
-"to clean up your working directory with the #{lb clean} command (see {The lb "
-"clean command}#lb-clean):"
+"to clean up your working directory with the #{lb clean}# command (see {The "
+"lb clean command}#lb-clean):"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:104 en/user_basics.ssi:184
+#: en/user_basics.ssi:104 en/user_basics.ssi:186
msgid "$ lb clean --binary"
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:108
msgid ""
-"Run the #{lb config}# command with the parameters to configure the \"config/"
-"\" hierarchy to create a USB/HDD image type:"
+"Run the #{lb config}# command with the parameters to configure the #{config/}"
+"# hierarchy to create a USB/HDD image type:"
msgstr ""
#. type: Plain text
@@ -444,21 +465,28 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:138
-msgid "3~ Testing a USB/HDD image with Qemu"
+msgid ""
+"Note: As discussed earlier, this same process can be used for #{iso-hybrid}# "
+"type images, (suffixed #{-hybrid.iso}#,) but not #{iso}# type images."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:144
+#: en/user_basics.ssi:140
+msgid "3~testing-usb-hdd-with-qemu Testing a USB/HDD image with Qemu"
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:146
msgid "$ qemu -hda binary.img"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:148
+#: en/user_basics.ssi:150
msgid "3~ Using the space left on a USB stick"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:150
+#: en/user_basics.ssi:152
msgid ""
"If you want to use the remaining free space after you have installed the "
"binary.img, you can use a partitioning tool such as #{gparted}# or #{parted}"
@@ -467,45 +495,45 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:154
+#: en/user_basics.ssi:156
msgid "# gparted ${USBSTICK}"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:158
+#: en/user_basics.ssi:160
msgid ""
"After the creation of the partition, you have to create a filesystem on it. "
"One possible choice would be ext4."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:162
+#: en/user_basics.ssi:164
msgid "# mkfs.ext4 ${USBSTICK}"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:166
+#: en/user_basics.ssi:168
msgid "If you want to use this data partition with Windows, use FAT32."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:170
+#: en/user_basics.ssi:172
msgid "# mkfs.vfat -F 32"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:174
+#: en/user_basics.ssi:176
#, no-wrap
msgid "*{Remember: Every time you install a new binary.img on the stick, all data on the stick will be lost because the partition table is overwritten by the contents of the image.}*\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:176
-msgid "2~ Building a netboot image"
+#: en/user_basics.ssi:178
+msgid "2~building-netboot-image Building a netboot image"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:178
+#: en/user_basics.ssi:180
msgid ""
"The following sequence of commands will create a basic netboot image "
"containing the Debian standard system without X.org. It is suitable for "
@@ -513,28 +541,28 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:180
+#: en/user_basics.ssi:182
msgid ""
"Note: if you performed any previous examples, you will need to clean up your "
"working directory with the #{lb clean}# command:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:188
+#: en/user_basics.ssi:190
msgid ""
"Run the #{lb config}# command with the parameters to configure the \"config/"
"\" hierarchy to create our netboot image:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:192
+#: en/user_basics.ssi:194
msgid ""
"$ lb config -b net --net-root-path \"/srv/debian-live\" --net-root-server "
"\"192.168.0.1\""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:196
+#: en/user_basics.ssi:198
msgid ""
"In contrast with the ISO and USB/HDD images, netbooting does not support "
"serving a filesystem image with the client, so the files must be served via "
@@ -544,12 +572,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:198
+#: en/user_basics.ssi:200
msgid "Now build the image with the #{lb build}# command:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:206
+#: en/user_basics.ssi:208
msgid ""
"In a network boot, the client runs a small piece of software which usually "
"resides on the EPROM of the Ethernet card. This program sends a DHCP request "
@@ -560,7 +588,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:208
+#: en/user_basics.ssi:210
msgid ""
"For example, if you unpack the generated binary-net.tar.gz archive in the /"
"srv/debian-live directory, you'll find the filesystem image in live/"
@@ -569,17 +597,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:210
+#: en/user_basics.ssi:212
msgid "We must now configure three services on the server to enable netboot."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:212
+#: en/user_basics.ssi:214
msgid "3~ DHCP server"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:214
+#: en/user_basics.ssi:216
msgid ""
"We must configure our network's DHCP server to be sure to give an IP address "
"to the netbooting client system, and to advertise the location of the PXE "
@@ -587,25 +615,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:216
+#: en/user_basics.ssi:218
msgid ""
"Here is an example for inspiration, written for the ISC DHCP server #{isc-"
"dhcp-server}# in the /etc/dhcp/dhcpd.conf configuration file;"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:218 en/user_customization-packages.ssi:153
+#: en/user_basics.ssi:220
msgid "% FIXME"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:222
+#: en/user_basics.ssi:224
#, no-wrap
msgid "subnet 192.168.1.0 netmask 255.255.255.0 { # 192.168.1.0/24\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:225
+#: en/user_basics.ssi:227
#, no-wrap
msgid ""
" # IP addresses available for guests\n"
@@ -613,7 +641,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:228
+#: en/user_basics.ssi:230
#, no-wrap
msgid ""
" # allow booting from the net\n"
@@ -621,7 +649,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:233
+#: en/user_basics.ssi:235
#, no-wrap
msgid ""
" # for net booting, server where the first file to be loaded (by TFTP\n"
@@ -631,7 +659,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:237
+#: en/user_basics.ssi:239
#, no-wrap
msgid ""
" # net boot configuration for guests with a PXE client:\n"
@@ -640,7 +668,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:240
+#: en/user_basics.ssi:242
#, no-wrap
msgid ""
" # PXE bootloader (first program to be loaded, by TFTP)\n"
@@ -648,7 +676,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:243
+#: en/user_basics.ssi:245
#, no-wrap
msgid ""
" }\n"
@@ -656,17 +684,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:247
+#: en/user_basics.ssi:249
msgid "3~ TFTP server"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:249
+#: en/user_basics.ssi:251
msgid "This serves the kernel and initial ramdisk to the system at run time."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:251
+#: en/user_basics.ssi:253
msgid ""
"You should install the tftpd-hpa package. It can serve all files contained "
"inside a root directory, usually /srv/tftp. To let it serve files inside /"
@@ -674,22 +702,22 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:255
+#: en/user_basics.ssi:257
msgid "dpkg-reconfigure -plow tftpd-hpa"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:259
+#: en/user_basics.ssi:261
msgid "and fill in the new tftp server directory when being asked about it."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:261
+#: en/user_basics.ssi:263
msgid "3~ NFS server"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:263
+#: en/user_basics.ssi:265
msgid ""
"Once the guest computer has downloaded and booted a Linux kernel and loaded "
"its initrd, it will try to mount the Live filesystem image through a NFS "
@@ -697,35 +725,35 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:265
+#: en/user_basics.ssi:267
msgid "You need to install the nfs-kernel-server package."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:267
+#: en/user_basics.ssi:269
msgid ""
"Then, make the filesystem image available through NFS by adding a line like "
"the following to /etc/exports:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:271
+#: en/user_basics.ssi:273
msgid "/srv/debian-live *(ro,async,no_root_squash,no_subtree_check)"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:275
+#: en/user_basics.ssi:277
msgid ""
"and tell the NFS server about this new export with the following command:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:279
+#: en/user_basics.ssi:281
msgid "# exportfs -rv"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:283
+#: en/user_basics.ssi:285
msgid ""
"Setting up these three services can be a little tricky. You might need some "
"patience to get all of them working together. The Debian Installer Manual's "
@@ -734,40 +762,40 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:285
+#: en/user_basics.ssi:287
msgid "3~ Netboot testing HowTo"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:287
+#: en/user_basics.ssi:289
msgid ""
"Netboot image creation is made easy with live-build magic, but testing the "
"images on physical machines can be really time consuming."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:289
+#: en/user_basics.ssi:291
msgid ""
"To make our life easier, we can use virtualization. There are two solutions."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:291
+#: en/user_basics.ssi:293
msgid "3~ Qemu"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:293
+#: en/user_basics.ssi:295
msgid "_* Install qemu, bridge-utils, sudo."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:295
+#: en/user_basics.ssi:297
msgid "Edit /etc/qemu-ifup:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:306
+#: en/user_basics.ssi:308
msgid ""
"#!/bin/sh sudo -p \"Password for $0:\" /sbin/ifconfig $1 172.20.0.1 echo "
"\"Executing /etc/qemu-ifup\" echo \"Bringing up $1 for bridged mode...\" "
@@ -776,62 +804,62 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:310
+#: en/user_basics.ssi:312
msgid "Get, or build a grub-floppy-netboot (in the svn)."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:312
+#: en/user_basics.ssi:314
msgid "Launch qemu with \"-net nic,vlan=0 -net tap,vlan=0,ifname=tun0\""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:314
+#: en/user_basics.ssi:316
msgid "3~ VMWare Player"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:316
+#: en/user_basics.ssi:318
msgid "_* Install VMWare Player (\"free as in beer\" edition)"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:318
+#: en/user_basics.ssi:320
msgid ""
"_* Create a PXETester directory, and create a text file called pxe.vwx inside"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:320
+#: en/user_basics.ssi:322
msgid "_* Paste this text inside:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:328
+#: en/user_basics.ssi:330
msgid ""
"#!/usr/bin/vmware config.version = \"8\" virtualHW.version = \"4\" memsize = "
"\"512\" MemAllowAutoScaleDown = \"FALSE\""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:334
+#: en/user_basics.ssi:336
msgid ""
"ide0:0.present = \"FALSE\" ide1:0.present = \"FALSE\" floppy0.present = "
"\"FALSE\" sound.present = \"FALSE\" tools.remindInstall = \"FALSE\""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:337
+#: en/user_basics.ssi:339
msgid "ethernet0.present = \"TRUE\" ethernet0.addressType = \"generated\""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:340
+#: en/user_basics.ssi:342
msgid "displayName = \"Test Boot PXE\" guestOS = \"other\""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:345
+#: en/user_basics.ssi:347
msgid ""
"ethernet0.generatedAddress = \"00:0c:29:8d:71:3b\" uuid.location = \"56 4d "
"83 72 5c c4 de 3f-ae 9e 07 91 1d 8d 71 3b\" uuid.bios = \"56 4d 83 72 5c c4 "
@@ -839,19 +867,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:349
+#: en/user_basics.ssi:351
msgid ""
"_* You can play with this configuration file (i.e. change memory limit to "
"256)"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:351
+#: en/user_basics.ssi:353
msgid ""
"_* Double click on this file (or run VMWare player and select this file)."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:352
+#: en/user_basics.ssi:354
msgid "_* When running just press space if that strange question comes up..."
msgstr ""
diff --git a/manual/po/ro/user_customization-contents.ssi.po b/manual/po/ro/user_customization-contents.ssi.po
index 5bde24d..25d4cd1 100644
--- a/manual/po/ro/user_customization-contents.ssi.po
+++ b/manual/po/ro/user_customization-contents.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-23 16:43+0300\n"
+"POT-Creation-Date: 2010-11-27 09:40-0400\n"
"PO-Revision-Date: 2010-10-23 16:43+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -18,9 +18,9 @@ msgstr ""
"20)) ? 1 : 2;\n"
#. type: Plain text
-#: en/about_manual.ssi:80 en/about_manual.ssi:88 en/about_manual.ssi:96
-#: en/about_manual.ssi:108 en/about_manual.ssi:121 en/about_manual.ssi:134
-#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
+#: en/about_manual.ssi:112 en/about_manual.ssi:125 en/about_manual.ssi:138
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
#: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
#: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
#: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
@@ -40,47 +40,49 @@ msgstr ""
#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
-#: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
-#: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
-#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111 en/user_basics.ssi:34
-#: en/user_basics.ssi:44 en/user_basics.ssi:56 en/user_basics.ssi:68
-#: en/user_basics.ssi:80 en/user_basics.ssi:92 en/user_basics.ssi:106
-#: en/user_basics.ssi:114 en/user_basics.ssi:122 en/user_basics.ssi:132
-#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
-#: en/user_basics.ssi:172 en/user_basics.ssi:186 en/user_basics.ssi:194
-#: en/user_basics.ssi:204 en/user_basics.ssi:224 en/user_basics.ssi:257
-#: en/user_basics.ssi:273 en/user_basics.ssi:281 en/user_basics.ssi:301
-#: en/user_basics.ssi:326 en/user_customization-contents.ssi:34
+#: en/other_procedures.ssi:58 en/project_bugs.ssi:58 en/user_basics.ssi:32
+#: en/user_basics.ssi:42 en/user_basics.ssi:54 en/user_basics.ssi:66
+#: en/user_basics.ssi:78 en/user_basics.ssi:88 en/user_basics.ssi:102
+#: en/user_basics.ssi:110 en/user_basics.ssi:118 en/user_basics.ssi:128
+#: en/user_basics.ssi:142 en/user_basics.ssi:154 en/user_basics.ssi:162
+#: en/user_basics.ssi:170 en/user_basics.ssi:184 en/user_basics.ssi:192
+#: en/user_basics.ssi:202 en/user_basics.ssi:222 en/user_basics.ssi:255
+#: en/user_basics.ssi:271 en/user_basics.ssi:279 en/user_basics.ssi:299
+#: en/user_basics.ssi:324 en/user_customization-contents.ssi:34
#: en/user_customization-contents.ssi:43 en/user_customization-contents.ssi:66
#: en/user_customization-internationalization.ssi:10
#: en/user_customization-internationalization.ssi:18
#: en/user_customization-internationalization.ssi:26
#: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:16 en/user_customization-packages.ssi:24
-#: en/user_customization-packages.ssi:36 en/user_customization-packages.ssi:45
-#: en/user_customization-packages.ssi:59 en/user_customization-packages.ssi:73
-#: en/user_customization-packages.ssi:103
-#: en/user_customization-packages.ssi:111
-#: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:166
-#: en/user_customization-packages.ssi:176
-#: en/user_customization-packages.ssi:186
-#: en/user_customization-packages.ssi:196 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:104
-#: en/user_installation.ssi:118 en/user_installation.ssi:135
-#: en/user_managing_a_configuration.ssi:24
+#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
+#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
+#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:90
+#: en/user_customization-packages.ssi:120
+#: en/user_customization-packages.ssi:133
+#: en/user_customization-packages.ssi:143
+#: en/user_customization-packages.ssi:153
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:261
+#: en/user_customization-packages.ssi:273
+#: en/user_customization-packages.ssi:283 en/user_examples.ssi:12
+#: en/user_examples.ssi:27 en/user_examples.ssi:37 en/user_examples.ssi:75
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:76 en/user_installation.ssi:84
+#: en/user_installation.ssi:104 en/user_installation.ssi:118
+#: en/user_installation.ssi:135 en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
-#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:46
-#: en/user_overview.ssi:90 en/user_overview.ssi:98
+#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:36
+#: en/user_overview.ssi:80 en/user_overview.ssi:88
msgid "code{"
msgstr "code{"
#. type: Plain text
-#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:121 en/about_manual.ssi:134 en/about_manual.ssi:142
+#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:165
#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
@@ -100,46 +102,48 @@ msgstr "code{"
#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
#: en/other_live-environment.ssi:138 en/other_procedures.ssi:16
#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
-#: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
-#: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
-#: en/other_use-cases.ssi:137 en/user_basics.ssi:38 en/user_basics.ssi:48
-#: en/user_basics.ssi:62 en/user_basics.ssi:72 en/user_basics.ssi:86
-#: en/user_basics.ssi:98 en/user_basics.ssi:110 en/user_basics.ssi:118
-#: en/user_basics.ssi:126 en/user_basics.ssi:136 en/user_basics.ssi:150
-#: en/user_basics.ssi:160 en/user_basics.ssi:168 en/user_basics.ssi:176
-#: en/user_basics.ssi:190 en/user_basics.ssi:198 en/user_basics.ssi:208
-#: en/user_basics.ssi:249 en/user_basics.ssi:261 en/user_basics.ssi:277
-#: en/user_basics.ssi:285 en/user_basics.ssi:312 en/user_basics.ssi:351
+#: en/project_bugs.ssi:62 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:60 en/user_basics.ssi:72 en/user_basics.ssi:82
+#: en/user_basics.ssi:94 en/user_basics.ssi:106 en/user_basics.ssi:114
+#: en/user_basics.ssi:122 en/user_basics.ssi:132 en/user_basics.ssi:148
+#: en/user_basics.ssi:158 en/user_basics.ssi:166 en/user_basics.ssi:174
+#: en/user_basics.ssi:188 en/user_basics.ssi:196 en/user_basics.ssi:206
+#: en/user_basics.ssi:247 en/user_basics.ssi:259 en/user_basics.ssi:275
+#: en/user_basics.ssi:283 en/user_basics.ssi:310 en/user_basics.ssi:349
#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
#: en/user_customization-contents.ssi:70
#: en/user_customization-internationalization.ssi:14
#: en/user_customization-internationalization.ssi:22
#: en/user_customization-internationalization.ssi:30
#: en/user_customization-internationalization.ssi:42
-#: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
-#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
-#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
-#: en/user_customization-packages.ssi:107
-#: en/user_customization-packages.ssi:115
-#: en/user_customization-packages.ssi:135
-#: en/user_customization-packages.ssi:172
-#: en/user_customization-packages.ssi:182
-#: en/user_customization-packages.ssi:192
-#: en/user_customization-packages.ssi:202 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 en/user_installation.ssi:108
-#: en/user_installation.ssi:123 en/user_installation.ssi:138
-#: en/user_managing_a_configuration.ssi:31
+#: en/user_customization-packages.ssi:23 en/user_customization-packages.ssi:36
+#: en/user_customization-packages.ssi:48 en/user_customization-packages.ssi:62
+#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:94
+#: en/user_customization-packages.ssi:125
+#: en/user_customization-packages.ssi:139
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:159
+#: en/user_customization-packages.ssi:169
+#: en/user_customization-packages.ssi:181
+#: en/user_customization-packages.ssi:197
+#: en/user_customization-packages.ssi:265
+#: en/user_customization-packages.ssi:277
+#: en/user_customization-packages.ssi:287 en/user_examples.ssi:17
+#: en/user_examples.ssi:31 en/user_examples.ssi:41 en/user_examples.ssi:84
+#: 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
+#: en/user_installation.ssi:108 en/user_installation.ssi:123
+#: en/user_installation.ssi:138 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
-#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:84
-#: en/user_overview.ssi:94 en/user_overview.ssi:102
+#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:74
+#: en/user_overview.ssi:84 en/user_overview.ssi:92
msgid "}code"
msgstr "}code"
#. type: Plain text
#: en/user_customization-contents.ssi:2 en/user_customization-overview.ssi:2
-msgid "B~ Customizing contents"
+msgid ":B~ Customizing contents"
msgstr ""
#. type: Plain text
diff --git a/manual/po/ro/user_customization-internationalization.ssi.po b/manual/po/ro/user_customization-internationalization.ssi.po
index 148d727..43a0e38 100644
--- a/manual/po/ro/user_customization-internationalization.ssi.po
+++ b/manual/po/ro/user_customization-internationalization.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-28 09:15-0200\n"
+"POT-Creation-Date: 2010-11-27 09:40-0400\n"
"PO-Revision-Date: 2010-10-22 08:57-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -18,9 +18,9 @@ msgstr ""
"20)) ? 1 : 2;\n"
#. type: Plain text
-#: en/about_manual.ssi:80 en/about_manual.ssi:88 en/about_manual.ssi:96
-#: en/about_manual.ssi:108 en/about_manual.ssi:121 en/about_manual.ssi:134
-#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
+#: en/about_manual.ssi:112 en/about_manual.ssi:125 en/about_manual.ssi:138
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
#: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
#: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
#: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
@@ -40,48 +40,49 @@ msgstr ""
#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
-#: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
-#: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
-#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111
-#: en/project_bugs.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
-#: en/user_basics.ssi:54 en/user_basics.ssi:66 en/user_basics.ssi:78
-#: en/user_basics.ssi:88 en/user_basics.ssi:102 en/user_basics.ssi:110
-#: en/user_basics.ssi:118 en/user_basics.ssi:128 en/user_basics.ssi:140
-#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
-#: en/user_basics.ssi:182 en/user_basics.ssi:190 en/user_basics.ssi:200
-#: en/user_basics.ssi:220 en/user_basics.ssi:253 en/user_basics.ssi:269
-#: en/user_basics.ssi:277 en/user_basics.ssi:297 en/user_basics.ssi:322
-#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
-#: en/user_customization-contents.ssi:66
+#: en/other_procedures.ssi:58 en/project_bugs.ssi:58 en/user_basics.ssi:32
+#: en/user_basics.ssi:42 en/user_basics.ssi:54 en/user_basics.ssi:66
+#: en/user_basics.ssi:78 en/user_basics.ssi:88 en/user_basics.ssi:102
+#: en/user_basics.ssi:110 en/user_basics.ssi:118 en/user_basics.ssi:128
+#: en/user_basics.ssi:142 en/user_basics.ssi:154 en/user_basics.ssi:162
+#: en/user_basics.ssi:170 en/user_basics.ssi:184 en/user_basics.ssi:192
+#: en/user_basics.ssi:202 en/user_basics.ssi:222 en/user_basics.ssi:255
+#: en/user_basics.ssi:271 en/user_basics.ssi:279 en/user_basics.ssi:299
+#: en/user_basics.ssi:324 en/user_customization-contents.ssi:34
+#: en/user_customization-contents.ssi:43 en/user_customization-contents.ssi:66
#: en/user_customization-internationalization.ssi:10
#: en/user_customization-internationalization.ssi:18
#: en/user_customization-internationalization.ssi:26
#: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:16 en/user_customization-packages.ssi:24
-#: en/user_customization-packages.ssi:36 en/user_customization-packages.ssi:45
-#: en/user_customization-packages.ssi:59 en/user_customization-packages.ssi:73
-#: en/user_customization-packages.ssi:103
-#: en/user_customization-packages.ssi:111
-#: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:166
-#: en/user_customization-packages.ssi:176
-#: en/user_customization-packages.ssi:186
-#: en/user_customization-packages.ssi:196 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:104
-#: en/user_installation.ssi:118 en/user_installation.ssi:135
-#: en/user_managing_a_configuration.ssi:24
+#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
+#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
+#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:90
+#: en/user_customization-packages.ssi:120
+#: en/user_customization-packages.ssi:133
+#: en/user_customization-packages.ssi:143
+#: en/user_customization-packages.ssi:153
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:261
+#: en/user_customization-packages.ssi:273
+#: en/user_customization-packages.ssi:283 en/user_examples.ssi:12
+#: en/user_examples.ssi:27 en/user_examples.ssi:37 en/user_examples.ssi:75
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:76 en/user_installation.ssi:84
+#: en/user_installation.ssi:104 en/user_installation.ssi:118
+#: en/user_installation.ssi:135 en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
-#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:46
-#: en/user_overview.ssi:90 en/user_overview.ssi:98
+#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:36
+#: en/user_overview.ssi:80 en/user_overview.ssi:88
msgid "code{"
msgstr "code{"
#. type: Plain text
-#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:121 en/about_manual.ssi:134 en/about_manual.ssi:142
+#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:165
#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
@@ -101,46 +102,48 @@ msgstr "code{"
#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
#: en/other_live-environment.ssi:138 en/other_procedures.ssi:16
#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
-#: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
-#: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
-#: en/other_use-cases.ssi:137 en/project_bugs.ssi:62 en/user_basics.ssi:36
-#: en/user_basics.ssi:46 en/user_basics.ssi:60 en/user_basics.ssi:72
-#: en/user_basics.ssi:82 en/user_basics.ssi:94 en/user_basics.ssi:106
-#: en/user_basics.ssi:114 en/user_basics.ssi:122 en/user_basics.ssi:132
-#: en/user_basics.ssi:146 en/user_basics.ssi:156 en/user_basics.ssi:164
-#: en/user_basics.ssi:172 en/user_basics.ssi:186 en/user_basics.ssi:194
-#: en/user_basics.ssi:204 en/user_basics.ssi:245 en/user_basics.ssi:257
-#: en/user_basics.ssi:273 en/user_basics.ssi:281 en/user_basics.ssi:308
-#: en/user_basics.ssi:347 en/user_customization-contents.ssi:39
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:70
+#: en/project_bugs.ssi:62 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:60 en/user_basics.ssi:72 en/user_basics.ssi:82
+#: en/user_basics.ssi:94 en/user_basics.ssi:106 en/user_basics.ssi:114
+#: en/user_basics.ssi:122 en/user_basics.ssi:132 en/user_basics.ssi:148
+#: en/user_basics.ssi:158 en/user_basics.ssi:166 en/user_basics.ssi:174
+#: en/user_basics.ssi:188 en/user_basics.ssi:196 en/user_basics.ssi:206
+#: en/user_basics.ssi:247 en/user_basics.ssi:259 en/user_basics.ssi:275
+#: en/user_basics.ssi:283 en/user_basics.ssi:310 en/user_basics.ssi:349
+#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:70
#: en/user_customization-internationalization.ssi:14
#: en/user_customization-internationalization.ssi:22
#: en/user_customization-internationalization.ssi:30
#: en/user_customization-internationalization.ssi:42
-#: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
-#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
-#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
-#: en/user_customization-packages.ssi:107
-#: en/user_customization-packages.ssi:115
-#: en/user_customization-packages.ssi:135
-#: en/user_customization-packages.ssi:172
-#: en/user_customization-packages.ssi:182
-#: en/user_customization-packages.ssi:192
-#: en/user_customization-packages.ssi:202 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 en/user_installation.ssi:108
-#: en/user_installation.ssi:123 en/user_installation.ssi:138
-#: en/user_managing_a_configuration.ssi:31
+#: en/user_customization-packages.ssi:23 en/user_customization-packages.ssi:36
+#: en/user_customization-packages.ssi:48 en/user_customization-packages.ssi:62
+#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:94
+#: en/user_customization-packages.ssi:125
+#: en/user_customization-packages.ssi:139
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:159
+#: en/user_customization-packages.ssi:169
+#: en/user_customization-packages.ssi:181
+#: en/user_customization-packages.ssi:197
+#: en/user_customization-packages.ssi:265
+#: en/user_customization-packages.ssi:277
+#: en/user_customization-packages.ssi:287 en/user_examples.ssi:17
+#: en/user_examples.ssi:31 en/user_examples.ssi:41 en/user_examples.ssi:84
+#: 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
+#: en/user_installation.ssi:108 en/user_installation.ssi:123
+#: en/user_installation.ssi:138 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
-#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:84
-#: en/user_overview.ssi:94 en/user_overview.ssi:102
+#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:74
+#: en/user_overview.ssi:84 en/user_overview.ssi:92
msgid "}code"
msgstr "}code"
#. type: Plain text
#: en/user_customization-internationalization.ssi:2
-msgid "B~ Customizing locale and language"
+msgid ":B~ Customizing locale and language"
msgstr ""
#. type: Plain text
diff --git a/manual/po/ro/user_customization-overview.ssi.po b/manual/po/ro/user_customization-overview.ssi.po
index 83669bd..008b431 100644
--- a/manual/po/ro/user_customization-overview.ssi.po
+++ b/manual/po/ro/user_customization-overview.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-11-11 11:58-0400\n"
+"POT-Creation-Date: 2010-11-27 09:40-0400\n"
"PO-Revision-Date: 2010-10-22 08:57-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -19,7 +19,7 @@ msgstr ""
#. type: Plain text
#: en/user_customization-contents.ssi:2 en/user_customization-overview.ssi:2
-msgid "B~ Customizing contents"
+msgid ":B~ Customizing contents"
msgstr ""
#. type: Plain text
diff --git a/manual/po/ro/user_customization-packages.ssi.po b/manual/po/ro/user_customization-packages.ssi.po
index 6d90465..9c7203a 100644
--- a/manual/po/ro/user_customization-packages.ssi.po
+++ b/manual/po/ro/user_customization-packages.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-11-12 16:21-0400\n"
+"POT-Creation-Date: 2010-11-28 08:44-0400\n"
"PO-Revision-Date: 2010-10-22 08:58-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -18,52 +18,61 @@ msgstr ""
"20)) ? 1 : 2;\n"
#. type: Plain text
-#: en/about_manual.ssi:80 en/about_manual.ssi:88 en/about_manual.ssi:96
-#: en/about_manual.ssi:108 en/about_manual.ssi:121 en/about_manual.ssi:134
-#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
-#: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
-#: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
-#: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
-#: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
-#: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
-#: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
-#: en/other_faq.ssi:41 en/other_faq.ssi:83 en/other_faq.ssi:103
-#: en/other_faq.ssi:117 en/other_faq.ssi:137 en/other_faq.ssi:151
-#: en/other_faq.ssi:198 en/other_faq.ssi:245 en/other_faq.ssi:261
-#: en/other_faq.ssi:287 en/other_faq.ssi:299 en/other_faq.ssi:314
-#: en/other_faq.ssi:333 en/other_faq.ssi:345 en/other_faq.ssi:353
-#: en/other_faq.ssi:364 en/other_faq.ssi:374 en/other_howtos.ssi:16
-#: en/other_howtos.ssi:43 en/other_live-environment.ssi:14
-#: en/other_live-environment.ssi:30 en/other_live-environment.ssi:51
-#: en/other_live-environment.ssi:61 en/other_live-environment.ssi:69
-#: en/other_live-environment.ssi:77 en/other_live-environment.ssi:85
-#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
-#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
-#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
-#: en/other_procedures.ssi:58 en/project_bugs.ssi:58 en/user_basics.ssi:32
-#: en/user_basics.ssi:42 en/user_basics.ssi:54 en/user_basics.ssi:66
-#: en/user_basics.ssi:78 en/user_basics.ssi:88 en/user_basics.ssi:102
-#: en/user_basics.ssi:110 en/user_basics.ssi:118 en/user_basics.ssi:128
-#: en/user_basics.ssi:140 en/user_basics.ssi:152 en/user_basics.ssi:160
-#: en/user_basics.ssi:168 en/user_basics.ssi:182 en/user_basics.ssi:190
-#: en/user_basics.ssi:200 en/user_basics.ssi:220 en/user_basics.ssi:253
-#: en/user_basics.ssi:269 en/user_basics.ssi:277 en/user_basics.ssi:297
-#: en/user_basics.ssi:322 en/user_customization-contents.ssi:34
-#: en/user_customization-contents.ssi:43 en/user_customization-contents.ssi:66
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
+#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
+#: en/about_manual.ssi:170 en/other_coding-style.ssi:28
+#: en/other_coding-style.ssi:38 en/other_coding-style.ssi:51
+#: en/other_coding-style.ssi:61 en/other_coding-style.ssi:88
+#: en/other_coding-style.ssi:96 en/other_coding-style.ssi:106
+#: en/other_coding-style.ssi:117 en/other_common-tasks.ssi:32
+#: en/other_customization-backports.ssi:8 en/other_customization-bootup.ssi:30
+#: en/other_customization-bootup.ssi:39 en/other_faq.ssi:41
+#: en/other_faq.ssi:83 en/other_faq.ssi:103 en/other_faq.ssi:117
+#: en/other_faq.ssi:137 en/other_faq.ssi:151 en/other_faq.ssi:198
+#: en/other_faq.ssi:245 en/other_faq.ssi:261 en/other_faq.ssi:287
+#: en/other_faq.ssi:299 en/other_faq.ssi:314 en/other_faq.ssi:333
+#: en/other_faq.ssi:345 en/other_faq.ssi:353 en/other_faq.ssi:364
+#: en/other_faq.ssi:374 en/other_howtos.ssi:16 en/other_howtos.ssi:43
+#: en/other_live-environment.ssi:14 en/other_live-environment.ssi:30
+#: en/other_live-environment.ssi:51 en/other_live-environment.ssi:61
+#: en/other_live-environment.ssi:69 en/other_live-environment.ssi:77
+#: en/other_live-environment.ssi:85 en/other_live-environment.ssi:93
+#: en/other_live-environment.ssi:116 en/other_live-environment.ssi:124
+#: en/other_live-environment.ssi:133 en/other_procedures.ssi:12
+#: en/other_procedures.ssi:46 en/other_procedures.ssi:58
+#: en/project_bugs.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/user_basics.ssi:54 en/user_basics.ssi:66 en/user_basics.ssi:78
+#: en/user_basics.ssi:88 en/user_basics.ssi:102 en/user_basics.ssi:110
+#: en/user_basics.ssi:118 en/user_basics.ssi:128 en/user_basics.ssi:142
+#: en/user_basics.ssi:154 en/user_basics.ssi:162 en/user_basics.ssi:170
+#: en/user_basics.ssi:184 en/user_basics.ssi:192 en/user_basics.ssi:202
+#: en/user_basics.ssi:222 en/user_basics.ssi:255 en/user_basics.ssi:271
+#: en/user_basics.ssi:279 en/user_basics.ssi:299 en/user_basics.ssi:324
+#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
+#: en/user_customization-contents.ssi:66
#: en/user_customization-internationalization.ssi:10
#: en/user_customization-internationalization.ssi:18
#: en/user_customization-internationalization.ssi:26
#: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:26
-#: en/user_customization-packages.ssi:38 en/user_customization-packages.ssi:47
-#: en/user_customization-packages.ssi:61 en/user_customization-packages.ssi:75
-#: en/user_customization-packages.ssi:105
-#: en/user_customization-packages.ssi:113
+#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
+#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
+#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:90
+#: en/user_customization-packages.ssi:120
#: en/user_customization-packages.ssi:133
-#: en/user_customization-packages.ssi:168
-#: en/user_customization-packages.ssi:178
-#: en/user_customization-packages.ssi:188
-#: en/user_customization-packages.ssi:198 en/user_examples.ssi:24
+#: en/user_customization-packages.ssi:143
+#: en/user_customization-packages.ssi:153
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:261
+#: en/user_customization-packages.ssi:273
+#: en/user_customization-packages.ssi:283 en/user_examples.ssi:14
+#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
+#: en/user_examples.ssi:64 en/user_examples.ssi:80 en/user_examples.ssi:90
+#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:131
+#: en/user_examples.ssi:139 en/user_examples.ssi:154 en/user_examples.ssi:162
+#: en/user_examples.ssi:188 en/user_examples.ssi:209 en/user_examples.ssi:217
#: 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
@@ -76,14 +85,15 @@ msgid "code{"
msgstr "code{"
#. type: Plain text
-#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
-#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
-#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
-#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
-#: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
-#: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
+#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:166
+#: en/about_manual.ssi:173 en/other_coding-style.ssi:34
+#: en/other_coding-style.ssi:45 en/other_coding-style.ssi:57
+#: en/other_coding-style.ssi:68 en/other_coding-style.ssi:92
+#: en/other_coding-style.ssi:100 en/other_coding-style.ssi:113
+#: en/other_coding-style.ssi:124 en/other_common-tasks.ssi:36
+#: en/other_customization-backports.ssi:16
#: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
#: en/other_faq.ssi:37 en/other_faq.ssi:46 en/other_faq.ssi:92
#: en/other_faq.ssi:108 en/other_faq.ssi:141 en/other_faq.ssi:155
@@ -101,27 +111,35 @@ msgstr "code{"
#: en/project_bugs.ssi:62 en/user_basics.ssi:36 en/user_basics.ssi:46
#: en/user_basics.ssi:60 en/user_basics.ssi:72 en/user_basics.ssi:82
#: en/user_basics.ssi:94 en/user_basics.ssi:106 en/user_basics.ssi:114
-#: en/user_basics.ssi:122 en/user_basics.ssi:132 en/user_basics.ssi:146
-#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
-#: en/user_basics.ssi:186 en/user_basics.ssi:194 en/user_basics.ssi:204
-#: en/user_basics.ssi:245 en/user_basics.ssi:257 en/user_basics.ssi:273
-#: en/user_basics.ssi:281 en/user_basics.ssi:308 en/user_basics.ssi:347
+#: en/user_basics.ssi:122 en/user_basics.ssi:132 en/user_basics.ssi:148
+#: en/user_basics.ssi:158 en/user_basics.ssi:166 en/user_basics.ssi:174
+#: en/user_basics.ssi:188 en/user_basics.ssi:196 en/user_basics.ssi:206
+#: en/user_basics.ssi:247 en/user_basics.ssi:259 en/user_basics.ssi:275
+#: en/user_basics.ssi:283 en/user_basics.ssi:310 en/user_basics.ssi:349
#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
#: en/user_customization-contents.ssi:70
#: en/user_customization-internationalization.ssi:14
#: en/user_customization-internationalization.ssi:22
#: en/user_customization-internationalization.ssi:30
#: en/user_customization-internationalization.ssi:42
-#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:30
-#: en/user_customization-packages.ssi:43 en/user_customization-packages.ssi:51
-#: en/user_customization-packages.ssi:65 en/user_customization-packages.ssi:79
-#: en/user_customization-packages.ssi:109
-#: en/user_customization-packages.ssi:117
-#: en/user_customization-packages.ssi:137
-#: en/user_customization-packages.ssi:174
-#: en/user_customization-packages.ssi:184
-#: en/user_customization-packages.ssi:194
-#: en/user_customization-packages.ssi:204 en/user_examples.ssi:33
+#: en/user_customization-packages.ssi:23 en/user_customization-packages.ssi:36
+#: en/user_customization-packages.ssi:48 en/user_customization-packages.ssi:62
+#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:94
+#: en/user_customization-packages.ssi:125
+#: en/user_customization-packages.ssi:139
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:159
+#: en/user_customization-packages.ssi:169
+#: en/user_customization-packages.ssi:181
+#: en/user_customization-packages.ssi:197
+#: en/user_customization-packages.ssi:265
+#: en/user_customization-packages.ssi:277
+#: en/user_customization-packages.ssi:287 en/user_examples.ssi:20
+#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:58
+#: en/user_examples.ssi:68 en/user_examples.ssi:86 en/user_examples.ssi:101
+#: en/user_examples.ssi:111 en/user_examples.ssi:123 en/user_examples.ssi:135
+#: en/user_examples.ssi:150 en/user_examples.ssi:158 en/user_examples.ssi:166
+#: en/user_examples.ssi:197 en/user_examples.ssi:213 en/user_examples.ssi:221
#: en/user_installation.ssi:42 en/user_installation.ssi:50
#: en/user_installation.ssi:60 en/user_installation.ssi:72
#: en/user_installation.ssi:80 en/user_installation.ssi:88
@@ -134,11 +152,6 @@ msgid "}code"
msgstr "}code"
#. type: Plain text
-#: en/user_basics.ssi:218 en/user_customization-packages.ssi:155
-msgid "% FIXME"
-msgstr ""
-
-#. type: Plain text
#: en/user_customization-packages.ssi:2
msgid ":B~ Customizing package installation"
msgstr ""
@@ -162,7 +175,7 @@ msgid ""
"options give some control over apt, or if you prefer, aptitude, at build "
"time when packages are installed. You may find these handy if you use a "
"proxy, want to disable installation of recommended packages to save space, "
-"or need to control which versions of packages are installed via apt pinning, "
+"or need to control which versions of packages are installed via APT pinning, "
"to name a few possibilities."
msgstr ""
@@ -173,431 +186,486 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:10
-msgid "3~ Debian repositories"
+msgid "3~ Distribution mirrors"
msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:12
-msgid "To set a local mirror to be used to at build time:"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:16
-msgid "$ lb config --mirror-bootstrap http://localhost/debian/"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:20
msgid ""
-"The chroot repository, specified by --mirror-chroot, defaults to the same as "
-"--mirror-bootstrap."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:22
-msgid ""
-"Each of the --mirror-* options governs which repository is used at various "
-"stages of the build. Recall from {Stages of the build}#stages-of-the-build "
-"that the *bootstrap* stage is when the chroot is initially populated by "
-"debootstrap with a minimal system, and the *chroot* stage is when the chroot "
-"used to construct the live system's filesystem is built. Thus, the "
-"corresponding mirror switches are used for those stages, and later, when the "
-"binary image is constructed, the --mirror-binary value is used, superceding "
-"any earlier repositories."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:24
-msgid "The generic mirror is added to the live system's /etc/apt/sources.list."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:28
-msgid "$ lb config --mirror-binary http://ftp.debian.org/debian/"
+"Each of the #{--mirror-*}# options governs which distribution mirror is used "
+"at various stages of the build. Recall from {Stages of the build}#stages-of-"
+"the-build that the *bootstrap* stage is when the chroot is initially "
+"populated by debootstrap with a minimal system, and the *chroot* stage is "
+"when the chroot used to construct the live system's filesystem is built. "
+"Thus, the corresponding mirror switches are used for those stages, and "
+"later, in the *binary* stage, the #{--mirror-binary}# and #{--mirror-binary-"
+"security}# values are used, superceding any mirrors used in an earlier stage."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:32
+#: en/user_customization-packages.ssi:14
msgid ""
-"Note: It is not used for building the live system but to install new "
-"software while using the live system."
+"3~distribution-mirrors-build-time Distribution mirrors used at build time"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:34
+#: en/user_customization-packages.ssi:16
msgid ""
-"It can be disabled by setting the binary mirror to the same value as the "
-"chroot mirror."
+"To set the distribution mirrors used at build time to point at a local "
+"mirror, it is sufficient to set #{--mirror-bootstrap}# and #{--mirror-chroot-"
+"security}# as follows."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:36
+#: en/user_customization-packages.ssi:21
+#, no-wrap
msgid ""
-"Note: the same applies for mirror chroot security and mirror binary security"
+"$ lb config --mirror-bootstrap http://localhost/debian/ \\\n"
+" --mirror-chroot-security http://localhost/debian-security/\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:41
+#: en/user_customization-packages.ssi:25
msgid ""
-"$ lb config --mirror-chroot-security {URL} $ lb config --mirror-binary-"
-"security {URL}"
+"The chroot mirror, specified by #{--mirror-chroot}#, defaults to the #{--"
+"mirror-bootstrap}# value."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:45
-msgid "If you don't want to include apt indices, you can skip those with:"
+#: en/user_customization-packages.ssi:27
+msgid "3~ Distribution mirrors used at run time"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:49
-msgid "$ lb config --binary-indices false"
+#: en/user_customization-packages.ssi:29
+msgid ""
+"The #{--mirror-binary*}# options govern the distribution mirrors placed in "
+"the binary image. These may be used to install additional packages while "
+"running the live system. The 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
-#: en/user_customization-packages.ssi:53
+#: en/user_customization-packages.ssi:34
+#, no-wrap
msgid ""
-"This will not influence the entries in /etc/apt/sources.list, but only if /"
-"var/lib/apt contains the indices files or not (and by that making the image "
-"smaller)."
+"$ lb config --mirror-binary http://mirror/debian/ \\\n"
+" --mirror-binary-security http://mirror/debian-security/\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:55
-msgid "3~ Own repository"
+#: en/user_customization-packages.ssi:38
+msgid "3~ Additional repositories"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:57
+#: en/user_customization-packages.ssi:40
msgid ""
"To add more repositories (e.g. backports, experimental or custom packages, "
"etc.), create #{config/chroot_sources/your-repository.{chroot,binary}}# "
-"files."
+"files. As with the #{--mirror-*}# options, these govern the repositories "
+"used in the *chroot* stage when building the image, and in the *binary* "
+"stage, i.e. for use when running the live system."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:59
+#: en/user_customization-packages.ssi:42
msgid ""
-"e.g. #{config/chroot_sources/live.chroot}# allows you to install packages "
-"from the debian live snapshot repository at live system build time (you have "
-"to add the packages in your package list):"
+"For example, #{config/chroot_sources/live.chroot}# allows you to install "
+"packages from the debian live snapshot repository at live system build time."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:63
+#: en/user_customization-packages.ssi:46
msgid "deb http://live.debian.net/ sid-snapshots main contrib non-free"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:67
+#: en/user_customization-packages.ssi:50
msgid ""
-"If you add the line to #{config/chroot_sources/live.binary}# the repository "
-"will be added to your live-system's #{/etc/apt/sources.list}#."
+"If you add the same line to #{config/chroot_sources/live.binary}#, the "
+"repository will be added to your live system's #{/etc/apt/sources.list.d/}# "
+"directory."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:69
+#: en/user_customization-packages.ssi:52
msgid "If such files exist, they will be picked up automatically."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:71
+#: en/user_customization-packages.ssi:54
msgid ""
-"You can also put the gpg-key used to sign the repository into config/"
-"chroot_sources/your-repository.{binary,chroot}.gpg"
+"You should also put the GPG key used to sign the repository into #{config/"
+"chroot_sources/your-repository.{binary,chroot}.gpg}# files."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:73
+#: en/user_customization-packages.ssi:56
msgid ""
"Note: some preconfigured package repositories are available for easy "
-"selection through the --repository switch, e.g. for enabling live snapshots, "
-"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
-#: en/user_customization-packages.ssi:77
+#: en/user_customization-packages.ssi:60
msgid "$ lb config --repository live.debian.net"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:81
-msgid "3~ Package installation"
+#: en/user_customization-packages.ssi:64
+msgid "2~choosing-packages-to-install Choosing packages to install"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:83
+#: en/user_customization-packages.ssi:66
msgid ""
-"You can elect to use either #{apt}# or #{aptitude}# when installing "
-"packages. Which utility is used is governed by the #{LB_APT}# variable in #"
-"{config/chroot}# or by the #{--apt}# argument to #{lb config}#:"
+"There are a number of ways to choose which packages live-build will install "
+"in your image, covering a variety of different needs. You can simply name "
+"individual packages to install, either with the #{--packages}# option for a "
+"few packages, or in a package list of your own for larger numbers. You can "
+"also choose larger predefined lists of packages, or use APT tasks. And "
+"finally, you may place package files in your #{config/}# tree, which is well "
+"suited to testing of new or experimental packages before they are available "
+"from a repository."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:85
-msgid ""
-"_* #{apt}#: Specifying a missing package causes package installation to "
-"fail, which may not be the desired behaviour. This is the default setting "
-"for building images for Lenny or later."
+#: en/user_customization-packages.ssi:68
+msgid "3~ Choosing a few packages"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:87
+#: en/user_customization-packages.ssi:70
msgid ""
-"_* #{aptitude}#: Specifying a missing package causes package installation to "
-"succeed, which may not be the desired behaviour. This is the default setting "
-"for building images for Etch."
+"When the number of packages added is small, simply specify #{--packages}#. "
+"For example:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:89
-msgid "2~ Installing additional packages"
+#: en/user_customization-packages.ssi:74
+msgid "$ lb config --packages \"package1 package2 package3\""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:91
+#: en/user_customization-packages.ssi:78
msgid ""
-"live-helper has a number of mechanisms for indicating that additional "
-"packages should be installed, including:"
+"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."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:93
-msgid "_* The #{LB_PACKAGES}# variable"
+#: en/user_customization-packages.ssi:80
+msgid ""
+"If you need to specify a large number of packages to be installed or you "
+"need flexibility regarding which packages to install, use package lists as "
+"discussed in the following section, {Package lists}#package-lists."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:95
-msgid "_* Package lists"
+#: en/user_customization-packages.ssi:82
+msgid "3~package-lists Package lists"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:97
-msgid "_* Local packages (#{chroot_local-packages/}#)"
+#: en/user_customization-packages.ssi:84
+msgid ""
+"Package lists are a powerful way of expressing which packages should be "
+"installed. The list syntax supports included files and conditional sections "
+"which makes it easy to build lists from other lists and adapt them for use "
+"in multiple configurations. You can use predefined package lists, providing "
+"in a modular fashion package selections from each of the major desktop "
+"environments and some special purpose lists, as well as standard lists the "
+"others are based upon. You can also provide your own package lists, or use a "
+"combination of both."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:99
-msgid "_* Tasks"
+#: en/user_customization-packages.ssi:86
+msgid "3~ Predefined package lists"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:101
-msgid "3~ The #{LB_PACKAGES}# variable"
+#: en/user_customization-packages.ssi:88
+msgid ""
+"The simplest way to use lists is to specify one or more predefined lists "
+"with the #{--packages-lists}# option. For example:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:103
-msgid ""
-"To install additional packages, simply add them to the #{LB_PACKAGES}# "
-"variable in #{config/chroot}#. For example:"
+#: en/user_customization-packages.ssi:92
+msgid "$ lb config --packages-lists \"gnome-core rescue\""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:107
-msgid "LB_PACKAGES=\"package1 package2 package3 ... \""
+#: en/user_customization-packages.ssi:96
+msgid ""
+"In addition to these lists, live-build supports four virtual package lists: #"
+"{gnome-desktop}#, #{kde-desktop}#, #{lxde-desktop}# and #{xfce-desktop}#, "
+"each of which provide a more extensive selection of packages that "
+"corresponds with Debian Installer defaults for these desktop environments. "
+"See {Desktop and language tasks}#desktop-and-language-tasks for more details."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:111
-msgid "You can also specify initial values on the command line:"
+#: en/user_customization-packages.ssi:98
+msgid ""
+"Note: The prebuilt GNOME, KDE, LXDE and XFCE images available for download "
+"at http://live.debian.net are built using the corresponding virtual #{*-"
+"desktop}# lists."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:115
-msgid "$ lb config --packages \"package1 package2 package3\""
+#: en/user_customization-packages.ssi:100
+msgid ""
+"The default location for the list files on your system is #{/usr/share/live/"
+"build/lists/}#. To determine the packages in a given list, read the "
+"corresponding file, paying attention to included files and conditionals as "
+"described in the following sections."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:119
-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."
+#: en/user_customization-packages.ssi:102
+msgid "3~ Local package lists"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:121
-msgid "% FIXME: <xref linkend=\"package-installation\"/>"
+#: en/user_customization-packages.ssi:104
+msgid ""
+"You may supplement or replace entirely the supplied lists using local "
+"package lists stored in #{config/chroot_local-packageslists/}#."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:123
+#: en/user_customization-packages.ssi:106
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."
+"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."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:125
-msgid "% FIXME: <xref linkend=\"package-lists\"/>"
+#: en/user_customization-packages.ssi:108
+msgid "3~ Local binary package lists"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:127
-msgid "3~ Package lists"
+#: en/user_customization-packages.ssi:110
+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 "
+"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."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:129
+#: en/user_customization-packages.ssi:112
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 "
-"provide sensible default package selections for the major desktop "
-"environments, as well as standard systems."
+"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:131
-msgid "To specify one or more package list, you can use:"
+#: en/user_customization-packages.ssi:114
+msgid "3~ Extending a provided package list using includes"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:135
-msgid "$ lb config --packages-lists \"list1 list2 list3\""
+#: en/user_customization-packages.ssi:116
+msgid ""
+"The package lists that are included with live-build make extensive use of "
+"includes. Refer to these in the #{/usr/share/live/build/lists/}# directory, "
+"as they serve as good examples of how to write your own lists."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:139
+#: en/user_customization-packages.ssi:118
msgid ""
-"Note: Package lists that are distributed with live-build reside in the #{/"
-"usr/share/live/build/lists}# directory."
+"For example, to make a list that includes the predefined #{gnome}# list plus "
+"iceweasel, create #{config/chroot_local-packageslists/mygnome.list}# with "
+"the following contents:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:141
-#, no-wrap
-msgid "*{Local packages lists}*\n"
+#: en/user_customization-packages.ssi:123
+msgid "#include <gnome> iceweasel"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:143
+#: en/user_customization-packages.ssi:127
+msgid "3~ Using conditionals inside package lists"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:129
msgid ""
-"You may supplement the supplied lists using local package lists stored in #"
-"{config/chroot_local-packageslists}#."
+"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:145
+#: en/user_customization-packages.ssi:131
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 "
-"distributed with live-build. This can cause undesired effects, we therefore "
-"recommend to use unique names for local packages lists."
+"For example, to install #{ia32-libs}# if the #{--architecture amd64}# is "
+"specified:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:147
-#, no-wrap
-msgid "*{Local binary packages lists}*\n"
+#: en/user_customization-packages.ssi:137
+msgid "#if ARCHITECTURE amd64 ia32-libs #endif"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:141
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 "
-"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."
+"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
+#: en/user_customization-packages.ssi:147
+msgid "#if ARCHITECTURE i386 amd64 memtest86+ #endif"
msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:151
msgid ""
-"Package lists that exist in this directory need to have a .list suffix in "
-"order to be processed."
+"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
-#: en/user_customization-packages.ssi:153
-#, no-wrap
-msgid "*{Extending a provided package list using includes}*\n"
+#: en/user_customization-packages.ssi:157
+msgid "#if ARCHIVE_AREAS contrib non-free vrms #endif"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:162
-msgid "% code{ % % #include <gnome> % iceweasel % % }code"
+#: en/user_customization-packages.ssi:161
+msgid "A conditional may surround an #{#include}# directive:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:164
-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}# "
-"directory."
+#: en/user_customization-packages.ssi:167
+msgid "#if ARCHITECTURE amd64 #include <gnome-full> #endif"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:166
-#, no-wrap
-msgid "*{Using conditionals inside packages lists}*\n"
+#: en/user_customization-packages.ssi:171
+msgid "The nesting of conditionals is not supported."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:172
-msgid "#if ARCHITECTURE amd64 ia32-libs #endif"
+#: en/user_customization-packages.ssi:173
+msgid "3~ Tasks"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:176
-msgid "or if #{LB_ARCHITECTURE}# is set to #{i386}# or #{amd64}#:"
+#: en/user_customization-packages.ssi:175
+msgid ""
+"The Debian Installer offers the user choices of a number of preselected "
+"lists of packages, each one focused on a particular kind of system, or task "
+"a system may be used for, such as \"Graphical desktop environment\", \"Mail "
+"server\" or \"Laptop\". These lists are called \"tasks\" and are supported "
+"by APT through the \"Task:\" field. You can specify one or more tasks in "
+"live-build via the #{--tasks}# option, as in the example below."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:182
-msgid "#if ARCHITECTURE i386 amd64 memtest86+ #endif"
+#: en/user_customization-packages.ssi:179
+msgid "$ lb config --tasks \"mail-server file-server\""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:186
-msgid "or if #{LB_ARCHIVE_AREAS}# contains either #{contrib}# or #{non-free}#:"
+#: en/user_customization-packages.ssi:183
+msgid ""
+"The primary tasks available in the Debian Installer can be listed with #"
+"{tasksel --list-tasks}# in the live system. The contents of any task, "
+"including ones not included in this list, may be examined with #{tasksel --"
+"task-packages}#."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:192
-msgid "#if ARCHIVE_AREAS contrib non-free vrms #endif"
+#: en/user_customization-packages.ssi:185
+msgid "3~desktop-and-language-tasks Desktop and language tasks"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:196
-msgid "A conditional may surround an #{#include}# directive:"
+#: en/user_customization-packages.ssi:187
+msgid ""
+"Desktop and language tasks are special cases. In the Debian Installer, if "
+"the medium was prepared for a particular desktop environment flavour, the "
+"corresponding task will be automatically installed. Thus, there are there "
+"are #{gnome-desktop}#, #{kde-desktop}#, #{lxde-desktop}# and #{xfce-desktop}"
+"# tasks, none of which are offered in #{tasksel}#'s menu. Likewise, there "
+"are no menu entries for tasks for languages, but the user's language choice "
+"during the install influences the selection of corresponding language tasks."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:202
-msgid "#if ARCHITECTURE amd64 #include <gnome-full> #endif"
+#: en/user_customization-packages.ssi:189
+msgid ""
+"In live-build, therefore, these special cases are also given special "
+"consideration, but with three notable differences at the time of writing."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:206
+#: en/user_customization-packages.ssi:191
msgid ""
-"Any live-build configuration variable that begins with #{LB_}# can be tested "
-"in this way."
+"First, there is no provision made yet automatically for language tasks, "
+"although a subset of those packages are included if you specify #{lb config "
+"--language}#. If you need those tasks, which include such things as language-"
+"specific fonts and input-method packages, you need to specify them in your "
+"configuration. For example:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:208
-msgid "The nesting of conditionals is not supported."
+#: en/user_customization-packages.ssi:195
+msgid ""
+"$ lb config --tasks \"japanese japanese-desktop japanese-gnome-desktop\""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:210
-msgid "3~ Tasks"
+#: en/user_customization-packages.ssi:199
+msgid ""
+"Second, live-build supports #{*-desktop}# virtual package lists for each of "
+"the desktop flavours mentioned above, which select the #{standard-x11}# "
+"predefined package list, the corresponding #{*-desktop}# task and three "
+"additional tasks: #{desktop}#, #{standard}# and #{laptop}#. So, for example, "
+"if you specify #{--packages gnome-desktop}#, it is equivalent to specifying #"
+"{--packages standard-x11 --tasks \"gnome-desktop desktop standard laptop\"}#."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:212
-msgid "%FIXME"
+#: en/user_customization-packages.ssi:201
+msgid ""
+"Third, if any of the tasks for these desktop flavours are selected, either "
+"explicitly through #{--tasks}# or implicitly by #{--packages}#, live-build "
+"will preseed the corresponding desktop value for Debian Installer (if it is "
+"included) to ensure it follows its own rules for installing different "
+"desktop flavours."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:214
+#: en/user_customization-packages.ssi:203
msgid "2~ Installing modified or third-party packages"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:205
msgid ""
"Whilst it is against the philosophy of Debian Live, it may sometimes be "
"necessary to build a Live system with modified versions of packages that are "
@@ -608,7 +676,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:218
+#: en/user_customization-packages.ssi:207
msgid ""
"This section does not cover advice regarding building or maintaining "
"modified packages. Joachim Breitner's 'How to fork privately' method from "
@@ -619,95 +687,90 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:220
+#: en/user_customization-packages.ssi:209
msgid "There are two ways of installing modified custom packages:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:222
+#: en/user_customization-packages.ssi:211
msgid "_* #{chroot_local-packages}#"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:224
+#: en/user_customization-packages.ssi:213
msgid "_* Using a custom APT repository"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:226
+#: en/user_customization-packages.ssi:215
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:228
+#: en/user_customization-packages.ssi:217
msgid "3~ Using #{chroot_local-packages}# to install custom packages"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:230
+#: en/user_customization-packages.ssi:219
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:232
+#: en/user_customization-packages.ssi:221
msgid ""
"Packages *{must}* be named in the prescribed way. One simple way to do this "
"is to use #{dpkg-name}#."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:234
+#: en/user_customization-packages.ssi:223
msgid ""
"Using #{chroot_local-packages}# for installation of custom packages has "
"disadvantages:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:236
-msgid "_* It is not possible to use secure APT"
+#: en/user_customization-packages.ssi:225
+msgid "_* It is not possible to use secure APT."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:238
+#: en/user_customization-packages.ssi:227
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:240
+#: en/user_customization-packages.ssi:229
msgid ""
"_* It does not lend itself to storing Debian Live configurations in revision "
-"control"
+"control."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:242
+#: en/user_customization-packages.ssi:231
msgid "3~ Using an APT repository to install custom packages"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:244
+#: en/user_customization-packages.ssi:233
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."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:246
-msgid "% FIXME: <xref linkend=\"lb-packages\"/>"
+"you must ensure that you specify the packages elsewhere. See {Choosing "
+"packages to install}#choosing-packages-to-install for details."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:248
+#: en/user_customization-packages.ssi:235
msgid ""
"Whilst it may seem unnecessary effort to create an APT repository to install "
"custom packages, the infrastructure can be easily re-used at a later date to "
@@ -715,12 +778,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:250
+#: en/user_customization-packages.ssi:237
msgid "3~ Custom packages and APT"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:252
+#: en/user_customization-packages.ssi:239
msgid ""
"live-build uses APT to install all packages into the live system so will "
"therefore inherit behaviours from this program. One relevant example is that "
@@ -730,7 +793,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:254
+#: en/user_customization-packages.ssi:241
msgid ""
"Because of this, you may wish to increment the version number in your custom "
"packages' #{debian/changelog}# files to ensure that your modified version is "
@@ -740,19 +803,152 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:256
+#: en/user_customization-packages.ssi:243
msgid "% FIXME: <xref linkend=\"apt-preferences\"/>"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:258
-msgid "3~ Altering APT preferences during Live system"
+#: en/user_customization-packages.ssi:245
+msgid "2~ Configuring APT at build time"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:247
+msgid ""
+"You can configure APT through a number of options applied only at build "
+"time. (APT configuration used in the running live system may be configured "
+"in the normal way for live system contents, that is, by including the "
+"appropriate configurations through #{config/chroot_local_includes/}#.) For a "
+"complete list, look for options starting with #{apt}# in the #{lb_config}# "
+"man page."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:249
+msgid "3~choosing-apt-or-aptitude Choosing apt or aptitude"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:251
+msgid ""
+"You can elect to use either #{apt}# or #{aptitude}# when installing packages "
+"at build time. Which utility is used is governed by the #{--apt}# argument "
+"to #{lb config}#. Choose the method implementing the preferred behaviour for "
+"package installation, the notable difference being how missing packages are "
+"handled."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:253
+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:255
+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:257
+msgid "3~ Using a proxy with APT"
msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:259
msgid ""
-"Whilst it may seem unnecessary effort to create an APT repository to install "
-"custom packages, the infrastructure can be easily re-used at a later date to "
-"offer updates of the modified package."
+"One commonly required APT configuration is to deal with building an image "
+"behind a proxy. You may specify your APT proxy with the #{--apt-ftp-proxy}# "
+"or #{--apt-http-proxy}# options as needed, e.g."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:263
+msgid "lb config --apt-http-proxy http://proxy/"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:267
+msgid "3~ Tweaking APT to save space"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:269
+msgid ""
+"You may find yourself needing to save some space on the image media, in "
+"which case one or the other or both of the following options may be of "
+"interest."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:271
+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:275
+msgid "$ lb config --binary-indices false"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:279
+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 "
+"APT needs those indices in order to operate in the live system, so before "
+"performing #{apt-cache search}# or #{apt-get install}#, for instance, the "
+"user must #{apt-get update}# first to create those indices."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:281
+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:285
+msgid "$ lb config -apt-recommends false"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:289
+msgid ""
+"The tradeoff here is that recommended packages are defined as \"packages "
+"that would be found together with this one in all but unusual installations"
+"\" (Debian Policy Manual, 7.2). This may lead to some packages that you "
+"actually need being omitted, so we suggest you review the difference this "
+"makes to your packages list (see the #{binary.packages}# file generated by #"
+"{lb build}#) and re-include in your list any missing packages that you still "
+"want installed."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:291
+msgid "3~ Passing options to apt or aptitude"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:293
+msgid ""
+"If there is not an #{lb config}# option to alter APT's behaviour in the way "
+"you need, use #{--apt-options}# or #{--aptitude-options}# to pass any "
+"options through to your configured APT tool. See the man pages for #{apt}# "
+"and #{aptitude}# for details."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:295
+msgid "3~ APT pinning"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:297
+msgid "% FIXME: needs content"
msgstr ""
diff --git a/manual/po/ro/user_examples.ssi.po b/manual/po/ro/user_examples.ssi.po
index f9c2bc0..be8ad9b 100644
--- a/manual/po/ro/user_examples.ssi.po
+++ b/manual/po/ro/user_examples.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-11-04 16:34-0400\n"
+"POT-Creation-Date: 2010-11-28 07:51-0400\n"
"PO-Revision-Date: 2010-11-04 16:34-0400\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -18,52 +18,61 @@ msgstr ""
"20)) ? 1 : 2;\n"
#. type: Plain text
-#: en/about_manual.ssi:80 en/about_manual.ssi:88 en/about_manual.ssi:96
-#: en/about_manual.ssi:108 en/about_manual.ssi:121 en/about_manual.ssi:134
-#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
-#: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
-#: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
-#: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
-#: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
-#: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
-#: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
-#: en/other_faq.ssi:41 en/other_faq.ssi:83 en/other_faq.ssi:103
-#: en/other_faq.ssi:117 en/other_faq.ssi:137 en/other_faq.ssi:151
-#: en/other_faq.ssi:198 en/other_faq.ssi:245 en/other_faq.ssi:261
-#: en/other_faq.ssi:287 en/other_faq.ssi:299 en/other_faq.ssi:314
-#: en/other_faq.ssi:333 en/other_faq.ssi:345 en/other_faq.ssi:353
-#: en/other_faq.ssi:364 en/other_faq.ssi:374 en/other_howtos.ssi:16
-#: en/other_howtos.ssi:43 en/other_live-environment.ssi:14
-#: en/other_live-environment.ssi:30 en/other_live-environment.ssi:51
-#: en/other_live-environment.ssi:61 en/other_live-environment.ssi:69
-#: en/other_live-environment.ssi:77 en/other_live-environment.ssi:85
-#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
-#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
-#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
-#: en/other_procedures.ssi:58 en/project_bugs.ssi:58 en/user_basics.ssi:32
-#: en/user_basics.ssi:42 en/user_basics.ssi:54 en/user_basics.ssi:66
-#: en/user_basics.ssi:78 en/user_basics.ssi:88 en/user_basics.ssi:102
-#: en/user_basics.ssi:110 en/user_basics.ssi:118 en/user_basics.ssi:128
-#: en/user_basics.ssi:140 en/user_basics.ssi:152 en/user_basics.ssi:160
-#: en/user_basics.ssi:168 en/user_basics.ssi:182 en/user_basics.ssi:190
-#: en/user_basics.ssi:200 en/user_basics.ssi:220 en/user_basics.ssi:253
-#: en/user_basics.ssi:269 en/user_basics.ssi:277 en/user_basics.ssi:297
-#: en/user_basics.ssi:322 en/user_customization-contents.ssi:34
-#: en/user_customization-contents.ssi:43 en/user_customization-contents.ssi:66
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
+#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
+#: en/about_manual.ssi:170 en/other_coding-style.ssi:28
+#: en/other_coding-style.ssi:38 en/other_coding-style.ssi:51
+#: en/other_coding-style.ssi:61 en/other_coding-style.ssi:88
+#: en/other_coding-style.ssi:96 en/other_coding-style.ssi:106
+#: en/other_coding-style.ssi:117 en/other_common-tasks.ssi:32
+#: en/other_customization-backports.ssi:8 en/other_customization-bootup.ssi:30
+#: en/other_customization-bootup.ssi:39 en/other_faq.ssi:41
+#: en/other_faq.ssi:83 en/other_faq.ssi:103 en/other_faq.ssi:117
+#: en/other_faq.ssi:137 en/other_faq.ssi:151 en/other_faq.ssi:198
+#: en/other_faq.ssi:245 en/other_faq.ssi:261 en/other_faq.ssi:287
+#: en/other_faq.ssi:299 en/other_faq.ssi:314 en/other_faq.ssi:333
+#: en/other_faq.ssi:345 en/other_faq.ssi:353 en/other_faq.ssi:364
+#: en/other_faq.ssi:374 en/other_howtos.ssi:16 en/other_howtos.ssi:43
+#: en/other_live-environment.ssi:14 en/other_live-environment.ssi:30
+#: en/other_live-environment.ssi:51 en/other_live-environment.ssi:61
+#: en/other_live-environment.ssi:69 en/other_live-environment.ssi:77
+#: en/other_live-environment.ssi:85 en/other_live-environment.ssi:93
+#: en/other_live-environment.ssi:116 en/other_live-environment.ssi:124
+#: en/other_live-environment.ssi:133 en/other_procedures.ssi:12
+#: en/other_procedures.ssi:46 en/other_procedures.ssi:58
+#: en/project_bugs.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/user_basics.ssi:54 en/user_basics.ssi:66 en/user_basics.ssi:78
+#: en/user_basics.ssi:88 en/user_basics.ssi:102 en/user_basics.ssi:110
+#: en/user_basics.ssi:118 en/user_basics.ssi:128 en/user_basics.ssi:142
+#: en/user_basics.ssi:154 en/user_basics.ssi:162 en/user_basics.ssi:170
+#: en/user_basics.ssi:184 en/user_basics.ssi:192 en/user_basics.ssi:202
+#: en/user_basics.ssi:222 en/user_basics.ssi:255 en/user_basics.ssi:271
+#: en/user_basics.ssi:279 en/user_basics.ssi:299 en/user_basics.ssi:324
+#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
+#: en/user_customization-contents.ssi:66
#: en/user_customization-internationalization.ssi:10
#: en/user_customization-internationalization.ssi:18
#: en/user_customization-internationalization.ssi:26
#: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:16 en/user_customization-packages.ssi:24
-#: en/user_customization-packages.ssi:36 en/user_customization-packages.ssi:45
-#: en/user_customization-packages.ssi:59 en/user_customization-packages.ssi:73
-#: en/user_customization-packages.ssi:103
-#: en/user_customization-packages.ssi:111
-#: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:166
-#: en/user_customization-packages.ssi:176
-#: en/user_customization-packages.ssi:186
-#: en/user_customization-packages.ssi:196 en/user_examples.ssi:24
+#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
+#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
+#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:90
+#: en/user_customization-packages.ssi:120
+#: en/user_customization-packages.ssi:133
+#: en/user_customization-packages.ssi:143
+#: en/user_customization-packages.ssi:153
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:261
+#: en/user_customization-packages.ssi:273
+#: en/user_customization-packages.ssi:283 en/user_examples.ssi:14
+#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
+#: en/user_examples.ssi:64 en/user_examples.ssi:80 en/user_examples.ssi:90
+#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:131
+#: en/user_examples.ssi:139 en/user_examples.ssi:154 en/user_examples.ssi:162
+#: en/user_examples.ssi:188 en/user_examples.ssi:209 en/user_examples.ssi:217
#: 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
@@ -76,14 +85,15 @@ msgid "code{"
msgstr "code{"
#. type: Plain text
-#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
-#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
-#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
-#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
-#: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
-#: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
+#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:166
+#: en/about_manual.ssi:173 en/other_coding-style.ssi:34
+#: en/other_coding-style.ssi:45 en/other_coding-style.ssi:57
+#: en/other_coding-style.ssi:68 en/other_coding-style.ssi:92
+#: en/other_coding-style.ssi:100 en/other_coding-style.ssi:113
+#: en/other_coding-style.ssi:124 en/other_common-tasks.ssi:36
+#: en/other_customization-backports.ssi:16
#: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
#: en/other_faq.ssi:37 en/other_faq.ssi:46 en/other_faq.ssi:92
#: en/other_faq.ssi:108 en/other_faq.ssi:141 en/other_faq.ssi:155
@@ -101,27 +111,35 @@ msgstr "code{"
#: en/project_bugs.ssi:62 en/user_basics.ssi:36 en/user_basics.ssi:46
#: en/user_basics.ssi:60 en/user_basics.ssi:72 en/user_basics.ssi:82
#: en/user_basics.ssi:94 en/user_basics.ssi:106 en/user_basics.ssi:114
-#: en/user_basics.ssi:122 en/user_basics.ssi:132 en/user_basics.ssi:146
-#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
-#: en/user_basics.ssi:186 en/user_basics.ssi:194 en/user_basics.ssi:204
-#: en/user_basics.ssi:245 en/user_basics.ssi:257 en/user_basics.ssi:273
-#: en/user_basics.ssi:281 en/user_basics.ssi:308 en/user_basics.ssi:347
+#: en/user_basics.ssi:122 en/user_basics.ssi:132 en/user_basics.ssi:148
+#: en/user_basics.ssi:158 en/user_basics.ssi:166 en/user_basics.ssi:174
+#: en/user_basics.ssi:188 en/user_basics.ssi:196 en/user_basics.ssi:206
+#: en/user_basics.ssi:247 en/user_basics.ssi:259 en/user_basics.ssi:275
+#: en/user_basics.ssi:283 en/user_basics.ssi:310 en/user_basics.ssi:349
#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
#: en/user_customization-contents.ssi:70
#: en/user_customization-internationalization.ssi:14
#: en/user_customization-internationalization.ssi:22
#: en/user_customization-internationalization.ssi:30
#: en/user_customization-internationalization.ssi:42
-#: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
-#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
-#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
-#: en/user_customization-packages.ssi:107
-#: en/user_customization-packages.ssi:115
-#: en/user_customization-packages.ssi:135
-#: en/user_customization-packages.ssi:172
-#: en/user_customization-packages.ssi:182
-#: en/user_customization-packages.ssi:192
-#: en/user_customization-packages.ssi:202 en/user_examples.ssi:33
+#: en/user_customization-packages.ssi:23 en/user_customization-packages.ssi:36
+#: en/user_customization-packages.ssi:48 en/user_customization-packages.ssi:62
+#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:94
+#: en/user_customization-packages.ssi:125
+#: en/user_customization-packages.ssi:139
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:159
+#: en/user_customization-packages.ssi:169
+#: en/user_customization-packages.ssi:181
+#: en/user_customization-packages.ssi:197
+#: en/user_customization-packages.ssi:265
+#: en/user_customization-packages.ssi:277
+#: en/user_customization-packages.ssi:287 en/user_examples.ssi:20
+#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:58
+#: en/user_examples.ssi:68 en/user_examples.ssi:86 en/user_examples.ssi:101
+#: en/user_examples.ssi:111 en/user_examples.ssi:123 en/user_examples.ssi:135
+#: en/user_examples.ssi:150 en/user_examples.ssi:158 en/user_examples.ssi:166
+#: en/user_examples.ssi:197 en/user_examples.ssi:213 en/user_examples.ssi:221
#: en/user_installation.ssi:42 en/user_installation.ssi:50
#: en/user_installation.ssi:60 en/user_installation.ssi:72
#: en/user_installation.ssi:80 en/user_installation.ssi:88
@@ -134,95 +152,474 @@ msgid "}code"
msgstr "}code"
#. type: Plain text
-#: en/other_faq.ssi:85 en/other_faq.ssi:247 en/user_examples.ssi:26
+#: en/other_faq.ssi:85 en/other_faq.ssi:247 en/user_examples.ssi:92
+#: en/user_examples.ssi:141 en/user_examples.ssi:190
msgid "#!/bin/sh"
msgstr ""
#. type: Plain text
+#: en/user_basics.ssi:44 en/user_basics.ssi:120 en/user_basics.ssi:204
+#: en/user_examples.ssi:109 en/user_examples.ssi:156
+msgid "# lb build"
+msgstr ""
+
+#. type: Plain text
#: en/user_examples.ssi:2
-msgid "B~ Examples"
+msgid ":B~ Examples"
msgstr ""
#. type: Plain text
#: en/user_examples.ssi:4
-msgid "1~ Use Case Builds"
+msgid "1~examples Examples"
msgstr ""
#. type: Plain text
#: en/user_examples.ssi:6
msgid ""
-"This chapter covers example builds for specific use cases with Debian Live."
+"This chapter covers example builds for specific use cases with Debian Live. "
+"If you are new to building your own Debian Live images, we recommend you "
+"first look at the three tutorials in sequence, as each one teaches new "
+"techniques that will help you use and understand the remaining examples."
msgstr ""
#. type: Plain text
#: en/user_examples.ssi:8
-msgid "2~ VNC Kiosk Client"
+msgid "2~using-the-examples Using the examples"
msgstr ""
#. type: Plain text
#: en/user_examples.ssi:10
-msgid "Create an image with live-build to boot directly to a VNC server."
+msgid ""
+"To use these examples you need a system to build them on that meets the "
+"requirements listed in {Requirements}#requirements and has live-build "
+"installed as described in {Installing live-build}#installing-live-build."
msgstr ""
#. type: Plain text
#: en/user_examples.ssi:12
+msgid ""
+"Note that, for the sake of brevity, in these examples we do not specify a "
+"local mirror to use for the build. You can speed up downloads considerably "
+"if you use a local mirror. You may specify the options when you use #{lb "
+"config}#, as described in {Distribution mirrors used at build time}"
+"#distribution-mirrors-build-time, or for more convenience, set the default "
+"for your build system in #{/etc/live/build.conf}#. Simply create this file "
+"and in it, set the corresponding #{LB_MIRROR_*}# variables to your preferred "
+"mirror. For example:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:18
+msgid ""
+"LB_MIRROR_BOOTSTRAP=\"http://mirror/debian\" LB_MIRROR_CHROOT=\"http://"
+"mirror/debian\" LB_MIRROR_CHROOT_SECURITY=\"http://mirror/debian-security\""
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:22
+msgid "2~tutorial-1 Tutorial 1: A standard image"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:24
+#, no-wrap
+msgid "*{Use case:}* Create a simple first image, learning the basics of live-build\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:26
+msgid ""
+"In this tutorial, we will build a default ISO hybrid Debian Live image "
+"containing only base packages (no Xorg) and some Debian Live support "
+"packages, as a first exercise in using live-build."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:28
+msgid "You can't get much simpler than this:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:32
+msgid "$ mkdir tutorial1 ; cd tutorial1 ; lb config"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:36
+msgid ""
+"Examine the contents of the #{config/}# directory if you wish. You will see "
+"stored here a skeletal configuration, ready to customize or, in this case, "
+"use immediately to build a default image."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:38
+msgid ""
+"Now, as superuser, build the image, saving a log as you build with #{tee}#."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:42
+msgid "# lb_build 2>&1 | tee binary.log"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:46
+msgid ""
+"Assuming all goes well, after a while, the current directory will contain #"
+"{binary-hybrid.iso}#. This ISO hybrid image can be booted directly in a "
+"virtual machine as described in {Testing an ISO image with Qemu}#testing-iso-"
+"with-qemu and {Testing an ISO image with virtualbox-ose}#testing-iso-with-"
+"virtualbox, or else imaged onto optical media or a USB flash device as "
+"described in {Burning an ISO image to a physical medium}#burning-iso-image "
+"and {Copying USB/HDD image to a USB stick}#copying-usb-hdd-image, "
+"respectively."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:48
+msgid "2~tutorial-2 Tutorial 2: A web browser utility"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:50
+#, no-wrap
+msgid "*{Use case}* Create a web browser utility image, learning how to apply customizations\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:52
+msgid ""
+"In this tutorial, we will create an image suitable for use as a web browser "
+"utility, serving as an introduction to customizing Debian Live images."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:56
+msgid "mkdir tutorial2 ; cd tutorial2 ; lb config -p lxde --packages iceweasel"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:60
+msgid ""
+"Our choice of LXDE for this example reflects our desire to provide a minimal "
+"desktop environment, since the focus of the image is the single use we have "
+"in mind, the web browser. We could go even further and provide a default "
+"configuration for the web browser in #{config/chroot_local-includes/etc/"
+"iceweasel/profile/}#, or additional support packages for viewing various "
+"kinds of web content, but we leave this as an exercise for the reader."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:62
+msgid ""
+"Build the image, again as superuser, keeping a log as in {Tutorial 1}"
+"#tutorial-1:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:66 en/user_examples.ssi:219
+msgid "# lb build 2>&1 | tee binary.log"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:70
+msgid "Again, verify the image is OK and test, as in {Tutorial 1}#tutorial-1."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:72
+msgid "2~tutorial-3 Tutorial 3: A personalized image"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:74
+#, no-wrap
+msgid "*{Use case}* Create a project to build a personalized image, containing your favourite software to take with you on a USB stick wherever you go, and evolving in successive revisions as your needs and preferences change.\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:76
+msgid ""
+"Since we will be changing our personalized image over a number of revisions, "
+"and we want to track those changes, trying things experimentally and "
+"possibly reverting them if things don't work out, we will keep our "
+"configuration in the popular #{git}# version control system. We will also "
+"use the best practice of autoconfiguration via #{auto}# scripts as described "
+"in {Managing a configuration}#managing-a-configuration."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:78
+msgid "3~ First revision"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:84
+msgid ""
+"$ mkdir -p tutorial3/auto $ cp /usr/share/live/examples/auto/* tutorial3/"
+"auto/ $ cd tutorial3"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:88
+msgid "Edit #{auto/config}# to read as follows:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:99
+#, no-wrap
+msgid ""
+"lb config noauto \\\n"
+" --architecture i386 \\\n"
+" --linux-flavours 686 \\\n"
+" --packages-lists lxde \\\n"
+" --packages \"iceweasel xchat\" \\\n"
+" \"${@}\"\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:103
+msgid ""
+"First, #{--architecture i386}# ensures that on our #{amd64}# build system, "
+"we build a 32-bit version suitable for use on most machines. Second, we use #"
+"{--linux-flavours 686}# because we don't anticipate using this image on much "
+"older systems. Third, we've chosen the #{lxde}# package list to give us a "
+"minimal desktop. And finally, we have added two initial favourite packages: #"
+"{iceweasel}# and #{xchat}#."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:105
+msgid "Now, build the image:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:113
+msgid ""
+"Note that unlike in the first two tutorials, we no longer have to type #"
+"{2>&1 | tee binary.log}# as that is now included in #{auto/build}#."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:115
+msgid ""
+"Once you've tested the image (as in {Tutorial 1}#tutorial-1) and are "
+"satisfied it works, it's time to initialize our #{git}# repository, adding "
+"only the auto scripts we just created, and then make the first commit:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:121
+msgid "$ git init $ git add auto $ git commit -a -m \"Initial import.\""
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:125
+msgid "3~ Second revision"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:127
+msgid ""
+"In this revision, we're going to clean up from the first build, add the #"
+"{vlc}# package to our configuration, rebuild, test and commit."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:129
+msgid ""
+"The #{lb clean}# command will clean up all generated files from the previous "
+"build except for the cache, which saves having to re-download packages. This "
+"ensures that the subsequent #{lb build}# will re-run all stages to "
+"regenerate the files from our new configuration."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:133
+msgid "# lb clean"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:137
+msgid "Now edit #{auto/config}# to add the #{vlc}# package:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:148
+#, no-wrap
+msgid ""
+"lb config noauto \\\n"
+" --architecture i386 \\\n"
+" --linux-flavours 686 \\\n"
+" --packages-lists lxde \\\n"
+" --packages \"iceweasel xchat vlc\" \\\n"
+" \"${@}\"\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:152
+msgid "Build again:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:160
+msgid "Test, and when you're satisfied, commit the next revision:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:164
+msgid "$ git commit -a -m \"Adding vlc media player.\""
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:168
+msgid ""
+"Of course, more complicated changes to the configuration are possible, "
+"perhaps adding files in subdirectories of #{config/}#. When you commit new "
+"revisions, just take care not to hand edit or commit the top-level files in #"
+"{config}# containing #{LB_*}# variables, as these are build products, too, "
+"and are always cleaned up by #{lb clean}# and re-created with #{lb config}# "
+"via their respective #{auto}# scripts."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:170
+msgid ""
+"We've come to the end of our tutorial series. While many more kinds of "
+"customization are possible, even just using the few features explored in "
+"these simple examples, an almost infinite variety of different images can be "
+"created. The remaining examples in this section cover several other use "
+"cases drawn from the collected experiences of users of Debian Live."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:172
+msgid "2~ A VNC Kiosk Client"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:174
+msgid "Create an image with live-build to boot directly to a VNC server."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:176
msgid "_* Make a build directory: #{$ mkdir vncBuild}#"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:14
+#: en/user_examples.ssi:178
msgid "_* Move to the build directory: #{$ cd vncBuild}#"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:16
+#: en/user_examples.ssi:180
msgid ""
"Example to config the build directory to include gdm metacity "
"xtightvncviewer: #{$ lb config --packages \"gdm3 metacity xtightvncviewer\"}#"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:18
+#: en/user_examples.ssi:182
msgid ""
"Create a folder /etc/skel folder for a custom .xsession for the default "
"user: #{$ mkdir -p config/chroot_local-includes/etc/skel}#"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:20
+#: en/user_examples.ssi:184
msgid ""
"Create the .xsession for the default user: #{$ touch config/chroot_local-"
"includes/etc/skel/.xsession}#"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:22
+#: en/user_examples.ssi:186
msgid ""
"Edit the .xsession file to launch metacity and start xvncviewer with "
"something similar to the below:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:29
+#: en/user_examples.ssi:193
msgid "/usr/bin/metacity & /usr/bin/vncviewer xxx.xxx.xxx.xxx:PORT"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:31
+#: en/user_examples.ssi:195
msgid "exit"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:35
+#: en/user_examples.ssi:199
msgid "_* Build the image: #{# lb build}#"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:37
+#: en/user_examples.ssi:201
msgid "_* Enjoy."
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:39
-msgid "2~ Next Example FIXME"
+#: en/user_examples.ssi:203
+msgid "2~ A base image for a 128M USB key"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:205
+#, no-wrap
+msgid "*{Use case}* Create a standard image with some components removed in order to fit on a 128M USB key with space left over to use as you see fit.\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:207
+msgid ""
+"When optimizing an image to fit a certain media size, you need to understand "
+"the tradeoffs you are making between size and functionality. In this "
+"example, we trim only so much as to make room for additional material within "
+"a 128M media size, but without doing anything to destroy integrity of the "
+"packages contained within, such as the purging of locale data via the #"
+"{localepurge}# package, or other such \"intrusive\" optimizations. Of "
+"particular note, you should not use #{--bootstrap-flavour minimal}# unless "
+"you really know what you're doing, as omitting priority #{important}# "
+"packages will most likely produce a broken live system."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:211
+msgid ""
+"$ lb config -k 486 -p minimal --binary-indices false --memtest none --apt-"
+"recommends false --includes none"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:215
+msgid "Now, build the image in the usual way:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:223
+msgid ""
+"On the author's system at time of writing, the above configuration produced "
+"a 78Mbyte image. This compares favourably with the 166Mbyte image produced "
+"by the default configuration in {Tutorial 1}#tutorial-1."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:225
+msgid ""
+"The biggest space-saver here, compared to building a standard image on an #"
+"{i386}# architecture system, is to select only the #{486}# kernel flavour "
+"instead of the default #{-k \"486 686\"}#. Leaving off APT's indices with #"
+"{--binary-indices false}# also saves a fair amount of space, the tradeoff "
+"being that you need to #{apt-get update}# before using apt in the live "
+"system. Choosing the #{minimal}# package list leaves out the large #{locales}"
+"# package and associated utilities. Dropping recommended packages with #{--"
+"apt-recommends false}# saves some additional space, at the expense of "
+"omitting some packages you might otherwise expect to be there, such as #"
+"{firmware-linux-free}# which may be needed to support certain hardware. The "
+"remaining options shave off additional small amounts of space. It's up to "
+"you to decide if the functionality that is sacrificed with each optimization "
+"is worth the loss in functionality."
msgstr ""
diff --git a/manual/po/ro/user_installation.ssi.po b/manual/po/ro/user_installation.ssi.po
index 0e3f89d..15c2044 100644
--- a/manual/po/ro/user_installation.ssi.po
+++ b/manual/po/ro/user_installation.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-23 16:43+0300\n"
+"POT-Creation-Date: 2010-11-29 14:16-0400\n"
"PO-Revision-Date: 2010-10-23 16:43+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -18,74 +18,82 @@ msgstr ""
"20)) ? 1 : 2;\n"
#. type: Plain text
-#: en/about_manual.ssi:80 en/about_manual.ssi:88 en/about_manual.ssi:96
-#: en/about_manual.ssi:108 en/about_manual.ssi:121 en/about_manual.ssi:134
-#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
-#: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
-#: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
-#: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
-#: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
-#: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
-#: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
-#: en/other_faq.ssi:41 en/other_faq.ssi:83 en/other_faq.ssi:103
-#: en/other_faq.ssi:117 en/other_faq.ssi:137 en/other_faq.ssi:151
-#: en/other_faq.ssi:198 en/other_faq.ssi:245 en/other_faq.ssi:261
-#: en/other_faq.ssi:287 en/other_faq.ssi:299 en/other_faq.ssi:314
-#: en/other_faq.ssi:333 en/other_faq.ssi:345 en/other_faq.ssi:353
-#: en/other_faq.ssi:364 en/other_faq.ssi:374 en/other_howtos.ssi:16
-#: en/other_howtos.ssi:43 en/other_live-environment.ssi:14
-#: en/other_live-environment.ssi:30 en/other_live-environment.ssi:51
-#: en/other_live-environment.ssi:61 en/other_live-environment.ssi:69
-#: en/other_live-environment.ssi:77 en/other_live-environment.ssi:85
-#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
-#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
-#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
-#: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
-#: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
-#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111 en/user_basics.ssi:34
-#: en/user_basics.ssi:44 en/user_basics.ssi:56 en/user_basics.ssi:68
-#: en/user_basics.ssi:80 en/user_basics.ssi:92 en/user_basics.ssi:106
-#: en/user_basics.ssi:114 en/user_basics.ssi:122 en/user_basics.ssi:132
-#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
-#: en/user_basics.ssi:172 en/user_basics.ssi:186 en/user_basics.ssi:194
-#: en/user_basics.ssi:204 en/user_basics.ssi:224 en/user_basics.ssi:257
-#: en/user_basics.ssi:273 en/user_basics.ssi:281 en/user_basics.ssi:301
-#: en/user_basics.ssi:326 en/user_customization-contents.ssi:34
-#: en/user_customization-contents.ssi:43 en/user_customization-contents.ssi:66
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
+#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
+#: en/about_manual.ssi:170 en/other_coding-style.ssi:28
+#: en/other_coding-style.ssi:38 en/other_coding-style.ssi:51
+#: en/other_coding-style.ssi:61 en/other_coding-style.ssi:88
+#: en/other_coding-style.ssi:96 en/other_coding-style.ssi:106
+#: en/other_coding-style.ssi:117 en/other_common-tasks.ssi:32
+#: en/other_customization-backports.ssi:8 en/other_customization-bootup.ssi:30
+#: en/other_customization-bootup.ssi:39 en/other_faq.ssi:41
+#: en/other_faq.ssi:83 en/other_faq.ssi:103 en/other_faq.ssi:117
+#: en/other_faq.ssi:137 en/other_faq.ssi:151 en/other_faq.ssi:198
+#: en/other_faq.ssi:245 en/other_faq.ssi:261 en/other_faq.ssi:287
+#: en/other_faq.ssi:299 en/other_faq.ssi:314 en/other_faq.ssi:333
+#: en/other_faq.ssi:345 en/other_faq.ssi:353 en/other_faq.ssi:364
+#: en/other_faq.ssi:374 en/other_howtos.ssi:16 en/other_howtos.ssi:43
+#: en/other_live-environment.ssi:14 en/other_live-environment.ssi:30
+#: en/other_live-environment.ssi:51 en/other_live-environment.ssi:61
+#: en/other_live-environment.ssi:69 en/other_live-environment.ssi:77
+#: en/other_live-environment.ssi:85 en/other_live-environment.ssi:93
+#: en/other_live-environment.ssi:116 en/other_live-environment.ssi:124
+#: en/other_live-environment.ssi:133 en/other_procedures.ssi:12
+#: en/other_procedures.ssi:46 en/other_procedures.ssi:58
+#: en/project_bugs.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/user_basics.ssi:54 en/user_basics.ssi:66 en/user_basics.ssi:78
+#: en/user_basics.ssi:88 en/user_basics.ssi:102 en/user_basics.ssi:110
+#: en/user_basics.ssi:118 en/user_basics.ssi:128 en/user_basics.ssi:142
+#: en/user_basics.ssi:154 en/user_basics.ssi:162 en/user_basics.ssi:170
+#: en/user_basics.ssi:184 en/user_basics.ssi:192 en/user_basics.ssi:202
+#: en/user_basics.ssi:222 en/user_basics.ssi:255 en/user_basics.ssi:271
+#: en/user_basics.ssi:279 en/user_basics.ssi:299 en/user_basics.ssi:324
+#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
+#: en/user_customization-contents.ssi:66
#: en/user_customization-internationalization.ssi:10
#: en/user_customization-internationalization.ssi:18
#: en/user_customization-internationalization.ssi:26
#: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:16 en/user_customization-packages.ssi:24
-#: en/user_customization-packages.ssi:36 en/user_customization-packages.ssi:45
-#: en/user_customization-packages.ssi:59 en/user_customization-packages.ssi:73
-#: en/user_customization-packages.ssi:103
-#: en/user_customization-packages.ssi:111
-#: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:166
-#: en/user_customization-packages.ssi:176
-#: en/user_customization-packages.ssi:186
-#: en/user_customization-packages.ssi:196 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:104
-#: en/user_installation.ssi:118 en/user_installation.ssi:135
-#: en/user_managing_a_configuration.ssi:24
+#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
+#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
+#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:90
+#: en/user_customization-packages.ssi:120
+#: en/user_customization-packages.ssi:133
+#: en/user_customization-packages.ssi:143
+#: en/user_customization-packages.ssi:153
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:261
+#: en/user_customization-packages.ssi:273
+#: en/user_customization-packages.ssi:283 en/user_examples.ssi:14
+#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
+#: en/user_examples.ssi:64 en/user_examples.ssi:80 en/user_examples.ssi:90
+#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:131
+#: en/user_examples.ssi:139 en/user_examples.ssi:154 en/user_examples.ssi:162
+#: en/user_examples.ssi:188 en/user_examples.ssi:209 en/user_examples.ssi:217
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:76 en/user_installation.ssi:84
+#: en/user_installation.ssi:108 en/user_installation.ssi:126
+#: en/user_installation.ssi:144 en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
-#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:46
-#: en/user_overview.ssi:90 en/user_overview.ssi:98
+#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:36
+#: en/user_overview.ssi:80 en/user_overview.ssi:88
msgid "code{"
msgstr "code{"
#. type: Plain text
-#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
-#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
-#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
-#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
-#: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
-#: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
+#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:166
+#: en/about_manual.ssi:173 en/other_coding-style.ssi:34
+#: en/other_coding-style.ssi:45 en/other_coding-style.ssi:57
+#: en/other_coding-style.ssi:68 en/other_coding-style.ssi:92
+#: en/other_coding-style.ssi:100 en/other_coding-style.ssi:113
+#: en/other_coding-style.ssi:124 en/other_common-tasks.ssi:36
+#: en/other_customization-backports.ssi:16
#: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
#: en/other_faq.ssi:37 en/other_faq.ssi:46 en/other_faq.ssi:92
#: en/other_faq.ssi:108 en/other_faq.ssi:141 en/other_faq.ssi:155
@@ -100,40 +108,46 @@ msgstr "code{"
#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
#: en/other_live-environment.ssi:138 en/other_procedures.ssi:16
#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
-#: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
-#: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
-#: en/other_use-cases.ssi:137 en/user_basics.ssi:38 en/user_basics.ssi:48
-#: en/user_basics.ssi:62 en/user_basics.ssi:72 en/user_basics.ssi:86
-#: en/user_basics.ssi:98 en/user_basics.ssi:110 en/user_basics.ssi:118
-#: en/user_basics.ssi:126 en/user_basics.ssi:136 en/user_basics.ssi:150
-#: en/user_basics.ssi:160 en/user_basics.ssi:168 en/user_basics.ssi:176
-#: en/user_basics.ssi:190 en/user_basics.ssi:198 en/user_basics.ssi:208
-#: en/user_basics.ssi:249 en/user_basics.ssi:261 en/user_basics.ssi:277
-#: en/user_basics.ssi:285 en/user_basics.ssi:312 en/user_basics.ssi:351
+#: en/project_bugs.ssi:62 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:60 en/user_basics.ssi:72 en/user_basics.ssi:82
+#: en/user_basics.ssi:94 en/user_basics.ssi:106 en/user_basics.ssi:114
+#: en/user_basics.ssi:122 en/user_basics.ssi:132 en/user_basics.ssi:148
+#: en/user_basics.ssi:158 en/user_basics.ssi:166 en/user_basics.ssi:174
+#: en/user_basics.ssi:188 en/user_basics.ssi:196 en/user_basics.ssi:206
+#: en/user_basics.ssi:247 en/user_basics.ssi:259 en/user_basics.ssi:275
+#: en/user_basics.ssi:283 en/user_basics.ssi:310 en/user_basics.ssi:349
#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
#: en/user_customization-contents.ssi:70
#: en/user_customization-internationalization.ssi:14
#: en/user_customization-internationalization.ssi:22
#: en/user_customization-internationalization.ssi:30
#: en/user_customization-internationalization.ssi:42
-#: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
-#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
-#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
-#: en/user_customization-packages.ssi:107
-#: en/user_customization-packages.ssi:115
-#: en/user_customization-packages.ssi:135
-#: en/user_customization-packages.ssi:172
-#: en/user_customization-packages.ssi:182
-#: en/user_customization-packages.ssi:192
-#: en/user_customization-packages.ssi:202 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 en/user_installation.ssi:108
-#: en/user_installation.ssi:123 en/user_installation.ssi:138
-#: en/user_managing_a_configuration.ssi:31
+#: en/user_customization-packages.ssi:23 en/user_customization-packages.ssi:36
+#: en/user_customization-packages.ssi:48 en/user_customization-packages.ssi:62
+#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:94
+#: en/user_customization-packages.ssi:125
+#: en/user_customization-packages.ssi:139
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:159
+#: en/user_customization-packages.ssi:169
+#: en/user_customization-packages.ssi:181
+#: en/user_customization-packages.ssi:197
+#: en/user_customization-packages.ssi:265
+#: en/user_customization-packages.ssi:277
+#: en/user_customization-packages.ssi:287 en/user_examples.ssi:20
+#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:58
+#: en/user_examples.ssi:68 en/user_examples.ssi:86 en/user_examples.ssi:101
+#: en/user_examples.ssi:111 en/user_examples.ssi:123 en/user_examples.ssi:135
+#: en/user_examples.ssi:150 en/user_examples.ssi:158 en/user_examples.ssi:166
+#: en/user_examples.ssi:197 en/user_examples.ssi:213 en/user_examples.ssi:221
+#: 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
+#: en/user_installation.ssi:112 en/user_installation.ssi:131
+#: en/user_installation.ssi:147 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
-#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:84
-#: en/user_overview.ssi:94 en/user_overview.ssi:102
+#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:74
+#: en/user_overview.ssi:84 en/user_overview.ssi:92
msgid "}code"
msgstr "}code"
@@ -149,7 +163,7 @@ msgstr ""
#. type: Plain text
#: en/user_installation.ssi:6
-msgid "2~ Requirements"
+msgid "2~requirements Requirements"
msgstr ""
#. type: Plain text
@@ -191,7 +205,7 @@ msgstr ""
#. type: Plain text
#: en/user_installation.ssi:22
-msgid "2~ Installing live-build"
+msgid "2~installing-live-build Installing live-build"
msgstr ""
#. type: Plain text
@@ -325,33 +339,53 @@ msgstr ""
#. type: Plain text
#: en/user_installation.ssi:98
-msgid "3~ Using a customized live-boot"
+msgid "% FIXME: we also need to mention live-config"
msgstr ""
#. type: Plain text
#: en/user_installation.ssi:100
+msgid "3~ Using a customized live-boot"
+msgstr ""
+
+#. type: Plain text
+#: en/user_installation.ssi:102
+msgid ""
+"% FIXME: should follow the structure for live-build above (i.e. \"from source"
+"\", not \"customized\" -- we should not get into customization now, but "
+"should reserve that discussion for later."
+msgstr ""
+
+#. type: Plain text
+#: en/user_installation.ssi:104
msgid ""
"To modify the code you can follow the process below. Please ensure you are "
-"familiar with the terms mentioned in {Terms}#terms ."
+"familiar with the terms mentioned in {Terms}#terms."
msgstr ""
#. type: Plain text
-#: en/user_installation.ssi:102
+#: en/user_installation.ssi:106
msgid "_* Checkout the live-boot source"
msgstr ""
#. type: Plain text
-#: en/user_installation.ssi:106
+#: en/user_installation.ssi:110
msgid "$ git clone git://live.debian.net/git/live-boot.git"
msgstr ""
#. type: Plain text
-#: en/user_installation.ssi:110
+#: en/user_installation.ssi:114
msgid "_* Make changes to your local copy"
msgstr ""
#. type: Plain text
-#: en/user_installation.ssi:112
+#: en/user_installation.ssi:116
+msgid ""
+"% FIXME: as indicated above, it's too early for this topic. Move to later in "
+"the manual."
+msgstr ""
+
+#. type: Plain text
+#: en/user_installation.ssi:118
msgid ""
"And beware that if you want to add your pre-init script in live-bottom, you "
"should name it without dashes '-', e.g: call it \"99new_feature\" and not "
@@ -359,12 +393,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_installation.ssi:114
+#: en/user_installation.ssi:120
msgid "_* Build a live-boot .deb"
msgstr ""
#. type: Plain text
-#: en/user_installation.ssi:116
+#: en/user_installation.ssi:122
+msgid ""
+"% FIXME: not strictly true? building sid on squeeze is usually OK. also, "
+"building lenny on squeeze or sid is fine. clarify."
+msgstr ""
+
+#. type: Plain text
+#: en/user_installation.ssi:124
msgid ""
"You must build either on your target distribution or in a chroot containing "
"your target platform: this means if your target is Squeeze then you should "
@@ -375,17 +416,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_installation.ssi:121
-msgid "$ cd live-boot $ dpkg-buildpackage -rfakeroot -b -uc -us"
+#: en/user_installation.ssi:129
+msgid "$ cd live-boot $ dpkg-buildpackage -b -uc -us"
msgstr ""
#. type: Plain text
-#: en/user_installation.ssi:125
+#: en/user_installation.ssi:133
msgid "_* Use the generated live-boot .deb"
msgstr ""
#. type: Plain text
-#: en/user_installation.ssi:127
+#: en/user_installation.ssi:135
msgid ""
"As live-boot is installed by live-build system, installing the package in "
"the host system is not sufficient: you should treat the generated .deb like "
@@ -394,19 +435,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_installation.ssi:129
+#: en/user_installation.ssi:138
msgid ""
"% FIXME: <xref linkend=\"custom-packages\"/> <xref linkend=\"custom-packages-"
-"apt\"/>"
+"apt\"/> % Ben> What is the latter reference for? I can't see the relevance."
msgstr ""
#. type: Plain text
-#: en/user_installation.ssi:131
+#: en/user_installation.ssi:140
msgid "3~ Using live-boot snapshots"
msgstr ""
#. type: Plain text
-#: en/user_installation.ssi:133
+#: en/user_installation.ssi:142
msgid ""
"You can let live-build automatically use the latest snapshot of live-boot by "
"configuring a third-party repository in your live-build configuration "
@@ -415,6 +456,6 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_installation.ssi:137
+#: en/user_installation.ssi:146
msgid "lb config --repository live.debian.net"
msgstr ""
diff --git a/manual/po/ro/user_managing_a_configuration.ssi.po b/manual/po/ro/user_managing_a_configuration.ssi.po
index 6c3247f..4d701a8 100644
--- a/manual/po/ro/user_managing_a_configuration.ssi.po
+++ b/manual/po/ro/user_managing_a_configuration.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-28 16:34-0200\n"
+"POT-Creation-Date: 2010-11-27 19:55-0400\n"
"PO-Revision-Date: 2010-10-13 17:00+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -18,9 +18,9 @@ msgstr ""
"20)) ? 1 : 2;\n"
#. type: Plain text
-#: en/about_manual.ssi:80 en/about_manual.ssi:88 en/about_manual.ssi:96
-#: en/about_manual.ssi:108 en/about_manual.ssi:121 en/about_manual.ssi:134
-#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
+#: en/about_manual.ssi:112 en/about_manual.ssi:125 en/about_manual.ssi:138
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
#: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
#: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
#: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
@@ -40,38 +40,43 @@ msgstr ""
#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
-#: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
-#: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
-#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111
-#: en/project_bugs.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
-#: en/user_basics.ssi:54 en/user_basics.ssi:66 en/user_basics.ssi:78
-#: en/user_basics.ssi:88 en/user_basics.ssi:102 en/user_basics.ssi:110
-#: en/user_basics.ssi:118 en/user_basics.ssi:128 en/user_basics.ssi:140
-#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
-#: en/user_basics.ssi:182 en/user_basics.ssi:190 en/user_basics.ssi:200
-#: en/user_basics.ssi:220 en/user_basics.ssi:253 en/user_basics.ssi:269
-#: en/user_basics.ssi:277 en/user_basics.ssi:297 en/user_basics.ssi:322
-#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
-#: en/user_customization-contents.ssi:66
+#: en/other_procedures.ssi:58 en/project_bugs.ssi:58 en/user_basics.ssi:32
+#: en/user_basics.ssi:42 en/user_basics.ssi:54 en/user_basics.ssi:66
+#: en/user_basics.ssi:78 en/user_basics.ssi:88 en/user_basics.ssi:102
+#: en/user_basics.ssi:110 en/user_basics.ssi:118 en/user_basics.ssi:128
+#: en/user_basics.ssi:142 en/user_basics.ssi:154 en/user_basics.ssi:162
+#: en/user_basics.ssi:170 en/user_basics.ssi:184 en/user_basics.ssi:192
+#: en/user_basics.ssi:202 en/user_basics.ssi:222 en/user_basics.ssi:255
+#: en/user_basics.ssi:271 en/user_basics.ssi:279 en/user_basics.ssi:299
+#: en/user_basics.ssi:324 en/user_customization-contents.ssi:34
+#: en/user_customization-contents.ssi:43 en/user_customization-contents.ssi:66
#: en/user_customization-internationalization.ssi:10
#: en/user_customization-internationalization.ssi:18
#: en/user_customization-internationalization.ssi:26
#: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:16 en/user_customization-packages.ssi:24
-#: en/user_customization-packages.ssi:36 en/user_customization-packages.ssi:45
-#: en/user_customization-packages.ssi:59 en/user_customization-packages.ssi:73
-#: en/user_customization-packages.ssi:103
-#: en/user_customization-packages.ssi:111
-#: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:166
-#: en/user_customization-packages.ssi:176
-#: en/user_customization-packages.ssi:186
-#: en/user_customization-packages.ssi:196 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:104
-#: en/user_installation.ssi:118 en/user_installation.ssi:135
-#: en/user_managing_a_configuration.ssi:24
+#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
+#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
+#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:90
+#: en/user_customization-packages.ssi:120
+#: en/user_customization-packages.ssi:133
+#: en/user_customization-packages.ssi:143
+#: en/user_customization-packages.ssi:153
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:261
+#: en/user_customization-packages.ssi:273
+#: en/user_customization-packages.ssi:283 en/user_examples.ssi:12
+#: en/user_examples.ssi:27 en/user_examples.ssi:37 en/user_examples.ssi:51
+#: en/user_examples.ssi:61 en/user_examples.ssi:77 en/user_examples.ssi:87
+#: en/user_examples.ssi:104 en/user_examples.ssi:114 en/user_examples.ssi:128
+#: en/user_examples.ssi:136 en/user_examples.ssi:151 en/user_examples.ssi:159
+#: en/user_examples.ssi:185 en/user_examples.ssi:206 en/user_examples.ssi:214
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:76 en/user_installation.ssi:84
+#: en/user_installation.ssi:104 en/user_installation.ssi:118
+#: en/user_installation.ssi:135 en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:36
#: en/user_overview.ssi:80 en/user_overview.ssi:88
@@ -79,9 +84,9 @@ msgid "code{"
msgstr "code{"
#. type: Plain text
-#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:121 en/about_manual.ssi:134 en/about_manual.ssi:142
+#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:165
#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
@@ -101,37 +106,43 @@ msgstr "code{"
#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
#: en/other_live-environment.ssi:138 en/other_procedures.ssi:16
#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
-#: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
-#: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
-#: en/other_use-cases.ssi:137 en/project_bugs.ssi:62 en/user_basics.ssi:36
-#: en/user_basics.ssi:46 en/user_basics.ssi:60 en/user_basics.ssi:72
-#: en/user_basics.ssi:82 en/user_basics.ssi:94 en/user_basics.ssi:106
-#: en/user_basics.ssi:114 en/user_basics.ssi:122 en/user_basics.ssi:132
-#: en/user_basics.ssi:146 en/user_basics.ssi:156 en/user_basics.ssi:164
-#: en/user_basics.ssi:172 en/user_basics.ssi:186 en/user_basics.ssi:194
-#: en/user_basics.ssi:204 en/user_basics.ssi:245 en/user_basics.ssi:257
-#: en/user_basics.ssi:273 en/user_basics.ssi:281 en/user_basics.ssi:308
-#: en/user_basics.ssi:347 en/user_customization-contents.ssi:39
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:70
+#: en/project_bugs.ssi:62 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:60 en/user_basics.ssi:72 en/user_basics.ssi:82
+#: en/user_basics.ssi:94 en/user_basics.ssi:106 en/user_basics.ssi:114
+#: en/user_basics.ssi:122 en/user_basics.ssi:132 en/user_basics.ssi:148
+#: en/user_basics.ssi:158 en/user_basics.ssi:166 en/user_basics.ssi:174
+#: en/user_basics.ssi:188 en/user_basics.ssi:196 en/user_basics.ssi:206
+#: en/user_basics.ssi:247 en/user_basics.ssi:259 en/user_basics.ssi:275
+#: en/user_basics.ssi:283 en/user_basics.ssi:310 en/user_basics.ssi:349
+#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:70
#: en/user_customization-internationalization.ssi:14
#: en/user_customization-internationalization.ssi:22
#: en/user_customization-internationalization.ssi:30
#: en/user_customization-internationalization.ssi:42
-#: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
-#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
-#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
-#: en/user_customization-packages.ssi:107
-#: en/user_customization-packages.ssi:115
-#: en/user_customization-packages.ssi:135
-#: en/user_customization-packages.ssi:172
-#: en/user_customization-packages.ssi:182
-#: en/user_customization-packages.ssi:192
-#: en/user_customization-packages.ssi:202 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 en/user_installation.ssi:108
-#: en/user_installation.ssi:123 en/user_installation.ssi:138
-#: en/user_managing_a_configuration.ssi:31
+#: en/user_customization-packages.ssi:23 en/user_customization-packages.ssi:36
+#: en/user_customization-packages.ssi:48 en/user_customization-packages.ssi:62
+#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:94
+#: en/user_customization-packages.ssi:125
+#: en/user_customization-packages.ssi:139
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:159
+#: en/user_customization-packages.ssi:169
+#: en/user_customization-packages.ssi:181
+#: en/user_customization-packages.ssi:197
+#: en/user_customization-packages.ssi:265
+#: en/user_customization-packages.ssi:277
+#: en/user_customization-packages.ssi:287 en/user_examples.ssi:17
+#: en/user_examples.ssi:31 en/user_examples.ssi:41 en/user_examples.ssi:55
+#: en/user_examples.ssi:65 en/user_examples.ssi:83 en/user_examples.ssi:98
+#: en/user_examples.ssi:108 en/user_examples.ssi:120 en/user_examples.ssi:132
+#: en/user_examples.ssi:147 en/user_examples.ssi:155 en/user_examples.ssi:163
+#: en/user_examples.ssi:194 en/user_examples.ssi:210 en/user_examples.ssi:218
+#: 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
+#: en/user_installation.ssi:108 en/user_installation.ssi:123
+#: en/user_installation.ssi:138 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:74
#: en/user_overview.ssi:84 en/user_overview.ssi:92
@@ -230,8 +241,8 @@ msgstr ""
msgid ""
"#!/bin/sh\n"
"lb config noauto \\\n"
-"\t--architecture i386 \\\n"
-"\t${@}\n"
+"\t--packages-lists \"standard\" \\\n"
+"\t\"${@}\"\n"
msgstr ""
#. type: Plain text
@@ -244,7 +255,7 @@ msgstr ""
#, no-wrap
msgid ""
"#!/bin/sh\n"
-"lb clean noauto ${@}\n"
+"lb clean noauto \"${@}\"\n"
"rm -f config/binary config/bootstrap \\\n"
"\tconfig/chroot config/common config/source\n"
"rm -f binary.log\n"
@@ -257,16 +268,15 @@ msgstr ""
#. type: Plain text
#: en/user_managing_a_configuration.ssi:50
-msgid "#!/bin/sh lb build noauto ${@} 2>&1 | tee binary.log"
+msgid "#!/bin/sh lb build noauto \"${@}\" 2>&1 | tee binary.log"
msgstr ""
#. type: Plain text
#: en/user_managing_a_configuration.ssi:54
msgid ""
-"Edit auto/config, changing or adding any options as you see fit. In the "
-"example above, --architecture is set to i386 so that when the image is built "
-"on an amd64 system, it will not default to building amd64 images. Change "
-"this to an appropriate value for your image (or delete it if you want to use "
-"the default) and add any additional options in continuation lines that "
-"follow."
+"Edit #{auto/config}#, changing or adding any options as you see fit. In the "
+"example above, #{--packages-lists standard}# is set to the default value. "
+"Change this to an appropriate value for your image (or delete it if you want "
+"to use the default) and add any additional options in continuation lines "
+"that follow."
msgstr ""
diff --git a/manual/pot/about_manual.ssi.pot b/manual/pot/about_manual.ssi.pot
index 2a693c2..9b92aa6 100644
--- a/manual/pot/about_manual.ssi.pot
+++ b/manual/pot/about_manual.ssi.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-23 16:43+0300\n"
+"POT-Creation-Date: 2010-11-28 07:21-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"
@@ -48,12 +48,38 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:10
-msgid "2~terms Terms"
+msgid "2~ For the impatient"
msgstr ""
#. type: Plain text
#: en/about_manual.ssi:12
msgid ""
+"While we believe that everything in this manual is important to at least "
+"some of our users, we realize it is a lot of material to cover and that you "
+"may wish to experience early success using the software before delving into "
+"the details. Therefore, we have provided three tutorials in the {Examples}"
+"#examples section designed to teach you image building and customization "
+"basics. Read {Using the examples}#using-the-examples first, followed by "
+"{Tutorial 1: A standard image}#tutorial-1, {Tutorial 2: A web browser "
+"utility}#tutorial-2 and finally {Tutorial 3: A personal travelling companion}"
+"#tutorial-3. By the end of these tutorials, you will have a taste of what "
+"can be done with Debian Live. We encourage you to return to more in-depth "
+"study of the manual, perhaps next reading {The basics}#the-basics, skimming "
+"or skipping {Building a netboot image}#building-netboot-image, and finishing "
+"by reading the {Customization overview}#customization-overview and the "
+"chapters that follow it. By this point, we hope you are thoroughly excited "
+"by what can be done with Debian Live and motivated to read the rest of the "
+"manual, cover-to-cover."
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:14
+msgid "2~terms Terms"
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:16
+msgid ""
"_* *{Live system}*: An operating system that can boot without installation "
"to a hard drive. Live systems do not alter local operating system(s) or file"
"(s) already installed on the computer hard drive unless instructed to do so. "
@@ -62,14 +88,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:14
+#: en/about_manual.ssi:18
msgid ""
"_* *{Debian Live}*: The Debian sub-project which maintains the live-boot, "
"live-build, live-config, and live-manual packages."
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:16
+#: en/about_manual.ssi:20
msgid ""
"_* *{Debian Live system}*: A live system that uses software from the Debian "
"operating system that may be booted from CDs, DVDs, USB sticks, over the "
@@ -78,24 +104,24 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:18
+#: en/about_manual.ssi:22
msgid "_* *{Host system}*: The environment used to create the live system."
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:20
+#: en/about_manual.ssi:24
msgid "_* *{Target system}*: The environment used to run the live system."
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:22
+#: en/about_manual.ssi:26
msgid ""
"_* *{live-boot}*: A collection of scripts used to boot live systems. live-"
"boot was formerly a part of live-initramfs."
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:24
+#: en/about_manual.ssi:28
msgid ""
"_* *{live-build}*: A collection of scripts used to build customized Debian "
"Live systems. live-build was formerly known as live-helper, and even earlier "
@@ -103,152 +129,155 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:26
+#: en/about_manual.ssi:30
msgid ""
"_* *{live-config}*: A collection of scripts used to configure a live system "
"during the boot process. live-config was formerly a part of live-initramfs."
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:28
+#: en/about_manual.ssi:32
msgid ""
"_* *{live-manual}*: This document is maintained in a package called live-"
"manual."
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:30
+#: en/about_manual.ssi:34
msgid ""
"_* *{Debian Installer (d-i)}*: The official installation system for the "
"Debian distribution."
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:32
+#: en/about_manual.ssi:36
msgid ""
"_* *{Boot parameters}*: Parameters that can be entered at the bootloader "
"prompt to influence the kernel or live-config."
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:34
+#: en/about_manual.ssi:38
msgid ""
-"_* *{chroot}*: The chroot program, chroot(8), enables us to run different "
-"instances of the GNU/Linux environment on a single system simultaneously "
-"without rebooting."
+"_* *{chroot}*: The chroot program, #{chroot(8)}#, enables us to run "
+"different instances of the GNU/Linux environment on a single system "
+"simultaneously without rebooting."
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:36
+#: en/about_manual.ssi:40
msgid ""
"_* *{Binary image}*: A file containing the live system, such as binary.iso "
"or binary.img."
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:38
+#: en/about_manual.ssi:42
msgid ""
"_* *{Target distribution}*: The distribution upon which your live system "
"will be based. This can differ from the distribution of your host system."
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:40
+#: en/about_manual.ssi:44
msgid ""
-"_* *{Squeeze/Wheezy/Sid (stable/testing/unstable)}*: The stable distribution "
-"contains the latest officially released distribution of Debian. The testing "
-"distribution is the staging area for the next stable release. A major "
-"advantage of using this distribution is that it has more recent versions of "
-"software relative to the stable release. The unstable distribution is where "
-"active development of Debian occurs. Generally, this distribution is run by "
-"developers and those who like to live on the edge."
+"_* *{Squeeze/Wheezy/Sid (stable/testing/unstable)}*: Debian codenames for "
+"releases. At the time of writing, Squeeze is the current *{stable}* release "
+"and Wheezy is the current *{testing}* release. Sid will always be a synonym "
+"for the *{unstable}* release. Throughout the manual, we tend to use "
+"codenames for the releases, as that is what is supported by the tools "
+"themselves."
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:42
+#: en/about_manual.ssi:46
msgid ""
-"At the time of writing, Squeeze is the current stable release and Wheezy is "
-"the current testing release. Sid will always be a synonym for the unstable "
-"release."
+"The *{stable}* distribution contains the latest officially released "
+"distribution of Debian. The *{testing}* distribution is the staging area for "
+"the next *{stable}* release. A major advantage of using this distribution is "
+"that it has more recent versions of software relative to the *{stable}* "
+"release. The *{unstable}* distribution is where active development of Debian "
+"occurs. Generally, this distribution is run by developers and those who like "
+"to live on the edge."
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:44
+#: en/about_manual.ssi:48
msgid "2~ Authors"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:46
+#: en/about_manual.ssi:50
msgid "A list of authors (in alphabetical order):"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:48
+#: en/about_manual.ssi:52
msgid "_* Ben Armstrong"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:50
+#: en/about_manual.ssi:54
msgid "_* Brendan Sleight"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:52
+#: en/about_manual.ssi:56
msgid "_* Chris Lamb"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:54
+#: en/about_manual.ssi:58
msgid "_* Daniel Baumann"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:56
+#: en/about_manual.ssi:60
msgid "_* Franklin Piat"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:58
+#: en/about_manual.ssi:62
msgid "_* Jonas Stein"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:60
+#: en/about_manual.ssi:64
msgid "_* Kai Hendry"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:62
+#: en/about_manual.ssi:66
msgid "_* Marco Amadori"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:64
+#: en/about_manual.ssi:68
msgid "_* Mathieu Geli"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:66
+#: en/about_manual.ssi:70
msgid "_* Matthias Kirschner"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:68
+#: en/about_manual.ssi:72
msgid "_* Richard Nelson"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:70
+#: en/about_manual.ssi:74
msgid "_* Trent W. Buck"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:72
+#: en/about_manual.ssi:76
msgid "2~ Contributing to this document"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:74
+#: en/about_manual.ssi:78
msgid ""
"This manual is intended as a community project and all proposals for "
"improvements and contributions are extremely welcome. The preferred way to "
@@ -257,7 +286,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:76
+#: en/about_manual.ssi:80
msgid ""
"When submitting a contribution, please clearly identify its copyright holder "
"and include the licensing statement. Note that to be accepted, the "
@@ -266,86 +295,94 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:78
+#: en/about_manual.ssi:82
msgid ""
"The sources for this manual are maintained using the Git version control "
"system. You can checkout the latest copy by executing:"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:80 en/about_manual.ssi:88 en/about_manual.ssi:96
-#: en/about_manual.ssi:108 en/about_manual.ssi:121 en/about_manual.ssi:134
-#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
-#: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
-#: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
-#: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
-#: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
-#: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
-#: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
-#: en/other_faq.ssi:41 en/other_faq.ssi:83 en/other_faq.ssi:103
-#: en/other_faq.ssi:117 en/other_faq.ssi:137 en/other_faq.ssi:151
-#: en/other_faq.ssi:198 en/other_faq.ssi:245 en/other_faq.ssi:261
-#: en/other_faq.ssi:287 en/other_faq.ssi:299 en/other_faq.ssi:314
-#: en/other_faq.ssi:333 en/other_faq.ssi:345 en/other_faq.ssi:353
-#: en/other_faq.ssi:364 en/other_faq.ssi:374 en/other_howtos.ssi:16
-#: en/other_howtos.ssi:43 en/other_live-environment.ssi:14
-#: en/other_live-environment.ssi:30 en/other_live-environment.ssi:51
-#: en/other_live-environment.ssi:61 en/other_live-environment.ssi:69
-#: en/other_live-environment.ssi:77 en/other_live-environment.ssi:85
-#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
-#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
-#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
-#: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
-#: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
-#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111 en/user_basics.ssi:34
-#: en/user_basics.ssi:44 en/user_basics.ssi:56 en/user_basics.ssi:68
-#: en/user_basics.ssi:80 en/user_basics.ssi:92 en/user_basics.ssi:106
-#: en/user_basics.ssi:114 en/user_basics.ssi:122 en/user_basics.ssi:132
-#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
-#: en/user_basics.ssi:172 en/user_basics.ssi:186 en/user_basics.ssi:194
-#: en/user_basics.ssi:204 en/user_basics.ssi:224 en/user_basics.ssi:257
-#: en/user_basics.ssi:273 en/user_basics.ssi:281 en/user_basics.ssi:301
-#: en/user_basics.ssi:326 en/user_customization-contents.ssi:34
-#: en/user_customization-contents.ssi:43 en/user_customization-contents.ssi:66
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
+#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
+#: en/about_manual.ssi:170 en/other_coding-style.ssi:28
+#: en/other_coding-style.ssi:38 en/other_coding-style.ssi:51
+#: en/other_coding-style.ssi:61 en/other_coding-style.ssi:88
+#: en/other_coding-style.ssi:96 en/other_coding-style.ssi:106
+#: en/other_coding-style.ssi:117 en/other_common-tasks.ssi:32
+#: en/other_customization-backports.ssi:8 en/other_customization-bootup.ssi:30
+#: en/other_customization-bootup.ssi:39 en/other_faq.ssi:41
+#: en/other_faq.ssi:83 en/other_faq.ssi:103 en/other_faq.ssi:117
+#: en/other_faq.ssi:137 en/other_faq.ssi:151 en/other_faq.ssi:198
+#: en/other_faq.ssi:245 en/other_faq.ssi:261 en/other_faq.ssi:287
+#: en/other_faq.ssi:299 en/other_faq.ssi:314 en/other_faq.ssi:333
+#: en/other_faq.ssi:345 en/other_faq.ssi:353 en/other_faq.ssi:364
+#: en/other_faq.ssi:374 en/other_howtos.ssi:16 en/other_howtos.ssi:43
+#: en/other_live-environment.ssi:14 en/other_live-environment.ssi:30
+#: en/other_live-environment.ssi:51 en/other_live-environment.ssi:61
+#: en/other_live-environment.ssi:69 en/other_live-environment.ssi:77
+#: en/other_live-environment.ssi:85 en/other_live-environment.ssi:93
+#: en/other_live-environment.ssi:116 en/other_live-environment.ssi:124
+#: en/other_live-environment.ssi:133 en/other_procedures.ssi:12
+#: en/other_procedures.ssi:46 en/other_procedures.ssi:58
+#: en/project_bugs.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/user_basics.ssi:54 en/user_basics.ssi:66 en/user_basics.ssi:78
+#: en/user_basics.ssi:88 en/user_basics.ssi:102 en/user_basics.ssi:110
+#: en/user_basics.ssi:118 en/user_basics.ssi:128 en/user_basics.ssi:142
+#: en/user_basics.ssi:154 en/user_basics.ssi:162 en/user_basics.ssi:170
+#: en/user_basics.ssi:184 en/user_basics.ssi:192 en/user_basics.ssi:202
+#: en/user_basics.ssi:222 en/user_basics.ssi:255 en/user_basics.ssi:271
+#: en/user_basics.ssi:279 en/user_basics.ssi:299 en/user_basics.ssi:324
+#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
+#: en/user_customization-contents.ssi:66
#: en/user_customization-internationalization.ssi:10
#: en/user_customization-internationalization.ssi:18
#: en/user_customization-internationalization.ssi:26
#: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:16 en/user_customization-packages.ssi:24
-#: en/user_customization-packages.ssi:36 en/user_customization-packages.ssi:45
-#: en/user_customization-packages.ssi:59 en/user_customization-packages.ssi:73
-#: en/user_customization-packages.ssi:103
-#: en/user_customization-packages.ssi:111
-#: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:166
-#: en/user_customization-packages.ssi:176
-#: en/user_customization-packages.ssi:186
-#: en/user_customization-packages.ssi:196 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:104
-#: en/user_installation.ssi:118 en/user_installation.ssi:135
-#: en/user_managing_a_configuration.ssi:24
+#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
+#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
+#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:90
+#: en/user_customization-packages.ssi:120
+#: en/user_customization-packages.ssi:133
+#: en/user_customization-packages.ssi:143
+#: en/user_customization-packages.ssi:153
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:261
+#: en/user_customization-packages.ssi:273
+#: en/user_customization-packages.ssi:283 en/user_examples.ssi:12
+#: en/user_examples.ssi:27 en/user_examples.ssi:37 en/user_examples.ssi:51
+#: en/user_examples.ssi:61 en/user_examples.ssi:77 en/user_examples.ssi:87
+#: en/user_examples.ssi:104 en/user_examples.ssi:114 en/user_examples.ssi:128
+#: en/user_examples.ssi:136 en/user_examples.ssi:151 en/user_examples.ssi:159
+#: en/user_examples.ssi:185 en/user_examples.ssi:206 en/user_examples.ssi:214
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:76 en/user_installation.ssi:84
+#: en/user_installation.ssi:104 en/user_installation.ssi:118
+#: en/user_installation.ssi:135 en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
-#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:46
-#: en/user_overview.ssi:90 en/user_overview.ssi:98
+#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:36
+#: en/user_overview.ssi:80 en/user_overview.ssi:88
msgid "code{"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:82
+#: en/about_manual.ssi:86
msgid "$ git clone git://live.debian.net/git/live-manual.git"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
-#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
-#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
-#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
-#: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
-#: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
+#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:166
+#: en/about_manual.ssi:173 en/other_coding-style.ssi:34
+#: en/other_coding-style.ssi:45 en/other_coding-style.ssi:57
+#: en/other_coding-style.ssi:68 en/other_coding-style.ssi:92
+#: en/other_coding-style.ssi:100 en/other_coding-style.ssi:113
+#: en/other_coding-style.ssi:124 en/other_common-tasks.ssi:36
+#: en/other_customization-backports.ssi:16
#: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
#: en/other_faq.ssi:37 en/other_faq.ssi:46 en/other_faq.ssi:92
#: en/other_faq.ssi:108 en/other_faq.ssi:141 en/other_faq.ssi:155
@@ -360,45 +397,51 @@ msgstr ""
#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
#: en/other_live-environment.ssi:138 en/other_procedures.ssi:16
#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
-#: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
-#: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
-#: en/other_use-cases.ssi:137 en/user_basics.ssi:38 en/user_basics.ssi:48
-#: en/user_basics.ssi:62 en/user_basics.ssi:72 en/user_basics.ssi:86
-#: en/user_basics.ssi:98 en/user_basics.ssi:110 en/user_basics.ssi:118
-#: en/user_basics.ssi:126 en/user_basics.ssi:136 en/user_basics.ssi:150
-#: en/user_basics.ssi:160 en/user_basics.ssi:168 en/user_basics.ssi:176
-#: en/user_basics.ssi:190 en/user_basics.ssi:198 en/user_basics.ssi:208
-#: en/user_basics.ssi:249 en/user_basics.ssi:261 en/user_basics.ssi:277
-#: en/user_basics.ssi:285 en/user_basics.ssi:312 en/user_basics.ssi:351
+#: en/project_bugs.ssi:62 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:60 en/user_basics.ssi:72 en/user_basics.ssi:82
+#: en/user_basics.ssi:94 en/user_basics.ssi:106 en/user_basics.ssi:114
+#: en/user_basics.ssi:122 en/user_basics.ssi:132 en/user_basics.ssi:148
+#: en/user_basics.ssi:158 en/user_basics.ssi:166 en/user_basics.ssi:174
+#: en/user_basics.ssi:188 en/user_basics.ssi:196 en/user_basics.ssi:206
+#: en/user_basics.ssi:247 en/user_basics.ssi:259 en/user_basics.ssi:275
+#: en/user_basics.ssi:283 en/user_basics.ssi:310 en/user_basics.ssi:349
#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
#: en/user_customization-contents.ssi:70
#: en/user_customization-internationalization.ssi:14
#: en/user_customization-internationalization.ssi:22
#: en/user_customization-internationalization.ssi:30
#: en/user_customization-internationalization.ssi:42
-#: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
-#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
-#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
-#: en/user_customization-packages.ssi:107
-#: en/user_customization-packages.ssi:115
-#: en/user_customization-packages.ssi:135
-#: en/user_customization-packages.ssi:172
-#: en/user_customization-packages.ssi:182
-#: en/user_customization-packages.ssi:192
-#: en/user_customization-packages.ssi:202 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 en/user_installation.ssi:108
-#: en/user_installation.ssi:123 en/user_installation.ssi:138
-#: en/user_managing_a_configuration.ssi:31
+#: en/user_customization-packages.ssi:23 en/user_customization-packages.ssi:36
+#: en/user_customization-packages.ssi:48 en/user_customization-packages.ssi:62
+#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:94
+#: en/user_customization-packages.ssi:125
+#: en/user_customization-packages.ssi:139
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:159
+#: en/user_customization-packages.ssi:169
+#: en/user_customization-packages.ssi:181
+#: en/user_customization-packages.ssi:197
+#: en/user_customization-packages.ssi:265
+#: en/user_customization-packages.ssi:277
+#: en/user_customization-packages.ssi:287 en/user_examples.ssi:17
+#: en/user_examples.ssi:31 en/user_examples.ssi:41 en/user_examples.ssi:55
+#: en/user_examples.ssi:65 en/user_examples.ssi:83 en/user_examples.ssi:98
+#: en/user_examples.ssi:108 en/user_examples.ssi:120 en/user_examples.ssi:132
+#: en/user_examples.ssi:147 en/user_examples.ssi:155 en/user_examples.ssi:163
+#: en/user_examples.ssi:194 en/user_examples.ssi:210 en/user_examples.ssi:218
+#: 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
+#: en/user_installation.ssi:108 en/user_installation.ssi:123
+#: en/user_installation.ssi:138 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
-#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:84
-#: en/user_overview.ssi:94 en/user_overview.ssi:102
+#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:74
+#: en/user_overview.ssi:84 en/user_overview.ssi:92
msgid "}code"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:86
+#: en/about_manual.ssi:90
msgid ""
"Prior to submission of your contribution, please preview your work. To "
"preview the live-manual, ensure the packages needed for building are "
@@ -406,29 +449,42 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:90
+#: en/about_manual.ssi:94
msgid "# apt-get install make po4a sisu-complete"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:94
+#: en/about_manual.ssi:98
msgid ""
"You may build the live-manual from the top level directory of your git "
"checkout by executing:"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:98
+#: en/about_manual.ssi:102
msgid "$ make build"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:102
+#: en/about_manual.ssi:106
+msgid ""
+"Since it takes a while to build the manual in all supported languages, you "
+"may find it convenient when proofing to build for only one language, e.g. by "
+"executing:"
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:110
+msgid "$ make build LANGUAGES=en"
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:114
msgid "3~ Applying patches"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:104
+#: en/about_manual.ssi:116
msgid ""
"Directly commiting to the repository is possible by anyone. However, we ask "
"you to send bigger changes to the mailing list to discuss them first. In "
@@ -436,51 +492,51 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:106
+#: en/about_manual.ssi:118
msgid "_* Fetch the public commit key:"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:115
+#: en/about_manual.ssi:127
#, no-wrap
msgid ""
"$ mkdir -p ~/.ssh/identity.d\n"
-"$ wget http://live.debian.net/other/keys/live-manual@debian-live \\\n"
-"\t-O ~/.ssh/identity.d/live-manual at debian-live\n"
-"$ wget http://live.debian.net/other/keys/live-manual@debian-live.pub \\\n"
-"\t-O ~/.ssh/identity.d/live-manual at debian-live.pub\n"
-"$ chmod 0600 ~/.ssh/identity.d/live-manual at debian-live*\n"
+"$ wget http://live.debian.net/other/keys/gitosis@live.debian.net \\\n"
+"\t-O ~/.ssh/identity.d/live.debian.net\n"
+"$ wget http://live.debian.net/other/keys/gitosis@live.debian.net.pub \\\n"
+"\t-O ~/.ssh/identity.d/live.debian.net.pub\n"
+"$ chmod 0600 ~/.ssh/identity.d/live.debian.net*\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:119
+#: en/about_manual.ssi:131
msgid "_* Add the following section to your openssh-client config:"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:128
+#: en/about_manual.ssi:140
#, no-wrap
msgid ""
"$ cat >> ~/.ssh/config << EOF\n"
"Host live.debian.net\n"
" Hostname live.debian.net\n"
" User gitosis\n"
-" IdentityFile ~/.ssh/identity.d/live-manual at debian-live\n"
+" IdentityFile ~/.ssh/identity.d/gitosis at live.debian.net\n"
"EOF\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:132
+#: en/about_manual.ssi:144
msgid "_* Checkout a clone of the manual through ssh:"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:136
+#: en/about_manual.ssi:148
msgid "$ git clone gitosis at live.debian.net:/live-manual.git"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:140
+#: en/about_manual.ssi:152
msgid ""
"_* After editing the files in manual/en/, please call the 'commit' target in "
"the top level directory to sanitize the files and update the translation "
@@ -488,12 +544,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:144
+#: en/about_manual.ssi:156
msgid "$ make commit"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:148
+#: en/about_manual.ssi:160
msgid ""
"_* After sanitizing commit the changes. Write commit messages, that consist "
"of full useful sentences, starting with a capital letter and ending with a "
@@ -502,16 +558,16 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:152
+#: en/about_manual.ssi:164
msgid "$ git commit -a"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:156
+#: en/about_manual.ssi:168
msgid "_* Push the commit to the server:"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:160
+#: en/about_manual.ssi:172
msgid "$ git push"
msgstr ""
diff --git a/manual/pot/about_project.ssi.pot b/manual/pot/about_project.ssi.pot
index 5e4edf1..344dafa 100644
--- a/manual/pot/about_project.ssi.pot
+++ b/manual/pot/about_project.ssi.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-22 07:52-0200\n"
+"POT-Creation-Date: 2010-11-27 10:30-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"
@@ -51,7 +51,7 @@ msgstr ""
#. type: Plain text
#: en/about_project.ssi:14
-msgid "_* They mix different distributions, e.g. testing and unstable."
+msgid "_* They mix different distributions, e.g. *{testing}* and *{unstable}*."
msgstr ""
#. type: Plain text
diff --git a/manual/pot/live-manual.ssm.pot b/manual/pot/live-manual.ssm.pot
index e72bac7..dad30e9 100644
--- a/manual/pot/live-manual.ssm.pot
+++ b/manual/pot/live-manual.ssm.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-11-13 16:15+0100\n"
+"POT-Creation-Date: 2010-11-29 14:16-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -45,7 +45,7 @@ msgstr ""
#, no-wrap
msgid ""
"@date:\n"
-" :published: 2010-11-13\n"
+" :published: 2010-11-29\n"
msgstr ""
#. type: Plain text
@@ -58,7 +58,7 @@ msgstr ""
#, no-wrap
msgid ""
"@make:\n"
-" :bold: /Squeeze|squeeze|Stable|stable|Wheezy|wheezy|Testing|testing|Sid|sid|Unstable|unstable/\n"
+" :bold: /Squeeze|squeeze|Wheezy|wheezy|Sid|sid/\n"
" :italics: /live-boot|live-build|live-config|live-magic|live-manual|live-installer|debian-installer-launcher/\n"
" :num_top: 1\n"
" :skin: skin_debian-live\n"
diff --git a/manual/pot/project_bugs.ssi.pot b/manual/pot/project_bugs.ssi.pot
index dc6fde9..fa8f7c3 100644
--- a/manual/pot/project_bugs.ssi.pot
+++ b/manual/pot/project_bugs.ssi.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-27 21:40-0200\n"
+"POT-Creation-Date: 2010-11-27 10:30-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"
@@ -17,9 +17,9 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
#. type: Plain text
-#: en/about_manual.ssi:80 en/about_manual.ssi:88 en/about_manual.ssi:96
-#: en/about_manual.ssi:108 en/about_manual.ssi:121 en/about_manual.ssi:134
-#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
+#: en/about_manual.ssi:112 en/about_manual.ssi:125 en/about_manual.ssi:138
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
#: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
#: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
#: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
@@ -39,48 +39,49 @@ msgstr ""
#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
-#: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
-#: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
-#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111
-#: en/project_bugs.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
-#: en/user_basics.ssi:54 en/user_basics.ssi:66 en/user_basics.ssi:78
-#: en/user_basics.ssi:88 en/user_basics.ssi:102 en/user_basics.ssi:110
-#: en/user_basics.ssi:118 en/user_basics.ssi:128 en/user_basics.ssi:140
-#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
-#: en/user_basics.ssi:182 en/user_basics.ssi:190 en/user_basics.ssi:200
-#: en/user_basics.ssi:220 en/user_basics.ssi:253 en/user_basics.ssi:269
-#: en/user_basics.ssi:277 en/user_basics.ssi:297 en/user_basics.ssi:322
-#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
-#: en/user_customization-contents.ssi:66
+#: en/other_procedures.ssi:58 en/project_bugs.ssi:58 en/user_basics.ssi:32
+#: en/user_basics.ssi:42 en/user_basics.ssi:54 en/user_basics.ssi:66
+#: en/user_basics.ssi:78 en/user_basics.ssi:88 en/user_basics.ssi:102
+#: en/user_basics.ssi:110 en/user_basics.ssi:118 en/user_basics.ssi:128
+#: en/user_basics.ssi:142 en/user_basics.ssi:154 en/user_basics.ssi:162
+#: en/user_basics.ssi:170 en/user_basics.ssi:184 en/user_basics.ssi:192
+#: en/user_basics.ssi:202 en/user_basics.ssi:222 en/user_basics.ssi:255
+#: en/user_basics.ssi:271 en/user_basics.ssi:279 en/user_basics.ssi:299
+#: en/user_basics.ssi:324 en/user_customization-contents.ssi:34
+#: en/user_customization-contents.ssi:43 en/user_customization-contents.ssi:66
#: en/user_customization-internationalization.ssi:10
#: en/user_customization-internationalization.ssi:18
#: en/user_customization-internationalization.ssi:26
#: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:16 en/user_customization-packages.ssi:24
-#: en/user_customization-packages.ssi:36 en/user_customization-packages.ssi:45
-#: en/user_customization-packages.ssi:59 en/user_customization-packages.ssi:73
-#: en/user_customization-packages.ssi:103
-#: en/user_customization-packages.ssi:111
-#: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:166
-#: en/user_customization-packages.ssi:176
-#: en/user_customization-packages.ssi:186
-#: en/user_customization-packages.ssi:196 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:104
-#: en/user_installation.ssi:118 en/user_installation.ssi:135
-#: en/user_managing_a_configuration.ssi:24
+#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
+#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
+#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:90
+#: en/user_customization-packages.ssi:120
+#: en/user_customization-packages.ssi:133
+#: en/user_customization-packages.ssi:143
+#: en/user_customization-packages.ssi:153
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:261
+#: en/user_customization-packages.ssi:273
+#: en/user_customization-packages.ssi:283 en/user_examples.ssi:12
+#: en/user_examples.ssi:27 en/user_examples.ssi:37 en/user_examples.ssi:75
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:76 en/user_installation.ssi:84
+#: en/user_installation.ssi:104 en/user_installation.ssi:118
+#: en/user_installation.ssi:135 en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
-#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:46
-#: en/user_overview.ssi:90 en/user_overview.ssi:98
+#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:36
+#: en/user_overview.ssi:80 en/user_overview.ssi:88
msgid "code{"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:121 en/about_manual.ssi:134 en/about_manual.ssi:142
+#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:165
#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
@@ -100,40 +101,42 @@ msgstr ""
#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
#: en/other_live-environment.ssi:138 en/other_procedures.ssi:16
#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
-#: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
-#: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
-#: en/other_use-cases.ssi:137 en/project_bugs.ssi:62 en/user_basics.ssi:36
-#: en/user_basics.ssi:46 en/user_basics.ssi:60 en/user_basics.ssi:72
-#: en/user_basics.ssi:82 en/user_basics.ssi:94 en/user_basics.ssi:106
-#: en/user_basics.ssi:114 en/user_basics.ssi:122 en/user_basics.ssi:132
-#: en/user_basics.ssi:146 en/user_basics.ssi:156 en/user_basics.ssi:164
-#: en/user_basics.ssi:172 en/user_basics.ssi:186 en/user_basics.ssi:194
-#: en/user_basics.ssi:204 en/user_basics.ssi:245 en/user_basics.ssi:257
-#: en/user_basics.ssi:273 en/user_basics.ssi:281 en/user_basics.ssi:308
-#: en/user_basics.ssi:347 en/user_customization-contents.ssi:39
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:70
+#: en/project_bugs.ssi:62 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:60 en/user_basics.ssi:72 en/user_basics.ssi:82
+#: en/user_basics.ssi:94 en/user_basics.ssi:106 en/user_basics.ssi:114
+#: en/user_basics.ssi:122 en/user_basics.ssi:132 en/user_basics.ssi:148
+#: en/user_basics.ssi:158 en/user_basics.ssi:166 en/user_basics.ssi:174
+#: en/user_basics.ssi:188 en/user_basics.ssi:196 en/user_basics.ssi:206
+#: en/user_basics.ssi:247 en/user_basics.ssi:259 en/user_basics.ssi:275
+#: en/user_basics.ssi:283 en/user_basics.ssi:310 en/user_basics.ssi:349
+#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:70
#: en/user_customization-internationalization.ssi:14
#: en/user_customization-internationalization.ssi:22
#: en/user_customization-internationalization.ssi:30
#: en/user_customization-internationalization.ssi:42
-#: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
-#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
-#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
-#: en/user_customization-packages.ssi:107
-#: en/user_customization-packages.ssi:115
-#: en/user_customization-packages.ssi:135
-#: en/user_customization-packages.ssi:172
-#: en/user_customization-packages.ssi:182
-#: en/user_customization-packages.ssi:192
-#: en/user_customization-packages.ssi:202 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 en/user_installation.ssi:108
-#: en/user_installation.ssi:123 en/user_installation.ssi:138
-#: en/user_managing_a_configuration.ssi:31
+#: en/user_customization-packages.ssi:23 en/user_customization-packages.ssi:36
+#: en/user_customization-packages.ssi:48 en/user_customization-packages.ssi:62
+#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:94
+#: en/user_customization-packages.ssi:125
+#: en/user_customization-packages.ssi:139
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:159
+#: en/user_customization-packages.ssi:169
+#: en/user_customization-packages.ssi:181
+#: en/user_customization-packages.ssi:197
+#: en/user_customization-packages.ssi:265
+#: en/user_customization-packages.ssi:277
+#: en/user_customization-packages.ssi:287 en/user_examples.ssi:17
+#: en/user_examples.ssi:31 en/user_examples.ssi:41 en/user_examples.ssi:84
+#: 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
+#: en/user_installation.ssi:108 en/user_installation.ssi:123
+#: en/user_installation.ssi:138 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
-#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:84
-#: en/user_overview.ssi:94 en/user_overview.ssi:102
+#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:74
+#: en/user_overview.ssi:84 en/user_overview.ssi:92
msgid "}code"
msgstr ""
@@ -191,16 +194,17 @@ msgstr ""
#. type: Plain text
#: en/project_bugs.ssi:18
msgid ""
-"Due to the nature of Debian testing and Debian unstable distributions being "
-"a moving target, building a live system may not always be possible."
+"Due to the nature of Debian *{testing}* and Debian *{unstable}* "
+"distributions being a moving target, building a live system may not always "
+"be possible."
msgstr ""
#. type: Plain text
#: en/project_bugs.ssi:20
msgid ""
-"If this is a problem, do not build a system based on testing or unstable, "
-"but go with stable. live-build does always default to the current stable "
-"release."
+"If this is a problem, do not build a system based on *{testing}* or *"
+"{unstable}*, but go with *{stable}*. live-build does always default to the "
+"current *{stable}* release."
msgstr ""
#. type: Plain text
@@ -215,9 +219,10 @@ msgstr ""
msgid ""
"It is out of the scope of this manual to train you in correctly identifying "
"and fixing problems in packages of the development distributions, however, "
-"there are two things you can always try: When not succeeding to build "
-"testing, try if unstable works. If unstable does not work either, revert to "
-"testing and pinning the newer version of the failing package from unstable."
+"there are two things you can always try: When not succeeding to build *"
+"{testing}*, try if *{unstable}* works. If *{unstable}* does not work either, "
+"revert to *{testing}* and pinning the newer version of the failing package "
+"from *{unstable}*."
msgstr ""
#. type: Plain text
diff --git a/manual/pot/user_basics.ssi.pot b/manual/pot/user_basics.ssi.pot
index 26451b3..3ac6529 100644
--- a/manual/pot/user_basics.ssi.pot
+++ b/manual/pot/user_basics.ssi.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-11-01 06:47-0200\n"
+"POT-Creation-Date: 2010-11-28 07:16-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"
@@ -17,9 +17,9 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
#. type: Plain text
-#: en/about_manual.ssi:80 en/about_manual.ssi:88 en/about_manual.ssi:96
-#: en/about_manual.ssi:108 en/about_manual.ssi:121 en/about_manual.ssi:134
-#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
+#: en/about_manual.ssi:112 en/about_manual.ssi:125 en/about_manual.ssi:138
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
#: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
#: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
#: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
@@ -39,38 +39,43 @@ msgstr ""
#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
-#: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
-#: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
-#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111
-#: en/project_bugs.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
-#: en/user_basics.ssi:54 en/user_basics.ssi:66 en/user_basics.ssi:78
-#: en/user_basics.ssi:88 en/user_basics.ssi:102 en/user_basics.ssi:110
-#: en/user_basics.ssi:118 en/user_basics.ssi:128 en/user_basics.ssi:140
-#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
-#: en/user_basics.ssi:182 en/user_basics.ssi:190 en/user_basics.ssi:200
-#: en/user_basics.ssi:220 en/user_basics.ssi:253 en/user_basics.ssi:269
-#: en/user_basics.ssi:277 en/user_basics.ssi:297 en/user_basics.ssi:322
-#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
-#: en/user_customization-contents.ssi:66
+#: en/other_procedures.ssi:58 en/project_bugs.ssi:58 en/user_basics.ssi:32
+#: en/user_basics.ssi:42 en/user_basics.ssi:54 en/user_basics.ssi:66
+#: en/user_basics.ssi:78 en/user_basics.ssi:88 en/user_basics.ssi:102
+#: en/user_basics.ssi:110 en/user_basics.ssi:118 en/user_basics.ssi:128
+#: en/user_basics.ssi:142 en/user_basics.ssi:154 en/user_basics.ssi:162
+#: en/user_basics.ssi:170 en/user_basics.ssi:184 en/user_basics.ssi:192
+#: en/user_basics.ssi:202 en/user_basics.ssi:222 en/user_basics.ssi:255
+#: en/user_basics.ssi:271 en/user_basics.ssi:279 en/user_basics.ssi:299
+#: en/user_basics.ssi:324 en/user_customization-contents.ssi:34
+#: en/user_customization-contents.ssi:43 en/user_customization-contents.ssi:66
#: en/user_customization-internationalization.ssi:10
#: en/user_customization-internationalization.ssi:18
#: en/user_customization-internationalization.ssi:26
#: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:16 en/user_customization-packages.ssi:24
-#: en/user_customization-packages.ssi:36 en/user_customization-packages.ssi:45
-#: en/user_customization-packages.ssi:59 en/user_customization-packages.ssi:73
-#: en/user_customization-packages.ssi:103
-#: en/user_customization-packages.ssi:111
-#: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:166
-#: en/user_customization-packages.ssi:176
-#: en/user_customization-packages.ssi:186
-#: en/user_customization-packages.ssi:196 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:104
-#: en/user_installation.ssi:118 en/user_installation.ssi:135
-#: en/user_managing_a_configuration.ssi:24
+#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
+#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
+#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:90
+#: en/user_customization-packages.ssi:120
+#: en/user_customization-packages.ssi:133
+#: en/user_customization-packages.ssi:143
+#: en/user_customization-packages.ssi:153
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:261
+#: en/user_customization-packages.ssi:273
+#: en/user_customization-packages.ssi:283 en/user_examples.ssi:12
+#: en/user_examples.ssi:27 en/user_examples.ssi:37 en/user_examples.ssi:51
+#: en/user_examples.ssi:61 en/user_examples.ssi:77 en/user_examples.ssi:87
+#: en/user_examples.ssi:104 en/user_examples.ssi:114 en/user_examples.ssi:128
+#: en/user_examples.ssi:136 en/user_examples.ssi:151 en/user_examples.ssi:159
+#: en/user_examples.ssi:185 en/user_examples.ssi:206 en/user_examples.ssi:214
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:76 en/user_installation.ssi:84
+#: en/user_installation.ssi:104 en/user_installation.ssi:118
+#: en/user_installation.ssi:135 en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:36
#: en/user_overview.ssi:80 en/user_overview.ssi:88
@@ -78,9 +83,9 @@ msgid "code{"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:121 en/about_manual.ssi:134 en/about_manual.ssi:142
+#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:165
#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
@@ -100,37 +105,43 @@ msgstr ""
#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
#: en/other_live-environment.ssi:138 en/other_procedures.ssi:16
#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
-#: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
-#: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
-#: en/other_use-cases.ssi:137 en/project_bugs.ssi:62 en/user_basics.ssi:36
-#: en/user_basics.ssi:46 en/user_basics.ssi:60 en/user_basics.ssi:72
-#: en/user_basics.ssi:82 en/user_basics.ssi:94 en/user_basics.ssi:106
-#: en/user_basics.ssi:114 en/user_basics.ssi:122 en/user_basics.ssi:132
-#: en/user_basics.ssi:146 en/user_basics.ssi:156 en/user_basics.ssi:164
-#: en/user_basics.ssi:172 en/user_basics.ssi:186 en/user_basics.ssi:194
-#: en/user_basics.ssi:204 en/user_basics.ssi:245 en/user_basics.ssi:257
-#: en/user_basics.ssi:273 en/user_basics.ssi:281 en/user_basics.ssi:308
-#: en/user_basics.ssi:347 en/user_customization-contents.ssi:39
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:70
+#: en/project_bugs.ssi:62 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:60 en/user_basics.ssi:72 en/user_basics.ssi:82
+#: en/user_basics.ssi:94 en/user_basics.ssi:106 en/user_basics.ssi:114
+#: en/user_basics.ssi:122 en/user_basics.ssi:132 en/user_basics.ssi:148
+#: en/user_basics.ssi:158 en/user_basics.ssi:166 en/user_basics.ssi:174
+#: en/user_basics.ssi:188 en/user_basics.ssi:196 en/user_basics.ssi:206
+#: en/user_basics.ssi:247 en/user_basics.ssi:259 en/user_basics.ssi:275
+#: en/user_basics.ssi:283 en/user_basics.ssi:310 en/user_basics.ssi:349
+#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:70
#: en/user_customization-internationalization.ssi:14
#: en/user_customization-internationalization.ssi:22
#: en/user_customization-internationalization.ssi:30
#: en/user_customization-internationalization.ssi:42
-#: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
-#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
-#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
-#: en/user_customization-packages.ssi:107
-#: en/user_customization-packages.ssi:115
-#: en/user_customization-packages.ssi:135
-#: en/user_customization-packages.ssi:172
-#: en/user_customization-packages.ssi:182
-#: en/user_customization-packages.ssi:192
-#: en/user_customization-packages.ssi:202 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 en/user_installation.ssi:108
-#: en/user_installation.ssi:123 en/user_installation.ssi:138
-#: en/user_managing_a_configuration.ssi:31
+#: en/user_customization-packages.ssi:23 en/user_customization-packages.ssi:36
+#: en/user_customization-packages.ssi:48 en/user_customization-packages.ssi:62
+#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:94
+#: en/user_customization-packages.ssi:125
+#: en/user_customization-packages.ssi:139
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:159
+#: en/user_customization-packages.ssi:169
+#: en/user_customization-packages.ssi:181
+#: en/user_customization-packages.ssi:197
+#: en/user_customization-packages.ssi:265
+#: en/user_customization-packages.ssi:277
+#: en/user_customization-packages.ssi:287 en/user_examples.ssi:17
+#: en/user_examples.ssi:31 en/user_examples.ssi:41 en/user_examples.ssi:55
+#: en/user_examples.ssi:65 en/user_examples.ssi:83 en/user_examples.ssi:98
+#: en/user_examples.ssi:108 en/user_examples.ssi:120 en/user_examples.ssi:132
+#: en/user_examples.ssi:147 en/user_examples.ssi:155 en/user_examples.ssi:163
+#: en/user_examples.ssi:194 en/user_examples.ssi:210 en/user_examples.ssi:218
+#: 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
+#: en/user_installation.ssi:108 en/user_installation.ssi:123
+#: en/user_installation.ssi:138 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:74
#: en/user_overview.ssi:84 en/user_overview.ssi:92
@@ -144,14 +155,23 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:4
-msgid "1~ The basics"
+msgid "1~the-basics The basics"
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:6
msgid ""
"This chapter contains a brief overview of the build process and instructions "
-"for booting the various binary image types."
+"for using the three most commonly used image types. The most versatile image "
+"type, #{iso-hybrid}#, may be used on a virtual machine, optical media or USB "
+"portable storage device. In certain special cases, #{usb-hdd}# may be more "
+"suitable for USB devices. The chapter finishes with instructions for "
+"building and using a #{net}# type image, which is a bit more involved due to "
+"the setup required on the server. This is a slightly advanced topic for "
+"anyone who is not familiar already with netbooting, but is included here "
+"because once the setup is done, it is a very convenient way to test and "
+"deploy images for booting on the local network without the hassle of dealing "
+"with image media."
msgstr ""
#. type: Plain text
@@ -269,7 +289,8 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:44 en/user_basics.ssi:120 en/user_basics.ssi:202
+#: en/user_basics.ssi:44 en/user_basics.ssi:120 en/user_basics.ssi:204
+#: en/user_examples.ssi:106 en/user_examples.ssi:153
msgid "# lb build"
msgstr ""
@@ -282,7 +303,7 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:50
-msgid "3~ Testing an ISO image with Qemu"
+msgid "3~testing-iso-with-qemu Testing an ISO image with Qemu"
msgstr ""
#. type: Plain text
@@ -291,7 +312,7 @@ msgid "Testing an ISO is simple:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:56 en/user_basics.ssi:142
+#: en/user_basics.ssi:56 en/user_basics.ssi:144
msgid "# apt-get install qemu"
msgstr ""
@@ -302,7 +323,7 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:62
-msgid "3~ Testing an ISO image with virtualbox-ose"
+msgid "3~testing-iso-with-virtualbox Testing an ISO image with virtualbox-ose"
msgstr ""
#. type: Plain text
@@ -343,7 +364,7 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:84
-msgid "3~ Burning an ISO image to a physical medium"
+msgid "3~burning-iso-image Burning an ISO image to a physical medium"
msgstr ""
#. type: Plain text
@@ -382,20 +403,20 @@ msgstr ""
#: en/user_basics.ssi:100
msgid ""
"Note: if you created an ISO image with the previous example, you will need "
-"to clean up your working directory with the #{lb clean} command (see {The lb "
-"clean command}#lb-clean):"
+"to clean up your working directory with the #{lb clean}# command (see {The "
+"lb clean command}#lb-clean):"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:104 en/user_basics.ssi:184
+#: en/user_basics.ssi:104 en/user_basics.ssi:186
msgid "$ lb clean --binary"
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:108
msgid ""
-"Run the #{lb config}# command with the parameters to configure the \"config/"
-"\" hierarchy to create a USB/HDD image type:"
+"Run the #{lb config}# command with the parameters to configure the #{config/}"
+"# hierarchy to create a USB/HDD image type:"
msgstr ""
#. type: Plain text
@@ -443,21 +464,28 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:138
-msgid "3~ Testing a USB/HDD image with Qemu"
+msgid ""
+"Note: As discussed earlier, this same process can be used for #{iso-hybrid}# "
+"type images, (suffixed #{-hybrid.iso}#,) but not #{iso}# type images."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:144
+#: en/user_basics.ssi:140
+msgid "3~testing-usb-hdd-with-qemu Testing a USB/HDD image with Qemu"
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:146
msgid "$ qemu -hda binary.img"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:148
+#: en/user_basics.ssi:150
msgid "3~ Using the space left on a USB stick"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:150
+#: en/user_basics.ssi:152
msgid ""
"If you want to use the remaining free space after you have installed the "
"binary.img, you can use a partitioning tool such as #{gparted}# or #{parted}"
@@ -466,45 +494,45 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:154
+#: en/user_basics.ssi:156
msgid "# gparted ${USBSTICK}"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:158
+#: en/user_basics.ssi:160
msgid ""
"After the creation of the partition, you have to create a filesystem on it. "
"One possible choice would be ext4."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:162
+#: en/user_basics.ssi:164
msgid "# mkfs.ext4 ${USBSTICK}"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:166
+#: en/user_basics.ssi:168
msgid "If you want to use this data partition with Windows, use FAT32."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:170
+#: en/user_basics.ssi:172
msgid "# mkfs.vfat -F 32"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:174
+#: en/user_basics.ssi:176
#, no-wrap
msgid "*{Remember: Every time you install a new binary.img on the stick, all data on the stick will be lost because the partition table is overwritten by the contents of the image.}*\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:176
-msgid "2~ Building a netboot image"
+#: en/user_basics.ssi:178
+msgid "2~building-netboot-image Building a netboot image"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:178
+#: en/user_basics.ssi:180
msgid ""
"The following sequence of commands will create a basic netboot image "
"containing the Debian standard system without X.org. It is suitable for "
@@ -512,28 +540,28 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:180
+#: en/user_basics.ssi:182
msgid ""
"Note: if you performed any previous examples, you will need to clean up your "
"working directory with the #{lb clean}# command:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:188
+#: en/user_basics.ssi:190
msgid ""
"Run the #{lb config}# command with the parameters to configure the \"config/"
"\" hierarchy to create our netboot image:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:192
+#: en/user_basics.ssi:194
msgid ""
"$ lb config -b net --net-root-path \"/srv/debian-live\" --net-root-server "
"\"192.168.0.1\""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:196
+#: en/user_basics.ssi:198
msgid ""
"In contrast with the ISO and USB/HDD images, netbooting does not support "
"serving a filesystem image with the client, so the files must be served via "
@@ -543,12 +571,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:198
+#: en/user_basics.ssi:200
msgid "Now build the image with the #{lb build}# command:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:206
+#: en/user_basics.ssi:208
msgid ""
"In a network boot, the client runs a small piece of software which usually "
"resides on the EPROM of the Ethernet card. This program sends a DHCP request "
@@ -559,7 +587,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:208
+#: en/user_basics.ssi:210
msgid ""
"For example, if you unpack the generated binary-net.tar.gz archive in the /"
"srv/debian-live directory, you'll find the filesystem image in live/"
@@ -568,17 +596,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:210
+#: en/user_basics.ssi:212
msgid "We must now configure three services on the server to enable netboot."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:212
+#: en/user_basics.ssi:214
msgid "3~ DHCP server"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:214
+#: en/user_basics.ssi:216
msgid ""
"We must configure our network's DHCP server to be sure to give an IP address "
"to the netbooting client system, and to advertise the location of the PXE "
@@ -586,25 +614,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:216
+#: en/user_basics.ssi:218
msgid ""
"Here is an example for inspiration, written for the ISC DHCP server #{isc-"
"dhcp-server}# in the /etc/dhcp/dhcpd.conf configuration file;"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:218 en/user_customization-packages.ssi:153
+#: en/user_basics.ssi:220
msgid "% FIXME"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:222
+#: en/user_basics.ssi:224
#, no-wrap
msgid "subnet 192.168.1.0 netmask 255.255.255.0 { # 192.168.1.0/24\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:225
+#: en/user_basics.ssi:227
#, no-wrap
msgid ""
" # IP addresses available for guests\n"
@@ -612,7 +640,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:228
+#: en/user_basics.ssi:230
#, no-wrap
msgid ""
" # allow booting from the net\n"
@@ -620,7 +648,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:233
+#: en/user_basics.ssi:235
#, no-wrap
msgid ""
" # for net booting, server where the first file to be loaded (by TFTP\n"
@@ -630,7 +658,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:237
+#: en/user_basics.ssi:239
#, no-wrap
msgid ""
" # net boot configuration for guests with a PXE client:\n"
@@ -639,7 +667,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:240
+#: en/user_basics.ssi:242
#, no-wrap
msgid ""
" # PXE bootloader (first program to be loaded, by TFTP)\n"
@@ -647,7 +675,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:243
+#: en/user_basics.ssi:245
#, no-wrap
msgid ""
" }\n"
@@ -655,17 +683,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:247
+#: en/user_basics.ssi:249
msgid "3~ TFTP server"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:249
+#: en/user_basics.ssi:251
msgid "This serves the kernel and initial ramdisk to the system at run time."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:251
+#: en/user_basics.ssi:253
msgid ""
"You should install the tftpd-hpa package. It can serve all files contained "
"inside a root directory, usually /srv/tftp. To let it serve files inside /"
@@ -673,22 +701,22 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:255
+#: en/user_basics.ssi:257
msgid "dpkg-reconfigure -plow tftpd-hpa"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:259
+#: en/user_basics.ssi:261
msgid "and fill in the new tftp server directory when being asked about it."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:261
+#: en/user_basics.ssi:263
msgid "3~ NFS server"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:263
+#: en/user_basics.ssi:265
msgid ""
"Once the guest computer has downloaded and booted a Linux kernel and loaded "
"its initrd, it will try to mount the Live filesystem image through a NFS "
@@ -696,35 +724,35 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:265
+#: en/user_basics.ssi:267
msgid "You need to install the nfs-kernel-server package."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:267
+#: en/user_basics.ssi:269
msgid ""
"Then, make the filesystem image available through NFS by adding a line like "
"the following to /etc/exports:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:271
+#: en/user_basics.ssi:273
msgid "/srv/debian-live *(ro,async,no_root_squash,no_subtree_check)"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:275
+#: en/user_basics.ssi:277
msgid ""
"and tell the NFS server about this new export with the following command:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:279
+#: en/user_basics.ssi:281
msgid "# exportfs -rv"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:283
+#: en/user_basics.ssi:285
msgid ""
"Setting up these three services can be a little tricky. You might need some "
"patience to get all of them working together. The Debian Installer Manual's "
@@ -733,40 +761,40 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:285
+#: en/user_basics.ssi:287
msgid "3~ Netboot testing HowTo"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:287
+#: en/user_basics.ssi:289
msgid ""
"Netboot image creation is made easy with live-build magic, but testing the "
"images on physical machines can be really time consuming."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:289
+#: en/user_basics.ssi:291
msgid ""
"To make our life easier, we can use virtualization. There are two solutions."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:291
+#: en/user_basics.ssi:293
msgid "3~ Qemu"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:293
+#: en/user_basics.ssi:295
msgid "_* Install qemu, bridge-utils, sudo."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:295
+#: en/user_basics.ssi:297
msgid "Edit /etc/qemu-ifup:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:306
+#: en/user_basics.ssi:308
msgid ""
"#!/bin/sh sudo -p \"Password for $0:\" /sbin/ifconfig $1 172.20.0.1 echo "
"\"Executing /etc/qemu-ifup\" echo \"Bringing up $1 for bridged mode...\" "
@@ -775,62 +803,62 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:310
+#: en/user_basics.ssi:312
msgid "Get, or build a grub-floppy-netboot (in the svn)."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:312
+#: en/user_basics.ssi:314
msgid "Launch qemu with \"-net nic,vlan=0 -net tap,vlan=0,ifname=tun0\""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:314
+#: en/user_basics.ssi:316
msgid "3~ VMWare Player"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:316
+#: en/user_basics.ssi:318
msgid "_* Install VMWare Player (\"free as in beer\" edition)"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:318
+#: en/user_basics.ssi:320
msgid ""
"_* Create a PXETester directory, and create a text file called pxe.vwx inside"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:320
+#: en/user_basics.ssi:322
msgid "_* Paste this text inside:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:328
+#: en/user_basics.ssi:330
msgid ""
"#!/usr/bin/vmware config.version = \"8\" virtualHW.version = \"4\" memsize = "
"\"512\" MemAllowAutoScaleDown = \"FALSE\""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:334
+#: en/user_basics.ssi:336
msgid ""
"ide0:0.present = \"FALSE\" ide1:0.present = \"FALSE\" floppy0.present = "
"\"FALSE\" sound.present = \"FALSE\" tools.remindInstall = \"FALSE\""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:337
+#: en/user_basics.ssi:339
msgid "ethernet0.present = \"TRUE\" ethernet0.addressType = \"generated\""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:340
+#: en/user_basics.ssi:342
msgid "displayName = \"Test Boot PXE\" guestOS = \"other\""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:345
+#: en/user_basics.ssi:347
msgid ""
"ethernet0.generatedAddress = \"00:0c:29:8d:71:3b\" uuid.location = \"56 4d "
"83 72 5c c4 de 3f-ae 9e 07 91 1d 8d 71 3b\" uuid.bios = \"56 4d 83 72 5c c4 "
@@ -838,19 +866,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:349
+#: en/user_basics.ssi:351
msgid ""
"_* You can play with this configuration file (i.e. change memory limit to "
"256)"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:351
+#: en/user_basics.ssi:353
msgid ""
"_* Double click on this file (or run VMWare player and select this file)."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:352
+#: en/user_basics.ssi:354
msgid "_* When running just press space if that strange question comes up..."
msgstr ""
diff --git a/manual/pot/user_customization-contents.ssi.pot b/manual/pot/user_customization-contents.ssi.pot
index c4275ac..72d5ed3 100644
--- a/manual/pot/user_customization-contents.ssi.pot
+++ b/manual/pot/user_customization-contents.ssi.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-23 16:43+0300\n"
+"POT-Creation-Date: 2010-11-27 09:40-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"
@@ -17,9 +17,9 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
#. type: Plain text
-#: en/about_manual.ssi:80 en/about_manual.ssi:88 en/about_manual.ssi:96
-#: en/about_manual.ssi:108 en/about_manual.ssi:121 en/about_manual.ssi:134
-#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
+#: en/about_manual.ssi:112 en/about_manual.ssi:125 en/about_manual.ssi:138
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
#: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
#: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
#: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
@@ -39,47 +39,49 @@ msgstr ""
#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
-#: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
-#: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
-#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111 en/user_basics.ssi:34
-#: en/user_basics.ssi:44 en/user_basics.ssi:56 en/user_basics.ssi:68
-#: en/user_basics.ssi:80 en/user_basics.ssi:92 en/user_basics.ssi:106
-#: en/user_basics.ssi:114 en/user_basics.ssi:122 en/user_basics.ssi:132
-#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
-#: en/user_basics.ssi:172 en/user_basics.ssi:186 en/user_basics.ssi:194
-#: en/user_basics.ssi:204 en/user_basics.ssi:224 en/user_basics.ssi:257
-#: en/user_basics.ssi:273 en/user_basics.ssi:281 en/user_basics.ssi:301
-#: en/user_basics.ssi:326 en/user_customization-contents.ssi:34
+#: en/other_procedures.ssi:58 en/project_bugs.ssi:58 en/user_basics.ssi:32
+#: en/user_basics.ssi:42 en/user_basics.ssi:54 en/user_basics.ssi:66
+#: en/user_basics.ssi:78 en/user_basics.ssi:88 en/user_basics.ssi:102
+#: en/user_basics.ssi:110 en/user_basics.ssi:118 en/user_basics.ssi:128
+#: en/user_basics.ssi:142 en/user_basics.ssi:154 en/user_basics.ssi:162
+#: en/user_basics.ssi:170 en/user_basics.ssi:184 en/user_basics.ssi:192
+#: en/user_basics.ssi:202 en/user_basics.ssi:222 en/user_basics.ssi:255
+#: en/user_basics.ssi:271 en/user_basics.ssi:279 en/user_basics.ssi:299
+#: en/user_basics.ssi:324 en/user_customization-contents.ssi:34
#: en/user_customization-contents.ssi:43 en/user_customization-contents.ssi:66
#: en/user_customization-internationalization.ssi:10
#: en/user_customization-internationalization.ssi:18
#: en/user_customization-internationalization.ssi:26
#: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:16 en/user_customization-packages.ssi:24
-#: en/user_customization-packages.ssi:36 en/user_customization-packages.ssi:45
-#: en/user_customization-packages.ssi:59 en/user_customization-packages.ssi:73
-#: en/user_customization-packages.ssi:103
-#: en/user_customization-packages.ssi:111
-#: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:166
-#: en/user_customization-packages.ssi:176
-#: en/user_customization-packages.ssi:186
-#: en/user_customization-packages.ssi:196 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:104
-#: en/user_installation.ssi:118 en/user_installation.ssi:135
-#: en/user_managing_a_configuration.ssi:24
+#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
+#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
+#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:90
+#: en/user_customization-packages.ssi:120
+#: en/user_customization-packages.ssi:133
+#: en/user_customization-packages.ssi:143
+#: en/user_customization-packages.ssi:153
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:261
+#: en/user_customization-packages.ssi:273
+#: en/user_customization-packages.ssi:283 en/user_examples.ssi:12
+#: en/user_examples.ssi:27 en/user_examples.ssi:37 en/user_examples.ssi:75
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:76 en/user_installation.ssi:84
+#: en/user_installation.ssi:104 en/user_installation.ssi:118
+#: en/user_installation.ssi:135 en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
-#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:46
-#: en/user_overview.ssi:90 en/user_overview.ssi:98
+#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:36
+#: en/user_overview.ssi:80 en/user_overview.ssi:88
msgid "code{"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:121 en/about_manual.ssi:134 en/about_manual.ssi:142
+#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:165
#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
@@ -99,46 +101,48 @@ msgstr ""
#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
#: en/other_live-environment.ssi:138 en/other_procedures.ssi:16
#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
-#: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
-#: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
-#: en/other_use-cases.ssi:137 en/user_basics.ssi:38 en/user_basics.ssi:48
-#: en/user_basics.ssi:62 en/user_basics.ssi:72 en/user_basics.ssi:86
-#: en/user_basics.ssi:98 en/user_basics.ssi:110 en/user_basics.ssi:118
-#: en/user_basics.ssi:126 en/user_basics.ssi:136 en/user_basics.ssi:150
-#: en/user_basics.ssi:160 en/user_basics.ssi:168 en/user_basics.ssi:176
-#: en/user_basics.ssi:190 en/user_basics.ssi:198 en/user_basics.ssi:208
-#: en/user_basics.ssi:249 en/user_basics.ssi:261 en/user_basics.ssi:277
-#: en/user_basics.ssi:285 en/user_basics.ssi:312 en/user_basics.ssi:351
+#: en/project_bugs.ssi:62 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:60 en/user_basics.ssi:72 en/user_basics.ssi:82
+#: en/user_basics.ssi:94 en/user_basics.ssi:106 en/user_basics.ssi:114
+#: en/user_basics.ssi:122 en/user_basics.ssi:132 en/user_basics.ssi:148
+#: en/user_basics.ssi:158 en/user_basics.ssi:166 en/user_basics.ssi:174
+#: en/user_basics.ssi:188 en/user_basics.ssi:196 en/user_basics.ssi:206
+#: en/user_basics.ssi:247 en/user_basics.ssi:259 en/user_basics.ssi:275
+#: en/user_basics.ssi:283 en/user_basics.ssi:310 en/user_basics.ssi:349
#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
#: en/user_customization-contents.ssi:70
#: en/user_customization-internationalization.ssi:14
#: en/user_customization-internationalization.ssi:22
#: en/user_customization-internationalization.ssi:30
#: en/user_customization-internationalization.ssi:42
-#: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
-#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
-#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
-#: en/user_customization-packages.ssi:107
-#: en/user_customization-packages.ssi:115
-#: en/user_customization-packages.ssi:135
-#: en/user_customization-packages.ssi:172
-#: en/user_customization-packages.ssi:182
-#: en/user_customization-packages.ssi:192
-#: en/user_customization-packages.ssi:202 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 en/user_installation.ssi:108
-#: en/user_installation.ssi:123 en/user_installation.ssi:138
-#: en/user_managing_a_configuration.ssi:31
+#: en/user_customization-packages.ssi:23 en/user_customization-packages.ssi:36
+#: en/user_customization-packages.ssi:48 en/user_customization-packages.ssi:62
+#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:94
+#: en/user_customization-packages.ssi:125
+#: en/user_customization-packages.ssi:139
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:159
+#: en/user_customization-packages.ssi:169
+#: en/user_customization-packages.ssi:181
+#: en/user_customization-packages.ssi:197
+#: en/user_customization-packages.ssi:265
+#: en/user_customization-packages.ssi:277
+#: en/user_customization-packages.ssi:287 en/user_examples.ssi:17
+#: en/user_examples.ssi:31 en/user_examples.ssi:41 en/user_examples.ssi:84
+#: 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
+#: en/user_installation.ssi:108 en/user_installation.ssi:123
+#: en/user_installation.ssi:138 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
-#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:84
-#: en/user_overview.ssi:94 en/user_overview.ssi:102
+#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:74
+#: en/user_overview.ssi:84 en/user_overview.ssi:92
msgid "}code"
msgstr ""
#. type: Plain text
#: en/user_customization-contents.ssi:2 en/user_customization-overview.ssi:2
-msgid "B~ Customizing contents"
+msgid ":B~ Customizing contents"
msgstr ""
#. type: Plain text
diff --git a/manual/pot/user_customization-internationalization.ssi.pot b/manual/pot/user_customization-internationalization.ssi.pot
index 7d6accb..136e237 100644
--- a/manual/pot/user_customization-internationalization.ssi.pot
+++ b/manual/pot/user_customization-internationalization.ssi.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-28 09:15-0200\n"
+"POT-Creation-Date: 2010-11-27 09:40-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"
@@ -17,9 +17,9 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
#. type: Plain text
-#: en/about_manual.ssi:80 en/about_manual.ssi:88 en/about_manual.ssi:96
-#: en/about_manual.ssi:108 en/about_manual.ssi:121 en/about_manual.ssi:134
-#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
+#: en/about_manual.ssi:112 en/about_manual.ssi:125 en/about_manual.ssi:138
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
#: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
#: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
#: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
@@ -39,48 +39,49 @@ msgstr ""
#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
-#: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
-#: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
-#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111
-#: en/project_bugs.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
-#: en/user_basics.ssi:54 en/user_basics.ssi:66 en/user_basics.ssi:78
-#: en/user_basics.ssi:88 en/user_basics.ssi:102 en/user_basics.ssi:110
-#: en/user_basics.ssi:118 en/user_basics.ssi:128 en/user_basics.ssi:140
-#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
-#: en/user_basics.ssi:182 en/user_basics.ssi:190 en/user_basics.ssi:200
-#: en/user_basics.ssi:220 en/user_basics.ssi:253 en/user_basics.ssi:269
-#: en/user_basics.ssi:277 en/user_basics.ssi:297 en/user_basics.ssi:322
-#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
-#: en/user_customization-contents.ssi:66
+#: en/other_procedures.ssi:58 en/project_bugs.ssi:58 en/user_basics.ssi:32
+#: en/user_basics.ssi:42 en/user_basics.ssi:54 en/user_basics.ssi:66
+#: en/user_basics.ssi:78 en/user_basics.ssi:88 en/user_basics.ssi:102
+#: en/user_basics.ssi:110 en/user_basics.ssi:118 en/user_basics.ssi:128
+#: en/user_basics.ssi:142 en/user_basics.ssi:154 en/user_basics.ssi:162
+#: en/user_basics.ssi:170 en/user_basics.ssi:184 en/user_basics.ssi:192
+#: en/user_basics.ssi:202 en/user_basics.ssi:222 en/user_basics.ssi:255
+#: en/user_basics.ssi:271 en/user_basics.ssi:279 en/user_basics.ssi:299
+#: en/user_basics.ssi:324 en/user_customization-contents.ssi:34
+#: en/user_customization-contents.ssi:43 en/user_customization-contents.ssi:66
#: en/user_customization-internationalization.ssi:10
#: en/user_customization-internationalization.ssi:18
#: en/user_customization-internationalization.ssi:26
#: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:16 en/user_customization-packages.ssi:24
-#: en/user_customization-packages.ssi:36 en/user_customization-packages.ssi:45
-#: en/user_customization-packages.ssi:59 en/user_customization-packages.ssi:73
-#: en/user_customization-packages.ssi:103
-#: en/user_customization-packages.ssi:111
-#: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:166
-#: en/user_customization-packages.ssi:176
-#: en/user_customization-packages.ssi:186
-#: en/user_customization-packages.ssi:196 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:104
-#: en/user_installation.ssi:118 en/user_installation.ssi:135
-#: en/user_managing_a_configuration.ssi:24
+#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
+#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
+#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:90
+#: en/user_customization-packages.ssi:120
+#: en/user_customization-packages.ssi:133
+#: en/user_customization-packages.ssi:143
+#: en/user_customization-packages.ssi:153
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:261
+#: en/user_customization-packages.ssi:273
+#: en/user_customization-packages.ssi:283 en/user_examples.ssi:12
+#: en/user_examples.ssi:27 en/user_examples.ssi:37 en/user_examples.ssi:75
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:76 en/user_installation.ssi:84
+#: en/user_installation.ssi:104 en/user_installation.ssi:118
+#: en/user_installation.ssi:135 en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
-#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:46
-#: en/user_overview.ssi:90 en/user_overview.ssi:98
+#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:36
+#: en/user_overview.ssi:80 en/user_overview.ssi:88
msgid "code{"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:121 en/about_manual.ssi:134 en/about_manual.ssi:142
+#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:165
#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
@@ -100,46 +101,48 @@ msgstr ""
#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
#: en/other_live-environment.ssi:138 en/other_procedures.ssi:16
#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
-#: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
-#: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
-#: en/other_use-cases.ssi:137 en/project_bugs.ssi:62 en/user_basics.ssi:36
-#: en/user_basics.ssi:46 en/user_basics.ssi:60 en/user_basics.ssi:72
-#: en/user_basics.ssi:82 en/user_basics.ssi:94 en/user_basics.ssi:106
-#: en/user_basics.ssi:114 en/user_basics.ssi:122 en/user_basics.ssi:132
-#: en/user_basics.ssi:146 en/user_basics.ssi:156 en/user_basics.ssi:164
-#: en/user_basics.ssi:172 en/user_basics.ssi:186 en/user_basics.ssi:194
-#: en/user_basics.ssi:204 en/user_basics.ssi:245 en/user_basics.ssi:257
-#: en/user_basics.ssi:273 en/user_basics.ssi:281 en/user_basics.ssi:308
-#: en/user_basics.ssi:347 en/user_customization-contents.ssi:39
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:70
+#: en/project_bugs.ssi:62 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:60 en/user_basics.ssi:72 en/user_basics.ssi:82
+#: en/user_basics.ssi:94 en/user_basics.ssi:106 en/user_basics.ssi:114
+#: en/user_basics.ssi:122 en/user_basics.ssi:132 en/user_basics.ssi:148
+#: en/user_basics.ssi:158 en/user_basics.ssi:166 en/user_basics.ssi:174
+#: en/user_basics.ssi:188 en/user_basics.ssi:196 en/user_basics.ssi:206
+#: en/user_basics.ssi:247 en/user_basics.ssi:259 en/user_basics.ssi:275
+#: en/user_basics.ssi:283 en/user_basics.ssi:310 en/user_basics.ssi:349
+#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:70
#: en/user_customization-internationalization.ssi:14
#: en/user_customization-internationalization.ssi:22
#: en/user_customization-internationalization.ssi:30
#: en/user_customization-internationalization.ssi:42
-#: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
-#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
-#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
-#: en/user_customization-packages.ssi:107
-#: en/user_customization-packages.ssi:115
-#: en/user_customization-packages.ssi:135
-#: en/user_customization-packages.ssi:172
-#: en/user_customization-packages.ssi:182
-#: en/user_customization-packages.ssi:192
-#: en/user_customization-packages.ssi:202 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 en/user_installation.ssi:108
-#: en/user_installation.ssi:123 en/user_installation.ssi:138
-#: en/user_managing_a_configuration.ssi:31
+#: en/user_customization-packages.ssi:23 en/user_customization-packages.ssi:36
+#: en/user_customization-packages.ssi:48 en/user_customization-packages.ssi:62
+#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:94
+#: en/user_customization-packages.ssi:125
+#: en/user_customization-packages.ssi:139
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:159
+#: en/user_customization-packages.ssi:169
+#: en/user_customization-packages.ssi:181
+#: en/user_customization-packages.ssi:197
+#: en/user_customization-packages.ssi:265
+#: en/user_customization-packages.ssi:277
+#: en/user_customization-packages.ssi:287 en/user_examples.ssi:17
+#: en/user_examples.ssi:31 en/user_examples.ssi:41 en/user_examples.ssi:84
+#: 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
+#: en/user_installation.ssi:108 en/user_installation.ssi:123
+#: en/user_installation.ssi:138 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
-#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:84
-#: en/user_overview.ssi:94 en/user_overview.ssi:102
+#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:74
+#: en/user_overview.ssi:84 en/user_overview.ssi:92
msgid "}code"
msgstr ""
#. type: Plain text
#: en/user_customization-internationalization.ssi:2
-msgid "B~ Customizing locale and language"
+msgid ":B~ Customizing locale and language"
msgstr ""
#. type: Plain text
diff --git a/manual/pot/user_customization-overview.ssi.pot b/manual/pot/user_customization-overview.ssi.pot
index afae677..b0c1404 100644
--- a/manual/pot/user_customization-overview.ssi.pot
+++ b/manual/pot/user_customization-overview.ssi.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-11-11 11:58-0400\n"
+"POT-Creation-Date: 2010-11-27 09:40-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"
@@ -18,7 +18,7 @@ msgstr ""
#. type: Plain text
#: en/user_customization-contents.ssi:2 en/user_customization-overview.ssi:2
-msgid "B~ Customizing contents"
+msgid ":B~ Customizing contents"
msgstr ""
#. type: Plain text
diff --git a/manual/pot/user_customization-packages.ssi.pot b/manual/pot/user_customization-packages.ssi.pot
index 037382e..85f7dd2 100644
--- a/manual/pot/user_customization-packages.ssi.pot
+++ b/manual/pot/user_customization-packages.ssi.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-11-12 16:21-0400\n"
+"POT-Creation-Date: 2010-11-28 08:44-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"
@@ -17,52 +17,61 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
#. type: Plain text
-#: en/about_manual.ssi:80 en/about_manual.ssi:88 en/about_manual.ssi:96
-#: en/about_manual.ssi:108 en/about_manual.ssi:121 en/about_manual.ssi:134
-#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
-#: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
-#: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
-#: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
-#: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
-#: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
-#: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
-#: en/other_faq.ssi:41 en/other_faq.ssi:83 en/other_faq.ssi:103
-#: en/other_faq.ssi:117 en/other_faq.ssi:137 en/other_faq.ssi:151
-#: en/other_faq.ssi:198 en/other_faq.ssi:245 en/other_faq.ssi:261
-#: en/other_faq.ssi:287 en/other_faq.ssi:299 en/other_faq.ssi:314
-#: en/other_faq.ssi:333 en/other_faq.ssi:345 en/other_faq.ssi:353
-#: en/other_faq.ssi:364 en/other_faq.ssi:374 en/other_howtos.ssi:16
-#: en/other_howtos.ssi:43 en/other_live-environment.ssi:14
-#: en/other_live-environment.ssi:30 en/other_live-environment.ssi:51
-#: en/other_live-environment.ssi:61 en/other_live-environment.ssi:69
-#: en/other_live-environment.ssi:77 en/other_live-environment.ssi:85
-#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
-#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
-#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
-#: en/other_procedures.ssi:58 en/project_bugs.ssi:58 en/user_basics.ssi:32
-#: en/user_basics.ssi:42 en/user_basics.ssi:54 en/user_basics.ssi:66
-#: en/user_basics.ssi:78 en/user_basics.ssi:88 en/user_basics.ssi:102
-#: en/user_basics.ssi:110 en/user_basics.ssi:118 en/user_basics.ssi:128
-#: en/user_basics.ssi:140 en/user_basics.ssi:152 en/user_basics.ssi:160
-#: en/user_basics.ssi:168 en/user_basics.ssi:182 en/user_basics.ssi:190
-#: en/user_basics.ssi:200 en/user_basics.ssi:220 en/user_basics.ssi:253
-#: en/user_basics.ssi:269 en/user_basics.ssi:277 en/user_basics.ssi:297
-#: en/user_basics.ssi:322 en/user_customization-contents.ssi:34
-#: en/user_customization-contents.ssi:43 en/user_customization-contents.ssi:66
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
+#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
+#: en/about_manual.ssi:170 en/other_coding-style.ssi:28
+#: en/other_coding-style.ssi:38 en/other_coding-style.ssi:51
+#: en/other_coding-style.ssi:61 en/other_coding-style.ssi:88
+#: en/other_coding-style.ssi:96 en/other_coding-style.ssi:106
+#: en/other_coding-style.ssi:117 en/other_common-tasks.ssi:32
+#: en/other_customization-backports.ssi:8 en/other_customization-bootup.ssi:30
+#: en/other_customization-bootup.ssi:39 en/other_faq.ssi:41
+#: en/other_faq.ssi:83 en/other_faq.ssi:103 en/other_faq.ssi:117
+#: en/other_faq.ssi:137 en/other_faq.ssi:151 en/other_faq.ssi:198
+#: en/other_faq.ssi:245 en/other_faq.ssi:261 en/other_faq.ssi:287
+#: en/other_faq.ssi:299 en/other_faq.ssi:314 en/other_faq.ssi:333
+#: en/other_faq.ssi:345 en/other_faq.ssi:353 en/other_faq.ssi:364
+#: en/other_faq.ssi:374 en/other_howtos.ssi:16 en/other_howtos.ssi:43
+#: en/other_live-environment.ssi:14 en/other_live-environment.ssi:30
+#: en/other_live-environment.ssi:51 en/other_live-environment.ssi:61
+#: en/other_live-environment.ssi:69 en/other_live-environment.ssi:77
+#: en/other_live-environment.ssi:85 en/other_live-environment.ssi:93
+#: en/other_live-environment.ssi:116 en/other_live-environment.ssi:124
+#: en/other_live-environment.ssi:133 en/other_procedures.ssi:12
+#: en/other_procedures.ssi:46 en/other_procedures.ssi:58
+#: en/project_bugs.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/user_basics.ssi:54 en/user_basics.ssi:66 en/user_basics.ssi:78
+#: en/user_basics.ssi:88 en/user_basics.ssi:102 en/user_basics.ssi:110
+#: en/user_basics.ssi:118 en/user_basics.ssi:128 en/user_basics.ssi:142
+#: en/user_basics.ssi:154 en/user_basics.ssi:162 en/user_basics.ssi:170
+#: en/user_basics.ssi:184 en/user_basics.ssi:192 en/user_basics.ssi:202
+#: en/user_basics.ssi:222 en/user_basics.ssi:255 en/user_basics.ssi:271
+#: en/user_basics.ssi:279 en/user_basics.ssi:299 en/user_basics.ssi:324
+#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
+#: en/user_customization-contents.ssi:66
#: en/user_customization-internationalization.ssi:10
#: en/user_customization-internationalization.ssi:18
#: en/user_customization-internationalization.ssi:26
#: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:26
-#: en/user_customization-packages.ssi:38 en/user_customization-packages.ssi:47
-#: en/user_customization-packages.ssi:61 en/user_customization-packages.ssi:75
-#: en/user_customization-packages.ssi:105
-#: en/user_customization-packages.ssi:113
+#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
+#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
+#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:90
+#: en/user_customization-packages.ssi:120
#: en/user_customization-packages.ssi:133
-#: en/user_customization-packages.ssi:168
-#: en/user_customization-packages.ssi:178
-#: en/user_customization-packages.ssi:188
-#: en/user_customization-packages.ssi:198 en/user_examples.ssi:24
+#: en/user_customization-packages.ssi:143
+#: en/user_customization-packages.ssi:153
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:261
+#: en/user_customization-packages.ssi:273
+#: en/user_customization-packages.ssi:283 en/user_examples.ssi:14
+#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
+#: en/user_examples.ssi:64 en/user_examples.ssi:80 en/user_examples.ssi:90
+#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:131
+#: en/user_examples.ssi:139 en/user_examples.ssi:154 en/user_examples.ssi:162
+#: en/user_examples.ssi:188 en/user_examples.ssi:209 en/user_examples.ssi:217
#: 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
@@ -75,14 +84,15 @@ msgid "code{"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
-#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
-#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
-#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
-#: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
-#: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
+#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:166
+#: en/about_manual.ssi:173 en/other_coding-style.ssi:34
+#: en/other_coding-style.ssi:45 en/other_coding-style.ssi:57
+#: en/other_coding-style.ssi:68 en/other_coding-style.ssi:92
+#: en/other_coding-style.ssi:100 en/other_coding-style.ssi:113
+#: en/other_coding-style.ssi:124 en/other_common-tasks.ssi:36
+#: en/other_customization-backports.ssi:16
#: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
#: en/other_faq.ssi:37 en/other_faq.ssi:46 en/other_faq.ssi:92
#: en/other_faq.ssi:108 en/other_faq.ssi:141 en/other_faq.ssi:155
@@ -100,27 +110,35 @@ msgstr ""
#: en/project_bugs.ssi:62 en/user_basics.ssi:36 en/user_basics.ssi:46
#: en/user_basics.ssi:60 en/user_basics.ssi:72 en/user_basics.ssi:82
#: en/user_basics.ssi:94 en/user_basics.ssi:106 en/user_basics.ssi:114
-#: en/user_basics.ssi:122 en/user_basics.ssi:132 en/user_basics.ssi:146
-#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
-#: en/user_basics.ssi:186 en/user_basics.ssi:194 en/user_basics.ssi:204
-#: en/user_basics.ssi:245 en/user_basics.ssi:257 en/user_basics.ssi:273
-#: en/user_basics.ssi:281 en/user_basics.ssi:308 en/user_basics.ssi:347
+#: en/user_basics.ssi:122 en/user_basics.ssi:132 en/user_basics.ssi:148
+#: en/user_basics.ssi:158 en/user_basics.ssi:166 en/user_basics.ssi:174
+#: en/user_basics.ssi:188 en/user_basics.ssi:196 en/user_basics.ssi:206
+#: en/user_basics.ssi:247 en/user_basics.ssi:259 en/user_basics.ssi:275
+#: en/user_basics.ssi:283 en/user_basics.ssi:310 en/user_basics.ssi:349
#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
#: en/user_customization-contents.ssi:70
#: en/user_customization-internationalization.ssi:14
#: en/user_customization-internationalization.ssi:22
#: en/user_customization-internationalization.ssi:30
#: en/user_customization-internationalization.ssi:42
-#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:30
-#: en/user_customization-packages.ssi:43 en/user_customization-packages.ssi:51
-#: en/user_customization-packages.ssi:65 en/user_customization-packages.ssi:79
-#: en/user_customization-packages.ssi:109
-#: en/user_customization-packages.ssi:117
-#: en/user_customization-packages.ssi:137
-#: en/user_customization-packages.ssi:174
-#: en/user_customization-packages.ssi:184
-#: en/user_customization-packages.ssi:194
-#: en/user_customization-packages.ssi:204 en/user_examples.ssi:33
+#: en/user_customization-packages.ssi:23 en/user_customization-packages.ssi:36
+#: en/user_customization-packages.ssi:48 en/user_customization-packages.ssi:62
+#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:94
+#: en/user_customization-packages.ssi:125
+#: en/user_customization-packages.ssi:139
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:159
+#: en/user_customization-packages.ssi:169
+#: en/user_customization-packages.ssi:181
+#: en/user_customization-packages.ssi:197
+#: en/user_customization-packages.ssi:265
+#: en/user_customization-packages.ssi:277
+#: en/user_customization-packages.ssi:287 en/user_examples.ssi:20
+#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:58
+#: en/user_examples.ssi:68 en/user_examples.ssi:86 en/user_examples.ssi:101
+#: en/user_examples.ssi:111 en/user_examples.ssi:123 en/user_examples.ssi:135
+#: en/user_examples.ssi:150 en/user_examples.ssi:158 en/user_examples.ssi:166
+#: en/user_examples.ssi:197 en/user_examples.ssi:213 en/user_examples.ssi:221
#: en/user_installation.ssi:42 en/user_installation.ssi:50
#: en/user_installation.ssi:60 en/user_installation.ssi:72
#: en/user_installation.ssi:80 en/user_installation.ssi:88
@@ -133,11 +151,6 @@ msgid "}code"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:218 en/user_customization-packages.ssi:155
-msgid "% FIXME"
-msgstr ""
-
-#. type: Plain text
#: en/user_customization-packages.ssi:2
msgid ":B~ Customizing package installation"
msgstr ""
@@ -161,7 +174,7 @@ msgid ""
"options give some control over apt, or if you prefer, aptitude, at build "
"time when packages are installed. You may find these handy if you use a "
"proxy, want to disable installation of recommended packages to save space, "
-"or need to control which versions of packages are installed via apt pinning, "
+"or need to control which versions of packages are installed via APT pinning, "
"to name a few possibilities."
msgstr ""
@@ -172,431 +185,486 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:10
-msgid "3~ Debian repositories"
+msgid "3~ Distribution mirrors"
msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:12
-msgid "To set a local mirror to be used to at build time:"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:16
-msgid "$ lb config --mirror-bootstrap http://localhost/debian/"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:20
msgid ""
-"The chroot repository, specified by --mirror-chroot, defaults to the same as "
-"--mirror-bootstrap."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:22
-msgid ""
-"Each of the --mirror-* options governs which repository is used at various "
-"stages of the build. Recall from {Stages of the build}#stages-of-the-build "
-"that the *bootstrap* stage is when the chroot is initially populated by "
-"debootstrap with a minimal system, and the *chroot* stage is when the chroot "
-"used to construct the live system's filesystem is built. Thus, the "
-"corresponding mirror switches are used for those stages, and later, when the "
-"binary image is constructed, the --mirror-binary value is used, superceding "
-"any earlier repositories."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:24
-msgid "The generic mirror is added to the live system's /etc/apt/sources.list."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:28
-msgid "$ lb config --mirror-binary http://ftp.debian.org/debian/"
+"Each of the #{--mirror-*}# options governs which distribution mirror is used "
+"at various stages of the build. Recall from {Stages of the build}#stages-of-"
+"the-build that the *bootstrap* stage is when the chroot is initially "
+"populated by debootstrap with a minimal system, and the *chroot* stage is "
+"when the chroot used to construct the live system's filesystem is built. "
+"Thus, the corresponding mirror switches are used for those stages, and "
+"later, in the *binary* stage, the #{--mirror-binary}# and #{--mirror-binary-"
+"security}# values are used, superceding any mirrors used in an earlier stage."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:32
+#: en/user_customization-packages.ssi:14
msgid ""
-"Note: It is not used for building the live system but to install new "
-"software while using the live system."
+"3~distribution-mirrors-build-time Distribution mirrors used at build time"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:34
+#: en/user_customization-packages.ssi:16
msgid ""
-"It can be disabled by setting the binary mirror to the same value as the "
-"chroot mirror."
+"To set the distribution mirrors used at build time to point at a local "
+"mirror, it is sufficient to set #{--mirror-bootstrap}# and #{--mirror-chroot-"
+"security}# as follows."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:36
+#: en/user_customization-packages.ssi:21
+#, no-wrap
msgid ""
-"Note: the same applies for mirror chroot security and mirror binary security"
+"$ lb config --mirror-bootstrap http://localhost/debian/ \\\n"
+" --mirror-chroot-security http://localhost/debian-security/\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:41
+#: en/user_customization-packages.ssi:25
msgid ""
-"$ lb config --mirror-chroot-security {URL} $ lb config --mirror-binary-"
-"security {URL}"
+"The chroot mirror, specified by #{--mirror-chroot}#, defaults to the #{--"
+"mirror-bootstrap}# value."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:45
-msgid "If you don't want to include apt indices, you can skip those with:"
+#: en/user_customization-packages.ssi:27
+msgid "3~ Distribution mirrors used at run time"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:49
-msgid "$ lb config --binary-indices false"
+#: en/user_customization-packages.ssi:29
+msgid ""
+"The #{--mirror-binary*}# options govern the distribution mirrors placed in "
+"the binary image. These may be used to install additional packages while "
+"running the live system. The 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
-#: en/user_customization-packages.ssi:53
+#: en/user_customization-packages.ssi:34
+#, no-wrap
msgid ""
-"This will not influence the entries in /etc/apt/sources.list, but only if /"
-"var/lib/apt contains the indices files or not (and by that making the image "
-"smaller)."
+"$ lb config --mirror-binary http://mirror/debian/ \\\n"
+" --mirror-binary-security http://mirror/debian-security/\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:55
-msgid "3~ Own repository"
+#: en/user_customization-packages.ssi:38
+msgid "3~ Additional repositories"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:57
+#: en/user_customization-packages.ssi:40
msgid ""
"To add more repositories (e.g. backports, experimental or custom packages, "
"etc.), create #{config/chroot_sources/your-repository.{chroot,binary}}# "
-"files."
+"files. As with the #{--mirror-*}# options, these govern the repositories "
+"used in the *chroot* stage when building the image, and in the *binary* "
+"stage, i.e. for use when running the live system."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:59
+#: en/user_customization-packages.ssi:42
msgid ""
-"e.g. #{config/chroot_sources/live.chroot}# allows you to install packages "
-"from the debian live snapshot repository at live system build time (you have "
-"to add the packages in your package list):"
+"For example, #{config/chroot_sources/live.chroot}# allows you to install "
+"packages from the debian live snapshot repository at live system build time."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:63
+#: en/user_customization-packages.ssi:46
msgid "deb http://live.debian.net/ sid-snapshots main contrib non-free"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:67
+#: en/user_customization-packages.ssi:50
msgid ""
-"If you add the line to #{config/chroot_sources/live.binary}# the repository "
-"will be added to your live-system's #{/etc/apt/sources.list}#."
+"If you add the same line to #{config/chroot_sources/live.binary}#, the "
+"repository will be added to your live system's #{/etc/apt/sources.list.d/}# "
+"directory."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:69
+#: en/user_customization-packages.ssi:52
msgid "If such files exist, they will be picked up automatically."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:71
+#: en/user_customization-packages.ssi:54
msgid ""
-"You can also put the gpg-key used to sign the repository into config/"
-"chroot_sources/your-repository.{binary,chroot}.gpg"
+"You should also put the GPG key used to sign the repository into #{config/"
+"chroot_sources/your-repository.{binary,chroot}.gpg}# files."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:73
+#: en/user_customization-packages.ssi:56
msgid ""
"Note: some preconfigured package repositories are available for easy "
-"selection through the --repository switch, e.g. for enabling live snapshots, "
-"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
-#: en/user_customization-packages.ssi:77
+#: en/user_customization-packages.ssi:60
msgid "$ lb config --repository live.debian.net"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:81
-msgid "3~ Package installation"
+#: en/user_customization-packages.ssi:64
+msgid "2~choosing-packages-to-install Choosing packages to install"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:83
+#: en/user_customization-packages.ssi:66
msgid ""
-"You can elect to use either #{apt}# or #{aptitude}# when installing "
-"packages. Which utility is used is governed by the #{LB_APT}# variable in #"
-"{config/chroot}# or by the #{--apt}# argument to #{lb config}#:"
+"There are a number of ways to choose which packages live-build will install "
+"in your image, covering a variety of different needs. You can simply name "
+"individual packages to install, either with the #{--packages}# option for a "
+"few packages, or in a package list of your own for larger numbers. You can "
+"also choose larger predefined lists of packages, or use APT tasks. And "
+"finally, you may place package files in your #{config/}# tree, which is well "
+"suited to testing of new or experimental packages before they are available "
+"from a repository."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:85
-msgid ""
-"_* #{apt}#: Specifying a missing package causes package installation to "
-"fail, which may not be the desired behaviour. This is the default setting "
-"for building images for Lenny or later."
+#: en/user_customization-packages.ssi:68
+msgid "3~ Choosing a few packages"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:87
+#: en/user_customization-packages.ssi:70
msgid ""
-"_* #{aptitude}#: Specifying a missing package causes package installation to "
-"succeed, which may not be the desired behaviour. This is the default setting "
-"for building images for Etch."
+"When the number of packages added is small, simply specify #{--packages}#. "
+"For example:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:89
-msgid "2~ Installing additional packages"
+#: en/user_customization-packages.ssi:74
+msgid "$ lb config --packages \"package1 package2 package3\""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:91
+#: en/user_customization-packages.ssi:78
msgid ""
-"live-helper has a number of mechanisms for indicating that additional "
-"packages should be installed, including:"
+"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."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:93
-msgid "_* The #{LB_PACKAGES}# variable"
+#: en/user_customization-packages.ssi:80
+msgid ""
+"If you need to specify a large number of packages to be installed or you "
+"need flexibility regarding which packages to install, use package lists as "
+"discussed in the following section, {Package lists}#package-lists."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:95
-msgid "_* Package lists"
+#: en/user_customization-packages.ssi:82
+msgid "3~package-lists Package lists"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:97
-msgid "_* Local packages (#{chroot_local-packages/}#)"
+#: en/user_customization-packages.ssi:84
+msgid ""
+"Package lists are a powerful way of expressing which packages should be "
+"installed. The list syntax supports included files and conditional sections "
+"which makes it easy to build lists from other lists and adapt them for use "
+"in multiple configurations. You can use predefined package lists, providing "
+"in a modular fashion package selections from each of the major desktop "
+"environments and some special purpose lists, as well as standard lists the "
+"others are based upon. You can also provide your own package lists, or use a "
+"combination of both."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:99
-msgid "_* Tasks"
+#: en/user_customization-packages.ssi:86
+msgid "3~ Predefined package lists"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:101
-msgid "3~ The #{LB_PACKAGES}# variable"
+#: en/user_customization-packages.ssi:88
+msgid ""
+"The simplest way to use lists is to specify one or more predefined lists "
+"with the #{--packages-lists}# option. For example:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:103
-msgid ""
-"To install additional packages, simply add them to the #{LB_PACKAGES}# "
-"variable in #{config/chroot}#. For example:"
+#: en/user_customization-packages.ssi:92
+msgid "$ lb config --packages-lists \"gnome-core rescue\""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:107
-msgid "LB_PACKAGES=\"package1 package2 package3 ... \""
+#: en/user_customization-packages.ssi:96
+msgid ""
+"In addition to these lists, live-build supports four virtual package lists: #"
+"{gnome-desktop}#, #{kde-desktop}#, #{lxde-desktop}# and #{xfce-desktop}#, "
+"each of which provide a more extensive selection of packages that "
+"corresponds with Debian Installer defaults for these desktop environments. "
+"See {Desktop and language tasks}#desktop-and-language-tasks for more details."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:111
-msgid "You can also specify initial values on the command line:"
+#: en/user_customization-packages.ssi:98
+msgid ""
+"Note: The prebuilt GNOME, KDE, LXDE and XFCE images available for download "
+"at http://live.debian.net are built using the corresponding virtual #{*-"
+"desktop}# lists."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:115
-msgid "$ lb config --packages \"package1 package2 package3\""
+#: en/user_customization-packages.ssi:100
+msgid ""
+"The default location for the list files on your system is #{/usr/share/live/"
+"build/lists/}#. To determine the packages in a given list, read the "
+"corresponding file, paying attention to included files and conditionals as "
+"described in the following sections."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:119
-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."
+#: en/user_customization-packages.ssi:102
+msgid "3~ Local package lists"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:121
-msgid "% FIXME: <xref linkend=\"package-installation\"/>"
+#: en/user_customization-packages.ssi:104
+msgid ""
+"You may supplement or replace entirely the supplied lists using local "
+"package lists stored in #{config/chroot_local-packageslists/}#."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:123
+#: en/user_customization-packages.ssi:106
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."
+"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."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:125
-msgid "% FIXME: <xref linkend=\"package-lists\"/>"
+#: en/user_customization-packages.ssi:108
+msgid "3~ Local binary package lists"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:127
-msgid "3~ Package lists"
+#: en/user_customization-packages.ssi:110
+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 "
+"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."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:129
+#: en/user_customization-packages.ssi:112
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 "
-"provide sensible default package selections for the major desktop "
-"environments, as well as standard systems."
+"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:131
-msgid "To specify one or more package list, you can use:"
+#: en/user_customization-packages.ssi:114
+msgid "3~ Extending a provided package list using includes"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:135
-msgid "$ lb config --packages-lists \"list1 list2 list3\""
+#: en/user_customization-packages.ssi:116
+msgid ""
+"The package lists that are included with live-build make extensive use of "
+"includes. Refer to these in the #{/usr/share/live/build/lists/}# directory, "
+"as they serve as good examples of how to write your own lists."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:139
+#: en/user_customization-packages.ssi:118
msgid ""
-"Note: Package lists that are distributed with live-build reside in the #{/"
-"usr/share/live/build/lists}# directory."
+"For example, to make a list that includes the predefined #{gnome}# list plus "
+"iceweasel, create #{config/chroot_local-packageslists/mygnome.list}# with "
+"the following contents:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:141
-#, no-wrap
-msgid "*{Local packages lists}*\n"
+#: en/user_customization-packages.ssi:123
+msgid "#include <gnome> iceweasel"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:143
+#: en/user_customization-packages.ssi:127
+msgid "3~ Using conditionals inside package lists"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:129
msgid ""
-"You may supplement the supplied lists using local package lists stored in #"
-"{config/chroot_local-packageslists}#."
+"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:145
+#: en/user_customization-packages.ssi:131
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 "
-"distributed with live-build. This can cause undesired effects, we therefore "
-"recommend to use unique names for local packages lists."
+"For example, to install #{ia32-libs}# if the #{--architecture amd64}# is "
+"specified:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:147
-#, no-wrap
-msgid "*{Local binary packages lists}*\n"
+#: en/user_customization-packages.ssi:137
+msgid "#if ARCHITECTURE amd64 ia32-libs #endif"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:141
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 "
-"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."
+"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
+#: en/user_customization-packages.ssi:147
+msgid "#if ARCHITECTURE i386 amd64 memtest86+ #endif"
msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:151
msgid ""
-"Package lists that exist in this directory need to have a .list suffix in "
-"order to be processed."
+"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
-#: en/user_customization-packages.ssi:153
-#, no-wrap
-msgid "*{Extending a provided package list using includes}*\n"
+#: en/user_customization-packages.ssi:157
+msgid "#if ARCHIVE_AREAS contrib non-free vrms #endif"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:162
-msgid "% code{ % % #include <gnome> % iceweasel % % }code"
+#: en/user_customization-packages.ssi:161
+msgid "A conditional may surround an #{#include}# directive:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:164
-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}# "
-"directory."
+#: en/user_customization-packages.ssi:167
+msgid "#if ARCHITECTURE amd64 #include <gnome-full> #endif"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:166
-#, no-wrap
-msgid "*{Using conditionals inside packages lists}*\n"
+#: en/user_customization-packages.ssi:171
+msgid "The nesting of conditionals is not supported."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:172
-msgid "#if ARCHITECTURE amd64 ia32-libs #endif"
+#: en/user_customization-packages.ssi:173
+msgid "3~ Tasks"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:176
-msgid "or if #{LB_ARCHITECTURE}# is set to #{i386}# or #{amd64}#:"
+#: en/user_customization-packages.ssi:175
+msgid ""
+"The Debian Installer offers the user choices of a number of preselected "
+"lists of packages, each one focused on a particular kind of system, or task "
+"a system may be used for, such as \"Graphical desktop environment\", \"Mail "
+"server\" or \"Laptop\". These lists are called \"tasks\" and are supported "
+"by APT through the \"Task:\" field. You can specify one or more tasks in "
+"live-build via the #{--tasks}# option, as in the example below."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:182
-msgid "#if ARCHITECTURE i386 amd64 memtest86+ #endif"
+#: en/user_customization-packages.ssi:179
+msgid "$ lb config --tasks \"mail-server file-server\""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:186
-msgid "or if #{LB_ARCHIVE_AREAS}# contains either #{contrib}# or #{non-free}#:"
+#: en/user_customization-packages.ssi:183
+msgid ""
+"The primary tasks available in the Debian Installer can be listed with #"
+"{tasksel --list-tasks}# in the live system. The contents of any task, "
+"including ones not included in this list, may be examined with #{tasksel --"
+"task-packages}#."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:192
-msgid "#if ARCHIVE_AREAS contrib non-free vrms #endif"
+#: en/user_customization-packages.ssi:185
+msgid "3~desktop-and-language-tasks Desktop and language tasks"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:196
-msgid "A conditional may surround an #{#include}# directive:"
+#: en/user_customization-packages.ssi:187
+msgid ""
+"Desktop and language tasks are special cases. In the Debian Installer, if "
+"the medium was prepared for a particular desktop environment flavour, the "
+"corresponding task will be automatically installed. Thus, there are there "
+"are #{gnome-desktop}#, #{kde-desktop}#, #{lxde-desktop}# and #{xfce-desktop}"
+"# tasks, none of which are offered in #{tasksel}#'s menu. Likewise, there "
+"are no menu entries for tasks for languages, but the user's language choice "
+"during the install influences the selection of corresponding language tasks."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:202
-msgid "#if ARCHITECTURE amd64 #include <gnome-full> #endif"
+#: en/user_customization-packages.ssi:189
+msgid ""
+"In live-build, therefore, these special cases are also given special "
+"consideration, but with three notable differences at the time of writing."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:206
+#: en/user_customization-packages.ssi:191
msgid ""
-"Any live-build configuration variable that begins with #{LB_}# can be tested "
-"in this way."
+"First, there is no provision made yet automatically for language tasks, "
+"although a subset of those packages are included if you specify #{lb config "
+"--language}#. If you need those tasks, which include such things as language-"
+"specific fonts and input-method packages, you need to specify them in your "
+"configuration. For example:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:208
-msgid "The nesting of conditionals is not supported."
+#: en/user_customization-packages.ssi:195
+msgid ""
+"$ lb config --tasks \"japanese japanese-desktop japanese-gnome-desktop\""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:210
-msgid "3~ Tasks"
+#: en/user_customization-packages.ssi:199
+msgid ""
+"Second, live-build supports #{*-desktop}# virtual package lists for each of "
+"the desktop flavours mentioned above, which select the #{standard-x11}# "
+"predefined package list, the corresponding #{*-desktop}# task and three "
+"additional tasks: #{desktop}#, #{standard}# and #{laptop}#. So, for example, "
+"if you specify #{--packages gnome-desktop}#, it is equivalent to specifying #"
+"{--packages standard-x11 --tasks \"gnome-desktop desktop standard laptop\"}#."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:212
-msgid "%FIXME"
+#: en/user_customization-packages.ssi:201
+msgid ""
+"Third, if any of the tasks for these desktop flavours are selected, either "
+"explicitly through #{--tasks}# or implicitly by #{--packages}#, live-build "
+"will preseed the corresponding desktop value for Debian Installer (if it is "
+"included) to ensure it follows its own rules for installing different "
+"desktop flavours."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:214
+#: en/user_customization-packages.ssi:203
msgid "2~ Installing modified or third-party packages"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:205
msgid ""
"Whilst it is against the philosophy of Debian Live, it may sometimes be "
"necessary to build a Live system with modified versions of packages that are "
@@ -607,7 +675,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:218
+#: en/user_customization-packages.ssi:207
msgid ""
"This section does not cover advice regarding building or maintaining "
"modified packages. Joachim Breitner's 'How to fork privately' method from "
@@ -618,95 +686,90 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:220
+#: en/user_customization-packages.ssi:209
msgid "There are two ways of installing modified custom packages:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:222
+#: en/user_customization-packages.ssi:211
msgid "_* #{chroot_local-packages}#"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:224
+#: en/user_customization-packages.ssi:213
msgid "_* Using a custom APT repository"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:226
+#: en/user_customization-packages.ssi:215
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:228
+#: en/user_customization-packages.ssi:217
msgid "3~ Using #{chroot_local-packages}# to install custom packages"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:230
+#: en/user_customization-packages.ssi:219
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:232
+#: en/user_customization-packages.ssi:221
msgid ""
"Packages *{must}* be named in the prescribed way. One simple way to do this "
"is to use #{dpkg-name}#."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:234
+#: en/user_customization-packages.ssi:223
msgid ""
"Using #{chroot_local-packages}# for installation of custom packages has "
"disadvantages:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:236
-msgid "_* It is not possible to use secure APT"
+#: en/user_customization-packages.ssi:225
+msgid "_* It is not possible to use secure APT."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:238
+#: en/user_customization-packages.ssi:227
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:240
+#: en/user_customization-packages.ssi:229
msgid ""
"_* It does not lend itself to storing Debian Live configurations in revision "
-"control"
+"control."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:242
+#: en/user_customization-packages.ssi:231
msgid "3~ Using an APT repository to install custom packages"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:244
+#: en/user_customization-packages.ssi:233
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."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:246
-msgid "% FIXME: <xref linkend=\"lb-packages\"/>"
+"you must ensure that you specify the packages elsewhere. See {Choosing "
+"packages to install}#choosing-packages-to-install for details."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:248
+#: en/user_customization-packages.ssi:235
msgid ""
"Whilst it may seem unnecessary effort to create an APT repository to install "
"custom packages, the infrastructure can be easily re-used at a later date to "
@@ -714,12 +777,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:250
+#: en/user_customization-packages.ssi:237
msgid "3~ Custom packages and APT"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:252
+#: en/user_customization-packages.ssi:239
msgid ""
"live-build uses APT to install all packages into the live system so will "
"therefore inherit behaviours from this program. One relevant example is that "
@@ -729,7 +792,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:254
+#: en/user_customization-packages.ssi:241
msgid ""
"Because of this, you may wish to increment the version number in your custom "
"packages' #{debian/changelog}# files to ensure that your modified version is "
@@ -739,19 +802,152 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:256
+#: en/user_customization-packages.ssi:243
msgid "% FIXME: <xref linkend=\"apt-preferences\"/>"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:258
-msgid "3~ Altering APT preferences during Live system"
+#: en/user_customization-packages.ssi:245
+msgid "2~ Configuring APT at build time"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:247
+msgid ""
+"You can configure APT through a number of options applied only at build "
+"time. (APT configuration used in the running live system may be configured "
+"in the normal way for live system contents, that is, by including the "
+"appropriate configurations through #{config/chroot_local_includes/}#.) For a "
+"complete list, look for options starting with #{apt}# in the #{lb_config}# "
+"man page."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:249
+msgid "3~choosing-apt-or-aptitude Choosing apt or aptitude"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:251
+msgid ""
+"You can elect to use either #{apt}# or #{aptitude}# when installing packages "
+"at build time. Which utility is used is governed by the #{--apt}# argument "
+"to #{lb config}#. Choose the method implementing the preferred behaviour for "
+"package installation, the notable difference being how missing packages are "
+"handled."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:253
+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:255
+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:257
+msgid "3~ Using a proxy with APT"
msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:259
msgid ""
-"Whilst it may seem unnecessary effort to create an APT repository to install "
-"custom packages, the infrastructure can be easily re-used at a later date to "
-"offer updates of the modified package."
+"One commonly required APT configuration is to deal with building an image "
+"behind a proxy. You may specify your APT proxy with the #{--apt-ftp-proxy}# "
+"or #{--apt-http-proxy}# options as needed, e.g."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:263
+msgid "lb config --apt-http-proxy http://proxy/"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:267
+msgid "3~ Tweaking APT to save space"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:269
+msgid ""
+"You may find yourself needing to save some space on the image media, in "
+"which case one or the other or both of the following options may be of "
+"interest."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:271
+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:275
+msgid "$ lb config --binary-indices false"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:279
+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 "
+"APT needs those indices in order to operate in the live system, so before "
+"performing #{apt-cache search}# or #{apt-get install}#, for instance, the "
+"user must #{apt-get update}# first to create those indices."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:281
+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:285
+msgid "$ lb config -apt-recommends false"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:289
+msgid ""
+"The tradeoff here is that recommended packages are defined as \"packages "
+"that would be found together with this one in all but unusual installations"
+"\" (Debian Policy Manual, 7.2). This may lead to some packages that you "
+"actually need being omitted, so we suggest you review the difference this "
+"makes to your packages list (see the #{binary.packages}# file generated by #"
+"{lb build}#) and re-include in your list any missing packages that you still "
+"want installed."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:291
+msgid "3~ Passing options to apt or aptitude"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:293
+msgid ""
+"If there is not an #{lb config}# option to alter APT's behaviour in the way "
+"you need, use #{--apt-options}# or #{--aptitude-options}# to pass any "
+"options through to your configured APT tool. See the man pages for #{apt}# "
+"and #{aptitude}# for details."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:295
+msgid "3~ APT pinning"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:297
+msgid "% FIXME: needs content"
msgstr ""
diff --git a/manual/pot/user_examples.ssi.pot b/manual/pot/user_examples.ssi.pot
index 7494c39..6f98511 100644
--- a/manual/pot/user_examples.ssi.pot
+++ b/manual/pot/user_examples.ssi.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-11-04 16:34-0400\n"
+"POT-Creation-Date: 2010-11-28 07:51-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"
@@ -17,52 +17,61 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
#. type: Plain text
-#: en/about_manual.ssi:80 en/about_manual.ssi:88 en/about_manual.ssi:96
-#: en/about_manual.ssi:108 en/about_manual.ssi:121 en/about_manual.ssi:134
-#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
-#: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
-#: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
-#: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
-#: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
-#: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
-#: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
-#: en/other_faq.ssi:41 en/other_faq.ssi:83 en/other_faq.ssi:103
-#: en/other_faq.ssi:117 en/other_faq.ssi:137 en/other_faq.ssi:151
-#: en/other_faq.ssi:198 en/other_faq.ssi:245 en/other_faq.ssi:261
-#: en/other_faq.ssi:287 en/other_faq.ssi:299 en/other_faq.ssi:314
-#: en/other_faq.ssi:333 en/other_faq.ssi:345 en/other_faq.ssi:353
-#: en/other_faq.ssi:364 en/other_faq.ssi:374 en/other_howtos.ssi:16
-#: en/other_howtos.ssi:43 en/other_live-environment.ssi:14
-#: en/other_live-environment.ssi:30 en/other_live-environment.ssi:51
-#: en/other_live-environment.ssi:61 en/other_live-environment.ssi:69
-#: en/other_live-environment.ssi:77 en/other_live-environment.ssi:85
-#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
-#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
-#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
-#: en/other_procedures.ssi:58 en/project_bugs.ssi:58 en/user_basics.ssi:32
-#: en/user_basics.ssi:42 en/user_basics.ssi:54 en/user_basics.ssi:66
-#: en/user_basics.ssi:78 en/user_basics.ssi:88 en/user_basics.ssi:102
-#: en/user_basics.ssi:110 en/user_basics.ssi:118 en/user_basics.ssi:128
-#: en/user_basics.ssi:140 en/user_basics.ssi:152 en/user_basics.ssi:160
-#: en/user_basics.ssi:168 en/user_basics.ssi:182 en/user_basics.ssi:190
-#: en/user_basics.ssi:200 en/user_basics.ssi:220 en/user_basics.ssi:253
-#: en/user_basics.ssi:269 en/user_basics.ssi:277 en/user_basics.ssi:297
-#: en/user_basics.ssi:322 en/user_customization-contents.ssi:34
-#: en/user_customization-contents.ssi:43 en/user_customization-contents.ssi:66
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
+#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
+#: en/about_manual.ssi:170 en/other_coding-style.ssi:28
+#: en/other_coding-style.ssi:38 en/other_coding-style.ssi:51
+#: en/other_coding-style.ssi:61 en/other_coding-style.ssi:88
+#: en/other_coding-style.ssi:96 en/other_coding-style.ssi:106
+#: en/other_coding-style.ssi:117 en/other_common-tasks.ssi:32
+#: en/other_customization-backports.ssi:8 en/other_customization-bootup.ssi:30
+#: en/other_customization-bootup.ssi:39 en/other_faq.ssi:41
+#: en/other_faq.ssi:83 en/other_faq.ssi:103 en/other_faq.ssi:117
+#: en/other_faq.ssi:137 en/other_faq.ssi:151 en/other_faq.ssi:198
+#: en/other_faq.ssi:245 en/other_faq.ssi:261 en/other_faq.ssi:287
+#: en/other_faq.ssi:299 en/other_faq.ssi:314 en/other_faq.ssi:333
+#: en/other_faq.ssi:345 en/other_faq.ssi:353 en/other_faq.ssi:364
+#: en/other_faq.ssi:374 en/other_howtos.ssi:16 en/other_howtos.ssi:43
+#: en/other_live-environment.ssi:14 en/other_live-environment.ssi:30
+#: en/other_live-environment.ssi:51 en/other_live-environment.ssi:61
+#: en/other_live-environment.ssi:69 en/other_live-environment.ssi:77
+#: en/other_live-environment.ssi:85 en/other_live-environment.ssi:93
+#: en/other_live-environment.ssi:116 en/other_live-environment.ssi:124
+#: en/other_live-environment.ssi:133 en/other_procedures.ssi:12
+#: en/other_procedures.ssi:46 en/other_procedures.ssi:58
+#: en/project_bugs.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/user_basics.ssi:54 en/user_basics.ssi:66 en/user_basics.ssi:78
+#: en/user_basics.ssi:88 en/user_basics.ssi:102 en/user_basics.ssi:110
+#: en/user_basics.ssi:118 en/user_basics.ssi:128 en/user_basics.ssi:142
+#: en/user_basics.ssi:154 en/user_basics.ssi:162 en/user_basics.ssi:170
+#: en/user_basics.ssi:184 en/user_basics.ssi:192 en/user_basics.ssi:202
+#: en/user_basics.ssi:222 en/user_basics.ssi:255 en/user_basics.ssi:271
+#: en/user_basics.ssi:279 en/user_basics.ssi:299 en/user_basics.ssi:324
+#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
+#: en/user_customization-contents.ssi:66
#: en/user_customization-internationalization.ssi:10
#: en/user_customization-internationalization.ssi:18
#: en/user_customization-internationalization.ssi:26
#: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:16 en/user_customization-packages.ssi:24
-#: en/user_customization-packages.ssi:36 en/user_customization-packages.ssi:45
-#: en/user_customization-packages.ssi:59 en/user_customization-packages.ssi:73
-#: en/user_customization-packages.ssi:103
-#: en/user_customization-packages.ssi:111
-#: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:166
-#: en/user_customization-packages.ssi:176
-#: en/user_customization-packages.ssi:186
-#: en/user_customization-packages.ssi:196 en/user_examples.ssi:24
+#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
+#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
+#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:90
+#: en/user_customization-packages.ssi:120
+#: en/user_customization-packages.ssi:133
+#: en/user_customization-packages.ssi:143
+#: en/user_customization-packages.ssi:153
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:261
+#: en/user_customization-packages.ssi:273
+#: en/user_customization-packages.ssi:283 en/user_examples.ssi:14
+#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
+#: en/user_examples.ssi:64 en/user_examples.ssi:80 en/user_examples.ssi:90
+#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:131
+#: en/user_examples.ssi:139 en/user_examples.ssi:154 en/user_examples.ssi:162
+#: en/user_examples.ssi:188 en/user_examples.ssi:209 en/user_examples.ssi:217
#: 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
@@ -75,14 +84,15 @@ msgid "code{"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
-#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
-#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
-#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
-#: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
-#: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
+#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:166
+#: en/about_manual.ssi:173 en/other_coding-style.ssi:34
+#: en/other_coding-style.ssi:45 en/other_coding-style.ssi:57
+#: en/other_coding-style.ssi:68 en/other_coding-style.ssi:92
+#: en/other_coding-style.ssi:100 en/other_coding-style.ssi:113
+#: en/other_coding-style.ssi:124 en/other_common-tasks.ssi:36
+#: en/other_customization-backports.ssi:16
#: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
#: en/other_faq.ssi:37 en/other_faq.ssi:46 en/other_faq.ssi:92
#: en/other_faq.ssi:108 en/other_faq.ssi:141 en/other_faq.ssi:155
@@ -100,27 +110,35 @@ msgstr ""
#: en/project_bugs.ssi:62 en/user_basics.ssi:36 en/user_basics.ssi:46
#: en/user_basics.ssi:60 en/user_basics.ssi:72 en/user_basics.ssi:82
#: en/user_basics.ssi:94 en/user_basics.ssi:106 en/user_basics.ssi:114
-#: en/user_basics.ssi:122 en/user_basics.ssi:132 en/user_basics.ssi:146
-#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
-#: en/user_basics.ssi:186 en/user_basics.ssi:194 en/user_basics.ssi:204
-#: en/user_basics.ssi:245 en/user_basics.ssi:257 en/user_basics.ssi:273
-#: en/user_basics.ssi:281 en/user_basics.ssi:308 en/user_basics.ssi:347
+#: en/user_basics.ssi:122 en/user_basics.ssi:132 en/user_basics.ssi:148
+#: en/user_basics.ssi:158 en/user_basics.ssi:166 en/user_basics.ssi:174
+#: en/user_basics.ssi:188 en/user_basics.ssi:196 en/user_basics.ssi:206
+#: en/user_basics.ssi:247 en/user_basics.ssi:259 en/user_basics.ssi:275
+#: en/user_basics.ssi:283 en/user_basics.ssi:310 en/user_basics.ssi:349
#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
#: en/user_customization-contents.ssi:70
#: en/user_customization-internationalization.ssi:14
#: en/user_customization-internationalization.ssi:22
#: en/user_customization-internationalization.ssi:30
#: en/user_customization-internationalization.ssi:42
-#: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
-#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
-#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
-#: en/user_customization-packages.ssi:107
-#: en/user_customization-packages.ssi:115
-#: en/user_customization-packages.ssi:135
-#: en/user_customization-packages.ssi:172
-#: en/user_customization-packages.ssi:182
-#: en/user_customization-packages.ssi:192
-#: en/user_customization-packages.ssi:202 en/user_examples.ssi:33
+#: en/user_customization-packages.ssi:23 en/user_customization-packages.ssi:36
+#: en/user_customization-packages.ssi:48 en/user_customization-packages.ssi:62
+#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:94
+#: en/user_customization-packages.ssi:125
+#: en/user_customization-packages.ssi:139
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:159
+#: en/user_customization-packages.ssi:169
+#: en/user_customization-packages.ssi:181
+#: en/user_customization-packages.ssi:197
+#: en/user_customization-packages.ssi:265
+#: en/user_customization-packages.ssi:277
+#: en/user_customization-packages.ssi:287 en/user_examples.ssi:20
+#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:58
+#: en/user_examples.ssi:68 en/user_examples.ssi:86 en/user_examples.ssi:101
+#: en/user_examples.ssi:111 en/user_examples.ssi:123 en/user_examples.ssi:135
+#: en/user_examples.ssi:150 en/user_examples.ssi:158 en/user_examples.ssi:166
+#: en/user_examples.ssi:197 en/user_examples.ssi:213 en/user_examples.ssi:221
#: en/user_installation.ssi:42 en/user_installation.ssi:50
#: en/user_installation.ssi:60 en/user_installation.ssi:72
#: en/user_installation.ssi:80 en/user_installation.ssi:88
@@ -133,95 +151,474 @@ msgid "}code"
msgstr ""
#. type: Plain text
-#: en/other_faq.ssi:85 en/other_faq.ssi:247 en/user_examples.ssi:26
+#: en/other_faq.ssi:85 en/other_faq.ssi:247 en/user_examples.ssi:92
+#: en/user_examples.ssi:141 en/user_examples.ssi:190
msgid "#!/bin/sh"
msgstr ""
#. type: Plain text
+#: en/user_basics.ssi:44 en/user_basics.ssi:120 en/user_basics.ssi:204
+#: en/user_examples.ssi:109 en/user_examples.ssi:156
+msgid "# lb build"
+msgstr ""
+
+#. type: Plain text
#: en/user_examples.ssi:2
-msgid "B~ Examples"
+msgid ":B~ Examples"
msgstr ""
#. type: Plain text
#: en/user_examples.ssi:4
-msgid "1~ Use Case Builds"
+msgid "1~examples Examples"
msgstr ""
#. type: Plain text
#: en/user_examples.ssi:6
msgid ""
-"This chapter covers example builds for specific use cases with Debian Live."
+"This chapter covers example builds for specific use cases with Debian Live. "
+"If you are new to building your own Debian Live images, we recommend you "
+"first look at the three tutorials in sequence, as each one teaches new "
+"techniques that will help you use and understand the remaining examples."
msgstr ""
#. type: Plain text
#: en/user_examples.ssi:8
-msgid "2~ VNC Kiosk Client"
+msgid "2~using-the-examples Using the examples"
msgstr ""
#. type: Plain text
#: en/user_examples.ssi:10
-msgid "Create an image with live-build to boot directly to a VNC server."
+msgid ""
+"To use these examples you need a system to build them on that meets the "
+"requirements listed in {Requirements}#requirements and has live-build "
+"installed as described in {Installing live-build}#installing-live-build."
msgstr ""
#. type: Plain text
#: en/user_examples.ssi:12
+msgid ""
+"Note that, for the sake of brevity, in these examples we do not specify a "
+"local mirror to use for the build. You can speed up downloads considerably "
+"if you use a local mirror. You may specify the options when you use #{lb "
+"config}#, as described in {Distribution mirrors used at build time}"
+"#distribution-mirrors-build-time, or for more convenience, set the default "
+"for your build system in #{/etc/live/build.conf}#. Simply create this file "
+"and in it, set the corresponding #{LB_MIRROR_*}# variables to your preferred "
+"mirror. For example:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:18
+msgid ""
+"LB_MIRROR_BOOTSTRAP=\"http://mirror/debian\" LB_MIRROR_CHROOT=\"http://"
+"mirror/debian\" LB_MIRROR_CHROOT_SECURITY=\"http://mirror/debian-security\""
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:22
+msgid "2~tutorial-1 Tutorial 1: A standard image"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:24
+#, no-wrap
+msgid "*{Use case:}* Create a simple first image, learning the basics of live-build\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:26
+msgid ""
+"In this tutorial, we will build a default ISO hybrid Debian Live image "
+"containing only base packages (no Xorg) and some Debian Live support "
+"packages, as a first exercise in using live-build."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:28
+msgid "You can't get much simpler than this:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:32
+msgid "$ mkdir tutorial1 ; cd tutorial1 ; lb config"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:36
+msgid ""
+"Examine the contents of the #{config/}# directory if you wish. You will see "
+"stored here a skeletal configuration, ready to customize or, in this case, "
+"use immediately to build a default image."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:38
+msgid ""
+"Now, as superuser, build the image, saving a log as you build with #{tee}#."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:42
+msgid "# lb_build 2>&1 | tee binary.log"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:46
+msgid ""
+"Assuming all goes well, after a while, the current directory will contain #"
+"{binary-hybrid.iso}#. This ISO hybrid image can be booted directly in a "
+"virtual machine as described in {Testing an ISO image with Qemu}#testing-iso-"
+"with-qemu and {Testing an ISO image with virtualbox-ose}#testing-iso-with-"
+"virtualbox, or else imaged onto optical media or a USB flash device as "
+"described in {Burning an ISO image to a physical medium}#burning-iso-image "
+"and {Copying USB/HDD image to a USB stick}#copying-usb-hdd-image, "
+"respectively."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:48
+msgid "2~tutorial-2 Tutorial 2: A web browser utility"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:50
+#, no-wrap
+msgid "*{Use case}* Create a web browser utility image, learning how to apply customizations\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:52
+msgid ""
+"In this tutorial, we will create an image suitable for use as a web browser "
+"utility, serving as an introduction to customizing Debian Live images."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:56
+msgid "mkdir tutorial2 ; cd tutorial2 ; lb config -p lxde --packages iceweasel"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:60
+msgid ""
+"Our choice of LXDE for this example reflects our desire to provide a minimal "
+"desktop environment, since the focus of the image is the single use we have "
+"in mind, the web browser. We could go even further and provide a default "
+"configuration for the web browser in #{config/chroot_local-includes/etc/"
+"iceweasel/profile/}#, or additional support packages for viewing various "
+"kinds of web content, but we leave this as an exercise for the reader."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:62
+msgid ""
+"Build the image, again as superuser, keeping a log as in {Tutorial 1}"
+"#tutorial-1:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:66 en/user_examples.ssi:219
+msgid "# lb build 2>&1 | tee binary.log"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:70
+msgid "Again, verify the image is OK and test, as in {Tutorial 1}#tutorial-1."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:72
+msgid "2~tutorial-3 Tutorial 3: A personalized image"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:74
+#, no-wrap
+msgid "*{Use case}* Create a project to build a personalized image, containing your favourite software to take with you on a USB stick wherever you go, and evolving in successive revisions as your needs and preferences change.\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:76
+msgid ""
+"Since we will be changing our personalized image over a number of revisions, "
+"and we want to track those changes, trying things experimentally and "
+"possibly reverting them if things don't work out, we will keep our "
+"configuration in the popular #{git}# version control system. We will also "
+"use the best practice of autoconfiguration via #{auto}# scripts as described "
+"in {Managing a configuration}#managing-a-configuration."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:78
+msgid "3~ First revision"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:84
+msgid ""
+"$ mkdir -p tutorial3/auto $ cp /usr/share/live/examples/auto/* tutorial3/"
+"auto/ $ cd tutorial3"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:88
+msgid "Edit #{auto/config}# to read as follows:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:99
+#, no-wrap
+msgid ""
+"lb config noauto \\\n"
+" --architecture i386 \\\n"
+" --linux-flavours 686 \\\n"
+" --packages-lists lxde \\\n"
+" --packages \"iceweasel xchat\" \\\n"
+" \"${@}\"\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:103
+msgid ""
+"First, #{--architecture i386}# ensures that on our #{amd64}# build system, "
+"we build a 32-bit version suitable for use on most machines. Second, we use #"
+"{--linux-flavours 686}# because we don't anticipate using this image on much "
+"older systems. Third, we've chosen the #{lxde}# package list to give us a "
+"minimal desktop. And finally, we have added two initial favourite packages: #"
+"{iceweasel}# and #{xchat}#."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:105
+msgid "Now, build the image:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:113
+msgid ""
+"Note that unlike in the first two tutorials, we no longer have to type #"
+"{2>&1 | tee binary.log}# as that is now included in #{auto/build}#."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:115
+msgid ""
+"Once you've tested the image (as in {Tutorial 1}#tutorial-1) and are "
+"satisfied it works, it's time to initialize our #{git}# repository, adding "
+"only the auto scripts we just created, and then make the first commit:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:121
+msgid "$ git init $ git add auto $ git commit -a -m \"Initial import.\""
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:125
+msgid "3~ Second revision"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:127
+msgid ""
+"In this revision, we're going to clean up from the first build, add the #"
+"{vlc}# package to our configuration, rebuild, test and commit."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:129
+msgid ""
+"The #{lb clean}# command will clean up all generated files from the previous "
+"build except for the cache, which saves having to re-download packages. This "
+"ensures that the subsequent #{lb build}# will re-run all stages to "
+"regenerate the files from our new configuration."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:133
+msgid "# lb clean"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:137
+msgid "Now edit #{auto/config}# to add the #{vlc}# package:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:148
+#, no-wrap
+msgid ""
+"lb config noauto \\\n"
+" --architecture i386 \\\n"
+" --linux-flavours 686 \\\n"
+" --packages-lists lxde \\\n"
+" --packages \"iceweasel xchat vlc\" \\\n"
+" \"${@}\"\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:152
+msgid "Build again:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:160
+msgid "Test, and when you're satisfied, commit the next revision:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:164
+msgid "$ git commit -a -m \"Adding vlc media player.\""
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:168
+msgid ""
+"Of course, more complicated changes to the configuration are possible, "
+"perhaps adding files in subdirectories of #{config/}#. When you commit new "
+"revisions, just take care not to hand edit or commit the top-level files in #"
+"{config}# containing #{LB_*}# variables, as these are build products, too, "
+"and are always cleaned up by #{lb clean}# and re-created with #{lb config}# "
+"via their respective #{auto}# scripts."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:170
+msgid ""
+"We've come to the end of our tutorial series. While many more kinds of "
+"customization are possible, even just using the few features explored in "
+"these simple examples, an almost infinite variety of different images can be "
+"created. The remaining examples in this section cover several other use "
+"cases drawn from the collected experiences of users of Debian Live."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:172
+msgid "2~ A VNC Kiosk Client"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:174
+msgid "Create an image with live-build to boot directly to a VNC server."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:176
msgid "_* Make a build directory: #{$ mkdir vncBuild}#"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:14
+#: en/user_examples.ssi:178
msgid "_* Move to the build directory: #{$ cd vncBuild}#"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:16
+#: en/user_examples.ssi:180
msgid ""
"Example to config the build directory to include gdm metacity "
"xtightvncviewer: #{$ lb config --packages \"gdm3 metacity xtightvncviewer\"}#"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:18
+#: en/user_examples.ssi:182
msgid ""
"Create a folder /etc/skel folder for a custom .xsession for the default "
"user: #{$ mkdir -p config/chroot_local-includes/etc/skel}#"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:20
+#: en/user_examples.ssi:184
msgid ""
"Create the .xsession for the default user: #{$ touch config/chroot_local-"
"includes/etc/skel/.xsession}#"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:22
+#: en/user_examples.ssi:186
msgid ""
"Edit the .xsession file to launch metacity and start xvncviewer with "
"something similar to the below:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:29
+#: en/user_examples.ssi:193
msgid "/usr/bin/metacity & /usr/bin/vncviewer xxx.xxx.xxx.xxx:PORT"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:31
+#: en/user_examples.ssi:195
msgid "exit"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:35
+#: en/user_examples.ssi:199
msgid "_* Build the image: #{# lb build}#"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:37
+#: en/user_examples.ssi:201
msgid "_* Enjoy."
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:39
-msgid "2~ Next Example FIXME"
+#: en/user_examples.ssi:203
+msgid "2~ A base image for a 128M USB key"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:205
+#, no-wrap
+msgid "*{Use case}* Create a standard image with some components removed in order to fit on a 128M USB key with space left over to use as you see fit.\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:207
+msgid ""
+"When optimizing an image to fit a certain media size, you need to understand "
+"the tradeoffs you are making between size and functionality. In this "
+"example, we trim only so much as to make room for additional material within "
+"a 128M media size, but without doing anything to destroy integrity of the "
+"packages contained within, such as the purging of locale data via the #"
+"{localepurge}# package, or other such \"intrusive\" optimizations. Of "
+"particular note, you should not use #{--bootstrap-flavour minimal}# unless "
+"you really know what you're doing, as omitting priority #{important}# "
+"packages will most likely produce a broken live system."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:211
+msgid ""
+"$ lb config -k 486 -p minimal --binary-indices false --memtest none --apt-"
+"recommends false --includes none"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:215
+msgid "Now, build the image in the usual way:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:223
+msgid ""
+"On the author's system at time of writing, the above configuration produced "
+"a 78Mbyte image. This compares favourably with the 166Mbyte image produced "
+"by the default configuration in {Tutorial 1}#tutorial-1."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:225
+msgid ""
+"The biggest space-saver here, compared to building a standard image on an #"
+"{i386}# architecture system, is to select only the #{486}# kernel flavour "
+"instead of the default #{-k \"486 686\"}#. Leaving off APT's indices with #"
+"{--binary-indices false}# also saves a fair amount of space, the tradeoff "
+"being that you need to #{apt-get update}# before using apt in the live "
+"system. Choosing the #{minimal}# package list leaves out the large #{locales}"
+"# package and associated utilities. Dropping recommended packages with #{--"
+"apt-recommends false}# saves some additional space, at the expense of "
+"omitting some packages you might otherwise expect to be there, such as #"
+"{firmware-linux-free}# which may be needed to support certain hardware. The "
+"remaining options shave off additional small amounts of space. It's up to "
+"you to decide if the functionality that is sacrificed with each optimization "
+"is worth the loss in functionality."
msgstr ""
diff --git a/manual/pot/user_installation.ssi.pot b/manual/pot/user_installation.ssi.pot
index e10ea02..b562d76 100644
--- a/manual/pot/user_installation.ssi.pot
+++ b/manual/pot/user_installation.ssi.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-23 16:43+0300\n"
+"POT-Creation-Date: 2010-11-29 14:16-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"
@@ -17,74 +17,82 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
#. type: Plain text
-#: en/about_manual.ssi:80 en/about_manual.ssi:88 en/about_manual.ssi:96
-#: en/about_manual.ssi:108 en/about_manual.ssi:121 en/about_manual.ssi:134
-#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
-#: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
-#: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
-#: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
-#: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
-#: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
-#: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
-#: en/other_faq.ssi:41 en/other_faq.ssi:83 en/other_faq.ssi:103
-#: en/other_faq.ssi:117 en/other_faq.ssi:137 en/other_faq.ssi:151
-#: en/other_faq.ssi:198 en/other_faq.ssi:245 en/other_faq.ssi:261
-#: en/other_faq.ssi:287 en/other_faq.ssi:299 en/other_faq.ssi:314
-#: en/other_faq.ssi:333 en/other_faq.ssi:345 en/other_faq.ssi:353
-#: en/other_faq.ssi:364 en/other_faq.ssi:374 en/other_howtos.ssi:16
-#: en/other_howtos.ssi:43 en/other_live-environment.ssi:14
-#: en/other_live-environment.ssi:30 en/other_live-environment.ssi:51
-#: en/other_live-environment.ssi:61 en/other_live-environment.ssi:69
-#: en/other_live-environment.ssi:77 en/other_live-environment.ssi:85
-#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
-#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
-#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
-#: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
-#: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
-#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111 en/user_basics.ssi:34
-#: en/user_basics.ssi:44 en/user_basics.ssi:56 en/user_basics.ssi:68
-#: en/user_basics.ssi:80 en/user_basics.ssi:92 en/user_basics.ssi:106
-#: en/user_basics.ssi:114 en/user_basics.ssi:122 en/user_basics.ssi:132
-#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
-#: en/user_basics.ssi:172 en/user_basics.ssi:186 en/user_basics.ssi:194
-#: en/user_basics.ssi:204 en/user_basics.ssi:224 en/user_basics.ssi:257
-#: en/user_basics.ssi:273 en/user_basics.ssi:281 en/user_basics.ssi:301
-#: en/user_basics.ssi:326 en/user_customization-contents.ssi:34
-#: en/user_customization-contents.ssi:43 en/user_customization-contents.ssi:66
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
+#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
+#: en/about_manual.ssi:170 en/other_coding-style.ssi:28
+#: en/other_coding-style.ssi:38 en/other_coding-style.ssi:51
+#: en/other_coding-style.ssi:61 en/other_coding-style.ssi:88
+#: en/other_coding-style.ssi:96 en/other_coding-style.ssi:106
+#: en/other_coding-style.ssi:117 en/other_common-tasks.ssi:32
+#: en/other_customization-backports.ssi:8 en/other_customization-bootup.ssi:30
+#: en/other_customization-bootup.ssi:39 en/other_faq.ssi:41
+#: en/other_faq.ssi:83 en/other_faq.ssi:103 en/other_faq.ssi:117
+#: en/other_faq.ssi:137 en/other_faq.ssi:151 en/other_faq.ssi:198
+#: en/other_faq.ssi:245 en/other_faq.ssi:261 en/other_faq.ssi:287
+#: en/other_faq.ssi:299 en/other_faq.ssi:314 en/other_faq.ssi:333
+#: en/other_faq.ssi:345 en/other_faq.ssi:353 en/other_faq.ssi:364
+#: en/other_faq.ssi:374 en/other_howtos.ssi:16 en/other_howtos.ssi:43
+#: en/other_live-environment.ssi:14 en/other_live-environment.ssi:30
+#: en/other_live-environment.ssi:51 en/other_live-environment.ssi:61
+#: en/other_live-environment.ssi:69 en/other_live-environment.ssi:77
+#: en/other_live-environment.ssi:85 en/other_live-environment.ssi:93
+#: en/other_live-environment.ssi:116 en/other_live-environment.ssi:124
+#: en/other_live-environment.ssi:133 en/other_procedures.ssi:12
+#: en/other_procedures.ssi:46 en/other_procedures.ssi:58
+#: en/project_bugs.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/user_basics.ssi:54 en/user_basics.ssi:66 en/user_basics.ssi:78
+#: en/user_basics.ssi:88 en/user_basics.ssi:102 en/user_basics.ssi:110
+#: en/user_basics.ssi:118 en/user_basics.ssi:128 en/user_basics.ssi:142
+#: en/user_basics.ssi:154 en/user_basics.ssi:162 en/user_basics.ssi:170
+#: en/user_basics.ssi:184 en/user_basics.ssi:192 en/user_basics.ssi:202
+#: en/user_basics.ssi:222 en/user_basics.ssi:255 en/user_basics.ssi:271
+#: en/user_basics.ssi:279 en/user_basics.ssi:299 en/user_basics.ssi:324
+#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
+#: en/user_customization-contents.ssi:66
#: en/user_customization-internationalization.ssi:10
#: en/user_customization-internationalization.ssi:18
#: en/user_customization-internationalization.ssi:26
#: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:16 en/user_customization-packages.ssi:24
-#: en/user_customization-packages.ssi:36 en/user_customization-packages.ssi:45
-#: en/user_customization-packages.ssi:59 en/user_customization-packages.ssi:73
-#: en/user_customization-packages.ssi:103
-#: en/user_customization-packages.ssi:111
-#: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:166
-#: en/user_customization-packages.ssi:176
-#: en/user_customization-packages.ssi:186
-#: en/user_customization-packages.ssi:196 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:104
-#: en/user_installation.ssi:118 en/user_installation.ssi:135
-#: en/user_managing_a_configuration.ssi:24
+#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
+#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
+#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:90
+#: en/user_customization-packages.ssi:120
+#: en/user_customization-packages.ssi:133
+#: en/user_customization-packages.ssi:143
+#: en/user_customization-packages.ssi:153
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:261
+#: en/user_customization-packages.ssi:273
+#: en/user_customization-packages.ssi:283 en/user_examples.ssi:14
+#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
+#: en/user_examples.ssi:64 en/user_examples.ssi:80 en/user_examples.ssi:90
+#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:131
+#: en/user_examples.ssi:139 en/user_examples.ssi:154 en/user_examples.ssi:162
+#: en/user_examples.ssi:188 en/user_examples.ssi:209 en/user_examples.ssi:217
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:76 en/user_installation.ssi:84
+#: en/user_installation.ssi:108 en/user_installation.ssi:126
+#: en/user_installation.ssi:144 en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
-#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:46
-#: en/user_overview.ssi:90 en/user_overview.ssi:98
+#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:36
+#: en/user_overview.ssi:80 en/user_overview.ssi:88
msgid "code{"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
-#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
-#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
-#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
-#: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
-#: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
+#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:166
+#: en/about_manual.ssi:173 en/other_coding-style.ssi:34
+#: en/other_coding-style.ssi:45 en/other_coding-style.ssi:57
+#: en/other_coding-style.ssi:68 en/other_coding-style.ssi:92
+#: en/other_coding-style.ssi:100 en/other_coding-style.ssi:113
+#: en/other_coding-style.ssi:124 en/other_common-tasks.ssi:36
+#: en/other_customization-backports.ssi:16
#: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
#: en/other_faq.ssi:37 en/other_faq.ssi:46 en/other_faq.ssi:92
#: en/other_faq.ssi:108 en/other_faq.ssi:141 en/other_faq.ssi:155
@@ -99,40 +107,46 @@ msgstr ""
#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
#: en/other_live-environment.ssi:138 en/other_procedures.ssi:16
#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
-#: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
-#: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
-#: en/other_use-cases.ssi:137 en/user_basics.ssi:38 en/user_basics.ssi:48
-#: en/user_basics.ssi:62 en/user_basics.ssi:72 en/user_basics.ssi:86
-#: en/user_basics.ssi:98 en/user_basics.ssi:110 en/user_basics.ssi:118
-#: en/user_basics.ssi:126 en/user_basics.ssi:136 en/user_basics.ssi:150
-#: en/user_basics.ssi:160 en/user_basics.ssi:168 en/user_basics.ssi:176
-#: en/user_basics.ssi:190 en/user_basics.ssi:198 en/user_basics.ssi:208
-#: en/user_basics.ssi:249 en/user_basics.ssi:261 en/user_basics.ssi:277
-#: en/user_basics.ssi:285 en/user_basics.ssi:312 en/user_basics.ssi:351
+#: en/project_bugs.ssi:62 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:60 en/user_basics.ssi:72 en/user_basics.ssi:82
+#: en/user_basics.ssi:94 en/user_basics.ssi:106 en/user_basics.ssi:114
+#: en/user_basics.ssi:122 en/user_basics.ssi:132 en/user_basics.ssi:148
+#: en/user_basics.ssi:158 en/user_basics.ssi:166 en/user_basics.ssi:174
+#: en/user_basics.ssi:188 en/user_basics.ssi:196 en/user_basics.ssi:206
+#: en/user_basics.ssi:247 en/user_basics.ssi:259 en/user_basics.ssi:275
+#: en/user_basics.ssi:283 en/user_basics.ssi:310 en/user_basics.ssi:349
#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
#: en/user_customization-contents.ssi:70
#: en/user_customization-internationalization.ssi:14
#: en/user_customization-internationalization.ssi:22
#: en/user_customization-internationalization.ssi:30
#: en/user_customization-internationalization.ssi:42
-#: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
-#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
-#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
-#: en/user_customization-packages.ssi:107
-#: en/user_customization-packages.ssi:115
-#: en/user_customization-packages.ssi:135
-#: en/user_customization-packages.ssi:172
-#: en/user_customization-packages.ssi:182
-#: en/user_customization-packages.ssi:192
-#: en/user_customization-packages.ssi:202 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 en/user_installation.ssi:108
-#: en/user_installation.ssi:123 en/user_installation.ssi:138
-#: en/user_managing_a_configuration.ssi:31
+#: en/user_customization-packages.ssi:23 en/user_customization-packages.ssi:36
+#: en/user_customization-packages.ssi:48 en/user_customization-packages.ssi:62
+#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:94
+#: en/user_customization-packages.ssi:125
+#: en/user_customization-packages.ssi:139
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:159
+#: en/user_customization-packages.ssi:169
+#: en/user_customization-packages.ssi:181
+#: en/user_customization-packages.ssi:197
+#: en/user_customization-packages.ssi:265
+#: en/user_customization-packages.ssi:277
+#: en/user_customization-packages.ssi:287 en/user_examples.ssi:20
+#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:58
+#: en/user_examples.ssi:68 en/user_examples.ssi:86 en/user_examples.ssi:101
+#: en/user_examples.ssi:111 en/user_examples.ssi:123 en/user_examples.ssi:135
+#: en/user_examples.ssi:150 en/user_examples.ssi:158 en/user_examples.ssi:166
+#: en/user_examples.ssi:197 en/user_examples.ssi:213 en/user_examples.ssi:221
+#: 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
+#: en/user_installation.ssi:112 en/user_installation.ssi:131
+#: en/user_installation.ssi:147 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
-#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:84
-#: en/user_overview.ssi:94 en/user_overview.ssi:102
+#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:74
+#: en/user_overview.ssi:84 en/user_overview.ssi:92
msgid "}code"
msgstr ""
@@ -148,7 +162,7 @@ msgstr ""
#. type: Plain text
#: en/user_installation.ssi:6
-msgid "2~ Requirements"
+msgid "2~requirements Requirements"
msgstr ""
#. type: Plain text
@@ -190,7 +204,7 @@ msgstr ""
#. type: Plain text
#: en/user_installation.ssi:22
-msgid "2~ Installing live-build"
+msgid "2~installing-live-build Installing live-build"
msgstr ""
#. type: Plain text
@@ -324,33 +338,53 @@ msgstr ""
#. type: Plain text
#: en/user_installation.ssi:98
-msgid "3~ Using a customized live-boot"
+msgid "% FIXME: we also need to mention live-config"
msgstr ""
#. type: Plain text
#: en/user_installation.ssi:100
+msgid "3~ Using a customized live-boot"
+msgstr ""
+
+#. type: Plain text
+#: en/user_installation.ssi:102
+msgid ""
+"% FIXME: should follow the structure for live-build above (i.e. \"from source"
+"\", not \"customized\" -- we should not get into customization now, but "
+"should reserve that discussion for later."
+msgstr ""
+
+#. type: Plain text
+#: en/user_installation.ssi:104
msgid ""
"To modify the code you can follow the process below. Please ensure you are "
-"familiar with the terms mentioned in {Terms}#terms ."
+"familiar with the terms mentioned in {Terms}#terms."
msgstr ""
#. type: Plain text
-#: en/user_installation.ssi:102
+#: en/user_installation.ssi:106
msgid "_* Checkout the live-boot source"
msgstr ""
#. type: Plain text
-#: en/user_installation.ssi:106
+#: en/user_installation.ssi:110
msgid "$ git clone git://live.debian.net/git/live-boot.git"
msgstr ""
#. type: Plain text
-#: en/user_installation.ssi:110
+#: en/user_installation.ssi:114
msgid "_* Make changes to your local copy"
msgstr ""
#. type: Plain text
-#: en/user_installation.ssi:112
+#: en/user_installation.ssi:116
+msgid ""
+"% FIXME: as indicated above, it's too early for this topic. Move to later in "
+"the manual."
+msgstr ""
+
+#. type: Plain text
+#: en/user_installation.ssi:118
msgid ""
"And beware that if you want to add your pre-init script in live-bottom, you "
"should name it without dashes '-', e.g: call it \"99new_feature\" and not "
@@ -358,12 +392,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_installation.ssi:114
+#: en/user_installation.ssi:120
msgid "_* Build a live-boot .deb"
msgstr ""
#. type: Plain text
-#: en/user_installation.ssi:116
+#: en/user_installation.ssi:122
+msgid ""
+"% FIXME: not strictly true? building sid on squeeze is usually OK. also, "
+"building lenny on squeeze or sid is fine. clarify."
+msgstr ""
+
+#. type: Plain text
+#: en/user_installation.ssi:124
msgid ""
"You must build either on your target distribution or in a chroot containing "
"your target platform: this means if your target is Squeeze then you should "
@@ -374,17 +415,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_installation.ssi:121
-msgid "$ cd live-boot $ dpkg-buildpackage -rfakeroot -b -uc -us"
+#: en/user_installation.ssi:129
+msgid "$ cd live-boot $ dpkg-buildpackage -b -uc -us"
msgstr ""
#. type: Plain text
-#: en/user_installation.ssi:125
+#: en/user_installation.ssi:133
msgid "_* Use the generated live-boot .deb"
msgstr ""
#. type: Plain text
-#: en/user_installation.ssi:127
+#: en/user_installation.ssi:135
msgid ""
"As live-boot is installed by live-build system, installing the package in "
"the host system is not sufficient: you should treat the generated .deb like "
@@ -393,19 +434,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_installation.ssi:129
+#: en/user_installation.ssi:138
msgid ""
"% FIXME: <xref linkend=\"custom-packages\"/> <xref linkend=\"custom-packages-"
-"apt\"/>"
+"apt\"/> % Ben> What is the latter reference for? I can't see the relevance."
msgstr ""
#. type: Plain text
-#: en/user_installation.ssi:131
+#: en/user_installation.ssi:140
msgid "3~ Using live-boot snapshots"
msgstr ""
#. type: Plain text
-#: en/user_installation.ssi:133
+#: en/user_installation.ssi:142
msgid ""
"You can let live-build automatically use the latest snapshot of live-boot by "
"configuring a third-party repository in your live-build configuration "
@@ -414,6 +455,6 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_installation.ssi:137
+#: en/user_installation.ssi:146
msgid "lb config --repository live.debian.net"
msgstr ""
diff --git a/manual/pot/user_managing_a_configuration.ssi.pot b/manual/pot/user_managing_a_configuration.ssi.pot
index 1872562..f4ae9ea 100644
--- a/manual/pot/user_managing_a_configuration.ssi.pot
+++ b/manual/pot/user_managing_a_configuration.ssi.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-28 16:34-0200\n"
+"POT-Creation-Date: 2010-11-27 19:55-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"
@@ -17,9 +17,9 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
#. type: Plain text
-#: en/about_manual.ssi:80 en/about_manual.ssi:88 en/about_manual.ssi:96
-#: en/about_manual.ssi:108 en/about_manual.ssi:121 en/about_manual.ssi:134
-#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
+#: en/about_manual.ssi:112 en/about_manual.ssi:125 en/about_manual.ssi:138
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
#: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
#: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
#: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
@@ -39,38 +39,43 @@ msgstr ""
#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
-#: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
-#: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
-#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111
-#: en/project_bugs.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
-#: en/user_basics.ssi:54 en/user_basics.ssi:66 en/user_basics.ssi:78
-#: en/user_basics.ssi:88 en/user_basics.ssi:102 en/user_basics.ssi:110
-#: en/user_basics.ssi:118 en/user_basics.ssi:128 en/user_basics.ssi:140
-#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
-#: en/user_basics.ssi:182 en/user_basics.ssi:190 en/user_basics.ssi:200
-#: en/user_basics.ssi:220 en/user_basics.ssi:253 en/user_basics.ssi:269
-#: en/user_basics.ssi:277 en/user_basics.ssi:297 en/user_basics.ssi:322
-#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
-#: en/user_customization-contents.ssi:66
+#: en/other_procedures.ssi:58 en/project_bugs.ssi:58 en/user_basics.ssi:32
+#: en/user_basics.ssi:42 en/user_basics.ssi:54 en/user_basics.ssi:66
+#: en/user_basics.ssi:78 en/user_basics.ssi:88 en/user_basics.ssi:102
+#: en/user_basics.ssi:110 en/user_basics.ssi:118 en/user_basics.ssi:128
+#: en/user_basics.ssi:142 en/user_basics.ssi:154 en/user_basics.ssi:162
+#: en/user_basics.ssi:170 en/user_basics.ssi:184 en/user_basics.ssi:192
+#: en/user_basics.ssi:202 en/user_basics.ssi:222 en/user_basics.ssi:255
+#: en/user_basics.ssi:271 en/user_basics.ssi:279 en/user_basics.ssi:299
+#: en/user_basics.ssi:324 en/user_customization-contents.ssi:34
+#: en/user_customization-contents.ssi:43 en/user_customization-contents.ssi:66
#: en/user_customization-internationalization.ssi:10
#: en/user_customization-internationalization.ssi:18
#: en/user_customization-internationalization.ssi:26
#: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:16 en/user_customization-packages.ssi:24
-#: en/user_customization-packages.ssi:36 en/user_customization-packages.ssi:45
-#: en/user_customization-packages.ssi:59 en/user_customization-packages.ssi:73
-#: en/user_customization-packages.ssi:103
-#: en/user_customization-packages.ssi:111
-#: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:166
-#: en/user_customization-packages.ssi:176
-#: en/user_customization-packages.ssi:186
-#: en/user_customization-packages.ssi:196 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:104
-#: en/user_installation.ssi:118 en/user_installation.ssi:135
-#: en/user_managing_a_configuration.ssi:24
+#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
+#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
+#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:90
+#: en/user_customization-packages.ssi:120
+#: en/user_customization-packages.ssi:133
+#: en/user_customization-packages.ssi:143
+#: en/user_customization-packages.ssi:153
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:261
+#: en/user_customization-packages.ssi:273
+#: en/user_customization-packages.ssi:283 en/user_examples.ssi:12
+#: en/user_examples.ssi:27 en/user_examples.ssi:37 en/user_examples.ssi:51
+#: en/user_examples.ssi:61 en/user_examples.ssi:77 en/user_examples.ssi:87
+#: en/user_examples.ssi:104 en/user_examples.ssi:114 en/user_examples.ssi:128
+#: en/user_examples.ssi:136 en/user_examples.ssi:151 en/user_examples.ssi:159
+#: en/user_examples.ssi:185 en/user_examples.ssi:206 en/user_examples.ssi:214
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:76 en/user_installation.ssi:84
+#: en/user_installation.ssi:104 en/user_installation.ssi:118
+#: en/user_installation.ssi:135 en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:36
#: en/user_overview.ssi:80 en/user_overview.ssi:88
@@ -78,9 +83,9 @@ msgid "code{"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:121 en/about_manual.ssi:134 en/about_manual.ssi:142
+#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:165
#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
@@ -100,37 +105,43 @@ msgstr ""
#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
#: en/other_live-environment.ssi:138 en/other_procedures.ssi:16
#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
-#: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
-#: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
-#: en/other_use-cases.ssi:137 en/project_bugs.ssi:62 en/user_basics.ssi:36
-#: en/user_basics.ssi:46 en/user_basics.ssi:60 en/user_basics.ssi:72
-#: en/user_basics.ssi:82 en/user_basics.ssi:94 en/user_basics.ssi:106
-#: en/user_basics.ssi:114 en/user_basics.ssi:122 en/user_basics.ssi:132
-#: en/user_basics.ssi:146 en/user_basics.ssi:156 en/user_basics.ssi:164
-#: en/user_basics.ssi:172 en/user_basics.ssi:186 en/user_basics.ssi:194
-#: en/user_basics.ssi:204 en/user_basics.ssi:245 en/user_basics.ssi:257
-#: en/user_basics.ssi:273 en/user_basics.ssi:281 en/user_basics.ssi:308
-#: en/user_basics.ssi:347 en/user_customization-contents.ssi:39
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:70
+#: en/project_bugs.ssi:62 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:60 en/user_basics.ssi:72 en/user_basics.ssi:82
+#: en/user_basics.ssi:94 en/user_basics.ssi:106 en/user_basics.ssi:114
+#: en/user_basics.ssi:122 en/user_basics.ssi:132 en/user_basics.ssi:148
+#: en/user_basics.ssi:158 en/user_basics.ssi:166 en/user_basics.ssi:174
+#: en/user_basics.ssi:188 en/user_basics.ssi:196 en/user_basics.ssi:206
+#: en/user_basics.ssi:247 en/user_basics.ssi:259 en/user_basics.ssi:275
+#: en/user_basics.ssi:283 en/user_basics.ssi:310 en/user_basics.ssi:349
+#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:70
#: en/user_customization-internationalization.ssi:14
#: en/user_customization-internationalization.ssi:22
#: en/user_customization-internationalization.ssi:30
#: en/user_customization-internationalization.ssi:42
-#: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
-#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
-#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
-#: en/user_customization-packages.ssi:107
-#: en/user_customization-packages.ssi:115
-#: en/user_customization-packages.ssi:135
-#: en/user_customization-packages.ssi:172
-#: en/user_customization-packages.ssi:182
-#: en/user_customization-packages.ssi:192
-#: en/user_customization-packages.ssi:202 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 en/user_installation.ssi:108
-#: en/user_installation.ssi:123 en/user_installation.ssi:138
-#: en/user_managing_a_configuration.ssi:31
+#: en/user_customization-packages.ssi:23 en/user_customization-packages.ssi:36
+#: en/user_customization-packages.ssi:48 en/user_customization-packages.ssi:62
+#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:94
+#: en/user_customization-packages.ssi:125
+#: en/user_customization-packages.ssi:139
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:159
+#: en/user_customization-packages.ssi:169
+#: en/user_customization-packages.ssi:181
+#: en/user_customization-packages.ssi:197
+#: en/user_customization-packages.ssi:265
+#: en/user_customization-packages.ssi:277
+#: en/user_customization-packages.ssi:287 en/user_examples.ssi:17
+#: en/user_examples.ssi:31 en/user_examples.ssi:41 en/user_examples.ssi:55
+#: en/user_examples.ssi:65 en/user_examples.ssi:83 en/user_examples.ssi:98
+#: en/user_examples.ssi:108 en/user_examples.ssi:120 en/user_examples.ssi:132
+#: en/user_examples.ssi:147 en/user_examples.ssi:155 en/user_examples.ssi:163
+#: en/user_examples.ssi:194 en/user_examples.ssi:210 en/user_examples.ssi:218
+#: 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
+#: en/user_installation.ssi:108 en/user_installation.ssi:123
+#: en/user_installation.ssi:138 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:74
#: en/user_overview.ssi:84 en/user_overview.ssi:92
@@ -229,8 +240,8 @@ msgstr ""
msgid ""
"#!/bin/sh\n"
"lb config noauto \\\n"
-"\t--architecture i386 \\\n"
-"\t${@}\n"
+"\t--packages-lists \"standard\" \\\n"
+"\t\"${@}\"\n"
msgstr ""
#. type: Plain text
@@ -243,7 +254,7 @@ msgstr ""
#, no-wrap
msgid ""
"#!/bin/sh\n"
-"lb clean noauto ${@}\n"
+"lb clean noauto \"${@}\"\n"
"rm -f config/binary config/bootstrap \\\n"
"\tconfig/chroot config/common config/source\n"
"rm -f binary.log\n"
@@ -256,16 +267,15 @@ msgstr ""
#. type: Plain text
#: en/user_managing_a_configuration.ssi:50
-msgid "#!/bin/sh lb build noauto ${@} 2>&1 | tee binary.log"
+msgid "#!/bin/sh lb build noauto \"${@}\" 2>&1 | tee binary.log"
msgstr ""
#. type: Plain text
#: en/user_managing_a_configuration.ssi:54
msgid ""
-"Edit auto/config, changing or adding any options as you see fit. In the "
-"example above, --architecture is set to i386 so that when the image is built "
-"on an amd64 system, it will not default to building amd64 images. Change "
-"this to an appropriate value for your image (or delete it if you want to use "
-"the default) and add any additional options in continuation lines that "
-"follow."
+"Edit #{auto/config}#, changing or adding any options as you see fit. In the "
+"example above, #{--packages-lists standard}# is set to the default value. "
+"Change this to an appropriate value for your image (or delete it if you want "
+"to use the default) and add any additional options in continuation lines "
+"that follow."
msgstr ""
diff --git a/manual/pt_BR/about_manual.ssi b/manual/pt_BR/about_manual.ssi
index 26c5921..b889857 100644
--- a/manual/pt_BR/about_manual.ssi
+++ b/manual/pt_BR/about_manual.ssi
@@ -14,6 +14,25 @@ executados como usuário não privilegiado e aqueles que requerem privilégios
de super usuário, os comandos são precididos por: #{$}# ou #{#}#
respectivamente. Esse simbolo não é parte do comando.
+2~ For the impatient
+
+While we believe that everything in this manual is important to at least
+some of our users, we realize it is a lot of material to cover and that you
+may wish to experience early success using the software before delving into
+the details. Therefore, we have provided three tutorials in the
+{Examples}#examples section designed to teach you image building and
+customization basics. Read {Using the examples}#using-the-examples first,
+followed by {Tutorial 1: A standard image}#tutorial-1, {Tutorial 2: A web
+browser utility}#tutorial-2 and finally {Tutorial 3: A personal travelling
+companion}#tutorial-3. By the end of these tutorials, you will have a taste
+of what can be done with Debian Live. We encourage you to return to more
+in-depth study of the manual, perhaps next reading {The basics}#the-basics,
+skimming or skipping {Building a netboot image}#building-netboot-image, and
+finishing by reading the {Customization overview}#customization-overview and
+the chapters that follow it. By this point, we hope you are thoroughly
+excited by what can be done with Debian Live and motivated to read the rest
+of the manual, cover-to-cover.
+
2~terms Terminologia
_* *{Live system}*: Um sistema operacional que pode inicializar sem
@@ -55,7 +74,7 @@ distribuição Debian.
_* *{Boot parameters}*: Parametros que podem ser entrados no prompt do
bootloader para influenciar o kernel ou o live-config.
-_* *{chroot}*: O programa chroot, chroot(8), nos habilita a rodar
+_* *{chroot}*: O programa chroot, #{chroot(8)}#, nos habilita a rodar
simultâneamente diferentes instâncias do ambiente do GNU/Linux em um único
sistema sem reinicialização.
@@ -65,19 +84,21 @@ binary.img.
_* *{Target distribution}*: A distribuição em que o sistema live será
baseado. Isso pode diferir da distribuição do seu sistema host.
-_* *{Squeeze/Wheezy/Sid (stable/testing/unstable)}*: A distribuição
-estável(stable) contem a última versão oficial lançada do Debian. A
-distribuição "Testing" é a ária de estágio para a próxima versão
-estável(stable). A maior vantagem de usar essa distribuição é que ela tem
-versões mais recentes de software relacionado com a versão
-estável(stable). A distribuição instável(unstable) é onde ocorre o
+_* *{Squeeze/Wheezy/Sid (stable/testing/unstable)}*: Debian codenames for
+releases. At the time of writing, Squeeze is the current *{stable}* release
+and Wheezy is the current *{testing}* release. Sid will always be a synonym
+for the *{unstable}* release. Throughout the manual, we tend to use
+codenames for the releases, as that is what is supported by the tools
+themselves.
+
+A distribuição estável (*{stable}*) contem a última versão oficial lançada
+do Debian. A distribuição *{testing}* é a ária de estágio para a próxima
+versão estável(stable). A maior vantagem de usar essa distribuição é que ela
+tem versões mais recentes de software relacionado com a versão estável
+(*{stable}*). A distribuição instável (*{unstable}*) é onde ocorre o
desenvolvimento ativo do Debian. Geralmente, essa distribuição é mantida por
desenvolvedores e aqueles que vivem no limite.
-No tempo da escrita, Squeeze é o a atual versão estável(stable) e Wheezy é a
-atual versão testing. Sid sempre será um sinônimo para a versão
-instável(unstable).
-
2~Autores
A lista de autores (em ordem alfabética)
@@ -147,6 +168,16 @@ $ make build
}code
+Since it takes a while to build the manual in all supported languages, you
+may find it convenient when proofing to build for only one language, e.g. by
+executing:
+
+code{
+
+$ make build LANGUAGES=en
+
+}code
+
3~ Aplicando patches
Diretamente cometer ao repoitório é possivel por qualquer um. No entanto,
@@ -159,11 +190,11 @@ _* Obter a chave publica de commit:
code{
$ mkdir -p ~/.ssh/identity.d
-$ wget http://live.debian.net/other/keys/live-manual@debian-live \
- -O ~/.ssh/identity.d/live-manual at debian-live
-$ wget http://live.debian.net/other/keys/live-manual@debian-live.pub \
- -O ~/.ssh/identity.d/live-manual at debian-live.pub
-$ chmod 0600 ~/.ssh/identity.d/live-manual at debian-live*
+$ wget http://live.debian.net/other/keys/gitosis@live.debian.net \
+ -O ~/.ssh/identity.d/gitosis at live.debian.net
+$ wget http://live.debian.net/other/keys/gitosis@live.debian.net.pub \
+ -O ~/.ssh/identity.d/gitosis at live.debian.net.pub
+$ chmod 0600 ~/.ssh/identity.d/gitosis at live.debian.net*
}code
@@ -175,7 +206,7 @@ $ cat >> ~/.ssh/config << EOF
Host live.debian.net
Hostname live.debian.net
User gitosis
- IdentityFile ~/.ssh/identity.d/live-manual at debian-live
+ IdentityFile ~/.ssh/identity.d/gitosis at live.debian.net
EOF
}code
@@ -188,7 +219,7 @@ $ git clone gitosis at live.debian.net:/live-manual.git
}code
-_* Depoi de editar os arquivos no manual/en/, por favor chame o alvo
+_* Depois de editar os arquivos no manual/en/, por favor chame o alvo
'commit' no nível superior do diretório para higiênizar os arquivos e
atualizar os arquivos de tradução.
diff --git a/manual/pt_BR/about_project.ssi b/manual/pt_BR/about_project.ssi
index 473de07..def33ca 100644
--- a/manual/pt_BR/about_project.ssi
+++ b/manual/pt_BR/about_project.ssi
@@ -12,7 +12,7 @@ perspective most of them have one or more of the following disadvantages:
_* They are unofficial projects, developed outside of Debian.
-_* They mix different distributions, e.g. testing and unstable.
+_* They mix different distributions, e.g. *{testing}* and *{unstable}*.
_* They support i386 only.
diff --git a/manual/pt_BR/live-manual.ssm b/manual/pt_BR/live-manual.ssm
index ca909a0..d5160cc 100644
--- a/manual/pt_BR/live-manual.ssm
+++ b/manual/pt_BR/live-manual.ssm
@@ -9,12 +9,12 @@
:license: This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.<br><br>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.<br><br>You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses/. <br><br>On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-3 file.
@date:
- :published: 2010-11-13
+ :published: 2010-11-29
@publisher: Debian Live Project <debian-live at lists.debian.org>
@make:
- :bold: /Squeeze|squeeze|Stable|stable|Wheezy|wheezy|Testing|testing|Sid|sid|Unstable|unstable/
+ :bold: /Squeeze|squeeze|Wheezy|wheezy|Sid|sid/
:italics: /live-boot|live-build|live-config|live-magic|live-manual|live-installer|debian-installer-launcher/
:num_top: 1
:skin: skin_debian-live
diff --git a/manual/pt_BR/project_bugs.ssi b/manual/pt_BR/project_bugs.ssi
index 8443811..a2a2de3 100644
--- a/manual/pt_BR/project_bugs.ssi
+++ b/manual/pt_BR/project_bugs.ssi
@@ -21,12 +21,13 @@ used and the distribution of the live system you are building.
2~ Known issues
-Due to the nature of Debian testing and Debian unstable distributions being
-a moving target, building a live system may not always be possible.
+Due to the nature of Debian *{testing}* and Debian *{unstable}*
+distributions being a moving target, building a live system may not always
+be possible.
-If this is a problem, do not build a system based on testing or unstable,
-but go with stable. live-build does always default to the current stable
-release.
+If this is a problem, do not build a system based on *{testing}* or
+*{unstable}*, but go with *{stable}*. live-build does always default to the
+current *{stable}* release.
Currently known issues are listed under the section 'status' on our homepage
at http://live.debian.net/
@@ -34,8 +35,9 @@ at http://live.debian.net/
It is out of the scope of this manual to train you in correctly identifying
and fixing problems in packages of the development distributions, however,
there are two things you can always try: When not succeeding to build
-testing, try if unstable works. If unstable does not work either, revert to
-testing and pinning the newer version of the failing package from unstable.
+*{testing}*, try if *{unstable}* works. If *{unstable}* does not work
+either, revert to *{testing}* and pinning the newer version of the failing
+package from *{unstable}*.
2~ Rebuild from scratch
diff --git a/manual/pt_BR/user_basics.ssi b/manual/pt_BR/user_basics.ssi
index 303cdd7..b4e6373 100644
--- a/manual/pt_BR/user_basics.ssi
+++ b/manual/pt_BR/user_basics.ssi
@@ -1,9 +1,18 @@
:B~ The basics
-1~ The basics
+1~the-basics The basics
This chapter contains a brief overview of the build process and instructions
-for booting the various binary image types.
+for using the three most commonly used image types. The most versatile image
+type, #{iso-hybrid}#, may be used on a virtual machine, optical media or USB
+portable storage device. In certain special cases, #{usb-hdd}# may be more
+suitable for USB devices. The chapter finishes with instructions for
+building and using a #{net}# type image, which is a bit more involved due to
+the setup required on the server. This is a slightly advanced topic for
+anyone who is not familiar already with netbooting, but is included here
+because once the setup is done, it is a very convenient way to test and
+deploy images for booting on the local network without the hassle of dealing
+with image media.
2~ What is a live system?
@@ -77,7 +86,7 @@ code{
This process can take a while, depending on the speed of your network
connection (see {The lb build command}#lb-build).
-3~ Testing an ISO image with Qemu
+3~testing-iso-with-qemu Testing an ISO image with Qemu
Testing an ISO is simple:
@@ -89,7 +98,7 @@ $ qemu -cdrom binary.iso
}code
-3~ Testing an ISO image with virtualbox-ose
+3~testing-iso-with-virtualbox Testing an ISO image with virtualbox-ose
In order to test the ISO with virtualbox-ose:
@@ -115,7 +124,7 @@ code{
}code
-3~ Burning an ISO image to a physical medium
+3~burning-iso-image Burning an ISO image to a physical medium
Burning an ISO image is easy:
@@ -138,8 +147,8 @@ to use the remaining space on the media for a persistence partition, you
need a USB/HDD image.
Note: if you created an ISO image with the previous example, you will need
-to clean up your working directory with the #{lb clean} command (see {The lb
-clean command}#lb-clean):
+to clean up your working directory with the #{lb clean}# command (see {The
+lb clean command}#lb-clean):
code{
@@ -147,8 +156,8 @@ $ lb clean --binary
}code
-Run the #{lb config}# command with the parameters to configure the "config/"
-hierarchy to create a USB/HDD image type:
+Run the #{lb config}# command with the parameters to configure the
+#{config/}# hierarchy to create a USB/HDD image type:
code{
@@ -183,7 +192,10 @@ better yet, #{ls -l /dev/disk/by-id}#.
*{This will definitely overwrite any previous contents on your stick!}*
-3~ Testing a USB/HDD image with Qemu
+Note: As discussed earlier, this same process can be used for #{iso-hybrid}#
+type images, (suffixed #{-hybrid.iso}#,) but not #{iso}# type images.
+
+3~testing-usb-hdd-with-qemu Testing a USB/HDD image with Qemu
code{
@@ -225,7 +237,7 @@ code{
*{Remember: Every time you install a new binary.img on the stick, all data on the stick will be lost because the partition table is overwritten by the contents of the image.}*
-2~ Building a netboot image
+2~building-netboot-image Building a netboot image
The following sequence of commands will create a basic netboot image
containing the Debian standard system without X.org. It is suitable for
diff --git a/manual/pt_BR/user_customization-contents.ssi b/manual/pt_BR/user_customization-contents.ssi
index df28e53..f8d01ce 100644
--- a/manual/pt_BR/user_customization-contents.ssi
+++ b/manual/pt_BR/user_customization-contents.ssi
@@ -1,4 +1,4 @@
-B~ Customizing contents
+:B~ Customizing contents
1~customizing-contents Customizing contents
diff --git a/manual/pt_BR/user_customization-internationalization.ssi b/manual/pt_BR/user_customization-internationalization.ssi
index b86f8f8..0288819 100644
--- a/manual/pt_BR/user_customization-internationalization.ssi
+++ b/manual/pt_BR/user_customization-internationalization.ssi
@@ -1,4 +1,4 @@
-B~ Customizing locale and language
+:B~ Customizing locale and language
1~customizing-locale-and-language Customizing locale and language
diff --git a/manual/pt_BR/user_customization-overview.ssi b/manual/pt_BR/user_customization-overview.ssi
index 44c6731..dfef318 100644
--- a/manual/pt_BR/user_customization-overview.ssi
+++ b/manual/pt_BR/user_customization-overview.ssi
@@ -1,4 +1,4 @@
-B~ Customizing contents
+:B~ Customizing contents
1~customization-overview Customization overview
diff --git a/manual/pt_BR/user_customization-packages.ssi b/manual/pt_BR/user_customization-packages.ssi
index 1ae1289..bd1a027 100644
--- a/manual/pt_BR/user_customization-packages.ssi
+++ b/manual/pt_BR/user_customization-packages.ssi
@@ -13,77 +13,67 @@ use #{tasksel}# tasks, or a combination of all three. Finally, a number of
options give some control over apt, or if you prefer, aptitude, at build
time when packages are installed. You may find these handy if you use a
proxy, want to disable installation of recommended packages to save space,
-or need to control which versions of packages are installed via apt pinning,
+or need to control which versions of packages are installed via APT pinning,
to name a few possibilities.
2~ Package sources
-3~ Debian repositories
+3~ Distribution mirrors
-To set a local mirror to be used to at build time:
+Each of the #{--mirror-*}# options governs which distribution mirror is used
+at various stages of the build. Recall from {Stages of the
+build}#stages-of-the-build that the *bootstrap* stage is when the chroot is
+initially populated by debootstrap with a minimal system, and the *chroot*
+stage is when the chroot used to construct the live system's filesystem is
+built. Thus, the corresponding mirror switches are used for those stages,
+and later, in the *binary* stage, the #{--mirror-binary}# and
+#{--mirror-binary-security}# values are used, superceding any mirrors used
+in an earlier stage.
-code{
-
-$ lb config --mirror-bootstrap http://localhost/debian/
-
-}code
+3~distribution-mirrors-build-time Distribution mirrors used at build time
-The chroot repository, specified by --mirror-chroot, defaults to the same as
---mirror-bootstrap.
-
-Each of the --mirror-* options governs which repository is used at various
-stages of the build. Recall from {Stages of the build}#stages-of-the-build
-that the *bootstrap* stage is when the chroot is initially populated by
-debootstrap with a minimal system, and the *chroot* stage is when the chroot
-used to construct the live system's filesystem is built. Thus, the
-corresponding mirror switches are used for those stages, and later, when the
-binary image is constructed, the --mirror-binary value is used, superceding
-any earlier repositories.
-
-The generic mirror is added to the live system's /etc/apt/sources.list.
+To set the distribution mirrors used at build time to point at a local
+mirror, it is sufficient to set #{--mirror-bootstrap}# and
+#{--mirror-chroot-security}# as follows.
code{
-$ lb config --mirror-binary http://ftp.debian.org/debian/
+$ lb config --mirror-bootstrap http://localhost/debian/ \
+ --mirror-chroot-security http://localhost/debian-security/
}code
-Note: It is not used for building the live system but to install new
-software while using the live system.
+The chroot mirror, specified by #{--mirror-chroot}#, defaults to the
+#{--mirror-bootstrap}# value.
-It can be disabled by setting the binary mirror to the same value as the
-chroot mirror.
+3~ Distribution mirrors used at run time
-Note: the same applies for mirror chroot security and mirror binary security
+The #{--mirror-binary*}# options govern the distribution mirrors placed in
+the binary image. These may be used to install additional packages while
+running the live system. The 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{
-$ lb config --mirror-chroot-security {URL} $ lb config
---mirror-binary-security {URL}
-
-}code
-
-If you don't want to include apt indices, you can skip those with:
-
-code{
-
-$ lb config --binary-indices false
+$ lb config --mirror-binary http://mirror/debian/ \
+ --mirror-binary-security http://mirror/debian-security/
}code
-This will not influence the entries in /etc/apt/sources.list, but only if
-/var/lib/apt contains the indices files or not (and by that making the image
-smaller).
-
-3~ Own repository
+3~ Additional repositories
To add more repositories (e.g. backports, experimental or custom packages,
etc.), create #{config/chroot_sources/your-repository.{chroot,binary}}#
-files.
+files. As with the #{--mirror-*}# options, these govern the repositories
+used in the *chroot* stage when building the image, and in the *binary*
+stage, i.e. for use when running the live system.
-e.g. #{config/chroot_sources/live.chroot}# allows you to install packages
-from the debian live snapshot repository at live system build time (you have
-to add the packages in your package list):
+For example, #{config/chroot_sources/live.chroot}# allows you to install
+packages from the debian live snapshot repository at live system build time.
code{
@@ -91,17 +81,18 @@ deb http://live.debian.net/ sid-snapshots main contrib non-free
}code
-If you add the line to #{config/chroot_sources/live.binary}# the repository
-will be added to your live-system's #{/etc/apt/sources.list}#.
+If you add the same line to #{config/chroot_sources/live.binary}#, the
+repository will be added to your live system's #{/etc/apt/sources.list.d/}#
+directory.
If such files exist, they will be picked up automatically.
-You can also put the gpg-key used to sign the repository into
-config/chroot_sources/your-repository.{binary,chroot}.gpg
+You should 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:
+selection through the #{--repository}# option, e.g. for enabling live
+snapshots, a simple command is enough to enable it:
code{
@@ -109,45 +100,21 @@ $ lb config --repository live.debian.net
}code
-3~ Package installation
-
-You can elect to use either #{apt}# or #{aptitude}# when installing
-packages. Which utility is used is governed by the #{LB_APT}# variable in
-#{config/chroot}# or by the #{--apt}# argument to #{lb config}#:
-
-_* #{apt}#: Specifying a missing package causes package installation to
-fail, which may not be the desired behaviour. This is the default setting
-for building images for Lenny or later.
-
-_* #{aptitude}#: Specifying a missing package causes package installation to
-succeed, which may not be the desired behaviour. This is the default setting
-for building images for Etch.
-
-2~ Installing additional packages
+2~choosing-packages-to-install Choosing packages to install
-live-helper has a number of mechanisms for indicating that additional
-packages should be installed, including:
+There are a number of ways to choose which packages live-build will install
+in your image, covering a variety of different needs. You can simply name
+individual packages to install, either with the #{--packages}# option for a
+few packages, or in a package list of your own for larger numbers. You can
+also choose larger predefined lists of packages, or use APT tasks. And
+finally, you may place package files in your #{config/}# tree, which is well
+suited to testing of new or experimental packages before they are available
+from a repository.
-_* The #{LB_PACKAGES}# variable
+3~ Choosing a few packages
-_* Package lists
-
-_* Local packages (#{chroot_local-packages/}#)
-
-_* Tasks
-
-3~ The #{LB_PACKAGES}# variable
-
-To install additional packages, simply add them to the #{LB_PACKAGES}#
-variable in #{config/chroot}#. For example:
-
-code{
-
-LB_PACKAGES="package1 package2 package3 ... "
-
-}code
-
-You can also specify initial values on the command line:
+When the number of packages added is small, simply specify
+#{--packages}#. For example:
code{
@@ -156,67 +123,99 @@ $ 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"/>
+need flexibility regarding which packages to install, use package lists as
+discussed in the following section, {Package lists}#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.
+installed. The list syntax supports included files and conditional sections
+which makes it easy to build lists from other lists and adapt them for use
+in multiple configurations. You can use predefined package lists, providing
+in a modular fashion package selections from each of the major desktop
+environments and some special purpose lists, as well as standard lists the
+others are based upon. You can also provide your own package lists, or use a
+combination of both.
-To specify one or more package list, you can use:
+3~ Predefined package lists
+
+The simplest way to use lists is to specify one or more predefined lists
+with the #{--packages-lists}# option. For example:
code{
-$ lb config --packages-lists "list1 list2 list3"
+$ lb config --packages-lists "gnome-core rescue"
}code
-Note: Package lists that are distributed with live-build reside in the
-#{/usr/share/live/build/lists}# directory.
+In addition to these lists, live-build supports four virtual package lists:
+#{gnome-desktop}#, #{kde-desktop}#, #{lxde-desktop}# and #{xfce-desktop}#,
+each of which provide a more extensive selection of packages that
+corresponds with Debian Installer defaults for these desktop
+environments. See {Desktop and language tasks}#desktop-and-language-tasks
+for more details.
+
+Note: The prebuilt GNOME, KDE, LXDE and XFCE images available for download
+at http://live.debian.net are built using the corresponding virtual
+#{*-desktop}# lists.
+
+The default location for the list files on your system is
+#{/usr/share/live/build/lists/}#. To determine the packages in a given list,
+read the corresponding file, paying attention to included files and
+conditionals as described in the following sections.
-*{Local packages lists}*
+3~ Local package lists
-You may supplement the supplied lists using local package lists stored in
-#{config/chroot_local-packageslists}#.
+You may supplement or replace entirely 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
+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}*
+3~ 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}*
+3~ Extending a provided package list using includes
-% FIXME
+The package lists that are included with live-build make extensive use of
+includes. Refer to these in the #{/usr/share/live/build/lists/}# directory,
+as they serve as good examples of how to write your own lists.
-% code{ % % #include <gnome> % iceweasel % % }code
+For example, to make a list that includes the predefined #{gnome}# list plus
+iceweasel, create #{config/chroot_local-packageslists/mygnome.list}# with
+the following contents:
-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.
+code{
+
+#include <gnome> iceweasel
+
+}code
+
+3~ 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{
@@ -224,7 +223,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{
@@ -232,7 +233,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{
@@ -248,14 +251,66 @@ code{
}code
-Any live-build configuration variable that begins with #{LB_}# can be tested
-in this way.
-
The nesting of conditionals is not supported.
3~ Tasks
-%FIXME
+The Debian Installer offers the user choices of a number of preselected
+lists of packages, each one focused on a particular kind of system, or task
+a system may be used for, such as "Graphical desktop environment", "Mail
+server" or "Laptop". These lists are called "tasks" and are supported by APT
+through the "Task:" field. You can specify one or more tasks in live-build
+via the #{--tasks}# option, as in the example below.
+
+code{
+
+$ lb config --tasks "mail-server file-server"
+
+}code
+
+The primary tasks available in the Debian Installer can be listed with
+#{tasksel --list-tasks}# in the live system. The contents of any task,
+including ones not included in this list, may be examined with #{tasksel
+--task-packages}#.
+
+3~desktop-and-language-tasks Desktop and language tasks
+
+Desktop and language tasks are special cases. In the Debian Installer, if
+the medium was prepared for a particular desktop environment flavour, the
+corresponding task will be automatically installed. Thus, there are there
+are #{gnome-desktop}#, #{kde-desktop}#, #{lxde-desktop}# and
+#{xfce-desktop}# tasks, none of which are offered in #{tasksel}#'s
+menu. Likewise, there are no menu entries for tasks for languages, but the
+user's language choice during the install influences the selection of
+corresponding language tasks.
+
+In live-build, therefore, these special cases are also given special
+consideration, but with three notable differences at the time of writing.
+
+First, there is no provision made yet automatically for language tasks,
+although a subset of those packages are included if you specify #{lb config
+--language}#. If you need those tasks, which include such things as
+language-specific fonts and input-method packages, you need to specify them
+in your configuration. For example:
+
+code{
+
+$ lb config --tasks "japanese japanese-desktop japanese-gnome-desktop"
+
+}code
+
+Second, live-build supports #{*-desktop}# virtual package lists for each of
+the desktop flavours mentioned above, which select the #{standard-x11}#
+predefined package list, the corresponding #{*-desktop}# task and three
+additional tasks: #{desktop}#, #{standard}# and #{laptop}#. So, for example,
+if you specify #{--packages gnome-desktop}#, it is equivalent to specifying
+#{--packages standard-x11 --tasks "gnome-desktop desktop standard laptop"}#.
+
+Third, if any of the tasks for these desktop flavours are selected, either
+explicitly through #{--tasks}# or implicitly by #{--packages}#, live-build
+will preseed the corresponding desktop value for Debian Installer (if it is
+included) to ensure it follows its own rules for installing different
+desktop flavours.
2~ Installing modified or third-party packages
@@ -279,14 +334,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.
@@ -296,21 +351,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 {Choosing
+packages to install}#choosing-packages-to-install 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
@@ -332,8 +385,87 @@ apt-preferences for more information.
% FIXME: <xref linkend="apt-preferences"/>
-3~ Altering APT preferences during Live system
+2~ Configuring APT at build time
+
+You can configure APT through a number of options applied only at build
+time. (APT configuration used in the running live system may be configured
+in the normal way for live system contents, that is, by including the
+appropriate configurations through #{config/chroot_local_includes/}#.) For a
+complete list, look for options starting with #{apt}# in the #{lb_config}#
+man page.
+
+3~choosing-apt-or-aptitude Choosing apt or aptitude
+
+You can elect to use either #{apt}# or #{aptitude}# when installing packages
+at build time. Which utility is used is governed by the #{--apt}# argument
+to #{lb config}#. Choose the method implementing the preferred behaviour for
+package installation, the notable difference being how missing packages are
+handled.
+
+_* #{apt}#: With this method, if a missing package is specified, the package
+installation will fail. This is the default setting.
+
+_* #{aptitude}#: With this method, if a missing package is specified, the
+package installation will succeed.
+
+3~ Using a proxy with APT
+
+One commonly required APT configuration is to deal with building an image
+behind a proxy. You may specify your APT proxy with the #{--apt-ftp-proxy}#
+or #{--apt-http-proxy}# options as needed, e.g.
+
+code{
+
+lb config --apt-http-proxy http://proxy/
+
+}code
+
+3~ Tweaking APT to save space
+
+You may find yourself needing to save some space on the image media, in
+which case one or the other or both of the following options may be of
+interest.
+
+If you don't want to include APT indices in the image, you can omit those
+with:
+
+code{
+
+$ lb config --binary-indices false
+
+}code
+
+This will not influence the entries in /etc/apt/sources.list, but merely
+whether /var/lib/apt contains the indices files or not. The tradeoff is that
+APT needs those indices in order to operate in the live system, so before
+performing #{apt-cache search}# or #{apt-get install}#, for instance, the
+user must #{apt-get update}# first to create those indices.
+
+If you find the installation of recommended packages bloats your image too
+much, you may disable that default option of APT with:
+
+code{
+
+$ lb config -apt-recommends false
+
+}code
+
+The tradeoff here is that recommended packages are defined as "packages that
+would be found together with this one in all but unusual installations"
+(Debian Policy Manual, §7.2). This may lead to some packages that you
+actually need being omitted, so we suggest you review the difference this
+makes to your packages list (see the #{binary.packages}# file generated by
+#{lb build}#) and re-include in your list any missing packages that you
+still want installed.
+
+3~ Passing options to apt or aptitude
+
+If there is not an #{lb config}# option to alter APT's behaviour in the way
+you need, use #{--apt-options}# or #{--aptitude-options}# to pass any
+options through to your configured APT tool. See the man pages for #{apt}#
+and #{aptitude}# for details.
+
+3~ APT pinning
+
+% FIXME: needs content
-Whilst it may seem unnecessary effort to create an APT repository to install
-custom packages, the infrastructure can be easily re-used at a later date to
-offer updates of the modified package.
diff --git a/manual/pt_BR/user_examples.ssi b/manual/pt_BR/user_examples.ssi
index 2567323..0bb4753 100644
--- a/manual/pt_BR/user_examples.ssi
+++ b/manual/pt_BR/user_examples.ssi
@@ -1,10 +1,228 @@
-B~ Examples
+:B~ Examples
-1~ Use Case Builds
+1~examples Examples
-This chapter covers example builds for specific use cases with Debian Live.
+This chapter covers example builds for specific use cases with Debian
+Live. If you are new to building your own Debian Live images, we recommend
+you first look at the three tutorials in sequence, as each one teaches new
+techniques that will help you use and understand the remaining examples.
-2~ VNC Kiosk Client
+2~using-the-examples Using the examples
+
+To use these examples you need a system to build them on that meets the
+requirements listed in {Requirements}#requirements and has live-build
+installed as described in {Installing live-build}#installing-live-build.
+
+Note that, for the sake of brevity, in these examples we do not specify a
+local mirror to use for the build. You can speed up downloads considerably
+if you use a local mirror. You may specify the options when you use #{lb
+config}#, as described in {Distribution mirrors used at build
+time}#distribution-mirrors-build-time, or for more convenience, set the
+default for your build system in #{/etc/live/build.conf}#. Simply create
+this file and in it, set the corresponding #{LB_MIRROR_*}# variables to your
+preferred mirror. For example:
+
+code{
+
+LB_MIRROR_BOOTSTRAP="http://mirror/debian"
+LB_MIRROR_CHROOT="http://mirror/debian"
+LB_MIRROR_CHROOT_SECURITY="http://mirror/debian-security"
+
+}code
+
+2~tutorial-1 Tutorial 1: A standard image
+
+*{Use case:}* Create a simple first image, learning the basics of live-build
+
+In this tutorial, we will build a default ISO hybrid Debian Live image
+containing only base packages (no Xorg) and some Debian Live support
+packages, as a first exercise in using live-build.
+
+You can't get much simpler than this:
+
+code{
+
+$ mkdir tutorial1 ; cd tutorial1 ; lb config
+
+}code
+
+Examine the contents of the #{config/}# directory if you wish. You will see
+stored here a skeletal configuration, ready to customize or, in this case,
+use immediately to build a default image.
+
+Now, as superuser, build the image, saving a log as you build with #{tee}#.
+
+code{
+
+# lb_build 2>&1 | tee binary.log
+
+}code
+
+Assuming all goes well, after a while, the current directory will contain
+#{binary-hybrid.iso}#. This ISO hybrid image can be booted directly in a
+virtual machine as described in {Testing an ISO image with
+Qemu}#testing-iso-with-qemu and {Testing an ISO image with
+virtualbox-ose}#testing-iso-with-virtualbox, or else imaged onto optical
+media or a USB flash device as described in {Burning an ISO image to a
+physical medium}#burning-iso-image and {Copying USB/HDD image to a USB
+stick}#copying-usb-hdd-image, respectively.
+
+2~tutorial-2 Tutorial 2: A web browser utility
+
+*{Use case}* Create a web browser utility image, learning how to apply customizations
+
+In this tutorial, we will create an image suitable for use as a web browser
+utility, serving as an introduction to customizing Debian Live images.
+
+code{
+
+mkdir tutorial2 ; cd tutorial2 ; lb config -p lxde --packages iceweasel
+
+}code
+
+Our choice of LXDE for this example reflects our desire to provide a minimal
+desktop environment, since the focus of the image is the single use we have
+in mind, the web browser. We could go even further and provide a default
+configuration for the web browser in
+#{config/chroot_local-includes/etc/iceweasel/profile/}#, or additional
+support packages for viewing various kinds of web content, but we leave this
+as an exercise for the reader.
+
+Build the image, again as superuser, keeping a log as in {Tutorial
+1}#tutorial-1:
+
+code{
+
+# lb build 2>&1 | tee binary.log
+
+}code
+
+Again, verify the image is OK and test, as in {Tutorial 1}#tutorial-1.
+
+2~tutorial-3 Tutorial 3: A personalized image
+
+*{Use case}* Create a project to build a personalized image, containing your favourite software to take with you on a USB stick wherever you go, and evolving in successive revisions as your needs and preferences change.
+
+Since we will be changing our personalized image over a number of revisions,
+and we want to track those changes, trying things experimentally and
+possibly reverting them if things don't work out, we will keep our
+configuration in the popular #{git}# version control system. We will also
+use the best practice of autoconfiguration via #{auto}# scripts as described
+in {Managing a configuration}#managing-a-configuration.
+
+3~ First revision
+
+code{
+
+$ mkdir -p tutorial3/auto $ cp /usr/share/live/examples/auto/*
+tutorial3/auto/ $ cd tutorial3
+
+}code
+
+Edit #{auto/config}# to read as follows:
+
+code{
+
+#!/bin/sh
+
+lb config noauto \
+ --architecture i386 \
+ --linux-flavours 686 \
+ --packages-lists lxde \
+ --packages "iceweasel xchat" \
+ "${@}"
+
+}code
+
+First, #{--architecture i386}# ensures that on our #{amd64}# build system,
+we build a 32-bit version suitable for use on most machines. Second, we use
+#{--linux-flavours 686}# because we don't anticipate using this image on
+much older systems. Third, we've chosen the #{lxde}# package list to give us
+a minimal desktop. And finally, we have added two initial favourite
+packages: #{iceweasel}# and #{xchat}#.
+
+Now, build the image:
+
+code{
+
+# lb build
+
+}code
+
+Note that unlike in the first two tutorials, we no longer have to type
+#{2>&1 | tee binary.log}# as that is now included in #{auto/build}#.
+
+Once you've tested the image (as in {Tutorial 1}#tutorial-1) and are
+satisfied it works, it's time to initialize our #{git}# repository, adding
+only the auto scripts we just created, and then make the first commit:
+
+code{
+
+$ git init $ git add auto $ git commit -a -m "Initial import."
+
+}code
+
+3~ Second revision
+
+In this revision, we're going to clean up from the first build, add the
+#{vlc}# package to our configuration, rebuild, test and commit.
+
+The #{lb clean}# command will clean up all generated files from the previous
+build except for the cache, which saves having to re-download packages. This
+ensures that the subsequent #{lb build}# will re-run all stages to
+regenerate the files from our new configuration.
+
+code{
+
+# lb clean
+
+}code
+
+Now edit #{auto/config}# to add the #{vlc}# package:
+
+code{
+
+#!/bin/sh
+
+lb config noauto \
+ --architecture i386 \
+ --linux-flavours 686 \
+ --packages-lists lxde \
+ --packages "iceweasel xchat vlc" \
+ "${@}"
+
+}code
+
+Build again:
+
+code{
+
+# lb build
+
+}code
+
+Test, and when you're satisfied, commit the next revision:
+
+code{
+
+$ git commit -a -m "Adding vlc media player."
+
+}code
+
+Of course, more complicated changes to the configuration are possible,
+perhaps adding files in subdirectories of #{config/}#. When you commit new
+revisions, just take care not to hand edit or commit the top-level files in
+#{config}# containing #{LB_*}# variables, as these are build products, too,
+and are always cleaned up by #{lb clean}# and re-created with #{lb config}#
+via their respective #{auto}# scripts.
+
+We've come to the end of our tutorial series. While many more kinds of
+customization are possible, even just using the few features explored in
+these simple examples, an almost infinite variety of different images can be
+created. The remaining examples in this section cover several other use
+cases drawn from the collected experiences of users of Debian Live.
+
+2~ A VNC Kiosk Client
Create an image with live-build to boot directly to a VNC server.
@@ -38,6 +256,50 @@ _* Build the image: #{# lb build}#
_* Enjoy.
-2~ Next Example FIXME
+2~ A base image for a 128M USB key
+
+*{Use case}* Create a standard image with some components removed in order to fit on a 128M USB key with space left over to use as you see fit.
+
+When optimizing an image to fit a certain media size, you need to understand
+the tradeoffs you are making between size and functionality. In this
+example, we trim only so much as to make room for additional material within
+a 128M media size, but without doing anything to destroy integrity of the
+packages contained within, such as the purging of locale data via the
+#{localepurge}# package, or other such "intrusive" optimizations. Of
+particular note, you should not use #{--bootstrap-flavour minimal}# unless
+you really know what you're doing, as omitting priority #{important}#
+packages will most likely produce a broken live system.
+
+code{
+
+$ lb config -k 486 -p minimal --binary-indices false --memtest none
+--apt-recommends false --includes none
+
+}code
+
+Now, build the image in the usual way:
+
+code{
+
+# lb build 2>&1 | tee binary.log
+
+}code
+
+On the author's system at time of writing, the above configuration produced
+a 78Mbyte image. This compares favourably with the 166Mbyte image produced
+by the default configuration in {Tutorial 1}#tutorial-1.
+The biggest space-saver here, compared to building a standard image on an
+#{i386}# architecture system, is to select only the #{486}# kernel flavour
+instead of the default #{-k "486 686"}#. Leaving off APT's indices with
+#{--binary-indices false}# also saves a fair amount of space, the tradeoff
+being that you need to #{apt-get update}# before using apt in the live
+system. Choosing the #{minimal}# package list leaves out the large
+#{locales}# package and associated utilities. Dropping recommended packages
+with #{--apt-recommends false}# saves some additional space, at the expense
+of omitting some packages you might otherwise expect to be there, such as
+#{firmware-linux-free}# which may be needed to support certain hardware. The
+remaining options shave off additional small amounts of space. It's up to
+you to decide if the functionality that is sacrificed with each optimization
+is worth the loss in functionality.
diff --git a/manual/pt_BR/user_installation.ssi b/manual/pt_BR/user_installation.ssi
index 9869ff4..adcc91b 100644
--- a/manual/pt_BR/user_installation.ssi
+++ b/manual/pt_BR/user_installation.ssi
@@ -2,7 +2,7 @@
1~ Installation
-2~ Requirements
+2~requirements Requirements
Building Debian Live images has very few system requirements:
@@ -19,7 +19,7 @@ _* Linux 2.6.x
Note that using Debian or a Debian-derived distribution is not required -
live-build will run on almost any distribution with the above requirements.
-2~ Installing live-build
+2~installing-live-build Installing live-build
You can install live-build in a number of different ways:
@@ -98,10 +98,16 @@ are available on http://live.debian.net/debian/.
*{Note:}* You do not need to install live-boot on your system to create customized Debian Live systems. However, doing so will do no harm.
+% FIXME: we also need to mention live-config
+
3~ Using a customized live-boot
+% FIXME: should follow the structure for live-build above (i.e. "from
+source", not "customized" -- we should not get into customization now, but
+should reserve that discussion for later.
+
To modify the code you can follow the process below. Please ensure you are
-familiar with the terms mentioned in {Terms}#terms .
+familiar with the terms mentioned in {Terms}#terms.
_* Checkout the live-boot source
@@ -113,12 +119,18 @@ $ git clone git://live.debian.net/git/live-boot.git
_* Make changes to your local copy
+% FIXME: as indicated above, it's too early for this topic. Move to later in
+the manual.
+
And beware that if you want to add your pre-init script in live-bottom, you
should name it without dashes '-', e.g: call it "99new_feature" and not
"99new-feature".
_* Build a live-boot .deb
+% FIXME: not strictly true? building sid on squeeze is usually OK. also,
+building lenny on squeeze or sid is fine. clarify.
+
You must build either on your target distribution or in a chroot containing
your target platform: this means if your target is Squeeze then you should
build against Squeeze. You can use a personal builder such as /{pbuilder}/
@@ -128,7 +140,7 @@ package):
code{
-$ cd live-boot $ dpkg-buildpackage -rfakeroot -b -uc -us
+$ cd live-boot $ dpkg-buildpackage -b -uc -us
}code
@@ -140,7 +152,8 @@ another custom package. Please see custom-packages for more information. You
should pay particular attention to custom-packages-apt.
% FIXME: <xref linkend="custom-packages"/> <xref
-linkend="custom-packages-apt"/>
+linkend="custom-packages-apt"/> % Ben> What is the latter reference for? I
+can't see the relevance.
3~ Using live-boot snapshots
diff --git a/manual/pt_BR/user_managing_a_configuration.ssi b/manual/pt_BR/user_managing_a_configuration.ssi
index bc03008..ab5b6c1 100644
--- a/manual/pt_BR/user_managing_a_configuration.ssi
+++ b/manual/pt_BR/user_managing_a_configuration.ssi
@@ -49,8 +49,8 @@ code{
#!/bin/sh
lb config noauto \
- --architecture i386 \
- ${@}
+ --packages-lists "standard" \
+ "${@}"
}code
@@ -59,7 +59,7 @@ auto/clean
code{
#!/bin/sh
-lb clean noauto ${@}
+lb clean noauto "${@}"
rm -f config/binary config/bootstrap \
config/chroot config/common config/source
rm -f binary.log
@@ -70,14 +70,13 @@ auto/build
code{
-#!/bin/sh lb build noauto ${@} 2>&1 | tee binary.log
+#!/bin/sh lb build noauto "${@}" 2>&1 | tee binary.log
}code
-Edit auto/config, changing or adding any options as you see fit. In the
-example above, --architecture is set to i386 so that when the image is built
-on an amd64 system, it will not default to building amd64 images. Change
-this to an appropriate value for your image (or delete it if you want to use
-the default) and add any additional options in continuation lines that
-follow.
+Edit #{auto/config}#, changing or adding any options as you see fit. In the
+example above, #{--packages-lists standard}# is set to the default
+value. Change this to an appropriate value for your image (or delete it if
+you want to use the default) and add any additional options in continuation
+lines that follow.
diff --git a/manual/ro/about_manual.ssi b/manual/ro/about_manual.ssi
index 71a6e7f..45fa105 100644
--- a/manual/ro/about_manual.ssi
+++ b/manual/ro/about_manual.ssi
@@ -12,6 +12,25 @@ privilegiu care poate fi obtinut fie prin comanda #{su}, sau #{sudo}. Pentru
a distinge intre acesti utilizatori se vor folosi #{$}# respectiv #{#}#
. Aceste simboluri nu fac parte din comenzi.
+2~ For the impatient
+
+While we believe that everything in this manual is important to at least
+some of our users, we realize it is a lot of material to cover and that you
+may wish to experience early success using the software before delving into
+the details. Therefore, we have provided three tutorials in the
+{Examples}#examples section designed to teach you image building and
+customization basics. Read {Using the examples}#using-the-examples first,
+followed by {Tutorial 1: A standard image}#tutorial-1, {Tutorial 2: A web
+browser utility}#tutorial-2 and finally {Tutorial 3: A personal travelling
+companion}#tutorial-3. By the end of these tutorials, you will have a taste
+of what can be done with Debian Live. We encourage you to return to more
+in-depth study of the manual, perhaps next reading {The basics}#the-basics,
+skimming or skipping {Building a netboot image}#building-netboot-image, and
+finishing by reading the {Customization overview}#customization-overview and
+the chapters that follow it. By this point, we hope you are thoroughly
+excited by what can be done with Debian Live and motivated to read the rest
+of the manual, cover-to-cover.
+
2~terms Termeni
_* *{Live system}*: Un sistem de operare care porneste fara a instala pe
@@ -53,7 +72,7 @@ distributia Debian.
_* *{Boot parameters}*: Parameti care pot fi adaugati la promptul
bootloader-ului care sa infuenteze kernelul sau live-config.
-_* *{chroot}*: Programul chroot , chroot(8), permite rularea a diferite
+_* *{chroot}*: Programul chroot, #{chroot(8)}#, permite rularea a diferite
instante din mediul GNU/Linux pe un singur sistem si in simultan fara a
necesita o repornire a sistemului.
@@ -63,17 +82,19 @@ binary.iso sau binary.img.
_* *{Target distribution}*: Dea pe care se bazeaza sistemul live. Aceasta
distributie poate fi diferita de cea a sistemului gazda.
-_* *{Squeeze/Wheezy/Sid (stable/testing/unstable)}*: stable contine ultima
-versiune oficiala a distributiei Debian. testing este sursa pentru
-urmatoarea versiune stable. Pricipalul avantaj la folosirea distibutiei
-testing este folosirea programelor mai noi decat cele din
-stable. Distributia unstable este locul unde au loc activ dezvoltarile din
-Debian. In general ea este folosita de dezvoltatori sau de cei ce le place
-riscul ... .
+_* *{Squeeze/Wheezy/Sid (stable/testing/unstable)}*: Debian codenames for
+releases. At the time of writing, Squeeze is the current *{stable}* release
+and Wheezy is the current *{testing}* release. Sid will always be a synonym
+for the *{unstable}* release. Throughout the manual, we tend to use
+codenames for the releases, as that is what is supported by the tools
+themselves.
-La momentul in care au fost scrise aceste randurei, versiunea stable este
-Squeeze, Wheezy estei versiunea testing. Sid va fi mereu simbolul versiunii
-unstable.
+*{stable}* contine ultima versiune oficiala a distributiei
+Debian. *{testing}* este sursa pentru urmatoarea versiune
+*{stable}*. Pricipalul avantaj la folosirea distibutiei *{testing}* este
+folosirea programelor mai noi decat cele din *{stable}*. Distributia
+*{unstable}* este locul unde au loc activ dezvoltarile din Debian. In
+general ea este folosita de dezvoltatori sau de cei ce le place riscul ... .
2~ Autori
@@ -143,6 +164,16 @@ $ make build
}code
+Since it takes a while to build the manual in all supported languages, you
+may find it convenient when proofing to build for only one language, e.g. by
+executing:
+
+code{
+
+$ make build LANGUAGES=en
+
+}code
+
3~ Aplicarea de patch-uri
Commiterea in direct este la indemana oricui. Totusi, va rugam sa trimeteti
@@ -154,11 +185,11 @@ _* Fetch the public commit key:
code{
$ mkdir -p ~/.ssh/identity.d
-$ wget http://live.debian.net/other/keys/live-manual@debian-live \
- -O ~/.ssh/identity.d/live-manual at debian-live
-$ wget http://live.debian.net/other/keys/live-manual@debian-live.pub \
- -O ~/.ssh/identity.d/live-manual at debian-live.pub
-$ chmod 0600 ~/.ssh/identity.d/live-manual at debian-live*
+$ wget http://live.debian.net/other/keys/gitosis@live.debian.net \
+ -O ~/.ssh/identity.d/gitosis at live.debian.net
+$ wget http://live.debian.net/other/keys/gitosis@live.debian.net.pub \
+ -O ~/.ssh/identity.d/gitosis at live.debian.net.pub
+$ chmod 0600 ~/.ssh/identity.d/gitosis at live.debian.net*
}code
@@ -170,7 +201,7 @@ $ cat >> ~/.ssh/config << EOF
Host live.debian.net
Hostname live.debian.net
User gitosis
- IdentityFile ~/.ssh/identity.d/live-manual at debian-live
+ IdentityFile ~/.ssh/identity.d/gitosis at live.debian.net
EOF
}code
diff --git a/manual/ro/about_project.ssi b/manual/ro/about_project.ssi
index 49a81c2..ebb2af3 100644
--- a/manual/ro/about_project.ssi
+++ b/manual/ro/about_project.ssi
@@ -12,7 +12,7 @@ Debian marea majoritate a acestor sisteme au urmatoarele dezavantaje:
_* Sunt proiecte neoficiale, dezvoltate in afara proiectului Debian.
-_* Ele amalgameaza diferite distributii, ca testing si unstable.
+_* Ele amalgameaza diferite distributii, ca *{testing}* si *{unstable}*.
_* Ele suporta doar arhitectura i386.
diff --git a/manual/ro/live-manual.ssm b/manual/ro/live-manual.ssm
index ca909a0..d5160cc 100644
--- a/manual/ro/live-manual.ssm
+++ b/manual/ro/live-manual.ssm
@@ -9,12 +9,12 @@
:license: This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.<br><br>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.<br><br>You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses/. <br><br>On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-3 file.
@date:
- :published: 2010-11-13
+ :published: 2010-11-29
@publisher: Debian Live Project <debian-live at lists.debian.org>
@make:
- :bold: /Squeeze|squeeze|Stable|stable|Wheezy|wheezy|Testing|testing|Sid|sid|Unstable|unstable/
+ :bold: /Squeeze|squeeze|Wheezy|wheezy|Sid|sid/
:italics: /live-boot|live-build|live-config|live-magic|live-manual|live-installer|debian-installer-launcher/
:num_top: 1
:skin: skin_debian-live
diff --git a/manual/ro/project_bugs.ssi b/manual/ro/project_bugs.ssi
index 8443811..a2a2de3 100644
--- a/manual/ro/project_bugs.ssi
+++ b/manual/ro/project_bugs.ssi
@@ -21,12 +21,13 @@ used and the distribution of the live system you are building.
2~ Known issues
-Due to the nature of Debian testing and Debian unstable distributions being
-a moving target, building a live system may not always be possible.
+Due to the nature of Debian *{testing}* and Debian *{unstable}*
+distributions being a moving target, building a live system may not always
+be possible.
-If this is a problem, do not build a system based on testing or unstable,
-but go with stable. live-build does always default to the current stable
-release.
+If this is a problem, do not build a system based on *{testing}* or
+*{unstable}*, but go with *{stable}*. live-build does always default to the
+current *{stable}* release.
Currently known issues are listed under the section 'status' on our homepage
at http://live.debian.net/
@@ -34,8 +35,9 @@ at http://live.debian.net/
It is out of the scope of this manual to train you in correctly identifying
and fixing problems in packages of the development distributions, however,
there are two things you can always try: When not succeeding to build
-testing, try if unstable works. If unstable does not work either, revert to
-testing and pinning the newer version of the failing package from unstable.
+*{testing}*, try if *{unstable}* works. If *{unstable}* does not work
+either, revert to *{testing}* and pinning the newer version of the failing
+package from *{unstable}*.
2~ Rebuild from scratch
diff --git a/manual/ro/user_basics.ssi b/manual/ro/user_basics.ssi
index 303cdd7..b4e6373 100644
--- a/manual/ro/user_basics.ssi
+++ b/manual/ro/user_basics.ssi
@@ -1,9 +1,18 @@
:B~ The basics
-1~ The basics
+1~the-basics The basics
This chapter contains a brief overview of the build process and instructions
-for booting the various binary image types.
+for using the three most commonly used image types. The most versatile image
+type, #{iso-hybrid}#, may be used on a virtual machine, optical media or USB
+portable storage device. In certain special cases, #{usb-hdd}# may be more
+suitable for USB devices. The chapter finishes with instructions for
+building and using a #{net}# type image, which is a bit more involved due to
+the setup required on the server. This is a slightly advanced topic for
+anyone who is not familiar already with netbooting, but is included here
+because once the setup is done, it is a very convenient way to test and
+deploy images for booting on the local network without the hassle of dealing
+with image media.
2~ What is a live system?
@@ -77,7 +86,7 @@ code{
This process can take a while, depending on the speed of your network
connection (see {The lb build command}#lb-build).
-3~ Testing an ISO image with Qemu
+3~testing-iso-with-qemu Testing an ISO image with Qemu
Testing an ISO is simple:
@@ -89,7 +98,7 @@ $ qemu -cdrom binary.iso
}code
-3~ Testing an ISO image with virtualbox-ose
+3~testing-iso-with-virtualbox Testing an ISO image with virtualbox-ose
In order to test the ISO with virtualbox-ose:
@@ -115,7 +124,7 @@ code{
}code
-3~ Burning an ISO image to a physical medium
+3~burning-iso-image Burning an ISO image to a physical medium
Burning an ISO image is easy:
@@ -138,8 +147,8 @@ to use the remaining space on the media for a persistence partition, you
need a USB/HDD image.
Note: if you created an ISO image with the previous example, you will need
-to clean up your working directory with the #{lb clean} command (see {The lb
-clean command}#lb-clean):
+to clean up your working directory with the #{lb clean}# command (see {The
+lb clean command}#lb-clean):
code{
@@ -147,8 +156,8 @@ $ lb clean --binary
}code
-Run the #{lb config}# command with the parameters to configure the "config/"
-hierarchy to create a USB/HDD image type:
+Run the #{lb config}# command with the parameters to configure the
+#{config/}# hierarchy to create a USB/HDD image type:
code{
@@ -183,7 +192,10 @@ better yet, #{ls -l /dev/disk/by-id}#.
*{This will definitely overwrite any previous contents on your stick!}*
-3~ Testing a USB/HDD image with Qemu
+Note: As discussed earlier, this same process can be used for #{iso-hybrid}#
+type images, (suffixed #{-hybrid.iso}#,) but not #{iso}# type images.
+
+3~testing-usb-hdd-with-qemu Testing a USB/HDD image with Qemu
code{
@@ -225,7 +237,7 @@ code{
*{Remember: Every time you install a new binary.img on the stick, all data on the stick will be lost because the partition table is overwritten by the contents of the image.}*
-2~ Building a netboot image
+2~building-netboot-image Building a netboot image
The following sequence of commands will create a basic netboot image
containing the Debian standard system without X.org. It is suitable for
diff --git a/manual/ro/user_customization-contents.ssi b/manual/ro/user_customization-contents.ssi
index df28e53..f8d01ce 100644
--- a/manual/ro/user_customization-contents.ssi
+++ b/manual/ro/user_customization-contents.ssi
@@ -1,4 +1,4 @@
-B~ Customizing contents
+:B~ Customizing contents
1~customizing-contents Customizing contents
diff --git a/manual/ro/user_customization-internationalization.ssi b/manual/ro/user_customization-internationalization.ssi
index b86f8f8..0288819 100644
--- a/manual/ro/user_customization-internationalization.ssi
+++ b/manual/ro/user_customization-internationalization.ssi
@@ -1,4 +1,4 @@
-B~ Customizing locale and language
+:B~ Customizing locale and language
1~customizing-locale-and-language Customizing locale and language
diff --git a/manual/ro/user_customization-overview.ssi b/manual/ro/user_customization-overview.ssi
index 44c6731..dfef318 100644
--- a/manual/ro/user_customization-overview.ssi
+++ b/manual/ro/user_customization-overview.ssi
@@ -1,4 +1,4 @@
-B~ Customizing contents
+:B~ Customizing contents
1~customization-overview Customization overview
diff --git a/manual/ro/user_customization-packages.ssi b/manual/ro/user_customization-packages.ssi
index 1ae1289..bd1a027 100644
--- a/manual/ro/user_customization-packages.ssi
+++ b/manual/ro/user_customization-packages.ssi
@@ -13,77 +13,67 @@ use #{tasksel}# tasks, or a combination of all three. Finally, a number of
options give some control over apt, or if you prefer, aptitude, at build
time when packages are installed. You may find these handy if you use a
proxy, want to disable installation of recommended packages to save space,
-or need to control which versions of packages are installed via apt pinning,
+or need to control which versions of packages are installed via APT pinning,
to name a few possibilities.
2~ Package sources
-3~ Debian repositories
+3~ Distribution mirrors
-To set a local mirror to be used to at build time:
+Each of the #{--mirror-*}# options governs which distribution mirror is used
+at various stages of the build. Recall from {Stages of the
+build}#stages-of-the-build that the *bootstrap* stage is when the chroot is
+initially populated by debootstrap with a minimal system, and the *chroot*
+stage is when the chroot used to construct the live system's filesystem is
+built. Thus, the corresponding mirror switches are used for those stages,
+and later, in the *binary* stage, the #{--mirror-binary}# and
+#{--mirror-binary-security}# values are used, superceding any mirrors used
+in an earlier stage.
-code{
-
-$ lb config --mirror-bootstrap http://localhost/debian/
-
-}code
+3~distribution-mirrors-build-time Distribution mirrors used at build time
-The chroot repository, specified by --mirror-chroot, defaults to the same as
---mirror-bootstrap.
-
-Each of the --mirror-* options governs which repository is used at various
-stages of the build. Recall from {Stages of the build}#stages-of-the-build
-that the *bootstrap* stage is when the chroot is initially populated by
-debootstrap with a minimal system, and the *chroot* stage is when the chroot
-used to construct the live system's filesystem is built. Thus, the
-corresponding mirror switches are used for those stages, and later, when the
-binary image is constructed, the --mirror-binary value is used, superceding
-any earlier repositories.
-
-The generic mirror is added to the live system's /etc/apt/sources.list.
+To set the distribution mirrors used at build time to point at a local
+mirror, it is sufficient to set #{--mirror-bootstrap}# and
+#{--mirror-chroot-security}# as follows.
code{
-$ lb config --mirror-binary http://ftp.debian.org/debian/
+$ lb config --mirror-bootstrap http://localhost/debian/ \
+ --mirror-chroot-security http://localhost/debian-security/
}code
-Note: It is not used for building the live system but to install new
-software while using the live system.
+The chroot mirror, specified by #{--mirror-chroot}#, defaults to the
+#{--mirror-bootstrap}# value.
-It can be disabled by setting the binary mirror to the same value as the
-chroot mirror.
+3~ Distribution mirrors used at run time
-Note: the same applies for mirror chroot security and mirror binary security
+The #{--mirror-binary*}# options govern the distribution mirrors placed in
+the binary image. These may be used to install additional packages while
+running the live system. The 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{
-$ lb config --mirror-chroot-security {URL} $ lb config
---mirror-binary-security {URL}
-
-}code
-
-If you don't want to include apt indices, you can skip those with:
-
-code{
-
-$ lb config --binary-indices false
+$ lb config --mirror-binary http://mirror/debian/ \
+ --mirror-binary-security http://mirror/debian-security/
}code
-This will not influence the entries in /etc/apt/sources.list, but only if
-/var/lib/apt contains the indices files or not (and by that making the image
-smaller).
-
-3~ Own repository
+3~ Additional repositories
To add more repositories (e.g. backports, experimental or custom packages,
etc.), create #{config/chroot_sources/your-repository.{chroot,binary}}#
-files.
+files. As with the #{--mirror-*}# options, these govern the repositories
+used in the *chroot* stage when building the image, and in the *binary*
+stage, i.e. for use when running the live system.
-e.g. #{config/chroot_sources/live.chroot}# allows you to install packages
-from the debian live snapshot repository at live system build time (you have
-to add the packages in your package list):
+For example, #{config/chroot_sources/live.chroot}# allows you to install
+packages from the debian live snapshot repository at live system build time.
code{
@@ -91,17 +81,18 @@ deb http://live.debian.net/ sid-snapshots main contrib non-free
}code
-If you add the line to #{config/chroot_sources/live.binary}# the repository
-will be added to your live-system's #{/etc/apt/sources.list}#.
+If you add the same line to #{config/chroot_sources/live.binary}#, the
+repository will be added to your live system's #{/etc/apt/sources.list.d/}#
+directory.
If such files exist, they will be picked up automatically.
-You can also put the gpg-key used to sign the repository into
-config/chroot_sources/your-repository.{binary,chroot}.gpg
+You should 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:
+selection through the #{--repository}# option, e.g. for enabling live
+snapshots, a simple command is enough to enable it:
code{
@@ -109,45 +100,21 @@ $ lb config --repository live.debian.net
}code
-3~ Package installation
-
-You can elect to use either #{apt}# or #{aptitude}# when installing
-packages. Which utility is used is governed by the #{LB_APT}# variable in
-#{config/chroot}# or by the #{--apt}# argument to #{lb config}#:
-
-_* #{apt}#: Specifying a missing package causes package installation to
-fail, which may not be the desired behaviour. This is the default setting
-for building images for Lenny or later.
-
-_* #{aptitude}#: Specifying a missing package causes package installation to
-succeed, which may not be the desired behaviour. This is the default setting
-for building images for Etch.
-
-2~ Installing additional packages
+2~choosing-packages-to-install Choosing packages to install
-live-helper has a number of mechanisms for indicating that additional
-packages should be installed, including:
+There are a number of ways to choose which packages live-build will install
+in your image, covering a variety of different needs. You can simply name
+individual packages to install, either with the #{--packages}# option for a
+few packages, or in a package list of your own for larger numbers. You can
+also choose larger predefined lists of packages, or use APT tasks. And
+finally, you may place package files in your #{config/}# tree, which is well
+suited to testing of new or experimental packages before they are available
+from a repository.
-_* The #{LB_PACKAGES}# variable
+3~ Choosing a few packages
-_* Package lists
-
-_* Local packages (#{chroot_local-packages/}#)
-
-_* Tasks
-
-3~ The #{LB_PACKAGES}# variable
-
-To install additional packages, simply add them to the #{LB_PACKAGES}#
-variable in #{config/chroot}#. For example:
-
-code{
-
-LB_PACKAGES="package1 package2 package3 ... "
-
-}code
-
-You can also specify initial values on the command line:
+When the number of packages added is small, simply specify
+#{--packages}#. For example:
code{
@@ -156,67 +123,99 @@ $ 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"/>
+need flexibility regarding which packages to install, use package lists as
+discussed in the following section, {Package lists}#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.
+installed. The list syntax supports included files and conditional sections
+which makes it easy to build lists from other lists and adapt them for use
+in multiple configurations. You can use predefined package lists, providing
+in a modular fashion package selections from each of the major desktop
+environments and some special purpose lists, as well as standard lists the
+others are based upon. You can also provide your own package lists, or use a
+combination of both.
-To specify one or more package list, you can use:
+3~ Predefined package lists
+
+The simplest way to use lists is to specify one or more predefined lists
+with the #{--packages-lists}# option. For example:
code{
-$ lb config --packages-lists "list1 list2 list3"
+$ lb config --packages-lists "gnome-core rescue"
}code
-Note: Package lists that are distributed with live-build reside in the
-#{/usr/share/live/build/lists}# directory.
+In addition to these lists, live-build supports four virtual package lists:
+#{gnome-desktop}#, #{kde-desktop}#, #{lxde-desktop}# and #{xfce-desktop}#,
+each of which provide a more extensive selection of packages that
+corresponds with Debian Installer defaults for these desktop
+environments. See {Desktop and language tasks}#desktop-and-language-tasks
+for more details.
+
+Note: The prebuilt GNOME, KDE, LXDE and XFCE images available for download
+at http://live.debian.net are built using the corresponding virtual
+#{*-desktop}# lists.
+
+The default location for the list files on your system is
+#{/usr/share/live/build/lists/}#. To determine the packages in a given list,
+read the corresponding file, paying attention to included files and
+conditionals as described in the following sections.
-*{Local packages lists}*
+3~ Local package lists
-You may supplement the supplied lists using local package lists stored in
-#{config/chroot_local-packageslists}#.
+You may supplement or replace entirely 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
+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}*
+3~ 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}*
+3~ Extending a provided package list using includes
-% FIXME
+The package lists that are included with live-build make extensive use of
+includes. Refer to these in the #{/usr/share/live/build/lists/}# directory,
+as they serve as good examples of how to write your own lists.
-% code{ % % #include <gnome> % iceweasel % % }code
+For example, to make a list that includes the predefined #{gnome}# list plus
+iceweasel, create #{config/chroot_local-packageslists/mygnome.list}# with
+the following contents:
-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.
+code{
+
+#include <gnome> iceweasel
+
+}code
+
+3~ 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{
@@ -224,7 +223,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{
@@ -232,7 +233,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{
@@ -248,14 +251,66 @@ code{
}code
-Any live-build configuration variable that begins with #{LB_}# can be tested
-in this way.
-
The nesting of conditionals is not supported.
3~ Tasks
-%FIXME
+The Debian Installer offers the user choices of a number of preselected
+lists of packages, each one focused on a particular kind of system, or task
+a system may be used for, such as "Graphical desktop environment", "Mail
+server" or "Laptop". These lists are called "tasks" and are supported by APT
+through the "Task:" field. You can specify one or more tasks in live-build
+via the #{--tasks}# option, as in the example below.
+
+code{
+
+$ lb config --tasks "mail-server file-server"
+
+}code
+
+The primary tasks available in the Debian Installer can be listed with
+#{tasksel --list-tasks}# in the live system. The contents of any task,
+including ones not included in this list, may be examined with #{tasksel
+--task-packages}#.
+
+3~desktop-and-language-tasks Desktop and language tasks
+
+Desktop and language tasks are special cases. In the Debian Installer, if
+the medium was prepared for a particular desktop environment flavour, the
+corresponding task will be automatically installed. Thus, there are there
+are #{gnome-desktop}#, #{kde-desktop}#, #{lxde-desktop}# and
+#{xfce-desktop}# tasks, none of which are offered in #{tasksel}#'s
+menu. Likewise, there are no menu entries for tasks for languages, but the
+user's language choice during the install influences the selection of
+corresponding language tasks.
+
+In live-build, therefore, these special cases are also given special
+consideration, but with three notable differences at the time of writing.
+
+First, there is no provision made yet automatically for language tasks,
+although a subset of those packages are included if you specify #{lb config
+--language}#. If you need those tasks, which include such things as
+language-specific fonts and input-method packages, you need to specify them
+in your configuration. For example:
+
+code{
+
+$ lb config --tasks "japanese japanese-desktop japanese-gnome-desktop"
+
+}code
+
+Second, live-build supports #{*-desktop}# virtual package lists for each of
+the desktop flavours mentioned above, which select the #{standard-x11}#
+predefined package list, the corresponding #{*-desktop}# task and three
+additional tasks: #{desktop}#, #{standard}# and #{laptop}#. So, for example,
+if you specify #{--packages gnome-desktop}#, it is equivalent to specifying
+#{--packages standard-x11 --tasks "gnome-desktop desktop standard laptop"}#.
+
+Third, if any of the tasks for these desktop flavours are selected, either
+explicitly through #{--tasks}# or implicitly by #{--packages}#, live-build
+will preseed the corresponding desktop value for Debian Installer (if it is
+included) to ensure it follows its own rules for installing different
+desktop flavours.
2~ Installing modified or third-party packages
@@ -279,14 +334,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.
@@ -296,21 +351,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 {Choosing
+packages to install}#choosing-packages-to-install 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
@@ -332,8 +385,87 @@ apt-preferences for more information.
% FIXME: <xref linkend="apt-preferences"/>
-3~ Altering APT preferences during Live system
+2~ Configuring APT at build time
+
+You can configure APT through a number of options applied only at build
+time. (APT configuration used in the running live system may be configured
+in the normal way for live system contents, that is, by including the
+appropriate configurations through #{config/chroot_local_includes/}#.) For a
+complete list, look for options starting with #{apt}# in the #{lb_config}#
+man page.
+
+3~choosing-apt-or-aptitude Choosing apt or aptitude
+
+You can elect to use either #{apt}# or #{aptitude}# when installing packages
+at build time. Which utility is used is governed by the #{--apt}# argument
+to #{lb config}#. Choose the method implementing the preferred behaviour for
+package installation, the notable difference being how missing packages are
+handled.
+
+_* #{apt}#: With this method, if a missing package is specified, the package
+installation will fail. This is the default setting.
+
+_* #{aptitude}#: With this method, if a missing package is specified, the
+package installation will succeed.
+
+3~ Using a proxy with APT
+
+One commonly required APT configuration is to deal with building an image
+behind a proxy. You may specify your APT proxy with the #{--apt-ftp-proxy}#
+or #{--apt-http-proxy}# options as needed, e.g.
+
+code{
+
+lb config --apt-http-proxy http://proxy/
+
+}code
+
+3~ Tweaking APT to save space
+
+You may find yourself needing to save some space on the image media, in
+which case one or the other or both of the following options may be of
+interest.
+
+If you don't want to include APT indices in the image, you can omit those
+with:
+
+code{
+
+$ lb config --binary-indices false
+
+}code
+
+This will not influence the entries in /etc/apt/sources.list, but merely
+whether /var/lib/apt contains the indices files or not. The tradeoff is that
+APT needs those indices in order to operate in the live system, so before
+performing #{apt-cache search}# or #{apt-get install}#, for instance, the
+user must #{apt-get update}# first to create those indices.
+
+If you find the installation of recommended packages bloats your image too
+much, you may disable that default option of APT with:
+
+code{
+
+$ lb config -apt-recommends false
+
+}code
+
+The tradeoff here is that recommended packages are defined as "packages that
+would be found together with this one in all but unusual installations"
+(Debian Policy Manual, §7.2). This may lead to some packages that you
+actually need being omitted, so we suggest you review the difference this
+makes to your packages list (see the #{binary.packages}# file generated by
+#{lb build}#) and re-include in your list any missing packages that you
+still want installed.
+
+3~ Passing options to apt or aptitude
+
+If there is not an #{lb config}# option to alter APT's behaviour in the way
+you need, use #{--apt-options}# or #{--aptitude-options}# to pass any
+options through to your configured APT tool. See the man pages for #{apt}#
+and #{aptitude}# for details.
+
+3~ APT pinning
+
+% FIXME: needs content
-Whilst it may seem unnecessary effort to create an APT repository to install
-custom packages, the infrastructure can be easily re-used at a later date to
-offer updates of the modified package.
diff --git a/manual/ro/user_examples.ssi b/manual/ro/user_examples.ssi
index 2567323..0bb4753 100644
--- a/manual/ro/user_examples.ssi
+++ b/manual/ro/user_examples.ssi
@@ -1,10 +1,228 @@
-B~ Examples
+:B~ Examples
-1~ Use Case Builds
+1~examples Examples
-This chapter covers example builds for specific use cases with Debian Live.
+This chapter covers example builds for specific use cases with Debian
+Live. If you are new to building your own Debian Live images, we recommend
+you first look at the three tutorials in sequence, as each one teaches new
+techniques that will help you use and understand the remaining examples.
-2~ VNC Kiosk Client
+2~using-the-examples Using the examples
+
+To use these examples you need a system to build them on that meets the
+requirements listed in {Requirements}#requirements and has live-build
+installed as described in {Installing live-build}#installing-live-build.
+
+Note that, for the sake of brevity, in these examples we do not specify a
+local mirror to use for the build. You can speed up downloads considerably
+if you use a local mirror. You may specify the options when you use #{lb
+config}#, as described in {Distribution mirrors used at build
+time}#distribution-mirrors-build-time, or for more convenience, set the
+default for your build system in #{/etc/live/build.conf}#. Simply create
+this file and in it, set the corresponding #{LB_MIRROR_*}# variables to your
+preferred mirror. For example:
+
+code{
+
+LB_MIRROR_BOOTSTRAP="http://mirror/debian"
+LB_MIRROR_CHROOT="http://mirror/debian"
+LB_MIRROR_CHROOT_SECURITY="http://mirror/debian-security"
+
+}code
+
+2~tutorial-1 Tutorial 1: A standard image
+
+*{Use case:}* Create a simple first image, learning the basics of live-build
+
+In this tutorial, we will build a default ISO hybrid Debian Live image
+containing only base packages (no Xorg) and some Debian Live support
+packages, as a first exercise in using live-build.
+
+You can't get much simpler than this:
+
+code{
+
+$ mkdir tutorial1 ; cd tutorial1 ; lb config
+
+}code
+
+Examine the contents of the #{config/}# directory if you wish. You will see
+stored here a skeletal configuration, ready to customize or, in this case,
+use immediately to build a default image.
+
+Now, as superuser, build the image, saving a log as you build with #{tee}#.
+
+code{
+
+# lb_build 2>&1 | tee binary.log
+
+}code
+
+Assuming all goes well, after a while, the current directory will contain
+#{binary-hybrid.iso}#. This ISO hybrid image can be booted directly in a
+virtual machine as described in {Testing an ISO image with
+Qemu}#testing-iso-with-qemu and {Testing an ISO image with
+virtualbox-ose}#testing-iso-with-virtualbox, or else imaged onto optical
+media or a USB flash device as described in {Burning an ISO image to a
+physical medium}#burning-iso-image and {Copying USB/HDD image to a USB
+stick}#copying-usb-hdd-image, respectively.
+
+2~tutorial-2 Tutorial 2: A web browser utility
+
+*{Use case}* Create a web browser utility image, learning how to apply customizations
+
+In this tutorial, we will create an image suitable for use as a web browser
+utility, serving as an introduction to customizing Debian Live images.
+
+code{
+
+mkdir tutorial2 ; cd tutorial2 ; lb config -p lxde --packages iceweasel
+
+}code
+
+Our choice of LXDE for this example reflects our desire to provide a minimal
+desktop environment, since the focus of the image is the single use we have
+in mind, the web browser. We could go even further and provide a default
+configuration for the web browser in
+#{config/chroot_local-includes/etc/iceweasel/profile/}#, or additional
+support packages for viewing various kinds of web content, but we leave this
+as an exercise for the reader.
+
+Build the image, again as superuser, keeping a log as in {Tutorial
+1}#tutorial-1:
+
+code{
+
+# lb build 2>&1 | tee binary.log
+
+}code
+
+Again, verify the image is OK and test, as in {Tutorial 1}#tutorial-1.
+
+2~tutorial-3 Tutorial 3: A personalized image
+
+*{Use case}* Create a project to build a personalized image, containing your favourite software to take with you on a USB stick wherever you go, and evolving in successive revisions as your needs and preferences change.
+
+Since we will be changing our personalized image over a number of revisions,
+and we want to track those changes, trying things experimentally and
+possibly reverting them if things don't work out, we will keep our
+configuration in the popular #{git}# version control system. We will also
+use the best practice of autoconfiguration via #{auto}# scripts as described
+in {Managing a configuration}#managing-a-configuration.
+
+3~ First revision
+
+code{
+
+$ mkdir -p tutorial3/auto $ cp /usr/share/live/examples/auto/*
+tutorial3/auto/ $ cd tutorial3
+
+}code
+
+Edit #{auto/config}# to read as follows:
+
+code{
+
+#!/bin/sh
+
+lb config noauto \
+ --architecture i386 \
+ --linux-flavours 686 \
+ --packages-lists lxde \
+ --packages "iceweasel xchat" \
+ "${@}"
+
+}code
+
+First, #{--architecture i386}# ensures that on our #{amd64}# build system,
+we build a 32-bit version suitable for use on most machines. Second, we use
+#{--linux-flavours 686}# because we don't anticipate using this image on
+much older systems. Third, we've chosen the #{lxde}# package list to give us
+a minimal desktop. And finally, we have added two initial favourite
+packages: #{iceweasel}# and #{xchat}#.
+
+Now, build the image:
+
+code{
+
+# lb build
+
+}code
+
+Note that unlike in the first two tutorials, we no longer have to type
+#{2>&1 | tee binary.log}# as that is now included in #{auto/build}#.
+
+Once you've tested the image (as in {Tutorial 1}#tutorial-1) and are
+satisfied it works, it's time to initialize our #{git}# repository, adding
+only the auto scripts we just created, and then make the first commit:
+
+code{
+
+$ git init $ git add auto $ git commit -a -m "Initial import."
+
+}code
+
+3~ Second revision
+
+In this revision, we're going to clean up from the first build, add the
+#{vlc}# package to our configuration, rebuild, test and commit.
+
+The #{lb clean}# command will clean up all generated files from the previous
+build except for the cache, which saves having to re-download packages. This
+ensures that the subsequent #{lb build}# will re-run all stages to
+regenerate the files from our new configuration.
+
+code{
+
+# lb clean
+
+}code
+
+Now edit #{auto/config}# to add the #{vlc}# package:
+
+code{
+
+#!/bin/sh
+
+lb config noauto \
+ --architecture i386 \
+ --linux-flavours 686 \
+ --packages-lists lxde \
+ --packages "iceweasel xchat vlc" \
+ "${@}"
+
+}code
+
+Build again:
+
+code{
+
+# lb build
+
+}code
+
+Test, and when you're satisfied, commit the next revision:
+
+code{
+
+$ git commit -a -m "Adding vlc media player."
+
+}code
+
+Of course, more complicated changes to the configuration are possible,
+perhaps adding files in subdirectories of #{config/}#. When you commit new
+revisions, just take care not to hand edit or commit the top-level files in
+#{config}# containing #{LB_*}# variables, as these are build products, too,
+and are always cleaned up by #{lb clean}# and re-created with #{lb config}#
+via their respective #{auto}# scripts.
+
+We've come to the end of our tutorial series. While many more kinds of
+customization are possible, even just using the few features explored in
+these simple examples, an almost infinite variety of different images can be
+created. The remaining examples in this section cover several other use
+cases drawn from the collected experiences of users of Debian Live.
+
+2~ A VNC Kiosk Client
Create an image with live-build to boot directly to a VNC server.
@@ -38,6 +256,50 @@ _* Build the image: #{# lb build}#
_* Enjoy.
-2~ Next Example FIXME
+2~ A base image for a 128M USB key
+
+*{Use case}* Create a standard image with some components removed in order to fit on a 128M USB key with space left over to use as you see fit.
+
+When optimizing an image to fit a certain media size, you need to understand
+the tradeoffs you are making between size and functionality. In this
+example, we trim only so much as to make room for additional material within
+a 128M media size, but without doing anything to destroy integrity of the
+packages contained within, such as the purging of locale data via the
+#{localepurge}# package, or other such "intrusive" optimizations. Of
+particular note, you should not use #{--bootstrap-flavour minimal}# unless
+you really know what you're doing, as omitting priority #{important}#
+packages will most likely produce a broken live system.
+
+code{
+
+$ lb config -k 486 -p minimal --binary-indices false --memtest none
+--apt-recommends false --includes none
+
+}code
+
+Now, build the image in the usual way:
+
+code{
+
+# lb build 2>&1 | tee binary.log
+
+}code
+
+On the author's system at time of writing, the above configuration produced
+a 78Mbyte image. This compares favourably with the 166Mbyte image produced
+by the default configuration in {Tutorial 1}#tutorial-1.
+The biggest space-saver here, compared to building a standard image on an
+#{i386}# architecture system, is to select only the #{486}# kernel flavour
+instead of the default #{-k "486 686"}#. Leaving off APT's indices with
+#{--binary-indices false}# also saves a fair amount of space, the tradeoff
+being that you need to #{apt-get update}# before using apt in the live
+system. Choosing the #{minimal}# package list leaves out the large
+#{locales}# package and associated utilities. Dropping recommended packages
+with #{--apt-recommends false}# saves some additional space, at the expense
+of omitting some packages you might otherwise expect to be there, such as
+#{firmware-linux-free}# which may be needed to support certain hardware. The
+remaining options shave off additional small amounts of space. It's up to
+you to decide if the functionality that is sacrificed with each optimization
+is worth the loss in functionality.
diff --git a/manual/ro/user_installation.ssi b/manual/ro/user_installation.ssi
index 9869ff4..adcc91b 100644
--- a/manual/ro/user_installation.ssi
+++ b/manual/ro/user_installation.ssi
@@ -2,7 +2,7 @@
1~ Installation
-2~ Requirements
+2~requirements Requirements
Building Debian Live images has very few system requirements:
@@ -19,7 +19,7 @@ _* Linux 2.6.x
Note that using Debian or a Debian-derived distribution is not required -
live-build will run on almost any distribution with the above requirements.
-2~ Installing live-build
+2~installing-live-build Installing live-build
You can install live-build in a number of different ways:
@@ -98,10 +98,16 @@ are available on http://live.debian.net/debian/.
*{Note:}* You do not need to install live-boot on your system to create customized Debian Live systems. However, doing so will do no harm.
+% FIXME: we also need to mention live-config
+
3~ Using a customized live-boot
+% FIXME: should follow the structure for live-build above (i.e. "from
+source", not "customized" -- we should not get into customization now, but
+should reserve that discussion for later.
+
To modify the code you can follow the process below. Please ensure you are
-familiar with the terms mentioned in {Terms}#terms .
+familiar with the terms mentioned in {Terms}#terms.
_* Checkout the live-boot source
@@ -113,12 +119,18 @@ $ git clone git://live.debian.net/git/live-boot.git
_* Make changes to your local copy
+% FIXME: as indicated above, it's too early for this topic. Move to later in
+the manual.
+
And beware that if you want to add your pre-init script in live-bottom, you
should name it without dashes '-', e.g: call it "99new_feature" and not
"99new-feature".
_* Build a live-boot .deb
+% FIXME: not strictly true? building sid on squeeze is usually OK. also,
+building lenny on squeeze or sid is fine. clarify.
+
You must build either on your target distribution or in a chroot containing
your target platform: this means if your target is Squeeze then you should
build against Squeeze. You can use a personal builder such as /{pbuilder}/
@@ -128,7 +140,7 @@ package):
code{
-$ cd live-boot $ dpkg-buildpackage -rfakeroot -b -uc -us
+$ cd live-boot $ dpkg-buildpackage -b -uc -us
}code
@@ -140,7 +152,8 @@ another custom package. Please see custom-packages for more information. You
should pay particular attention to custom-packages-apt.
% FIXME: <xref linkend="custom-packages"/> <xref
-linkend="custom-packages-apt"/>
+linkend="custom-packages-apt"/> % Ben> What is the latter reference for? I
+can't see the relevance.
3~ Using live-boot snapshots
diff --git a/manual/ro/user_managing_a_configuration.ssi b/manual/ro/user_managing_a_configuration.ssi
index bc03008..ab5b6c1 100644
--- a/manual/ro/user_managing_a_configuration.ssi
+++ b/manual/ro/user_managing_a_configuration.ssi
@@ -49,8 +49,8 @@ code{
#!/bin/sh
lb config noauto \
- --architecture i386 \
- ${@}
+ --packages-lists "standard" \
+ "${@}"
}code
@@ -59,7 +59,7 @@ auto/clean
code{
#!/bin/sh
-lb clean noauto ${@}
+lb clean noauto "${@}"
rm -f config/binary config/bootstrap \
config/chroot config/common config/source
rm -f binary.log
@@ -70,14 +70,13 @@ auto/build
code{
-#!/bin/sh lb build noauto ${@} 2>&1 | tee binary.log
+#!/bin/sh lb build noauto "${@}" 2>&1 | tee binary.log
}code
-Edit auto/config, changing or adding any options as you see fit. In the
-example above, --architecture is set to i386 so that when the image is built
-on an amd64 system, it will not default to building amd64 images. Change
-this to an appropriate value for your image (or delete it if you want to use
-the default) and add any additional options in continuation lines that
-follow.
+Edit #{auto/config}#, changing or adding any options as you see fit. In the
+example above, #{--packages-lists standard}# is set to the default
+value. Change this to an appropriate value for your image (or delete it if
+you want to use the default) and add any additional options in continuation
+lines that follow.
--
live-manual
More information about the debian-live-changes
mailing list