[SCM] live-manual branch, upstream, updated. upstream/3.0_a8-1-g4de3ba7
Daniel Baumann
daniel at debian.org
Sun Dec 4 09:28:05 UTC 2011
The following commit has been merged in the upstream branch:
commit 4de3ba79e8d94a51ec001ffc4d7791594becff8b
Author: Daniel Baumann <daniel at debian.org>
Date: Sun Dec 4 10:27:06 2011 +0100
Adding upstream version 3.0~a9.
diff --git a/Makefile b/Makefile
index adde6da..e5c8756 100644
--- a/Makefile
+++ b/Makefile
@@ -33,45 +33,45 @@ build:
cd $(CURDIR)/manual/$${LANGUAGE}; \
sisu-epub -v live-manual.ssm; \
sisu-html -v live-manual.ssm; \
- for FILE in build/$${LANGUAGE}/live-manual/*.html; \
- do \
- ../bin/fix-sisu-html.rb $${FILE}; \
- ([ $(DEBUG) -gt 0 ] || rm -f $${FILE}~); \
- done; \
sisu-odf -v live-manual.ssm; \
sisu-pdf -v live-manual.ssm; \
sisu-txt -v live-manual.ssm; \
done
+# for FILE in build/manual/live-manual/*.$${LANGUAGE}.html; \
+# do \
+# ../bin/fix-sisu-html.rb $${FILE}; \
+# ([ $(DEBUG) -gt 0 ] || rm -f $${FILE}~); \
+# done; \
autobuild: clean build
rm -rf build
cp -a html build
+ cp -a manual/en/_sisu build
- sed +e; for LANGUAGE in $(LANGUAGES); \
+ set +e; for LANGUAGE in $(LANGUAGES); \
do \
- FROMDIR=$(CURDIR)/manual/$${LANGUAGE}/build/$${LANGUAGE}; \
- TODIR=$(CURDIR)/build/$${LANGUAGE}; \
+ FROMDIR=$(CURDIR)/manual/$${LANGUAGE}/build/manual; \
+ TODIR=$(CURDIR)/build; \
mkdir -p $${TODIR}; \
cd $${TODIR}; \
mkdir -p epub; \
- cp $${FROMDIR}/epub/live-manual.epub epub; \
+ cp $${FROMDIR}/epub/live-manual.$${LANGUAGE}.epub epub; \
mkdir -p html; \
- cp $${FROMDIR}/live-manual/*.html html; \
- mv html/doc.html html/live-manual.html; \
- cp -a $${FROMDIR}/_sisu .; \
- rm -f html/toc.html html/sisu_manifest.html html/metadata.html; \
+ cp $${FROMDIR}/live-manual/*.$${LANGUAGE}.html html; \
+ mv html/scroll.$${LANGUAGE}.html html/live-manual.$${LANGUAGE}.html; \
+ rm -f html/toc.$${LANGUAGE}.html html/sisu_manifest.$${LANGUAGE}.html html/metadata.$${LANGUAGE}.html; \
mkdir -p odf; \
- cp $${FROMDIR}/live-manual/opendocument.odt odf/live-manual.odt; \
+ cp $${FROMDIR}/live-manual/opendocument.$${LANGUAGE}.odt odf/live-manual.$${LANGUAGE}.odt; \
mkdir -p pdf; \
- cp $${FROMDIR}/live-manual/landscape.a4.pdf pdf/live-manual.landscape-a4.pdf; \
- cp $${FROMDIR}/live-manual/portrait.a4.pdf pdf/live-manual.portrait-a4.pdf; \
- cp $${FROMDIR}/live-manual/landscape.letter.pdf pdf/live-manual.landscape-letter.pdf; \
- cp $${FROMDIR}/live-manual/portrait.letter.pdf pdf/live-manual.portrait-letter.pdf; \
+ cp $${FROMDIR}/live-manual/landscape.$${LANGUAGE}.a4.pdf pdf/live-manual.landscape-a4.$${LANGUAGE}.pdf; \
+ cp $${FROMDIR}/live-manual/portrait.$${LANGUAGE}.a4.pdf pdf/live-manual.portrait-a4.$${LANGUAGE}.pdf; \
+ cp $${FROMDIR}/live-manual/landscape.$${LANGUAGE}.letter.pdf pdf/live-manual.landscape-letter.$${LANGUAGE}.pdf; \
+ cp $${FROMDIR}/live-manual/portrait.$${LANGUAGE}.letter.pdf pdf/live-manual.portrait-letter.$${LANGUAGE}.pdf; \
mkdir -p txt; \
- cp $${FROMDIR}/live-manual/plain.txt txt/live-manual.txt; \
+ cp $${FROMDIR}/live-manual/plain.$${LANGUAGE}.txt txt/live-manual.$${LANGUAGE}.txt; \
sed -e "s|@DATE_BUILD@|$(shell LC_ALL=C date -R)|" \
-e "s|@DATE_CHANGE@|$(shell LC_ALL=C git log | grep -m1 Date | awk -FDate: '{ print $2 }' | sed -e 's| ||g')|" \
- $${FROMDIR}/../../index.html.in > index.html; \
+ $${FROMDIR}/../../index.html.in > index.$${LANGUAGE}.html; \
done
commit: tidy test
@@ -94,28 +94,28 @@ install:
for LANGUAGE in $(LANGUAGES); \
do \
- FROMDIR=$(CURDIR)/manual/$${LANGUAGE}/build/$${LANGUAGE}; \
+ FROMDIR=$(CURDIR)/manual/$${LANGUAGE}/build/manual; \
TODIR=$(DESTDIR)/usr/share/doc/live-manual; \
mkdir -p $${TODIR}; \
cd $${TODIR}; \
mkdir -p epub; \
- cp $${FROMDIR}/epub/live-manual.epub epub/live-manual.$${LANGUAGE}.epub; \
- mkdir -p html/$${LANGUAGE}; \
- cp $${FROMDIR}/live-manual/*.html html/$${LANGUAGE}; \
- mv html/$${LANGUAGE}/doc.html html/live-manual.$${LANGUAGE}.html; \
- rm -f html/$${LANGUAGE}/toc.html html/$${LANGUAGE}/sisu_manifest.html html/$${LANGUAGE}/metadata.html; \
+ cp $${FROMDIR}/epub/live-manual.$${LANGUAGE}.epub epub; \
+ mkdir -p html; \
+ cp $${FROMDIR}/live-manual/*.$${LANGUAGE}.html html; \
+ mv html/scroll.$${LANGUAGE}.html html/live-manual.$${LANGUAGE}.html; \
+ rm -f html/toc.$${LANGUAGE}.html html/sisu_manifest.$${LANGUAGE}.html html/metadata.$${LANGUAGE}.html; \
mkdir -p odf; \
- cp $${FROMDIR}/live-manual/opendocument.odt odf/live-manual.$${LANGUAGE}.odt; \
+ cp $${FROMDIR}/live-manual/opendocument.$${LANGUAGE}.odt odf/live-manual.$${LANGUAGE}.odt; \
mkdir -p txt; \
- cp $${FROMDIR}/live-manual/plain.txt txt/live-manual.$${LANGUAGE}.txt; \
+ cp $${FROMDIR}/live-manual/plain.$${LANGUAGE}.txt txt/live-manual.$${LANGUAGE}.txt; \
mkdir -p pdf; \
- cp $${FROMDIR}/live-manual/landscape.a4.pdf pdf/live-manual.landscape-a4.$${LANGUAGE}.pdf; \
- cp $${FROMDIR}/live-manual/portrait.a4.pdf pdf/live-manual.portrait-a4.$${LANGUAGE}.pdf; \
- cp $${FROMDIR}/live-manual/landscape.letter.pdf pdf/live-manual.landscape-letter.$${LANGUAGE}.pdf; \
- cp $${FROMDIR}/live-manual/portrait.letter.pdf pdf/live-manual.portrait-letter.$${LANGUAGE}.pdf; \
+ cp $${FROMDIR}/live-manual/landscape.$${LANGUAGE}.a4.pdf pdf/live-manual.landscape-a4.$${LANGUAGE}.pdf; \
+ cp $${FROMDIR}/live-manual/portrait.$${LANGUAGE}.a4.pdf pdf/live-manual.portrait-a4.$${LANGUAGE}.pdf; \
+ cp $${FROMDIR}/live-manual/landscape.$${LANGUAGE}.letter.pdf pdf/live-manual.landscape-letter.$${LANGUAGE}.pdf; \
+ cp $${FROMDIR}/live-manual/portrait.$${LANGUAGE}.letter.pdf pdf/live-manual.portrait-letter.$${LANGUAGE}.pdf; \
done
- cp -a manual/en/build/en/_sisu $(DESTDIR)/usr/share/doc/live-manual
+ cp -a manual/en/_sisu $(DESTDIR)/usr/share/doc/live-manual
uninstall:
rm -rf $(DESTDIR)/usr/share/doc/live-manual
diff --git a/VERSION b/VERSION
index c28f039..3d80df2 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.0~a8
+3.0~a9
diff --git a/html/index.html b/html/index.html
index d45d883..175f09d 100644
--- a/html/index.html
+++ b/html/index.html
@@ -10,13 +10,13 @@
<h3>Available Languages</h3>
<ul>
- <li><a href="de">Deutsch (German)</a></li>
- <li><a href="en">English</a></li>
- <li><a href="es">Español (Spanish)</a></li>
- <li><a href="fr">Français (French)</a></li>
- <li><a href="it">Italiano (Italian)</a></li>
- <li><a href="pt_BR">Português Brasil (Brazilian Portuguese)</a></li>
- <li><a href="ro">Româna (Romanian)</a></li>
+ <li><a href="index.de.html">Deutsch (German)</a></li>
+ <li><a href="index.en.html">English</a></li>
+ <li><a href="index.es.html">Español (Spanish)</a></li>
+ <li><a href="index.fr.html">Français (French)</a></li>
+ <li><a href="index.it.html">Italiano (Italian)</a></li>
+ <li><a href="index.pt_BR.html">Português Brasil (Brazilian Portuguese)</a></li>
+ <li><a href="index.ro.html">Româna (Romanian)</a></li>
<!-- <li><a href="ro">Român&acaron; (Romanian)</a></li> -->
</ul>
diff --git a/manual/de/index.html.in b/manual/de/index.html.in
index 68f1f56..acc1e36 100644
--- a/manual/de/index.html.in
+++ b/manual/de/index.html.in
@@ -9,26 +9,33 @@
<h2>Debian Live Handbuch</h2>
<p>
+ <i>live-manual</i> is available in different file formats and it is
+translated into several languages. Keep in mind that some translations may
+be incomplete or may not be up to date.
+ </p>
+
+ <p>
+
Fehler, Vergessenes, Patches und Vorschläge können an unsere Mailing Liste
unter <a
href="mailto:debian-live at lists.debian.org">debian-live at lists.debian.org</a>
(englischspraching) gemeldet werden. Informationen wie man <a
-href="html/about-manual.html#how-to-contribute">zum Handbuch beitragen</a>
-kann, können im Handbuch gefunden werden.
+href="html/about-manual.de.html#how-to-contribute">zum Handbuch
+beitragen</a> kann, können im Handbuch gefunden werden.
</p>
<h3>Verfügbare Formate</h3>
<ul>
- <li><a href="epub/live-manual.epub">EPUB</a></li>
- <li>HTML: <a href="html/index.html">mehrere Seiten</a>, <a
-href="html/live-manual.html">einzelne Seite</a></li>
- <li><a href="odf/live-manual.odt">ODF</a></li>
- <li>PDF: <a href="pdf/live-manual.portrait-a4.pdf">A4 Hochformat</a>, <a
-href="pdf/live-manual.landscape-a4.pdf">A4 Querformat</a>, <a
-href="pdf/live-manual.portrait-letter.pdf">Letter Hochformat</a>, <a
-href="pdf/live-manual.landscape-letter.pdf">Letter Querformat</a></li>
- <li><a href="txt/live-manual.txt">Text</a></li>
+ <li><a href="epub/live-manual.de.epub">EPUB</a></li>
+ <li>HTML: <a href="html/index.de.html">mehrere Seiten</a>, <a
+href="html/live-manual.de.html">einzelne Seite</a></li>
+ <li><a href="odf/live-manual.de.odt">ODF</a></li>
+ <li>PDF: <a href="pdf/live-manual.portrait-a4.de.pdf">A4 Hochformat</a>, <a
+href="pdf/live-manual.landscape-a4.de.pdf">A4 Querformat</a>, <a
+href="pdf/live-manual.portrait-letter.de.pdf">Letter Hochformat</a>, <a
+href="pdf/live-manual.landscape-letter.de.pdf">Letter Querformat</a></li>
+ <li><a href="txt/live-manual.de.txt">Text</a></li>
</ul>
<p>
diff --git a/manual/de/live-manual.ssm b/manual/de/live-manual.ssm
index 569cfd6..719b633 100644
--- a/manual/de/live-manual.ssm
+++ b/manual/de/live-manual.ssm
@@ -1,17 +1,17 @@
% SiSU 2.0
- at title: Debian Live Manual
+ at title: Debian Live Handbuch
- at creator: Debian Live Project <debian-live at lists.debian.org>
+ at creator: Debian Live Projekt <debian-live at lists.debian.org>
@rights:
- :copyright: Copyright (C) 2006-2011 Debian Live Project
- :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>The complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-3 file.
+ :copyright: Copyright (C) 2006-2011 Debian Live Projekt
+ :license: Dieses Programm ist freie Software. Sie können es unter den Bedingungen der GNU General Public License, wie von der Free Software Foundation veröffentlicht, weitergeben und/oder modifizieren, entweder gemäss Version 3 der Lizenz oder (nach Ihrer Option) jeder späteren Version.<br><br>Die Veröffentlichung dieses Programms erfolgt in der Hoffnung, dass es Ihnen von Nutzen sein wird, aber OHNE IRGENDEINE GARANTIE, sogar ohne die implizite Garantie der MARKTREIFE oder der VERWENDBARKEIT FÜR EINEN BESTIMMTEN ZWECK. Details finden Sie in der GNU General Public License.<br><br>Sie sollten ein Exemplar der GNU General Public License zusammen mit diesem Programm erhalten haben. Falls nicht, siehe <http://www.gnu.org/licenses/>.<br><br>Der komplette Text der GNU General Public License kann in der Datei /usr/share/common-licenses/GPL-3 gefunden werden.
@date:
- :published: 2011-09-30
+ :published: 2011-12-04
- at publisher: Debian Live Project <debian-live at lists.debian.org>
+ at publisher: Debian Live Projekt <debian-live at lists.debian.org>
@make:
:bold: /Squeeze|squeeze|Wheezy|wheezy|Sid|sid/
@@ -21,13 +21,13 @@
:A~ @title
-:B~ About
+:B~ Über Debian Live
<< about_manual.ssi
<< about_project.ssi
-:B~ User
+:B~ Benutzer
<< user_installation.ssi
@@ -49,7 +49,7 @@
<< user_customization-installer.ssi
-:B~ Project
+:B~ Projekt
<< project_bugs.ssi
@@ -57,6 +57,6 @@
<< project_procedures.ssi
-:B~ Examples
+:B~ Beispiele
<< user_examples.ssi
diff --git a/manual/de/user_basics.ssi b/manual/de/user_basics.ssi
index 4429660..4c42960 100644
--- a/manual/de/user_basics.ssi
+++ b/manual/de/user_basics.ssi
@@ -225,7 +225,7 @@ configuration. Otherwise, the resolution is limited to 800x600.
code{
- $ lb config --packages virtualbox-ose-guest-x11
+ $ echo virtualbox-ose-guest-x11 >> config/package-lists/my.list.chroot
}code
diff --git a/manual/de/user_customization-contents.ssi b/manual/de/user_customization-contents.ssi
index 814ba40..5759093 100644
--- a/manual/de/user_customization-contents.ssi
+++ b/manual/de/user_customization-contents.ssi
@@ -42,15 +42,15 @@ files that can be simply added or replaced in the image without processing;
see {Live/chroot local hooks}#live-chroot-local-hooks if processing is
needed.
-To include files, simply add them to your #{config/chroot_local-includes}#
+To include files, simply add them to your #{config/includes.chroot}#
directory. This directory corresponds to the root directory (#{/}#) of the
live system. For example, to add a file #{/var/www/index.html}# in the live
system, use:
code{
- $ mkdir -p config/chroot_local-includes/var/www
- $ cp /path/to/my/index.html config/chroot_local-includes/var/www
+ $ mkdir -p config/includes.chroot/var/www
+ $ cp /path/to/my/index.html config/includes.chroot/var/www
}code
@@ -60,7 +60,7 @@ code{
-- config
[...]
- |-- chroot_local-includes
+ |-- includes.chroot
| `-- var
| `-- www
| `-- index.html
@@ -80,11 +80,11 @@ booting the Live system, you can use binary local includes. This works in a
similar fashion to chroot local includes. For example, suppose the files
#{~/video_demo.*}# are demo videos of the live system described by and
linked to by an HTML index page. Simply copy the material to
-#{config/binary_local-includes/}# as follows:
+#{config/includes.binary/}# as follows:
code{
- $ cp ~/video_demo.* config/binary_local-includes/
+ $ cp ~/video_demo.* config/includes.binary/
}code
@@ -112,12 +112,12 @@ build in order to customize the image.
3~live-chroot-local-hooks Live/chroot local hooks
-To run commands in the chroot stage, create a hook script containing the
-commands in the #{config/chroot_local-hooks}# directory. The hook will run
-in the chroot after the rest of your chroot configuration has been applied,
-so remember to ensure your configuration includes all packages and files
-your hook needs in order to run. See the example chroot hook scripts for
-various common chroot customization tasks provided in
+To run commands in the chroot stage, create a hook script with a #{.chroot}#
+suffix containing the commands in the #{config/hooks/}# directory. The hook
+will run in the chroot after the rest of your chroot configuration has been
+applied, so remember to ensure your configuration includes all packages and
+files your hook needs in order to run. See the example chroot hook scripts
+for various common chroot customization tasks provided in
#{/usr/share/live/build/examples/hooks}# which you can copy or symlink to
use them in your own configuration.
@@ -128,27 +128,28 @@ explained in the "Customization" section of its man page. Examine
live-config's own hooks provided in #{/lib/live/config/}#, noting the
sequence numbers. Then provide your own hook prefixed with an appropriate
sequence number, either as a chroot local include in
-#{config/chroot_local-includes/lib/live/config/}#, or as a custom package as
+#{config/includes.chroot/lib/live/config/}#, or as a custom package as
discussed in {Installing modified or third-party
packages}#installing-modified-or-third-party-packages.
3~ Binary local hooks
-To run commands in the binary stage, create a hook script containing the
-commands in the #{config/binary_local-hooks}#. The hook will run after all
-other binary commands are run, but before binary_checksums, the very last
-binary commands The commands in your hook do not run in the chroot, so take
-care to not modify any files outside of the build tree, or you may damage
-your build system! See the example binary hook scripts for various common
-binary customization tasks provided in
+To run commands in the binary stage, create a hook script with a #{.binary}#
+suffix containing the commands in the #{config/hooks/}# directory. The hook
+will run after all other binary commands are run, but before
+binary_checksums, the very last binary command. The commands in your hook do
+not run in the chroot, so take care to not modify any files outside of the
+build tree, or you may damage your build system! See the example binary hook
+scripts for various common binary customization tasks provided in
#{/usr/share/live/build/examples/hooks}# which you can copy or symlink to
use them in your own configuration.
2~ Preseeding Debconf questions
-Files in the #{config/chroot_local-preseed}# directory are considered to be
+Files in the #{config/preseed/}# directory suffixed with #{.preseed}#
+followed by the stage (#{.chroot}# or #{.binary}#) are considered to be
debconf preseed files and are installed by live-build using
-#{debconf-set-selections}#.
+#{debconf-set-selections}# during the corresponding stage.
For more information about debconf, please see debconf(7) in the #{debconf}#
package.
diff --git a/manual/de/user_customization-installer.ssi b/manual/de/user_customization-installer.ssi
index 9349f27..d8d0c17 100644
--- a/manual/de/user_customization-installer.ssi
+++ b/manual/de/user_customization-installer.ssi
@@ -53,7 +53,8 @@ architecture. For example:
code{
$ lb config --architecture i386 --linux-flavours 486 \
- --debian-installer live --packages debian-installer-launcher
+ --debian-installer live
+ $ echo debian-installer-launcher >> config/package-lists/my.list.chroot
}code
@@ -81,7 +82,7 @@ code{
For experimental or debugging purposes, you might want to include locally
built #{d-i}# component udeb packages. Place these in
-#{config/binary_local-udebs/}# to include them in the image. Additional or
+#{config/packages.binary/}# to include them in the image. Additional or
replacement files and directories may be included in the installer initrd as
well, in a similar fashion to {Live/chroot local
includes}#live-chroot-local-includes, by placing the material in
diff --git a/manual/de/user_customization-packages.ssi b/manual/de/user_customization-packages.ssi
index 6b6f4fa..75d3198 100644
--- a/manual/de/user_customization-packages.ssi
+++ b/manual/de/user_customization-packages.ssi
@@ -24,7 +24,7 @@ installed via APT pinning, to name a few possibilities.
The distribution you choose has the broadest impact on which packages are
available to include in your live image. Specify the codename, which
-defaults to #{squeeze}# for the Squeeze version of live-build. Any current
+defaults to #{wheezy}# for the Wheezy version of live-build. Any current
distribution carried in the Debian archive may be specified by its codename
here. (See {Terms}#terms for more details.) The #{--distribution}# option
not only influences the source of packages within the archive, but also
@@ -62,38 +62,40 @@ also modifies live-build behaviour to suit the derivatives.
The Debian archive is replicated across a large network of mirrors around
the world so that people in each region can choose a nearby mirror for best
-download speed. Each of the #{--mirror-*}# options governs which
+download speed. Each of the #{--parent-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.
+those stages, and later, in the *binary* stage, the
+#{--parent-mirror-binary}# and #{--parent-mirror-binary-security}# values
+are used, superceding any mirrors used in an earlier stage.
3~distribution-mirrors-build-time Distribution mirrors used at build time
To set the distribution mirrors used at build time to point at a local
-mirror, it is sufficient to set #{--mirror-bootstrap}# and
-#{--mirror-chroot-security}# as follows.
+mirror, it is sufficient to set #{--parent-mirror-bootstrap}#,
+#{--parent-mirror-chroot-security}# and #{--parent-mirror-chroot-backports}#
+as follows.
code{
- $ lb config --mirror-bootstrap http://localhost/debian/ \
- --mirror-chroot-security http://localhost/debian-security/
+ $ lb config --parent-mirror-bootstrap http://localhost/debian/ \
+ --parent-mirror-chroot-security http://localhost/debian-security/ \
+ --parent-mirror-chroot-backports http://localhost/debian-backports/
}code
-The chroot mirror, specified by #{--mirror-chroot}#, defaults to the
-#{--mirror-bootstrap}# value.
+The chroot mirror, specified by #{--parent-mirror-chroot}#, defaults to the
+#{--parent-mirror-bootstrap}# value.
3~ Distribution mirrors used at run time
-The #{--mirror-binary*}# options govern the distribution mirrors placed in
-the binary image. These may be used to install additional packages while
-running the live system. The defaults employ #{cdn.debian.net}#, a service
-that chooses a geographically close mirror based on the user's IP
+The #{--parent-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
@@ -101,8 +103,8 @@ suitable for users on a network where "#{mirror}#" is reachable.
code{
- $ lb config --mirror-binary http://mirror/debian/ \
- --mirror-binary-security http://mirror/debian-security/
+ $ lb config --parent-mirror-binary http://mirror/debian/ \
+ --parent-mirror-binary-security http://mirror/debian-security/
}code
@@ -111,13 +113,13 @@ code{
You may add more repositories, broadening your package choices beyond what
is available in your target distribution. These may be, for example, for
backports, experimental or custom packages. To configure additional
-repositories, create #{config/chroot_sources/your-repository.chroot}#,
-and/or #{config/chroot_sources/your-repository.binary}# files. As with the
-#{--mirror-*}# options, these govern the repositories used in the *chroot*
-stage when building the image, and in the *binary* stage, i.e. for use when
-running the live system.
+repositories, create #{config/archives/your-repository.list.chroot}#, and/or
+#{config/archives/your-repository.list.binary}# files. As with the
+#{--parent-mirror-*}# options, these govern the repositories used in the
+*chroot* stage when building the image, and in the *binary* stage, i.e. for
+use when running the live system.
-For example, #{config/chroot_sources/live.chroot}# allows you to install
+For example, #{config/archives/live.list.chroot}# allows you to install
packages from the debian live snapshot repository at live system build time.
code{
@@ -126,20 +128,20 @@ code{
}code
-If you add the same line to #{config/chroot_sources/live.binary}#, the
+If you add the same line to #{config/archives/live.list.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 should also put the GPG key used to sign the repository into
-#{config/chroot_sources/your-repository.{binary,chroot}.gpg}# files.
+#{config/archives/your-repository.gpg.{binary,chroot}}# files.
-*{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:
+*{Note:}* some preconfigured package repositories are available for easy selection through the #{--archives}# option, e.g. for enabling live snapshots, a simple command is enough to enable it:
code{
- $ lb config --repository live.debian.net
+ $ lb config --archives live.debian.net
}code
@@ -147,31 +149,10 @@ code{
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.
-
-3~ Choosing a few packages
-
-When the number of packages added is small, simply specify
-#{--packages}#. For example:
-
-code{
-
- $ 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 {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, use package lists as
-discussed in the following section, {Package lists}#package-lists.
+individual packages to install in a package list. You can also choose
+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.
3~package-lists Package lists
@@ -184,61 +165,53 @@ 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.
+*{Note:}* 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.
+
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:
+with the #{--package-lists}# option. For example:
code{
- $ lb config --packages-lists "gnome-core rescue"
+ $ lb config --package-lists "gnome rescue"
}code
-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.
+#{/usr/share/live/build/package-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~ Local package lists
-You may supplement or replace entirely the supplied lists using local
-package lists stored in #{config/chroot_local-packageslists/}#.
+You may supplement the predefined lists using local package lists stored in
+#{config/package-lists/}#.
Package lists that exist in this directory need to have a #{.list}# suffix
-in order to be processed. Local package lists always override package lists
-distributed with live-build. This can cause undesired effects, we therefore
-recommend to use unique names for local package lists.
+in order to be processed, and then an additional stage suffix, #{.chroot}#
+or #{.binary}# to indicate which stage the list is for.
-3~ Local binary package lists
+*{Note:}* If you don't specify the stage suffix, the list will be used for both stages. Normally, you want to specify #{.list.chroot}# so that the packages will only be installed in the live filesystem and not have an extra copy of the #{.deb}# placed on the media.
-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.
+3~ Local binary package lists
-Package lists that exist in this directory need to have a #{.list}# suffix
-in order to be processed.
+To make a binary stage list, place a file suffixed with #{.list.binary}# in
+#{config/package-lists/}#. These packages are not installed in the live
+filesystem, but are included on the live media under #{pool/}#. You would
+typically use such a list with one of the non-live installer variants. As
+mentioned above, if you want this list to be the same as your chroot stage
+list, simply use the #{.list}# suffix by itself.
3~ Extending a provided package list using includes
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.
+includes. Refer to these in the #{/usr/share/live/build/package-lists/}#
+directory, as they serve as good examples of how to write your own 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:
+iceweasel, create #{config/package-lists/my.list.chroot}# with the following
+contents:
code{
@@ -310,11 +283,13 @@ 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.
+by putting them in a list in #{config/task-lists/}#, as in the example
+below.
code{
- $ lb config --tasks "mail-server file-server"
+ $ lb config
+ $ echo "mail-server file-server" >> config/task-lists/my.list.chroot
}code
@@ -325,55 +300,50 @@ including ones not included in this list, may be examined with #{tasksel
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
-#{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:
+Desktop and language tasks are special cases that need some extra planning
+and configuration. Live images are different from Debian Installer images in
+this respect. 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 internal #{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.
+
+When developing a desktop live image, the image typically boots directly to
+a working desktop, the choices of both desktop and default language having
+been made at build time, not at run time as in the case of the Debian
+Installer. That's not to say that a live image couldn't be built to support
+multiple desktops or multiple languages and offer the user a choice, but
+that is not live-build's default behaviour.
+
+Because there is no provision made automatically for language tasks, which
+include such things as language-specific fonts and input-method packages, if
+you want them, you need to specify them in your configuration. For example,
+a GNOME desktop image containing support for Japanese might include these
+tasks:
code{
- $ lb config --tasks "japanese japanese-desktop japanese-gnome-desktop"
+ $ lb config
+ $ echo "gnome-desktop desktop standard laptop" >> config/task-lists/my.list.chroot
+ $ echo "japanese japanese-desktop japanese-gnome-desktop" >> config/task-lists/my.list.chroot
}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-lists gnome-desktop}#, it is equivalent to
-specifying #{--packages debian-installer-launcher --packages-lists
-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-lists}#,
-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.
-
-*{Note:}* There is also an experimental #{--language}# option that has an overlapping purpose with language tasks. For any language for which it is known that there are #{*-l10n}# packages, if #{--language}# is specified, those packages will be installed. Furthermore, if any #{syslinux}# templates matching the language are found, they will be used instead of the default English templates. The package selection done by #{--language}# is a poor approximation of language tasks, as it requires that the list of packages to include per language be maintained internally in live-build, and besides, language tasks are more comprehensive and flexible. However, the #{syslinux}# aspect is still useful. Thus, if you use #{--bootloader syslinux}# and templates for the specified language exist either in #{/usr/share/live/build/templates/syslinux/}# or #{config/templates/syslinux/}#, consider using this option, possibly in combination with tasks to ensure all relevant packages are installed
. For example:
+Since desktop tasks are "internal" tasks, for every desktop flavour task
+included in the image, the corresponding value, if it differs from the
+default, "gnome", must be preseeded in the "tasksel/desktop" debconf
+variable or else tasksel will not recognize and install it. Thus:
code{
- $ lb config --language es
+ $ lb config
+ $ echo 'tasksel tasksel/desktop multiselect kde' >> config/preseed/my.preseed.chroot
}code
-Even so, it is limited in that it only supports a single language and a
-single bootloader. Therefore, for all of these reasons, the future of this
-option is under review, possibly to be replaced with something entirely
-different in the next major release of live-build.
+This parameter can take multiple values, e.g. "lxde xfce" instead of "kde".
2~installing-modified-or-third-party-packages Installing modified or
third-party packages
@@ -394,40 +364,40 @@ and elsewhere.
There are two ways of installing modified custom packages:
-_* #{chroot_local-packages}#
+_* #{packages.chroot}#
_* Using a custom APT repository
-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.
+Using #{packages.chroot}# 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
+3~ Using #{packages.chroot}# 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/packages.chroot/}# 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
+Using #{packages.chroot}# for installation of custom packages has
disadvantages:
_* It is not possible to use secure APT.
_* You must install all appropriate packages in the
-#{config/chroot_local-packages/}# directory.
+#{config/packages.chroot/}# directory.
_* 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 {Choosing
-packages to install}#choosing-packages-to-install for details.
+Unlike using #{packages.chroot}#, 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
@@ -452,7 +422,7 @@ pinning}#apt-pinning for more information.
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
+appropriate configurations through #{config/includes.chroot/}#.) For a
complete list, look for options starting with #{apt}# in the #{lb_config}#
man page.
@@ -493,7 +463,7 @@ with:
code{
- $ lb config --binary-indices false
+ $ lb config --apt-indices false
}code
@@ -536,19 +506,19 @@ and #{aptitude}# for details.
For background, please first read the #{apt_preferences(5)}# man page. APT
pinning can be configured either for build time, or else for run time. For
the former, create #{config/chroot_apt/preferences}#. For the latter, create
-#{config/chroot_local-includes/etc/apt/preferences}#.
+#{config/includes.chroot/etc/apt/preferences}#.
-Let's say you are building a Squeeze live system but need all the live
+Let's say you are building a Wheezy live system but need all the live
packages that end up in the binary image to be installed from Sid at build
time. You need to add Sid to your APT sources and pin it so that only the
packages you want are installed from it at build time and all others are
-taken from the target system distribution, Squeeze. The following will
+taken from the target system distribution, Wheezy. The following will
accomplish this:
code{
- $ echo "deb http://mirror/debian sid main" > config/chroot_sources/sid.chroot
- $ cat >>config/chroot_apt/preferences <<END
+ $ echo "deb http://mirror/debian sid main" > config/archives/sid.list.chroot
+ $ cat >> config/chroot_apt/preferences <<END
Package: live-boot live-boot-initramfs-tools live-config live-config-sysvinit
Pin: release n=sid
Pin-Priority: 600
@@ -570,7 +540,7 @@ $ lb config --distribution wheezy
Negative pin priorities will prevent a package from being installed, as in
the case where you do not want a package that is recommended by another
-package. Suppose you are building an LXDE image using #{--packages-lists
+package. Suppose you are building an LXDE image using #{--package-lists
lxde}# option, but don't want the user prompted to store wifi passwords in
the keyring. This list includes #{gdm}#, which depends on #{gksu}#, which in
turn recommends #{gnome-keyring}#. So you want to omit the recommended
diff --git a/manual/de/user_customization-runtime.ssi b/manual/de/user_customization-runtime.ssi
index 4bbf347..610fdb1 100644
--- a/manual/de/user_customization-runtime.ssi
+++ b/manual/de/user_customization-runtime.ssi
@@ -17,12 +17,15 @@ also any groups and permissions associated with the live user.
You can specify additional groups that the live user will belong to by
preseeding the #{passwd/user-default-groups}# debconf value. For example, to
-add the live user to the #{fuse}# group, add the following to a file in the
-#{config/chroot_local-preseed}# directory:
+add the live user to the #{fuse}# group, add the following preseed under
+#{config/preseed/}# for the chroot stage:
code{
- user-setup passwd/user-default-groups string audio cdrom dip floppy video plugdev netdev powerdev scanner bluetooth fuse
+ $ lb config
+ $ echo user-setup passwd/user-default-groups string audio cdrom \
+ dip floppy video plugdev netdev powerdev scanner bluetooth fuse \
+ >> config/preseed/my.preseed.chroot
}code
@@ -42,7 +45,7 @@ One possible way of changing the default password is by means of a hook as
described in {Boot-time hooks}#boot-time-hooks. In order to do that you can
use the "passwd" hook from #{/usr/share/doc/live-config/examples/hooks}#,
prefix it accordingly (e.g. 200-passwd) and add it to
-#{config/chroot_local-includes/lib/live/config/}#
+#{config/includes.chroot/lib/live/config/}#
2~customizing-locale-and-language Customizing locale and language
diff --git a/manual/de/user_examples.ssi b/manual/de/user_examples.ssi
index 5bb918a..965f9ac 100644
--- a/manual/de/user_examples.ssi
+++ b/manual/de/user_examples.ssi
@@ -1,4 +1,4 @@
-:B~ Examples
+:B~ Beispiele
1~examples Examples
@@ -19,14 +19,15 @@ 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:
+this file and in it, set the corresponding #{LB_PARENT_MIRROR_*}# variables
+to your preferred mirror. All other mirrors used in the build will be
+defaulted from these values. For example:
code{
- LB_MIRROR_BOOTSTRAP="http://mirror/debian"
- LB_MIRROR_CHROOT="http://mirror/debian"
- LB_MIRROR_CHROOT_SECURITY="http://mirror/debian-security"
+ LB_PARENT_MIRROR_BOOTSTRAP="http://mirror/debian"
+ LB_PARENT_MIRROR_CHROOT_SECURITY="http://mirror/debian-security"
+ LB_PARENT_MIRROR_CHROOT_BACKPORTS="http://mirror/debian-updates"
}code
@@ -76,7 +77,10 @@ utility, serving as an introduction to customizing Debian Live images.
code{
- $ mkdir tutorial2 ; cd tutorial2 ; lb config -p lxde --packages iceweasel
+ $ mkdir tutorial2
+ $ cd tutorial2
+ $ lb config -p lxde
+ $ echo iceweasel >> config/package-lists/my.list.chroot
}code
@@ -84,9 +88,9 @@ 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.
+#{config/includes.chroot/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:
@@ -128,16 +132,23 @@ code{
lb config noauto \
--architecture i386 \
- --linux-flavours 686 \
- --packages-lists lxde \
- --packages "iceweasel xchat" \
+ --linux-flavours 686-pae \
+ --package-lists lxde \
"${@}"
}code
+Now populate your local package list:
+
+code{
+
+ $ echo "iceweasel xchat" >> config/package-lists/my.list.chroot
+
+}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
+#{--linux-flavours 686-pae}# 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}#.
@@ -181,18 +192,12 @@ code{
}code
-Now edit #{auto/config}# to add the #{vlc}# package:
+Now append the #{vlc}# package to our local package list in
+#{config/package-lists/my.list.chroot}#:
code{
- #!/bin/sh
-
- lb config noauto \
- --architecture i386 \
- --linux-flavours 686 \
- --packages-lists lxde \
- --packages "iceweasel xchat vlc" \
- "${@}"
+ $ echo vlc >> config/package-lists/my.list.chroot
}code
@@ -231,15 +236,15 @@ cases drawn from the collected experiences of users of Debian Live.
Make a build directory and create a skeletal configuration in it built
around the standard-x11 list, including #{gdm3}#, #{metacity}# and
-#{xtightvncviewer}#, disabling recommends to make a minimal system:
+#{xvnc4viewer}#, disabling recommends to make a minimal system:
code{
$ mkdir vnc_kiosk_client
$ cd vnc_kiosk_client
- $ lb config -a i386 -k 686 -p standard-x11 \
- --packages "gdm3 metacity xvnc4viewer" \
+ $ lb config -a i386 -k 686-pae -p standard-x11 \
--apt-recommends false
+ $ echo "gdm3 metacity xvnc4viewer" >> config/package-lists/my.list.chroot
}code
@@ -249,8 +254,8 @@ to port #{5901}# on a server at #{192.168.1.2}#:
code{
- $ mkdir -p config/chroot_local-includes/etc/skel
- $ cat >config/chroot_local-includes/etc/skel/.xsession <<END
+ $ mkdir -p config/includes.chroot/etc/skel
+ $ cat > config/includes.chroot/etc/skel/.xsession <<END
#!/bin/sh
/usr/bin/metacity &
@@ -287,7 +292,7 @@ packages will most likely produce a broken live system.
code{
- $ lb config -k 486 -p minimal --binary-indices false \
+ $ lb config -k 486 -p minimal --apt-indices false \
--memtest none --apt-recommends false --includes none
}code
@@ -306,8 +311,8 @@ 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
+instead of the default #{-k "486 686-pae"}#. Leaving off APT's indices with
+#{--apt-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
@@ -327,10 +332,10 @@ preferred desktop, in this case KDE, containing all of the same packages
that would be installed by the standard Debian installer for KDE.
Our initial problem is the discovery of the names of the appropriate
-tasks. Currently, live-build cannot help with this. While we might get lucky
-and find this by trial-and-error, there is a tool, #{grep-dctrl}#, which can
-be used to dig it out of the task descriptions in tasksel-data, so to
-prepare, make sure you have both of those things:
+language tasks. Currently, live-build cannot help with this. While we might
+get lucky and find this by trial-and-error, there is a tool, #{grep-dctrl}#,
+which can be used to dig it out of the task descriptions in tasksel-data, so
+to prepare, make sure you have both of those things:
code{
@@ -342,12 +347,8 @@ Now we can search for the appropriate tasks, first with:
code{
- $ grep-dctrl -FTest-lang pt_BR /usr/share/tasksel/debian-tasks.desc -sTask,Description
+ $ grep-dctrl -FTest-lang pt_BR /usr/share/tasksel/descs/debian-tasks.desc -sTask
Task: brazilian-portuguese
- Description: Brazilian Portuguese environment
- This task installs programs, data files, and
- documentation that make it easier for Brazilian Portuguese speakers
- to use Debian.
}code
@@ -356,22 +357,17 @@ brazilian-portuguese. Now to find the related tasks:
code{
- $ grep-dctrl -FEnhances brazilian-portuguese /usr/share/tasksel/debian-tasks.desc -sTask,Description
+ $ grep-dctrl -FEnhances brazilian-portuguese /usr/share/tasksel/descs/debian-tasks.desc -sTask
Task: brazilian-portuguese-desktop
- Description: Brazilian Portuguese desktop
- This task localises the desktop in Brasilian Portuguese.
-
Task: brazilian-portuguese-kde-desktop
- Description: Brazilian Portuguese KDE desktop
- This task localises the KDE desktop in Brazilian Portuguese.
}code
-We will use the experimental #{--language}# option, as live-build happens to
-include #{syslinux}# templates for pt_BR (see {Desktop and language
-tasks}#desktop-and-language-tasks for details). And at boot time we will
-generate the pt_BR.UTF-8 locale and select the pt-latin1 keyboard
-layout. Now let's put the pieces together:
+At boot time we will generate the pt_BR.UTF-8 locale and select the
+pt-latin1 keyboard layout. We will also need to preseed our desktop choice,
+"kde" so that tasksel will install the correct desktop task, as it differs
+from the default (see {Desktop and languages
+tasks}#desktop-and-language-tasks). Now let's put the pieces together:
code{
@@ -380,12 +376,12 @@ code{
$ lb config \
-a i386 \
-k 486 \
- -p kde-desktop \
- --language pt_BR \
- --tasks "brazilian-portuguese brazilian-portuguese-desktop brazilian-portuguese-kde-desktop" \
--bootappend-live "locales=pt_BR.UTF-8 keyboard-layouts=pt-latin1" \
- --debian-installer live \
- --packages debian-installer-launcher
+ --debian-installer live
+ $ echo kde-desktop brazilian-portuguese brazilian-portuguese-desktop \
+ brazilian-portuguese-kde-desktop >> config/task-lists/my.list.chroot
+ $ echo debian-installer-launcher >> config/package-lists/my.list.chroot
+ $ echo tasksel tasksel/desktop multiselect kde >> config/preseed/my.preseed.chroot
}code
diff --git a/manual/de/user_installation.ssi b/manual/de/user_installation.ssi
index 6141868..bd8393d 100644
--- a/manual/de/user_installation.ssi
+++ b/manual/de/user_installation.ssi
@@ -105,7 +105,7 @@ are available on http://live.debian.net/debian/.
2~ live-boot and live-config
-*{Note:}* You do not need to install live-boot or live-config on your system to create customized Debian Live systems. However, doing so will do no harm and is useful for reference purposes.
+*{Note:}* You do not need to install live-boot or live-config on your system to create customized Debian Live systems. However, doing so will do no harm and is useful for reference purposes. If you only want the documentation, you may now install the live-boot-doc and live-config-doc packages separately.
3~ From the Debian repository
@@ -132,14 +132,14 @@ if that is your reason for building these packages from source.
_* Build live-boot and live-config .deb files
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.
+your target platform: this means if your target is Wheezy then you should
+build against Wheezy.
Use a personal builder such as /{pbuilder}/ or /{sbuild}/ if you need to
build #{live-boot}# for a target distribution that differs from your build
-system. For example, for Squeeze live images, build #{live-boot}# in a
-Squeeze chroot. If your target distribution happens to match your build
-system distribution, you may build directly on the build system using
+system. For example, for Wheezy live images, build #{live-boot}# in a Wheezy
+chroot. If your target distribution happens to match your build system
+distribution, you may build directly on the build system using
#{dpkg-buildpackage}# (provided by the /{dpkg-dev}/ package):
code{
@@ -165,10 +165,10 @@ repositories}#additional-repositories.
You can let live-build automatically use the latest snapshots of live-boot
and live-config by configuring a third-party repository in your live-build
configuration directory. Assuming you have already created a configuration
-tree with #{lb config}#:
+tree in the current directory with #{lb config}#:
code{
- $ lb config --repository live.debian.net
+ $ lb config --archives live.debian.net
}code
diff --git a/manual/de/user_managing_a_configuration.ssi b/manual/de/user_managing_a_configuration.ssi
index 999c508..d0706a8 100644
--- a/manual/de/user_managing_a_configuration.ssi
+++ b/manual/de/user_managing_a_configuration.ssi
@@ -52,7 +52,7 @@ code{
#!/bin/sh
lb config noauto \
- --packages-lists "standard" \
+ --package-lists "standard" \
"${@}"
}code
@@ -88,7 +88,7 @@ code{
}code
Edit #{auto/config}#, changing or adding any options as you see fit. In the
-example above, #{--packages-lists standard}# is set to the default
+example above, #{--package-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/de/user_overview.ssi b/manual/de/user_overview.ssi
index ddb3b58..ad40e60 100644
--- a/manual/de/user_overview.ssi
+++ b/manual/de/user_overview.ssi
@@ -52,51 +52,20 @@ time-consuming and error-prone, the #{lb config}# command can be used to
create skeleton configuration folders.
Issuing #{lb config}# without any arguments creates a #{config/}#
-subdirectory which it populates with some default settings:
+subdirectory which it populates with some default settings, and a skeleton
+#{auto/}# subdirectory tree.
code{
$ lb config
+ P: Considering defaults defined in /etc/live/build.conf
P: Creating config tree
- $ ls -l
- total 8
- drwxr-xr-x 3 user user 4096 Sep 7 13:02 auto
- drwxr-xr-x 22 user user 4096 Sep 7 13:02 config
-
- $ ls -l config/
- total 104
- -rw-r--r-- 1 user user 4197 Sep 7 13:02 binary
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_debian-installer
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_debian-installer-includes
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_grub
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-debs
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-hooks
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-includes
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-packageslists
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-udebs
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_rootfs
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_syslinux
- -rw-r--r-- 1 user user 2051 Sep 7 13:02 bootstrap
- -rw-r--r-- 1 user user 1647 Sep 7 13:02 chroot
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_apt
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-hooks
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-includes
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-packages
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-packageslists
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-patches
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-preseed
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_sources
- -rw-r--r-- 1 user user 2954 Sep 7 13:02 common
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 includes
- -rw-r--r-- 1 user user 205 Sep 7 13:02 source
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 templates
-
}code
Using #{lb config}# without any arguments would be suitable for users who
need a very basic image, or who intend to later provide a more complete
-configuration via auto/config (see {Managing a
+configuration via #{auto/config}# (see {Managing a
configuration}#managing-a-configuration for details).
Normally, you will want to specify some options. For example, to include the
@@ -120,7 +89,7 @@ A full list of options is available in the #{lb_config}# man page.
3~lb-build The #{lb build}# command
-The #{lb build}# command reads in your configuration from the config/
+The #{lb build}# command reads in your configuration from the #{config/}#
directory. It then runs the lower level commands needed to build your Live
system.
@@ -141,10 +110,10 @@ initramfs-tools, used to generate an initramfs capable of booting live
systems, such as those created by live-build. This includes the Debian Live
ISOs, netboot tarballs, and USB stick images.
-At boot time it will look for read-only media containing a "/live" directory
-where a root filesystem (often a compressed filesystem image like squashfs)
-is stored. If found, it will create a writable environment, using aufs, for
-Debian like systems to boot from.
+At boot time it will look for read-only media containing a #{/live/}#
+directory where a root filesystem (often a compressed filesystem image like
+squashfs) is stored. If found, it will create a writable environment, using
+aufs, for Debian like systems to boot from.
More information on initial ramfs in Debian can be found in the Debian Linux
Kernel Handbook at http://kernel-handbook.alioth.debian.org/ in the chapter
diff --git a/manual/en/index.html.in b/manual/en/index.html.in
index c5b3624..2c630f3 100644
--- a/manual/en/index.html.in
+++ b/manual/en/index.html.in
@@ -9,17 +9,22 @@
<h2>Debian Live Manual</h2>
<p>
- Please report errors, omissions, patches and suggestions to our mailinglist at <a href="mailto:debian-live at lists.debian.org">debian-live at lists.debian.org</a> and read about <a href="html/about-manual.html#how-to-contribute">how to contribute</a> to the manual.
+ <i>live-manual</i> is available in different file formats and it is translated into several languages. Keep in mind that some translations may be incomplete or may not be up to date.
+ </p>
+
+ <p>
+
+ Please report errors, omissions, patches and suggestions to our mailinglist at <a href="mailto:debian-live at lists.debian.org">debian-live at lists.debian.org</a> and read about <a href="html/about-manual.en.html#how-to-contribute">how to contribute</a> to the manual.
</p>
<h3>Available Formats</h3>
<ul>
- <li><a href="epub/live-manual.epub">EPUB</a></li>
- <li>HTML: <a href="html/index.html">multi page</a>, <a href="html/live-manual.html">single page</a></li>
- <li><a href="odf/live-manual.odt">ODF</a></li>
- <li>PDF: <a href="pdf/live-manual.portrait-a4.pdf">A4 portrait</a>, <a href="pdf/live-manual.landscape-a4.pdf">A4 landscape</a>, <a href="pdf/live-manual.portrait-letter.pdf">letter portrait</a>, <a href="pdf/live-manual.landscape-letter.pdf">letter landscape</a></li>
- <li><a href="txt/live-manual.txt">Plain text</a></li>
+ <li><a href="epub/live-manual.en.epub">EPUB</a></li>
+ <li>HTML: <a href="html/index.en.html">multi page</a>, <a href="html/live-manual.en.html">single page</a></li>
+ <li><a href="odf/live-manual.en.odt">ODF</a></li>
+ <li>PDF: <a href="pdf/live-manual.portrait-a4.en.pdf">A4 portrait</a>, <a href="pdf/live-manual.landscape-a4.en.pdf">A4 landscape</a>, <a href="pdf/live-manual.portrait-letter.en.pdf">letter portrait</a>, <a href="pdf/live-manual.landscape-letter.en.pdf">letter landscape</a></li>
+ <li><a href="txt/live-manual.en.txt">Plain text</a></li>
</ul>
<p>
diff --git a/manual/en/live-manual.ssm b/manual/en/live-manual.ssm
index 569cfd6..75eb990 100644
--- a/manual/en/live-manual.ssm
+++ b/manual/en/live-manual.ssm
@@ -9,7 +9,7 @@
:license: This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.<br><br>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.<br><br>You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses/. <br><br>The complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-3 file.
@date:
- :published: 2011-09-30
+ :published: 2011-12-04
@publisher: Debian Live Project <debian-live at lists.debian.org>
diff --git a/manual/en/user_basics.ssi b/manual/en/user_basics.ssi
index 6eb9ac2..ba065ea 100644
--- a/manual/en/user_basics.ssi
+++ b/manual/en/user_basics.ssi
@@ -138,7 +138,7 @@ Note: For live systems containing X.org that you want to test with #{virtualbox-
code{
- $ lb config --packages virtualbox-ose-guest-x11
+ $ echo virtualbox-ose-guest-x11 >> config/package-lists/my.list.chroot
}code
diff --git a/manual/en/user_customization-contents.ssi b/manual/en/user_customization-contents.ssi
index 4826bf0..0ff1407 100644
--- a/manual/en/user_customization-contents.ssi
+++ b/manual/en/user_customization-contents.ssi
@@ -20,12 +20,12 @@ Please see {Terms}#terms for more information about the distinction between the
Chroot local includes can be used to add or replace files in the chroot/Live filesystem so that they may be used in the Live system. A typical use is to populate the skeleton user directory (#{/etc/skel}#) used by the Live system to create the live user's home directory. Another is to supply configuration files that can be simply added or replaced in the image without processing; see {Live/chroot local hooks}#live-chroot-local-hooks if processing is needed.
-To include files, simply add them to your #{config/chroot_local-includes}# directory. This directory corresponds to the root directory (#{/}#) of the live system. For example, to add a file #{/var/www/index.html}# in the live system, use:
+To include files, simply add them to your #{config/includes.chroot}# directory. This directory corresponds to the root directory (#{/}#) of the live system. For example, to add a file #{/var/www/index.html}# in the live system, use:
code{
- $ mkdir -p config/chroot_local-includes/var/www
- $ cp /path/to/my/index.html config/chroot_local-includes/var/www
+ $ mkdir -p config/includes.chroot/var/www
+ $ cp /path/to/my/index.html config/includes.chroot/var/www
}code
@@ -35,7 +35,7 @@ code{
-- config
[...]
- |-- chroot_local-includes
+ |-- includes.chroot
| `-- var
| `-- www
| `-- index.html
@@ -48,11 +48,11 @@ Chroot local includes are installed after package installation so that files ins
3~binary-local-includes Binary local includes
-To include material such as documentation or videos on the media filesystem so that it is accessible immediately upon insertion of the media without booting the Live system, you can use binary local includes. This works in a similar fashion to chroot local includes. For example, suppose the files #{~/video_demo.*}# are demo videos of the live system described by and linked to by an HTML index page. Simply copy the material to #{config/binary_local-includes/}# as follows:
+To include material such as documentation or videos on the media filesystem so that it is accessible immediately upon insertion of the media without booting the Live system, you can use binary local includes. This works in a similar fashion to chroot local includes. For example, suppose the files #{~/video_demo.*}# are demo videos of the live system described by and linked to by an HTML index page. Simply copy the material to #{config/includes.binary/}# as follows:
code{
- $ cp ~/video_demo.* config/binary_local-includes/
+ $ cp ~/video_demo.* config/includes.binary/
}code
@@ -76,18 +76,18 @@ Hooks allow commands to be performed in the chroot and binary stages of the buil
3~live-chroot-local-hooks Live/chroot local hooks
-To run commands in the chroot stage, create a hook script containing the commands in the #{config/chroot_local-hooks}# directory. The hook will run in the chroot after the rest of your chroot configuration has been applied, so remember to ensure your configuration includes all packages and files your hook needs in order to run. See the example chroot hook scripts for various common chroot customization tasks provided in #{/usr/share/live/build/examples/hooks}# which you can copy or symlink to use them in your own configuration.
+To run commands in the chroot stage, create a hook script with a #{.chroot}# suffix containing the commands in the #{config/hooks/}# directory. The hook will run in the chroot after the rest of your chroot configuration has been applied, so remember to ensure your configuration includes all packages and files your hook needs in order to run. See the example chroot hook scripts for various common chroot customization tasks provided in #{/usr/share/live/build/examples/hooks}# which you can copy or symlink to use them in your own configuration.
3~boot-time-hooks Boot-time hooks
-To execute commands at boot time, you can supply live-config hooks as explained in the "Customization" section of its man page. Examine live-config's own hooks provided in #{/lib/live/config/}#, noting the sequence numbers. Then provide your own hook prefixed with an appropriate sequence number, either as a chroot local include in #{config/chroot_local-includes/lib/live/config/}#, or as a custom package as discussed in {Installing modified or third-party packages}#installing-modified-or-third-party-packages.
+To execute commands at boot time, you can supply live-config hooks as explained in the "Customization" section of its man page. Examine live-config's own hooks provided in #{/lib/live/config/}#, noting the sequence numbers. Then provide your own hook prefixed with an appropriate sequence number, either as a chroot local include in #{config/includes.chroot/lib/live/config/}#, or as a custom package as discussed in {Installing modified or third-party packages}#installing-modified-or-third-party-packages.
3~ Binary local hooks
-To run commands in the binary stage, create a hook script containing the commands in the #{config/binary_local-hooks}#. The hook will run after all other binary commands are run, but before binary_checksums, the very last binary commands The commands in your hook do not run in the chroot, so take care to not modify any files outside of the build tree, or you may damage your build system! See the example binary hook scripts for various common binary customization tasks provided in #{/usr/share/live/build/examples/hooks}# which you can copy or symlink to use them in your own configuration.
+To run commands in the binary stage, create a hook script with a #{.binary}# suffix containing the commands in the #{config/hooks/}# directory. The hook will run after all other binary commands are run, but before binary_checksums, the very last binary command. The commands in your hook do not run in the chroot, so take care to not modify any files outside of the build tree, or you may damage your build system! See the example binary hook scripts for various common binary customization tasks provided in #{/usr/share/live/build/examples/hooks}# which you can copy or symlink to use them in your own configuration.
2~ Preseeding Debconf questions
-Files in the #{config/chroot_local-preseed}# directory are considered to be debconf preseed files and are installed by live-build using #{debconf-set-selections}#.
+Files in the #{config/preseed/}# directory suffixed with #{.preseed}# followed by the stage (#{.chroot}# or #{.binary}#) are considered to be debconf preseed files and are installed by live-build using #{debconf-set-selections}# during the corresponding stage.
For more information about debconf, please see debconf(7) in the #{debconf}# package.
diff --git a/manual/en/user_customization-installer.ssi b/manual/en/user_customization-installer.ssi
index 3105bf3..6a8e934 100644
--- a/manual/en/user_customization-installer.ssi
+++ b/manual/en/user_customization-installer.ssi
@@ -31,7 +31,8 @@ Note that by default, live-build does not include Debian Installer images in the
code{
$ lb config --architecture i386 --linux-flavours 486 \
- --debian-installer live --packages debian-installer-launcher
+ --debian-installer live
+ $ echo debian-installer-launcher >> config/package-lists/my.list.chroot
}code
@@ -48,4 +49,4 @@ code{
2~ Customizing Debian Installer content
-For experimental or debugging purposes, you might want to include locally built #{d-i}# component udeb packages. Place these in #{config/binary_local-udebs/}# to include them in the image. Additional or replacement files and directories may be included in the installer initrd as well, in a similar fashion to {Live/chroot local includes}#live-chroot-local-includes, by placing the material in #{config/binary_debian-installer-includes/}#.
+For experimental or debugging purposes, you might want to include locally built #{d-i}# component udeb packages. Place these in #{config/packages.binary/}# to include them in the image. Additional or replacement files and directories may be included in the installer initrd as well, in a similar fashion to {Live/chroot local includes}#live-chroot-local-includes, by placing the material in #{config/binary_debian-installer-includes/}#.
diff --git a/manual/en/user_customization-packages.ssi b/manual/en/user_customization-packages.ssi
index 2e642b1..8772854 100644
--- a/manual/en/user_customization-packages.ssi
+++ b/manual/en/user_customization-packages.ssi
@@ -8,7 +8,7 @@ Perhaps the most basic customization of a Debian live system is the selection of
3~ Distribution, archive areas and mode
-The distribution you choose has the broadest impact on which packages are available to include in your live image. Specify the codename, which defaults to #{squeeze}# for the Squeeze version of live-build. Any current distribution carried in the Debian archive may be specified by its codename here. (See {Terms}#terms for more details.) The #{--distribution}# option not only influences the source of packages within the archive, but also instructs #{live-build}# to behave as needed to build each supported distribution. For example, to build against the *unstable* release, Sid, specify:
+The distribution you choose has the broadest impact on which packages are available to include in your live image. Specify the codename, which defaults to #{wheezy}# for the Wheezy version of live-build. Any current distribution carried in the Debian archive may be specified by its codename here. (See {Terms}#terms for more details.) The #{--distribution}# option not only influences the source of packages within the archive, but also instructs #{live-build}# to behave as needed to build each supported distribution. For example, to build against the *unstable* release, Sid, specify:
code{
@@ -30,37 +30,38 @@ Experimental support is available for some Debian derivatives through a #{--mode
3~ Distribution mirrors
-The Debian archive is replicated across a large network of mirrors around the world so that people in each region can choose a nearby mirror for best download speed. Each of the #{--mirror-*}# options governs which distribution mirror is used at various stages of the build. Recall from {Stages of the build}#stages-of-the-build that the *bootstrap* stage is when the chroot is initially populated by debootstrap with a minimal system, and the *chroot* stage is when the chroot used to construct the live system's filesystem is built. Thus, the corresponding mirror switches are used for those stages, and later, in the *binary* stage, the #{--mirror-binary}# and #{--mirror-binary-security}# values are used, superceding any mirrors used in an earlier stage.
+The Debian archive is replicated across a large network of mirrors around the world so that people in each region can choose a nearby mirror for best download speed. Each of the #{--parent-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 #{--parent-mirror-binary}# and #{--parent-mirror-binary-security}# values are used, superceding any mirrors used in an earlier stage.
3~distribution-mirrors-build-time Distribution mirrors used at build time
-To set the distribution mirrors used at build time to point at a local mirror, it is sufficient to set #{--mirror-bootstrap}# and #{--mirror-chroot-security}# as follows.
+To set the distribution mirrors used at build time to point at a local mirror, it is sufficient to set #{--parent-mirror-bootstrap}#, #{--parent-mirror-chroot-security}# and #{--parent-mirror-chroot-backports}# as follows.
code{
- $ lb config --mirror-bootstrap http://localhost/debian/ \
- --mirror-chroot-security http://localhost/debian-security/
+ $ lb config --parent-mirror-bootstrap http://localhost/debian/ \
+ --parent-mirror-chroot-security http://localhost/debian-security/ \
+ --parent-mirror-chroot-backports http://localhost/debian-backports/
}code
-The chroot mirror, specified by #{--mirror-chroot}#, defaults to the #{--mirror-bootstrap}# value.
+The chroot mirror, specified by #{--parent-mirror-chroot}#, defaults to the #{--parent-mirror-bootstrap}# value.
3~ Distribution mirrors used at run time
-The #{--mirror-binary*}# options govern the distribution mirrors placed in the binary image. These may be used to install additional packages while running the live system. The 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.
+The #{--parent-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-binary http://mirror/debian/ \
- --mirror-binary-security http://mirror/debian-security/
+ $ lb config --parent-mirror-binary http://mirror/debian/ \
+ --parent-mirror-binary-security http://mirror/debian-security/
}code
3~additional-repositories Additional repositories
-You may add more repositories, broadening your package choices beyond what is available in your target distribution. These may be, for example, for backports, experimental or custom packages. To configure additional repositories, create #{config/chroot_sources/your-repository.chroot}#, and/or #{config/chroot_sources/your-repository.binary}# files. As with the #{--mirror-*}# options, these govern the repositories used in the *chroot* stage when building the image, and in the *binary* stage, i.e. for use when running the live system.
+You may add more repositories, broadening your package choices beyond what is available in your target distribution. These may be, for example, for backports, experimental or custom packages. To configure additional repositories, create #{config/archives/your-repository.list.chroot}#, and/or #{config/archives/your-repository.list.binary}# files. As with the #{--parent-mirror-*}# options, these govern the repositories used in the *chroot* stage when building the image, and in the *binary* stage, i.e. for use when running the live system.
-For example, #{config/chroot_sources/live.chroot}# allows you to install packages from the debian live snapshot repository at live system build time.
+For example, #{config/archives/live.list.chroot}# allows you to install packages from the debian live snapshot repository at live system build time.
code{
@@ -68,75 +69,59 @@ code{
}code
-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 you add the same line to #{config/archives/live.list.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 should also put the GPG key used to sign the repository into #{config/chroot_sources/your-repository.{binary,chroot}.gpg}# files.
+You should also put the GPG key used to sign the repository into #{config/archives/your-repository.gpg.{binary,chroot}}# files.
-*{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:
+*{Note:}* some preconfigured package repositories are available for easy selection through the #{--archives}# option, e.g. for enabling live snapshots, a simple command is enough to enable it:
code{
- $ lb config --repository live.debian.net
+ $ lb config --archives live.debian.net
}code
2~choosing-packages-to-install Choosing packages to install
-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.
-
-3~ Choosing a few packages
-
-When the number of packages added is small, simply specify #{--packages}#. For example:
-
-code{
-
- $ 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 {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, use package lists as discussed in the following section, {Package lists}#package-lists.
+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 in a package list. You can also choose 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.
3~package-lists Package lists
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.
+*{Note:}* 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.
+
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:
+The simplest way to use lists is to specify one or more predefined lists with the #{--package-lists}# option. For example:
code{
- $ lb config --packages-lists "gnome-core rescue"
+ $ lb config --package-lists "gnome rescue"
}code
-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.
+The default location for the list files on your system is #{/usr/share/live/build/package-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~ Local package lists
-You may supplement or replace entirely the supplied lists using local package lists stored in #{config/chroot_local-packageslists/}#.
+You may supplement the predefined lists using local package lists stored in #{config/package-lists/}#.
-Package lists that exist in this directory need to have a #{.list}# suffix in order to be processed. Local package lists always override package lists distributed with live-build. This can cause undesired effects, we therefore recommend to use unique names for local package lists.
+Package lists that exist in this directory need to have a #{.list}# suffix in order to be processed, and then an additional stage suffix, #{.chroot}# or #{.binary}# to indicate which stage the list is for.
-3~ Local binary package lists
+*{Note:}* If you don't specify the stage suffix, the list will be used for both stages. Normally, you want to specify #{.list.chroot}# so that the packages will only be installed in the live filesystem and not have an extra copy of the #{.deb}# placed on the media.
-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.
+3~ Local binary package lists
-Package lists that exist in this directory need to have a #{.list}# suffix in order to be processed.
+To make a binary stage list, place a file suffixed with #{.list.binary}# in #{config/package-lists/}#. These packages are not installed in the live filesystem, but are included on the live media under #{pool/}#. You would typically use such a list with one of the non-live installer variants. As mentioned above, if you want this list to be the same as your chroot stage list, simply use the #{.list}# suffix by itself.
3~ Extending a provided package list using includes
-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.
+The package lists that are included with live-build make extensive use of includes. Refer to these in the #{/usr/share/live/build/package-lists/}# directory, as they serve as good examples of how to write your own 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:
+For example, to make a list that includes the predefined #{gnome}# list plus iceweasel, create #{config/package-lists/my.list.chroot}# with the following contents:
code{
@@ -193,11 +178,12 @@ The nesting of conditionals is not supported.
3~ Tasks
-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.
+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 by putting them in a list in #{config/task-lists/}#, as in the example below.
code{
- $ lb config --tasks "mail-server file-server"
+ $ lb config
+ $ echo "mail-server file-server" >> config/task-lists/my.list.chroot
}code
@@ -205,31 +191,30 @@ The primary tasks available in the Debian Installer can be listed with #{tasksel
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 #{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.
+Desktop and language tasks are special cases that need some extra planning and configuration. Live images are different from Debian Installer images in this respect. 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 internal #{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.
+When developing a desktop live image, the image typically boots directly to a working desktop, the choices of both desktop and default language having been made at build time, not at run time as in the case of the Debian Installer. That's not to say that a live image couldn't be built to support multiple desktops or multiple languages and offer the user a choice, but that is not live-build's default behaviour.
-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:
+Because there is no provision made automatically for language tasks, which include such things as language-specific fonts and input-method packages, if you want them, you need to specify them in your configuration. For example, a GNOME desktop image containing support for Japanese might include these tasks:
code{
- $ lb config --tasks "japanese japanese-desktop japanese-gnome-desktop"
+ $ lb config
+ $ echo "gnome-desktop desktop standard laptop" >> config/task-lists/my.list.chroot
+ $ echo "japanese japanese-desktop japanese-gnome-desktop" >> config/task-lists/my.list.chroot
}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-lists gnome-desktop}#, it is equivalent to specifying #{--packages debian-installer-launcher --packages-lists 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-lists}#, 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.
-
-*{Note:}* There is also an experimental #{--language}# option that has an overlapping purpose with language tasks. For any language for which it is known that there are #{*-l10n}# packages, if #{--language}# is specified, those packages will be installed. Furthermore, if any #{syslinux}# templates matching the language are found, they will be used instead of the default English templates. The package selection done by #{--language}# is a poor approximation of language tasks, as it requires that the list of packages to include per language be maintained internally in live-build, and besides, language tasks are more comprehensive and flexible. However, the #{syslinux}# aspect is still useful. Thus, if you use #{--bootloader syslinux}# and templates for the specified language exist either in #{/usr/share/live/build/templates/syslinux/}# or #{config/templates/syslinux/}#, consider using this option, possibly in combination with tasks to ensure all relevant packages are installed
. For example:
+Since desktop tasks are "internal" tasks, for every desktop flavour task included in the image, the corresponding value, if it differs from the default, "gnome", must be preseeded in the "tasksel/desktop" debconf variable or else tasksel will not recognize and install it. Thus:
code{
- $ lb config --language es
+ $ lb config
+ $ echo 'tasksel tasksel/desktop multiselect kde' >> config/preseed/my.preseed.chroot
}code
-Even so, it is limited in that it only supports a single language and a single bootloader. Therefore, for all of these reasons, the future of this option is under review, possibly to be replaced with something entirely different in the next major release of live-build.
+This parameter can take multiple values, e.g. "lxde xfce" instead of "kde".
2~installing-modified-or-third-party-packages Installing modified or third-party packages
@@ -239,29 +224,29 @@ This section does not cover advice regarding building or maintaining modified pa
There are two ways of installing modified custom packages:
-_* #{chroot_local-packages}#
+_* #{packages.chroot}#
_* Using a custom APT repository
-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.
+Using #{packages.chroot}# 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
+3~ Using #{packages.chroot}# 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/packages.chroot/}# 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:
+Using #{packages.chroot}# for installation of custom packages has disadvantages:
_* 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/packages.chroot/}# directory.
_* 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 {Choosing packages to install}#choosing-packages-to-install for details.
+Unlike using #{packages.chroot}#, 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.
@@ -273,7 +258,7 @@ Because of this, you may wish to increment the version number in your custom pac
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.
+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/includes.chroot/}#.) 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
@@ -301,7 +286,7 @@ If you don't want to include APT indices in the image, you can omit those with:
code{
- $ lb config --binary-indices false
+ $ lb config --apt-indices false
}code
@@ -323,14 +308,14 @@ If there is not an #{lb config}# option to alter APT's behaviour in the way you
3~apt-pinning APT pinning
-For background, please first read the #{apt_preferences(5)}# man page. APT pinning can be configured either for build time, or else for run time. For the former, create #{config/chroot_apt/preferences}#. For the latter, create #{config/chroot_local-includes/etc/apt/preferences}#.
+For background, please first read the #{apt_preferences(5)}# man page. APT pinning can be configured either for build time, or else for run time. For the former, create #{config/chroot_apt/preferences}#. For the latter, create #{config/includes.chroot/etc/apt/preferences}#.
-Let's say you are building a Squeeze live system but need all the live packages that end up in the binary image to be installed from Sid at build time. You need to add Sid to your APT sources and pin it so that only the packages you want are installed from it at build time and all others are taken from the target system distribution, Squeeze. The following will accomplish this:
+Let's say you are building a Wheezy live system but need all the live packages that end up in the binary image to be installed from Sid at build time. You need to add Sid to your APT sources and pin it so that only the packages you want are installed from it at build time and all others are taken from the target system distribution, Wheezy. The following will accomplish this:
code{
- $ echo "deb http://mirror/debian sid main" > config/chroot_sources/sid.chroot
- $ cat >>config/chroot_apt/preferences <<END
+ $ echo "deb http://mirror/debian sid main" > config/archives/sid.list.chroot
+ $ cat >> config/chroot_apt/preferences <<END
Package: live-boot live-boot-initramfs-tools live-config live-config-sysvinit
Pin: release n=sid
Pin-Priority: 600
@@ -350,7 +335,7 @@ $ lb config --distribution wheezy
}code
-Negative pin priorities will prevent a package from being installed, as in the case where you do not want a package that is recommended by another package. Suppose you are building an LXDE image using #{--packages-lists lxde}# option, but don't want the user prompted to store wifi passwords in the keyring. This list includes #{gdm}#, which depends on #{gksu}#, which in turn recommends #{gnome-keyring}#. So you want to omit the recommended #{gnome-keyring}# package. This can be done by adding the following stanza to #{config/chroot_apt/preferences}#:
+Negative pin priorities will prevent a package from being installed, as in the case where you do not want a package that is recommended by another package. Suppose you are building an LXDE image using #{--package-lists lxde}# option, but don't want the user prompted to store wifi passwords in the keyring. This list includes #{gdm}#, which depends on #{gksu}#, which in turn recommends #{gnome-keyring}#. So you want to omit the recommended #{gnome-keyring}# package. This can be done by adding the following stanza to #{config/chroot_apt/preferences}#:
code{
diff --git a/manual/en/user_customization-runtime.ssi b/manual/en/user_customization-runtime.ssi
index b425ace..7daaa77 100644
--- a/manual/en/user_customization-runtime.ssi
+++ b/manual/en/user_customization-runtime.ssi
@@ -8,11 +8,14 @@ All configuration that is done during run time is done by live-config. Here are
One important consideration is that the live user is created by live-boot at boot time, not by live-build at build time. This not only influences where materials relating to the live user are introduced in your build, as discussed in {Live/chroot local includes}#live-chroot-local-includes, but also any groups and permissions associated with the live user.
-You can specify additional groups that the live user will belong to by preseeding the #{passwd/user-default-groups}# debconf value. For example, to add the live user to the #{fuse}# group, add the following to a file in the #{config/chroot_local-preseed}# directory:
+You can specify additional groups that the live user will belong to by preseeding the #{passwd/user-default-groups}# debconf value. For example, to add the live user to the #{fuse}# group, add the following preseed under #{config/preseed/}# for the chroot stage:
code{
- user-setup passwd/user-default-groups string audio cdrom dip floppy video plugdev netdev powerdev scanner bluetooth fuse
+ $ lb config
+ $ echo user-setup passwd/user-default-groups string audio cdrom \
+ dip floppy video plugdev netdev powerdev scanner bluetooth fuse \
+ >> config/preseed/my.preseed.chroot
}code
@@ -26,7 +29,7 @@ $ lb config --bootappend-live "username=live-user"
}code
-One possible way of changing the default password is by means of a hook as described in {Boot-time hooks}#boot-time-hooks. In order to do that you can use the "passwd" hook from #{/usr/share/doc/live-config/examples/hooks}#, prefix it accordingly (e.g. 200-passwd) and add it to #{config/chroot_local-includes/lib/live/config/}#
+One possible way of changing the default password is by means of a hook as described in {Boot-time hooks}#boot-time-hooks. In order to do that you can use the "passwd" hook from #{/usr/share/doc/live-config/examples/hooks}#, prefix it accordingly (e.g. 200-passwd) and add it to #{config/includes.chroot/lib/live/config/}#
2~customizing-locale-and-language Customizing locale and language
diff --git a/manual/en/user_examples.ssi b/manual/en/user_examples.ssi
index 74aac53..d3ac9e4 100644
--- a/manual/en/user_examples.ssi
+++ b/manual/en/user_examples.ssi
@@ -8,13 +8,13 @@ This chapter covers example builds for specific use cases with Debian Live. If y
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:
+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_PARENT_MIRROR_*}# variables to your preferred mirror. All other mirrors used in the build will be defaulted from these values. For example:
code{
- LB_MIRROR_BOOTSTRAP="http://mirror/debian"
- LB_MIRROR_CHROOT="http://mirror/debian"
- LB_MIRROR_CHROOT_SECURITY="http://mirror/debian-security"
+ LB_PARENT_MIRROR_BOOTSTRAP="http://mirror/debian"
+ LB_PARENT_MIRROR_CHROOT_SECURITY="http://mirror/debian-security"
+ LB_PARENT_MIRROR_CHROOT_BACKPORTS="http://mirror/debian-updates"
}code
@@ -52,11 +52,14 @@ In this tutorial, we will create an image suitable for use as a web browser util
code{
- $ mkdir tutorial2 ; cd tutorial2 ; lb config -p lxde --packages iceweasel
+ $ mkdir tutorial2
+ $ cd tutorial2
+ $ lb config -p lxde
+ $ echo iceweasel >> config/package-lists/my.list.chroot
}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.
+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/includes.chroot/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:
@@ -92,14 +95,21 @@ code{
lb config noauto \
--architecture i386 \
- --linux-flavours 686 \
- --packages-lists lxde \
- --packages "iceweasel xchat" \
+ --linux-flavours 686-pae \
+ --package-lists lxde \
"${@}"
}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 populate your local package list:
+
+code{
+
+ $ echo "iceweasel xchat" >> config/package-lists/my.list.chroot
+
+}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-pae}# 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:
@@ -133,18 +143,11 @@ code{
}code
-Now edit #{auto/config}# to add the #{vlc}# package:
+Now append the #{vlc}# package to our local package list in #{config/package-lists/my.list.chroot}#:
code{
- #!/bin/sh
-
- lb config noauto \
- --architecture i386 \
- --linux-flavours 686 \
- --packages-lists lxde \
- --packages "iceweasel xchat vlc" \
- "${@}"
+ $ echo vlc >> config/package-lists/my.list.chroot
}code
@@ -172,15 +175,15 @@ We've come to the end of our tutorial series. While many more kinds of customiza
*{Use case:}* Create an image with live-build to boot directly to a VNC server.
-Make a build directory and create a skeletal configuration in it built around the standard-x11 list, including #{gdm3}#, #{metacity}# and #{xtightvncviewer}#, disabling recommends to make a minimal system:
+Make a build directory and create a skeletal configuration in it built around the standard-x11 list, including #{gdm3}#, #{metacity}# and #{xvnc4viewer}#, disabling recommends to make a minimal system:
code{
$ mkdir vnc_kiosk_client
$ cd vnc_kiosk_client
- $ lb config -a i386 -k 686 -p standard-x11 \
- --packages "gdm3 metacity xvnc4viewer" \
+ $ lb config -a i386 -k 686-pae -p standard-x11 \
--apt-recommends false
+ $ echo "gdm3 metacity xvnc4viewer" >> config/package-lists/my.list.chroot
}code
@@ -188,8 +191,8 @@ Create the directory #{/etc/skel}# and put a custom #{.xsession}# in it for the
code{
- $ mkdir -p config/chroot_local-includes/etc/skel
- $ cat >config/chroot_local-includes/etc/skel/.xsession <<END
+ $ mkdir -p config/includes.chroot/etc/skel
+ $ cat > config/includes.chroot/etc/skel/.xsession <<END
#!/bin/sh
/usr/bin/metacity &
@@ -218,7 +221,7 @@ When optimizing an image to fit a certain media size, you need to understand the
code{
- $ lb config -k 486 -p minimal --binary-indices false \
+ $ lb config -k 486 -p minimal --apt-indices false \
--memtest none --apt-recommends false --includes none
}code
@@ -233,7 +236,7 @@ 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.
+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-pae"}#. Leaving off APT's indices with #{--apt-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.
2~ A localized KDE desktop and installer
@@ -241,7 +244,7 @@ The biggest space-saver here, compared to building a standard image on an #{i386
We want to make an iso-hybrid image for i386 architecture using our preferred desktop, in this case KDE, containing all of the same packages that would be installed by the standard Debian installer for KDE.
-Our initial problem is the discovery of the names of the appropriate tasks. Currently, live-build cannot help with this. While we might get lucky and find this by trial-and-error, there is a tool, #{grep-dctrl}#, which can be used to dig it out of the task descriptions in tasksel-data, so to prepare, make sure you have both of those things:
+Our initial problem is the discovery of the names of the appropriate language tasks. Currently, live-build cannot help with this. While we might get lucky and find this by trial-and-error, there is a tool, #{grep-dctrl}#, which can be used to dig it out of the task descriptions in tasksel-data, so to prepare, make sure you have both of those things:
code{
@@ -253,12 +256,8 @@ Now we can search for the appropriate tasks, first with:
code{
- $ grep-dctrl -FTest-lang pt_BR /usr/share/tasksel/debian-tasks.desc -sTask,Description
+ $ grep-dctrl -FTest-lang pt_BR /usr/share/tasksel/descs/debian-tasks.desc -sTask
Task: brazilian-portuguese
- Description: Brazilian Portuguese environment
- This task installs programs, data files, and
- documentation that make it easier for Brazilian Portuguese speakers
- to use Debian.
}code
@@ -266,18 +265,13 @@ By this command, we discover the task is called, plainly enough, brazilian-portu
code{
- $ grep-dctrl -FEnhances brazilian-portuguese /usr/share/tasksel/debian-tasks.desc -sTask,Description
+ $ grep-dctrl -FEnhances brazilian-portuguese /usr/share/tasksel/descs/debian-tasks.desc -sTask
Task: brazilian-portuguese-desktop
- Description: Brazilian Portuguese desktop
- This task localises the desktop in Brasilian Portuguese.
-
Task: brazilian-portuguese-kde-desktop
- Description: Brazilian Portuguese KDE desktop
- This task localises the KDE desktop in Brazilian Portuguese.
}code
-We will use the experimental #{--language}# option, as live-build happens to include #{syslinux}# templates for pt_BR (see {Desktop and language tasks}#desktop-and-language-tasks for details). And at boot time we will generate the pt_BR.UTF-8 locale and select the pt-latin1 keyboard layout. Now let's put the pieces together:
+At boot time we will generate the pt_BR.UTF-8 locale and select the pt-latin1 keyboard layout. We will also need to preseed our desktop choice, "kde" so that tasksel will install the correct desktop task, as it differs from the default (see {Desktop and languages tasks}#desktop-and-language-tasks). Now let's put the pieces together:
code{
@@ -286,12 +280,12 @@ code{
$ lb config \
-a i386 \
-k 486 \
- -p kde-desktop \
- --language pt_BR \
- --tasks "brazilian-portuguese brazilian-portuguese-desktop brazilian-portuguese-kde-desktop" \
--bootappend-live "locales=pt_BR.UTF-8 keyboard-layouts=pt-latin1" \
- --debian-installer live \
- --packages debian-installer-launcher
+ --debian-installer live
+ $ echo kde-desktop brazilian-portuguese brazilian-portuguese-desktop \
+ brazilian-portuguese-kde-desktop >> config/task-lists/my.list.chroot
+ $ echo debian-installer-launcher >> config/package-lists/my.list.chroot
+ $ echo tasksel tasksel/desktop multiselect kde >> config/preseed/my.preseed.chroot
}code
diff --git a/manual/en/user_installation.ssi b/manual/en/user_installation.ssi
index 4da3fd6..fd1f93f 100644
--- a/manual/en/user_installation.ssi
+++ b/manual/en/user_installation.ssi
@@ -98,7 +98,7 @@ If you do not wish to build or install live-build from source, you can use snaps
2~ live-boot and live-config
-*{Note:}* You do not need to install live-boot or live-config on your system to create customized Debian Live systems. However, doing so will do no harm and is useful for reference purposes.
+*{Note:}* You do not need to install live-boot or live-config on your system to create customized Debian Live systems. However, doing so will do no harm and is useful for reference purposes. If you only want the documentation, you may now install the live-boot-doc and live-config-doc packages separately.
3~ From the Debian repository
@@ -121,9 +121,9 @@ Consult the live-boot and live-config man pages for details on customizing if th
_* Build live-boot and live-config .deb files
-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 must build either on your target distribution or in a chroot containing your target platform: this means if your target is Wheezy then you should build against Wheezy.
-Use a personal builder such as /{pbuilder}/ or /{sbuild}/ if you need to build #{live-boot}# for a target distribution that differs from your build system. For example, for Squeeze live images, build #{live-boot}# in a Squeeze chroot. If your target distribution happens to match your build system distribution, you may build directly on the build system using #{dpkg-buildpackage}# (provided by the /{dpkg-dev}/ package):
+Use a personal builder such as /{pbuilder}/ or /{sbuild}/ if you need to build #{live-boot}# for a target distribution that differs from your build system. For example, for Wheezy live images, build #{live-boot}# in a Wheezy chroot. If your target distribution happens to match your build system distribution, you may build directly on the build system using #{dpkg-buildpackage}# (provided by the /{dpkg-dev}/ package):
code{
@@ -140,10 +140,10 @@ As live-boot and live-config are installed by live-build system, installing the
3~ From 'snapshots'
-You can let live-build automatically use the latest snapshots of live-boot and live-config by configuring a third-party repository in your live-build configuration directory. Assuming you have already created a configuration tree with #{lb config}#:
+You can let live-build automatically use the latest snapshots of live-boot and live-config by configuring a third-party repository in your live-build configuration directory. Assuming you have already created a configuration tree in the current directory with #{lb config}#:
code{
- $ lb config --repository live.debian.net
+ $ lb config --archives live.debian.net
}code
diff --git a/manual/en/user_managing_a_configuration.ssi b/manual/en/user_managing_a_configuration.ssi
index 03506e1..5047b97 100644
--- a/manual/en/user_managing_a_configuration.ssi
+++ b/manual/en/user_managing_a_configuration.ssi
@@ -24,7 +24,7 @@ code{
#!/bin/sh
lb config noauto \
- --packages-lists "standard" \
+ --package-lists "standard" \
"${@}"
}code
@@ -58,4 +58,4 @@ code{
}code
-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.
+Edit #{auto/config}#, changing or adding any options as you see fit. In the example above, #{--package-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/user_overview.ssi b/manual/en/user_overview.ssi
index bed30d6..9dd5a31 100644
--- a/manual/en/user_overview.ssi
+++ b/manual/en/user_overview.ssi
@@ -30,49 +30,17 @@ _* *{lb clean}*: Responsible for removing parts of a Live system build. See {The
As discussed in {live-build}#live-build, the scripts that make up live-build read their configuration with the #{source}# command from a single directory named #{config/}#. As constructing this directory by hand would be time-consuming and error-prone, the #{lb config}# command can be used to create skeleton configuration folders.
-Issuing #{lb config}# without any arguments creates a #{config/}# subdirectory which it populates with some default settings:
+Issuing #{lb config}# without any arguments creates a #{config/}# subdirectory which it populates with some default settings, and a skeleton #{auto/}# subdirectory tree.
code{
$ lb config
+ P: Considering defaults defined in /etc/live/build.conf
P: Creating config tree
- $ ls -l
- total 8
- drwxr-xr-x 3 user user 4096 Sep 7 13:02 auto
- drwxr-xr-x 22 user user 4096 Sep 7 13:02 config
-
- $ ls -l config/
- total 104
- -rw-r--r-- 1 user user 4197 Sep 7 13:02 binary
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_debian-installer
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_debian-installer-includes
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_grub
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-debs
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-hooks
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-includes
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-packageslists
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-udebs
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_rootfs
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_syslinux
- -rw-r--r-- 1 user user 2051 Sep 7 13:02 bootstrap
- -rw-r--r-- 1 user user 1647 Sep 7 13:02 chroot
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_apt
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-hooks
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-includes
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-packages
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-packageslists
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-patches
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-preseed
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_sources
- -rw-r--r-- 1 user user 2954 Sep 7 13:02 common
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 includes
- -rw-r--r-- 1 user user 205 Sep 7 13:02 source
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 templates
-
}code
-Using #{lb config}# without any arguments would be suitable for users who need a very basic image, or who intend to later provide a more complete configuration via auto/config (see {Managing a configuration}#managing-a-configuration for details).
+Using #{lb config}# without any arguments would be suitable for users who need a very basic image, or who intend to later provide a more complete configuration via #{auto/config}# (see {Managing a configuration}#managing-a-configuration for details).
Normally, you will want to specify some options. For example, to include the 'gnome' package list in your configuration:
@@ -94,7 +62,7 @@ A full list of options is available in the #{lb_config}# man page.
3~lb-build The #{lb build}# command
-The #{lb build}# command reads in your configuration from the config/ directory. It then runs the lower level commands needed to build your Live system.
+The #{lb build}# command reads in your configuration from the #{config/}# directory. It then runs the lower level commands needed to build your Live system.
3~lb-clean The #{lb clean}# command
@@ -104,7 +72,7 @@ It is the job of the #{lb clean}# command to remove various parts of a build so
live-boot is a collection of scripts providing hooks for the initramfs-tools, used to generate an initramfs capable of booting live systems, such as those created by live-build. This includes the Debian Live ISOs, netboot tarballs, and USB stick images.
-At boot time it will look for read-only media containing a "/live" directory where a root filesystem (often a compressed filesystem image like squashfs) is stored. If found, it will create a writable environment, using aufs, for Debian like systems to boot from.
+At boot time it will look for read-only media containing a #{/live/}# directory where a root filesystem (often a compressed filesystem image like squashfs) is stored. If found, it will create a writable environment, using aufs, for Debian like systems to boot from.
More information on initial ramfs in Debian can be found in the Debian Linux Kernel Handbook at http://kernel-handbook.alioth.debian.org/ in the chapter on initramfs.
diff --git a/manual/es/index.html.in b/manual/es/index.html.in
index ccc51a1..ffc31ff 100644
--- a/manual/es/index.html.in
+++ b/manual/es/index.html.in
@@ -9,8 +9,15 @@
<h2>Manual de Debian Live</h2>
<p>
+ <i>live-manual</i> se encuentra disponible en diferentes formatos y está
+traducido a varios idiomas. Pero hay que tener en cuenta que algunas
+traducciones pueden estar incompletas o sin actualizar.
+ </p>
+
+ <p>
+
Por favor, leer previamente <a
-href="html/about-manual.html#how-to-contribute">como contribuir</a> para
+href="html/about-manual.es.html#how-to-contribute">como contribuir</a> para
conocer como reportar errores, omisiones, parches y sugerencias a este
manual, utilizando la lista de correos <a
href="mailto:debian-live at lists.debian.org">debian-live at lists.debian.org</a>.
@@ -19,15 +26,16 @@ href="mailto:debian-live at lists.debian.org">debian-live at lists.debian.org</a>.
<h3>Formatos Disponibles</h3>
<ul>
- <li><a href="epub/live-manual.epub">EPUB</a></li>
- <li>HTML: <a href="html/index.html">una página por capítulo</a>, <a
-href="html/live-manual.html">todo el manual en una página</a></li>
- <li><a href="odf/live-manual.odt">ODF</a></li>
- <li>PDF: <a href="pdf/live-manual.portrait-a4.pdf">A4 vertical</a>, <a
-href="pdf/live-manual.landscape-a4.pdf">A4 apaisado</a>, <a
-href="pdf/live-manual.portrait-letter.pdf">Carta (letter) vertical</a>, <a
-href="pdf/live-manual.landscape-letter.pdf">Carta (letter) apaisado</a></li>
- <li><a href="txt/live-manual.txt">Texto sin formato</a></li>
+ <li><a href="epub/live-manual.es.epub">EPUB</a></li>
+ <li>HTML: <a href="html/index.es.html">una página por capítulo</a>, <a
+href="html/live-manual.es.html">todo el manual en una página</a></li>
+ <li><a href="odf/live-manual.es.odt">ODF</a></li>
+ <li>PDF: <a href="pdf/live-manual.portrait-a4.es.pdf">A4 vertical</a>, <a
+href="pdf/live-manual.landscape-a4.es.pdf">A4 apaisado</a>, <a
+href="pdf/live-manual.portrait-letter.es.pdf">Carta (letter) vertical</a>,
+<a href="pdf/live-manual.landscape-letter.es.pdf">Carta (letter)
+apaisado</a></li>
+ <li><a href="txt/live-manual.es.txt">Texto sin formato</a></li>
</ul>
<p>
diff --git a/manual/es/live-manual.ssm b/manual/es/live-manual.ssm
index de7ee9f..a87d382 100644
--- a/manual/es/live-manual.ssm
+++ b/manual/es/live-manual.ssm
@@ -9,7 +9,7 @@
:license: Este programa es software libre: puede ser redistribuido y / o modificado bajo los términos de la GNU General Public License publicada por la Free Software Foundation, bien de la versión 3 de la Licencia, o (a su elección) cualquier versión posterior. <br><br> Este programa se distribuye con la esperanza de que sea útil, pero SIN NINGUNA GARANTÍA, incluso sin la garantía implícita de COMERCIALIZACIÓN o IDONEIDAD PARA UN PROPÓSITO PARTICULAR. Consulte la GNU General Public License para más detalles. <br><br> Debería haber recibido una copia de la General Public License GNU junto con este programa. Si no, vea http://www.gnu.org/licenses/. <br><br> El texto completo de la GNU Licencia Pública General se pueden encontrar en /usr/share/common-licenses/GPL-3
@date:
- :published: 2011-09-30
+ :published: 2011-12-04
@publisher: Debian Live Project <debian-live at lists.debian.org>
diff --git a/manual/es/user_basics.ssi b/manual/es/user_basics.ssi
index 1a91561..072ff4c 100644
--- a/manual/es/user_basics.ssi
+++ b/manual/es/user_basics.ssi
@@ -248,7 +248,7 @@ contrario, la resolución se limita a 800x600
code{
- $ lb config --packages virtualbox-ose-guest-x11
+ $ echo virtualbox-ose-guest-x11 >> config/package-lists/my.list.chroot
}code
diff --git a/manual/es/user_customization-contents.ssi b/manual/es/user_customization-contents.ssi
index 12aedef..5d75a2f 100644
--- a/manual/es/user_customization-contents.ssi
+++ b/manual/es/user_customization-contents.ssi
@@ -53,15 +53,15 @@ ficheros ver la sección {Scripts gancho locales en
Live/chroot}#live-chroot-local-hooks
Para incluir ficheros solamente hace falta añadirlos al directorio de
-configuración #{config/chroot_local-includes}#. Habrá una relación directa
-entre este directorio y el directorio raiz (#{/}#) del sistema en vivo. Por
+configuración #{config/includes.chroot}#. Habrá una relación directa entre
+este directorio y el directorio raiz (#{/}#) del sistema en vivo. Por
ejemplo, si se desea añadir un fichero para que sea el fichero
#{/var/www/index.html}# del sistema en vivo se puede hacer lo siguiente:
code{
-$ mkdir -p config/chroot_local-includes/var/www
-$ cp /donde/esté/el/fichero/original/index.html config/chroot_local-includes/var/www
+ $ mkdir -p config/includes.chroot/var/www
+ $ cp /path/to/my/index.html config/includes.chroot/var/www
}code
@@ -71,7 +71,7 @@ code{
-- config
[...]
- |-- chroot_local-includes
+ |-- includes.chroot
| `-- var
| `-- www
| `-- index.html
@@ -92,14 +92,15 @@ imagen de manera que sea accesible nada más insertar el medio sin necesidad
de arrancar el sistema en vivo. Para esto se utilizan los includes locales
en Binary. Funciona de manera similar a los includes locales en chroot
comentados anteriormente. Por ejemplo, supongamos que en el medio de
-instalación se desea añadir unos ficheros con videos de demostración sobre
-el funcionamiento del sistema en vivo de manera que el usuario pueda acceder
-a ellos a través de la página de indice HTML. Simplemente se debe copiar el
-material en #{config/binary_local-includes/}# de la siguiente manera:
+instalación se desea añadir unos ficheros con videos de demostración
+#{~/video_demo.*}# sobre el funcionamiento del sistema en vivo de manera que
+el usuario pueda acceder a ellos a través de la página de indice
+HTML. Simplemente se debe copiar el material en #{config/includes.binary/}#
+de la siguiente manera:
code{
- $ cp ~/video_demo.* config/binary_local-includes/
+ $ cp ~/video_demo.* config/includes.binary/
}code
@@ -130,24 +131,24 @@ las etapas chroot y binary.
3~live-chroot-local-hooks Scripts gancho locales en Live/chroot
-Para ejecutar órdenes en la etapa chroot se deben crear scripts gancho que
-contengan dichas ordenes a ejecutar y depositarlos en el directorio
-#{config/chroot_local-hooks}#. Estos scripts serán ejecutados en el entorno
-del chroot después de que el resto de las tareas de preparación del chroot
-han sido realizadas. Se debe asegurar que previamente se han instalado en el
-entorno chroot cualquier paquete, fichero u órden que necesiten los scripts
-gancho. El paquete live-build instala en el directorio
+Para ejecutar órdenes en la etapa chroot se deben crear scripts gancho
+(hooks) con el sufijo #{.chroot}# que contengan dichas ordenes a ejecutar y
+depositarlos en el directorio #{config/hooks/}#. Estos scripts serán
+ejecutados en el entorno del chroot después de que el resto de las tareas de
+preparación del chroot han sido realizadas. Se debe asegurar que previamente
+se han instalado en el entorno chroot cualquier paquete, fichero u órden que
+necesiten los scripts gancho. El paquete live-build instala en el directorio
#{/usr/share/live/build/examples/hooks}# del sistema huésped unos cuantos
scripts gancho para realizar tareas habituales de personalización del
entorno chroot que pueden ser copiados o referenciados mediante enlace
-simbólico en el directorio de configuración #{config/chroot_local-hooks}#.
+simbólico en la propia configuración.
3~boot-time-hooks Scripts gancho en tiempo de arranque
Para ejecutar ordenes en el arranque del sistema en vivo, se puede
suministrar scripts gancho a live-config depositándolos en el directorio
-#{config/chroot_local-includes/lib/live/config/}#, tal y como se explica en
-la sección de "Personalización" de la página de manual de live-config. Es
+#{config/includes.chroot/lib/live/config/}#, tal y como se explica en la
+sección de "Personalización" de la página de manual de live-config. Es
interesante examinar los scripts gancho que trae de serie live-config que
pueden verse en #{/lib/live/config/}# y fijarse en la secuencia de
números. Cuando se vaya a utilizar scripts propios deben ser prefijados con
@@ -158,9 +159,9 @@ modificados}#installing-modified-or-third-party-packages.
3~ Scripts gancho locales en Binary
-Para ejecutar comandos en la etapa Binary se deben crear scripts gancho que
-contengan las ordenes y depositarlos en el directorio
-#{config/binary_local-hooks}#. Los scripts gancho se ejecutarán después de
+Para ejecutar comandos en la etapa Binary se deben crear scripts gancho con
+el sufijo #{.binary}# que contengan las ordenes y depositarlos en el
+directorio #{config/hooks/}#. Los scripts gancho se ejecutarán después de
finalizar el resto de procesos de la etapa pero antes de crear los checksum
con binary_checksum que es el último proceso que se ejecuta en esta
etapa. Los scripts gancho no se ejecutan en el entorno del chroot, así que
@@ -168,14 +169,15 @@ hay que tener cuidado de no modificar cualquier fichero fuera del árbol de
creación, o se dañará el sistema de creación. En
#{/usr/share/live/build/examples/hooks}# se pueden ver varios ejemplos de
scripts gancho genéricos que permiten tareas de personalización para la
-etapa Binary. Estos scripts pueden ser utilizados copiandolos o creando
-enlaces simbólicos en #{config/binary_local-hooks}#.
+etapa Binary. Estos scripts pueden ser utilizados en la propia configuración
+copiándolos o creando enlaces simbólicos.
2~ Preconfiguración de las preguntas de Debconf
-Los ficheros del directorio #{config/chroot_local-preseed}# son ficheros de
+Los ficheros del directorio #{config/preseed/}# con el sufijo #{.preseed}#
+seguido por la etapa (#{.chroot}# o #{.binary}#) son ficheros de
preconfiguración para debconf. live-build instalará estos ficheros mediante
-#{debconf-set-selections}#.
+#{debconf-set-selections}# durante la etapa correspondiente.
Ver debconf(7) en el paquete #{debconf}# para obtener más información acerca
de debconf.
diff --git a/manual/es/user_customization-installer.ssi b/manual/es/user_customization-installer.ssi
index ab5b459..104741b 100644
--- a/manual/es/user_customization-installer.ssi
+++ b/manual/es/user_customization-installer.ssi
@@ -56,7 +56,8 @@ kernel que utiliza #{d-i}# en la arquitectura especificada. Por ejemplo:
code{
$ lb config --architecture i386 --linux-flavours 486 \
- --debian-installer live --packages debian-installer-launcher
+ --debian-installer live
+ $ echo debian-installer-launcher >> config/package-lists/my.list.chroot
}code
@@ -83,12 +84,12 @@ code{
2~ Personalizar el contenido del Instalador de Debian
-Es posible que, con propósitos experimentales o para depuración, se desee
-incluir paquetes udeb creados localmente. Estos paquetes udeb son
-componentes del Instalador de Debian que definen su comportamiento. Para
-incluirlos en la imagen, basta con depositarlos en el directorio de
-configuración #{config/binary_local-udebs/}#. También pueden incluirse o
-reemplazarse ficheros y directorios en el initrd del instalador de una
-manera similar a la que se describe en {Includes locales en
+Es posible que, con propósitos experimentales o para depuración de errores,
+se desee incluir paquetes udeb creados localmente para el #{d-i}#. Estos
+paquetes udeb son componentes del Instalador de Debian que definen su
+comportamiento. Para incluirlos en la imagen, basta con depositarlos en el
+directorio de configuración #{config/packages.binary/}#. También pueden
+incluirse o reemplazarse ficheros y directorios en el initrd del instalador
+de una manera similar a la que se describe en {Includes locales en
Live/chroot}#live-chroot-local-includes, depositando el material en el
directorio #{config/binary_debian-installer-includes/}#.
diff --git a/manual/es/user_customization-packages.ssi b/manual/es/user_customization-packages.ssi
index f35c435..d3947a4 100644
--- a/manual/es/user_customization-packages.ssi
+++ b/manual/es/user_customization-packages.ssi
@@ -29,7 +29,7 @@ nombrar algunas posibilidades.
La distribución seleccionada tiene gran impacto en qué paquetes están
disponibles para incluir en la imagen. Se debe indicar el nombre en clave de
-la distribución, que por defecto es #{squeeze}# para la versión Squeeze de
+la distribución, que por defecto es #{wheezy}# para la versión Wheezy de
live-build. Se puede especificar cualquier nombre de distribución disponible
en los repositorios Debian indicando su nombre en clave. (Para más detalles
ver {Términos}#terms). La opción #{--distribution}# no solamente influencia
@@ -72,52 +72,55 @@ modificará su comportamiento para adecuarlo al modo seleccionado.
Los repositorios de Debian están replicados en una gran red alrededor del
mundo, de manera que se puede seleccionar la réplica más cercana con el fin
de obtener la mejor velocidad de descarga. Cada una de las opciones
-#{--mirror-*}# gobierna qué réplica de repositorio Debian se utiliza en las
-diferentes etapas de creación. Si se recuerda de {Etapas de la
+#{--parent-mirror-*}# gobierna qué réplica de repositorio Debian se utiliza
+en las diferentes etapas de creación. Si se recuerda de {Etapas de la
creación}#stages-of-the-build, en la etapa de *preinstalación (bootstrap)*
es cuando se crea el directorio chroot y se rellena con un sistema mínimo
mediante la herramienta debootstrap, y en la etapa *chroot* es cuando el
directorio chroot es completado con los paquetes necesarios para crear el
sistema de ficheros que será utilizado en el sistema en vivo. A cada una de
-estas etapas le corresponde su propia opción #{--mirror-*}#. Posteriormente,
-en la etapa *binary* se utilizarán las réplicas Debian indicadas en los
-valores de las opciones #{--mirror-binary}# y #{--mirror-binary-security}#
-en lugar de utilizar los indicados para las etapas anteriores.
+estas etapas le corresponde su propia opción
+#{--parent-mirror-*}#. Posteriormente, en la etapa *binary* se utilizarán
+las réplicas Debian indicadas en los valores de las opciones
+#{--parent-mirror-binary}# y #{--parent-mirror-binary-security}# en lugar de
+utilizar los indicados para las etapas anteriores.
3~distribution-mirrors-build-time Réplicas de Distribution utilizadas
durante la creación
Para indicar qué réplicas deben ser utilizadas en el momento de crear la
-imágen es suficiente con utilizar las opciones #{--mirror-bootstrap}# y
-#{--mirror-chroot-security}# como se muestra a continuación.
+imagen es suficiente con utilizar las opciones #{--parent-mirror-bootstrap}#
+, #{--parent-mirror-chroot-security}# y #{--parent-mirror-chroot-backports}#
+como se muestra a continuación.
code{
- $ lb config --mirror-bootstrap http://localhost/debian/ \
- --mirror-chroot-security http://localhost/debian-security/
+ $ lb config --parent-mirror-bootstrap http://localhost/debian/ \
+ --parent-mirror-chroot-security http://localhost/debian-security/ \
+ --parent-mirror-chroot-backports http://localhost/debian-backports/
}code
-El valor indicado en #{--mirror-chroot}# es utilizado como valor por defecto
-para la opción #{--mirror-bootstrap}# si esta no es indicada.
+El valor indicado en #{--parent-mirror-chroot}# es utilizado como valor por
+defecto para la opción #{--parent-mirror-bootstrap}# si esta no es indicada.
3~ Réplicas de distribución Debian utilizadas en la ejecución.
-Las opciones #{--mirror-binary*}# gobiernan las réplicas configuradas en la
-imagen binaria que serán utilizadas para instalar paquetes adicionales
+Las opciones #{--parent-mirror-binary*}# gobiernan las réplicas configuradas
+en la imagen binaria que serán utilizadas para instalar paquetes adicionales
mientras se ejecuta el sistema en vivo. Por defecto se utiliza
#{cdn.debian.net}#, que es un servicio que selecciona la réplica más cercana
basándose en el número de IP. Es una elección bastante acertada siempre que
no se pueda predecir que réplica será la mejor para todos los
usuarios. También se puede especificar valores personalizados como se
-muestra en el siguiente ejemplo. Una imágen construida con esta
+muestra en el siguiente ejemplo. Una imagen construida con esta
configuración solamente sería accesible a los usuarios de una red donde
"#{mirror}#" fuese alcanzable.
code{
- $ lb config --mirror-binary http://mirror/debian/ \
- --mirror-binary-security http://mirror/debian-security/
+ $ lb config --parent-mirror-binary http://mirror/debian/ \
+ --parent-mirror-binary-security http://mirror/debian-security/
}code
@@ -127,14 +130,14 @@ Se pueden añadir más repositorios, ampliando la lista de paquetes
seleccionables más alla de aquellos disponibles para la distribución
indicada, como pueden ser paquetes de backports, paquetes experimentales o
personalizados. Para configurar repositorios adicionales se debe crear los
-ficheros #{config/chroot_sources/your-repository.chroot}#, y/o
-#{config/chroot_sources/your-repository.binary}#. Al igual que en las
-opciones #{--mirror-*}#, estos ficheros gobiernan los repositorios
+ficheros #{config/archives/your-repository.list.chroot}# y/o
+#{config/archives/your-repository.list.binary}#. Al igual que en las
+opciones #{--parent-mirror-*}#, estos ficheros gobiernan los repositorios
utilizados en las etapas *chroot* y *binary* respectivamente, esto es, los
repositorios que serán utilizados cuando se ejecute el sistema en vivo.
-Por ejemplo, #{config/chroot_sources/live.chroot}# permite instalar paquetes
-de la instantánea del repositorio Debian Live en el momento de crear la
+Por ejemplo, #{config/archives/live.list.chroot}# permite instalar paquetes
+de las instantáneas del repositorio Debian Live en el momento de crear la
imagen.
code{
@@ -143,21 +146,21 @@ code{
}code
-Si se añade la misma línea a #{config/chroot_sources/live.binary}#, el
+Si se añade la misma línea a #{config/archives/live.list.binary}#, el
repositorio será añadido al directorio #{/etc/apt/sources.list.d/}# del
sistema en vivo.
Estos ficheros serán seleccionados automáticamente si existen.
Se debería también incluir en el fichero
-#{config/chroot_sources/your-repository.{binary,chroot}.gpg}# la clave GPG a
+#{config/archives/your-repository.gpg.{binary,chroot}}# la clave GPG a
utilizar para firmar dicho repositorio.
-*{Nota:}* Existen algunos repositorios de paquetes ya preconfigurados para facilitar la selección mediante la opción #{--repository}#. Por ejemplo, para utilizar las instantáneas del repositorio de Debian Live, sería suficiente con activarlo mediante:
+*{Nota:}* Existen algunos repositorios de paquetes ya preconfigurados para facilitar la selección mediante la opción #{--archives}#. Por ejemplo, para utilizar las instantáneas del repositorio de Debian Live, sería suficiente con activarlo mediante:
code{
- $ lb config --repository live.debian.net
+ $ lb config --archives live.debian.net
}code
@@ -165,35 +168,12 @@ code{
Hay varias maneras de seleccionar qué paquetes serán instalados por
live-build en la imagen que cubren una variedad de necesidades diversas. Se
-puede nombrar un paquete individual para que sea instalado o se pueden
-nombrar unos pocos paquetes mediante la opción #{--packages}#, o incluso se
-puede indicar un gran número de paquetes mediante una lista. También se
-puede seleccionar listas de paquetes predefinidos o incluso utilizar tareas
-de APT. Por último, también se pueden utilizar ficheros de paquetes de
-prueba o experimentales obtenidos antes de que aparezcan en los repositorios
-oficiales simplemente depositando estos ficheros directamente en el árbol de
-directorios #{config/}#.
-
-3~ Selección de unos pocos paquetes
-
-Cuando el número de paquetes a añadir es pequeño pueden indicarse mediante
-la opción #{--packages}#. Por ejemplo:
-
-code{
-
- $ lb config --packages "package1 package2 package3"
-
-}code
-
-El comportamiento de live-build cuando se especifica un paquete que no
-existe es determinado por lo que se haya configurado en la utilidad
-APT. Para más detalles ver {Utilizar apt o
-aptitude}#choosing-apt-or-aptitude .
-
-Si se necesita especificar un gran número de paquetes o se necesita cierta
-flexibilidad a la hora de indicar qué paquetes hay que instalar se puede
-utilizar las listas de paquetes tal y como se indica en la sección, {Listas
-de paquetes}#package-lists.
+puede nombrar paquetes individuales para instalar en una lista de
+paquetes. También se puede seleccionar listas de paquetes predefinidos o
+incluso utilizar tareas de APT. Por último, también se pueden utilizar
+ficheros de paquetes de prueba o experimentales obtenidos antes de que
+aparezcan en los repositorios oficiales simplemente depositando estos
+ficheros directamente en el árbol de directorios #{config/}#.
3~package-lists Listas de paquetes
@@ -207,69 +187,58 @@ diferentes entornos de escritorios y algunas listas de propósito especial
basadas en otras listas de propósito general. Puede utilizarse listas
propias o una combinación de listas propias y listas predefinidas.
+*{Nota:}* El comportamiento de live-build cuando se especifica un paquete que no existe es determinado por lo que se haya configurado en la utilidad APT. Para más detalles ver {Utilizar apt o aptitude}#choosing-apt-or-aptitude .
3~ Listas de paquetes predefinidas
La forma más simple de utilizar listas de paquetes es especificar una o más
-listas predefinidas mediante la opción #{--packages-lists}#, por ejemplo:
+listas predefinidas mediante la opción #{--package-lists}#, por ejemplo:
code{
- $ lb config --packages-lists "gnome-core rescue"
+ $ lb config --package-lists "gnome rescue"
}code
-Además de estas listas, live-build soporta cuatro listas de paquetes
-virtuales, #{gnome-desktop}#, #{kde-desktop}#, #{lxde-desktop}# y
-#{xfce-desktop}#, cada una de las cuales provee una selección de paquetes
-extensiva que corresponde con los valores por defecto del Instalador de
-Debian para estos entornos de escritorio. Para más información ver {Tareas
-de Escritorio e Idioma}#desktop-and-language-tasks .
-
-*{Nota:}* Existen imágenes listas para su descarga con los escritorios GNOME, KDE, LXDE y XFCE en http://live.debian.net. Estas imágenes han sido creadas utilizando la lista virtual #{*-desktop}# correspondiente.
-
La ubicación por defecto de las listas de los ficheros en el sistema huésped
-es #{/usr/share/live/build/lists/}#. Para determinar qué paquetes componen
-una lista dada se debe leer el correspondiente fichero poniendo atención en
-los ficheros incluidos y en las secciones condicionales como se describen a
-continuación.
+es #{/usr/share/live/build/package-lists/}#. Para determinar qué paquetes
+componen una lista dada se debe leer el correspondiente fichero poniendo
+atención en los ficheros incluidos y en las secciones condicionales como se
+describen a continuación.
3~ Listas de paquetes locales
Se pueden añadir o reemplazar completamente las listas predefinidas
depositando listas de paquetes locales en el directorio
-#{config/chroot_local-packageslists/}#.
+#{config/package-lists/}#.
-Para que sean procesadas, las listas de paquetes que existan en dicho
-directorio deben tener la extensión #{.list}#. Las listas de paquetes
-locales se superponen a las listas predefinidas por live-build. Esto puede
-causar efectos no deseados de manera que se recomienda utilizar nombres
-únicos para las listas de paquetes locales, que no coincidan con los nombres
-de listas de paquetes predefinidas.
+Para que sean procesadas, las listas de paquetes que se depositen en este
+directorio deben tener la extensión #{.list}# además de la extensión de la
+etapa #{.chroot}# o #{.binary}# para indicar a qué etapa corresponde la
+lista.
-3~ Listas de paquetes locales para binary
+*{Nota:}* Si no se especifica el sufijo, la lista será usada en las dos etapas. En consecuencia, es conveniente especificar #{.list.chroot}# de modo que los paquetes se instalen únicamente en el sistema en vivo y no exista otra copia extra del paquete #{.deb}#
-En caso de que se desee incluir algún paquete .deb en el directorio
-#{pool/}# del medio de instalación sin instalarlo en la imágen del sistema
-en vivo se pueden utilizar las listas de paquetes locales para binary
-depositando dichas listas en el directoro
-#{config/binary_local-packageslists/}#, de manera que el medio de
-instalación pueda ser utilizado como un medio de instalación personalizado
-para instalaciones sin red local (modo offline).
+3~ Listas de paquetes locales para binary
-Para que sean procesadas, las listas de paquetes que se depositen en este
-directorio deben tener la extensión #{.list}#.
+Para crear una lista para la etapa «binary» crear un fichero con el sufijo
+#{.list.binary}# en #{config/package-lists/}#. Estos paquetes no son
+instalados en el sistema en vivo, pero son incluidos en él en #{pool/}#. El
+uso típico de una de estas lista sería para una de las variantes de
+instalador normal («non-live» N.del T.). Tal y como se mencionaba
+anteriormente, si se desea usar la misma lista para la etapa «chroot» basta
+con solamente añadir el sufijo #{.list}#
3~ Extensión de una lista de paquetes dada mediante «includes»
Las listas de paquetes predefinidas en live-build hacen un uso intensivo de
-las directivas «include». Los ficheros existentes en el directorio
-#{/usr/share/live/build/lists/}# pueden servir como buen ejemplo de como
-escribir listas de paquetes.
+las directivas «includes». Los ficheros existentes en el directorio
+#{/usr/share/live/build/package-lists/}# pueden servir como buen ejemplo de
+como escribir listas de paquetes.
Por ejemplo, para hacer una lista de paquetes que incluya la lista de
paquetes predefinida #{gnome}# y añadir el paquete iceweasel se puede crear
-un fichero llamado #{config/chroot_local-packageslists/mygnome.list}# con el
-siguiente contenido:
+un fichero llamado #{config/package-lists/my.list.chroot}# con el siguiente
+contenido:
code{
@@ -344,13 +313,14 @@ El Instalador de Debian ofrece al usuario un conjunto de opciones con una
lista de paquetes preseleccionada enfocadas a configurar un tipo de sistema
o configurar el sistema para realizar una tarea como puede ser «Entorno de
escritorio gráfico», «Servidor de correo», «Portátil», etc. Estas listas son
-llamadas «tareas» y son soportadas por APT mediante el campo «Task:». Se
-puede especificar a live-build que seleccione estas tareas mediante la
-opción #{--task}# tal y como se muestra en el siguiente ejemplo:
+llamadas «tareas» ("Tasks") y son soportadas por APT mediante el campo
+«Task:». Se puede especificar una o más tareas a live-build poniéndolas en
+una lista en #{config/task-lists/}#, como en el ejemplo siguiente.
code{
- $ lb config --tasks "mail-server file-server"
+ $ lb config
+ $ echo "mail-server file-server" >> config/task-lists/my.list.chroot
}code
@@ -362,60 +332,55 @@ obtenerse mediante la orden #{tasksel --task-packages}#.
3~desktop-and-language-tasks Tareas de Escritorio e Idioma
-Las tareas de escritorio y de idioma son casos especiales. Si el medio de
-instalación fue preparado para una clase particular de entorno de
-escritorio, el Instalador de Debian instalará automáticamente la tarea de
-entorno de escritorio correspondiente. Para ello existen las tareas
-#{gnome-desktop}#, #{kde-desktop}#, #{lxde-desktop}# y #{xfce-desktop}# pero
-ninguna de ellas son presentadas en el menú de #{tasksel}#. De igual forma,
-las tareas para idiomas tampoco son presentadas en el menú de #{tasksel}#,
-pero la selección del idioma, al inicio de la instalación repercute en la
-selección de las correspondientes tareas del idioma.
-
-En live-build estos casos especiales también son tratados de manera
-especial, pero en el momento de escribir este manual, hay tres notables
-diferencias.
-
-Primero, no se ha previsto, todavía, la instalación automática de tareas de
-idiomas, aunque se incluye un subconjunto de estos paquetes si se especifica
-un idioma mediante #{lb config --language}#. Se puede especificar en la
-configuración de live-build la utilización de estas tareas, que incluyen
-cosas específicas del idioma, como pueden ser paquetes tipos de letra y
-métodos de introducción. Por ejemplo:
+Las tareas de escritorio y de idioma son casos especiales que necesitan un
+poco de planificación y configuración extra. Si el medio de instalación fue
+preparado para una clase particular de entorno de escritorio, el Instalador
+de Debian instalará automáticamente la tarea de entorno de escritorio
+correspondiente. Para ello existen las tareas internas #{gnome-desktop}#,
+#{kde-desktop}#, #{lxde-desktop}# y #{xfce-desktop}# pero ninguna de ellas
+son presentadas en el menú de #{tasksel}#. De igual forma, las tareas para
+idiomas tampoco son presentadas en el menú de #{tasksel}#, pero la selección
+del idioma, al inicio de la instalación repercute en la selección de las
+correspondientes tareas del idioma.
+
+Cuando se desarolla una imagen de escritorio, la imagen normalmente arranca
+directamente a un escritorio de trabajo, las opciones de escritorio y de
+idioma por defecto han sido elegidas en tiempo de creación, no en tiempo de
+ejecución como en el caso del instalador de Debian. Eso no quiere decir que
+una imagen en vivo no pueda ser creada para admitir múltiples escritorios o
+varios idiomas y ofrecer al usuario una elección, pero ese no es un
+comportamiento por defecto de live-build.
+
+Ya que no se ha previsto la instalación automática de tareas de idiomas, que
+incluyen cosas tales como tipos de letra específicos de cada lengua o
+paquetes de métodos de entrada, si se quiere incluirlos, es necesario
+especificarlo en la configuración. Por ejemplo, una imagen de escritorio
+GNOME que contenga soporte para el japonés podría incluir las siguientes
+tareas:
code{
- $ lb config --tasks "japanese japanese-desktop japanese-gnome-desktop"
+ $ lb config
+ $ echo "gnome-desktop desktop standard laptop" >> config/task-lists/my.list.chroot
+ $ echo "japanese japanese-desktop japanese-gnome-desktop" >> config/task-lists/my.list.chroot
}code
-Segundo, live-build soporta la lista de paquetes virtuales #{*-desktop}#
-para cada clase de escritorio mencionado anteriormente. Esto seleccionará la
-lista de paquetes predefinida #{standard-x11}#, la correspondiente tarea de
-escritorio #{*-desktop}# y tres tareas adicionales #{desktop}#,
-#{standard}# y #{laptop}#. Así, por ejemplo, si se especifica
-#{--packages-lists gnome-desktop}#, será equivalente a especificar
-#{--packages debian-installer-launcher --packages-lists standard-x11 --tasks
-"gnome-desktop desktop standard laptop"}#.
-
-Tercero, si se selecciona cualquier tarea de escritorio, explícitamente a
-través de #{--tasks}# o implícitamente mediante #{--packages-lists}#,
-live-build preconfigurará (preseed) en el Instalador de Debian (si es
-incluido) el escritorio correspondiente para asegurar que sigue sus propias
-reglas cuando sea instalado.
-
-*{Nota:}* Existe también la opción experimental #{--language}# cuyo propósito se solapa con las tareas de idioma. Se instalarán los paquetes de soporte #{*-l10n}# siempre que existan y que se especifique un idioma mediante la opción #{--language}#. Además, si existe, se utilizará, en lugar de las plantillas por defecto en ingles, cualquier plantilla para #{syslinux}# del idioma indicado mediante esta opción. La selección de paquetes realizada mediante la opción #{--language}# es una pobre aproximación a las tareas de idiomas. Las tareas de idiomas son un método más completo y flexible que la utilización de la opción #{--language}# que requiere que la lista de paquetes a incluir por idioma sea mantenida internamente en live-build. Sin embargo el tratamiento de las plantillas de #{syslinux}# es útil. Por esto, si se utiliza la opción #{--bootloader syslinux}# y plantillas para un idioma existente en #{/usr/share/live/build/templates/syslinux/}# o #{config/temp
lates/syslinux/}#, esta opción es un punto a tener en cuenta, posiblemente en combinación con las tareas de idiomas para asegurar la instalación de los paquetes adecuados. Por ejemplo:
+Ya que las tareas de escritorio son "internas", para cada tarea de sabor de
+escritorio incluido en la imagen, el valor correspondiente (si es diferente
+del predeterminado "gnome"), tiene que ser preconfigurado en la variable
+"tasksel/desktop" de lo contrario tasksel no lo va a reconocer e
+instalar. Por lo tanto:
code{
- $ lb config --language es
+ $ lb config
+ $ echo 'tasksel tasksel/desktop multiselect kde' >> config/preseed/my.preseed.chroot
}code
-Esta opción solamente soporta un idioma y un gestor de arranque. Por todas
-estas razones, el futuro de esta opción está bajo revisión y posiblemente
-será reemplazada por algo completamente diferente en la proxima revisión
-general de live-build.
+Este parámetro puede tener varios valores, por ejemplo, "lxde xfce" en lugar
+de "kde".
2~installing-modified-or-third-party-packages Instalar paquetes de terceros
o paquetes modificados
@@ -438,43 +403,43 @@ medida.
Existen dos formas de instalar paquetes personalizados:
-_* #{chroot_local-packages}#
+_* #{packages.chroot}#
_* Utilizando un repositorio APT personalizado
-El método #{chroot_local-packages}# es el más simple para añadir paquetes
+El método #{packages.chroot}# es el más simple para añadir paquetes
personalizados. Es muy útil para personalizaciones «rápidas» (one-off) pero
tiene unos cuantos inconvenientes mientras que la utilización de un
repositorio APT personalizado es más lento de poner en marcha.
-3~ Método #{chroot_local-packages}# para instalar paquetes personalizados
+3~ Método #{packages.chroot}# para instalar paquetes personalizados
Para instalar paquetes personalizados solamente hay que copiar el paquete en
-el directorio #{config/chroot_local-packages/}#. Los paquetes contenidos en
-este directorio serán automáticamente instalados en el sistema en vivo
-durante el proceso de creación. No es necesario especificar de dónde se
-deben obtener los paquetes.
+el directorio #{config/packages.chroot/}#. Los paquetes contenidos en este
+directorio serán automáticamente instalados en el sistema en vivo durante el
+proceso de creación. No es necesario especificar de dónde se deben obtener
+los paquetes.
Los paquetes *{deben}* nombrarse de la forma prescrita. La forma más simple
es usar #{dpkg-name}#.
-El método #{chroot_local-packages}# para la instalación de paquetes
-personalizados tiene desventajas:
+El método #{packages.chroot}# para la instalación de paquetes personalizados
+tiene desventajas:
_* No es posible utilizar APT seguro.
_* Se deben depositar todos los paquetes necesarios para cumplir
-dependencias en el directorio #{config/chroot_local-packages/}#.
+dependencias en el directorio #{config/packages.chroot/}#.
_* No es adecuado para almacenar configuraciones de Debian Live en un
control de versiones.
3~ Método de repositorio APT para instalar paquetes personalizados
-Al contrario del método #{chroot_local-packages}#, cuando se utiliza el
-método de repositorio APT personalizado se debe asegurar que se especifica
-dónde se deben buscar los paquetes a instalar. Para más información ver
-{Selección de los paquetes a instalar}#choosing-packages-to-install.
+Al contrario del método #{packages.chroot}#, cuando se utiliza el método de
+repositorio APT personalizado se debe asegurar que se especifica dónde se
+deben buscar los paquetes a instalar. Para más información ver {Selección de
+los paquetes a instalar}#choosing-packages-to-install.
Aunque crear un repositorio APT para instalar paquetes personalizados puede
parecer un esfuerzo innecesaro, la infraestructurar puede ser fácilmente
@@ -502,9 +467,9 @@ momento de crear la imagen. (La configuración que APT utilizará cuando se
ejecute el sistema en vivo puede ser configurada de la manera que
habitualmente se utiliza para introducir contenidos del sistema en vivo,
esto es, incluyendo las configuraciones apropiadas en el directorio
-#{config/chroot_local_includes/}#.) Se puede encontrar una lista completa de
-las opciones para configurar APT en la página de manual de
-#{lb_config}#. Son aquellas opciones que comienzan con #{apt}#.
+#{config/includes.chroot/}#.) Se puede encontrar una lista completa de las
+opciones para configurar APT en la página de manual de #{lb_config}#. Son
+aquellas opciones que comienzan con #{apt}#.
3~choosing-apt-or-aptitude Utilizar apt o aptitude
@@ -543,7 +508,7 @@ utilizar la siguiente opción:
code{
- $ lb config --binary-indices false
+ $ lb config --apt-indices false
}code
@@ -592,20 +557,20 @@ Como información básica, sería recomendable leer la página de manual
#{apt_preferences(5)}#. APT pinning puede ser configurado o en tiempo de
creación de la imagen, creando el fichero #{config/chroot_apt/preferences}#
o en tiempo de ejecución del sistema en vivo creando el fichero
-#{config/chroot_local-includes/etc/apt/preferences}#.
+#{config/includes.chroot/etc/apt/preferences}#.
-Supongamos que se está creando un sistema en vivo basado en Squeeze pero se
+Supongamos que se está creando un sistema en vivo basado en Wheezy pero se
necesita instalar todos los paquetes "live" que terminan instalados en la
imagen binaria final desde la versión inestable «Sid» en el momento de crear
la imagen. Se deberá añadir Sid a los orígenes (sources) de APT y fijarlo
(pin) de manera que solamente los paquetes fijados sean instalados desde Sid
-mientras que el resto será obtenido desde la distribución base,
-Squeeze. Esto se puede realizar de la siguiente forma:
+mientras que el resto será obtenido desde la distribución base, Wheezy. Esto
+se puede realizar de la siguiente forma:
code{
- $ echo "deb http://mirror/debian sid main" > config/chroot_sources/sid.chroot
- $ cat >>config/chroot_apt/preferences <<END
+ $ echo "deb http://mirror/debian sid main" > config/archives/sid.list.chroot
+ $ cat >> config/chroot_apt/preferences <<END
Package: live-boot live-boot-initramfs-tools live-config live-config-sysvinit
Pin: release n=sid
Pin-Priority: 600
@@ -628,12 +593,12 @@ $ lb config --distribution wheezy
Una prioridad pin negativa previene la instalación de un paquete, como puede
ser el caso de que no se desee que un paquete recomendado por otro sea
instalado al instalar el primero. Supongamos que se está creando una imagen
-LXDE mediante la opción #{--packages-lists lxde}#, pero no se desea
-preguntar al usuario si desea almacenar las claves wifi en el almacen de
-claves. La lista lxde incluye #{gdm}#, la cual depende de #{gksu}# que a su
-vez recomienda #{gnome-keyring}#. Así que el objetivo es omitir la
-instalación del paquete #{gnome-keyring}#, que puede conseguirse añadiendo
-un fichero con el siguiente contenido a #{config/chroot_apt/preferences}#:
+LXDE mediante la opción #{--package-lists lxde}#, pero no se desea preguntar
+al usuario si desea almacenar las claves wifi en el almacen de claves. La
+lista lxde incluye #{gdm}#, la cual depende de #{gksu}# que a su vez
+recomienda #{gnome-keyring}#. Así que el objetivo es omitir la instalación
+del paquete #{gnome-keyring}#, que puede conseguirse añadiendo un fichero
+con el siguiente contenido a #{config/chroot_apt/preferences}#:
code{
diff --git a/manual/es/user_customization-runtime.ssi b/manual/es/user_customization-runtime.ssi
index 7c1c9a5..d517934 100644
--- a/manual/es/user_customization-runtime.ssi
+++ b/manual/es/user_customization-runtime.ssi
@@ -21,12 +21,15 @@ los permisos asociados con el usuario por defecto del sistema en vivo.
Se puede especificar grupos adicionales a los que pertenecerá el usuario por
defecto del sistema en vivo preconfigurando el valor debconf
#{passwd/user-default-groups}#. Por ejemplo, para agregar el usuario al
-grupo #{fuse}# añadir el siguiente código en un fichero en el directorio
-#{config/chroot_local-preseed}#.
+grupo #{fuse}# durante la etapa chroot, añadir el siguiente código en un
+fichero en el directorio #{config/preseed/}#.
code{
- user-setup passwd/user-default-groups string audio cdrom dip floppy video plugdev netdev powerdev scanner bluetooth fuse
+ $ lb config
+ $ echo user-setup passwd/user-default-groups string audio cdrom \
+ dip floppy video plugdev netdev powerdev scanner bluetooth fuse \
+ >> config/preseed/my.preseed.chroot
}code
@@ -48,7 +51,7 @@ gancho (hook) tal y como se describe en {Scripts gancho en tiempo de
arranque}#boot-time-hooks. Para conseguirlo se puede usar el script gancho
«passwd» de #{/usr/share/doc/live-config/examples/hooks}#, ponerle un
prefijo adecuado (p.ej. 200-passwd) y añadirlo a
-#{config/chroot_local-includes/lib/live/config/}#
+#{config/includes.chroot/lib/live/config/}#
2~customizing-locale-and-language Personalización de las variantes locales e
idioma
diff --git a/manual/es/user_examples.ssi b/manual/es/user_examples.ssi
index 7e0a153..bda4ac7 100644
--- a/manual/es/user_examples.ssi
+++ b/manual/es/user_examples.ssi
@@ -23,14 +23,15 @@ describe en {Réplicas de Distribution utilizadas durante la
creación}#distribution-mirrors-build-time, o para más comodidad, establecer
el valor por defecto para la creación del sistema en
#{/etc/live/build.conf}#. Basta con crear este fichero y en el mismo,
-establecer las variables correspondientes a la réplica preferida. Por
-ejemplo:
+establecer las variables #{LB_PARENT_MIRROR_*}# correspondientes a la
+réplica preferida. Todas las demás réplicas usadas en el proceso de creación
+usarán estos valores por defecto. Por ejemplo:
code{
- LB_MIRROR_BOOTSTRAP="http://mirror/debian"
- LB_MIRROR_CHROOT="http://mirror/debian"
- LB_MIRROR_CHROOT_SECURITY="http://mirror/debian-security"
+ LB_PARENT_MIRROR_BOOTSTRAP="http://mirror/debian"
+ LB_PARENT_MIRROR_CHROOT_SECURITY="http://mirror/debian-security"
+ LB_PARENT_MIRROR_CHROOT_BACKPORTS="http://mirror/debian-updates"
}code
@@ -84,7 +85,10 @@ imágenes de Debian Live.
code{
- $ mkdir tutorial2 ; cd tutorial2 ; lb config -p lxde --packages iceweasel
+ $ mkdir tutorial2
+ $ cd tutorial2
+ $ lb config -p lxde
+ $ echo iceweasel >> config/package-lists/my.list.chroot
}code
@@ -92,9 +96,9 @@ La elección de LXDE para este ejemplo refleja el deseo de ofrecer un entorno
de escritorio mínimo, ya que el enfoque de la imagen es el uso individual
que se tiene en mente, el navegador web. Se podría ir aún más lejos y
ofrecer una configuración por defecto para el navegador web en
-#{config/chroot_local-includes/etc/iceweasel/profile/}#, o paquetes
-adicionales de soporte para la visualización de diversos tipos de contenido
-web, pero se deja esto como un ejercicio para el lector.
+#{config/includes.chroot/etc/iceweasel/profile/}#, o paquetes adicionales de
+soporte para la visualización de diversos tipos de contenido web, pero se
+deja esto como un ejercicio para el lector.
Crear la imagen, de nuevo como superusuario, guardando un log como en el
{Tutorial 1}#tutorial-1:
@@ -138,20 +142,27 @@ code{
lb config noauto \
--architecture i386 \
- --linux-flavours 686 \
- --packages-lists lxde \
- --packages "iceweasel xchat" \
+ --linux-flavours 686-pae \
+ --package-lists lxde \
"${@}"
}code
+Completar la lista de paquetes local:
+
+code{
+
+ $ echo "iceweasel xchat" >> config/package-lists/my.list.chroot
+
+}code
+
En primer lugar con #{--architecture i386}# se asegura de que en nuestro
sistema de creación #{amd64}# se crea una versión de 32-bits adecuada para
ser usada en la mayoría de máquinas. En segundo lugar, se usa
-#{--linux-flavours 686}# porque no se espera usar esta imagen en sistemas
-mucho más viejos. En tercer lugar se elige la lista de paquetes #{lxde}#
-para proporcionar un escritorio mínimo. Y, por último, se añaden dos
-paquetes iniciales favoritos: #{iceweasel}# y #{xchat}#.
+#{--linux-flavours 686-pae}# porque no se espera usar esta imagen en
+sistemas mucho más viejos. En tercer lugar se elige la lista de paquetes
+#{lxde}# para proporcionar un escritorio mínimo. Y, por último, se añaden
+dos paquetes iniciales favoritos: #{iceweasel}# y #{xchat}#.
Ahora, crear la imagen:
@@ -182,7 +193,7 @@ code{
En esta revisión, vamos a limpiar desde la primera creación, agregar el
paquete #{vlc}# a nuestra configuración, crear de nuevo, probar y enviar los
-cambios al git («commit» N.del T.).
+cambios al git.
El comando #{lb clean}# limpiará todos los ficheros generados en las
primeras creaciones a excepción del caché, lo cual ahorra tener que volver a
@@ -196,18 +207,12 @@ code{
}code
-Editar ahora #{auto/config}# para añadir el paquete #{vlc}#:
+Añadir ahora el paquete #{vlc}# a nuestra lista de paquetes local en
+#{config/package-lists/my.list.chroot}#:
code{
- #!/bin/sh
-
- lb config noauto \
- --architecture i386 \
- --linux-flavours 686 \
- --packages-lists lxde \
- --packages "iceweasel xchat vlc" \
- "${@}"
+ $ echo vlc >> config/package-lists/my.list.chroot
}code
@@ -247,17 +252,16 @@ experiencias recogidas de los usuarios de Debian Live.
*{Caso Práctico:}* Crear una imagen con live-build para arrancar directamente un servidor VNC.
Hacer un directorio de creación y crear una configuración en esqueleto según
-la lista estándar-x11, incluyendo #{gdm3}#, #{metacity}# y
-#{xtightvncviewer}#, desactivando los paquetes recomendados para conseguir
-un sistema mínimo:
+la lista estándar-x11, incluyendo #{gdm3}#, #{metacity}# y #{xvnc4viewer}#,
+desactivando los paquetes recomendados para conseguir un sistema mínimo:
code{
$ mkdir vnc_kiosk_client
$ cd vnc_kiosk_client
- $ lb config -a i386 -k 686 -p standard-x11 \
- --packages "gdm3 metacity xvnc4viewer" \
+ $ lb config -a i386 -k 686-pae -p standard-x11 \
--apt-recommends false
+ $ echo "gdm3 metacity xvnc4viewer" >> config/package-lists/my.list.chroot
}code
@@ -268,8 +272,8 @@ el xvncviewer, conectándo al puerto #{5901}# de un servidor en
code{
- $ mkdir -p config/chroot_local-includes/etc/skel
- $ cat >config/chroot_local-includes/etc/skel/.xsession <<END
+ $ mkdir -p config/includes.chroot/etc/skel
+ $ cat > config/includes.chroot/etc/skel/.xsession <<END
#!/bin/sh
/usr/bin/metacity &
@@ -307,7 +311,7 @@ probable es que se produzca un sistema roto.
code{
- $ lb config -k 486 -p minimal --binary-indices false \
+ $ lb config -k 486 -p minimal --apt-indices false \
--memtest none --apt-recommends false --includes none
}code
@@ -328,7 +332,7 @@ en el {Tutorial 1}#tutorial-1.
El mayor ahorro de espacio aquí, en comparación con la creación de una
imagen estándar en un sistema de arquitectura #{i386}# es seleccionar sólo
la versión del kernel #{486}# en lugar de la de por defecto #{-k "486
-686"}#. Dejar fuera los índices de APT con #{--binary-indices false}#
+686-pae"}#. Dejar fuera los índices de APT con #{--apt-indices false}#
también ahorra una cantidad importante de espacio, la desventaja es que es
necesario hacer un #{apt-get update}# antes de usar apt en el sistema en
vivo. Elegir la lista del paquete #{minimal}# deja fuera el gran paquete de
@@ -353,7 +357,7 @@ El primer problema es descubrir los nombres de las tareas adecuadas. En la
actualidad, live-build no puede ayudar en esto. Aunque podríamos tener
suerte y encontrarlos a base de pruebas, hay una herramienta,
#{grep-dctrl}#, para extraerlos de las descripciones de tareas en
-tasksel-data, para prepararlos, asegurarse de tener ambas cosas:
+tasksel-data, para proceder, asegurarse de tener ambas cosas:
code{
@@ -365,12 +369,8 @@ Ahora podemos buscar las tareas apropiadas, primero con:
code{
- $ grep-dctrl -FTest-lang pt_BR /usr/share/tasksel/debian-tasks.desc -sTask,Description
+ $ grep-dctrl -FTest-lang pt_BR /usr/share/tasksel/descs/debian-tasks.desc -sTask
Task: brazilian-portuguese
- Description: Brazilian Portuguese environment
- This task installs programs, data files, and
- documentation that make it easier for Brazilian Portuguese speakers
- to use Debian.
}code
@@ -379,22 +379,18 @@ brazilian-portuguese. Ahora para encontrar las tareas relacionas:
code{
-$ grep-dctrl -FEnhances brazilian-portuguese /usr/share/tasksel/debian-tasks.desc -sTask,Description
+ $ grep-dctrl -FEnhances brazilian-portuguese /usr/share/tasksel/descs/debian-tasks.desc -sTask
Task: brazilian-portuguese-desktop
- Description: Brazilian Portuguese desktop
- This task localises the desktop in Brasilian Portuguese.
-
Task: brazilian-portuguese-kde-desktop
- Description: Brazilian Portuguese KDE desktop
- This task localises the KDE desktop in Brazilian Portuguese.
}code
-Se usará la opción experimental #{--language}#, ya que live-build incluye
-#{syslinux}# para pt_BR (ver {Tareas de Escritorio e
-Idioma}#desktop-and-language-tasks para más detalles). Y en el momento del
-arranque se generarán las variantes locales pt_BR.UTF-8 y se seleccionará el
-diseño del teclado pt-latin1. Ahora se ponen todas las piezas juntas:
+En el momento del arranque se van a generar las variantes locales
+pt_BR.UTF-8 y seleccionar la distribución del teclado pt-latin1. También
+será necesario preconfigurar la opción de escritorio, "kde" para que tasksel
+instale la tarea de escritorio correcta, ya que difiere de la de por defecto
+(Ver {Tareas de Escritorio e Idioma}#desktop-and-language-tasks). Ahora
+vamos a poner las piezas juntas:
code{
@@ -403,12 +399,12 @@ code{
$ lb config \
-a i386 \
-k 486 \
- -p kde-desktop \
- --language pt_BR \
- --tasks "brazilian-portuguese brazilian-portuguese-desktop brazilian-portuguese-kde-desktop" \
--bootappend-live "locales=pt_BR.UTF-8 keyboard-layouts=pt-latin1" \
- --debian-installer live \
- --packages debian-installer-launcher
+ --debian-installer live
+ $ echo kde-desktop brazilian-portuguese brazilian-portuguese-desktop \
+ brazilian-portuguese-kde-desktop >> config/task-lists/my.list.chroot
+ $ echo debian-installer-launcher >> config/package-lists/my.list.chroot
+ $ echo tasksel tasksel/desktop multiselect kde >> config/preseed/my.preseed.chroot
}code
diff --git a/manual/es/user_installation.ssi b/manual/es/user_installation.ssi
index 246b71e..0b7d15b 100644
--- a/manual/es/user_installation.ssi
+++ b/manual/es/user_installation.ssi
@@ -108,7 +108,7 @@ puede usar instantáneas. Estas se generan automáticamente a partir de la
2~ live-boot y live-config
-*{Nota:}* No es necesario instalar live-boot o live-config en el sistema para crear sistemas personalizados de Debian Live. Sin embargo, eso no causará ningún daño y es útil por motivos de referencia.
+*{Nota:}* No es necesario instalar live-boot o live-config en el sistema para crear sistemas personalizados de Debian Live. Sin embargo, eso no causará ningún daño y es útil por motivos de referencia. Si únicamente se desea tener la documentación, es posible instalar los paquetes live-boot-doc y live-config-doc de forma independiente.
3~ Desde el repositorio Debian.
@@ -137,15 +137,15 @@ de live-boot y live-config.
_* Creación de los paquetes .deb de live-boot y live-config
Se debe crear ya sea en la distribución de destino o en un entorno chroot
-que contenga la plataforma de destino: es decir, si el objetivo es Squeeze
-entonces se debe crear usando Squeeze.
+que contenga la plataforma de destino: es decir, si el objetivo es Wheezy
+entonces se debe crear usando Wheezy.
Utilizar un programa creador personal como /{pbuilder}/ o /{sbuild}/ si se
necesita crear #{live-boot}# para una distribución de destino diferente del
-sistema de creación. Por ejemplo, para las imágenes en vivo de Squeeze,
-crear #{live-boot}# en un entorno chroot. Si la distribución de destino
-coincide con la distribución actual, se puede crear directamente sobre el
-sistema de creación con #{dpkg-buildpackage}# (proporcionada por el paquete
+sistema de creación. Por ejemplo, para las imágenes en vivo de Wheezy, crear
+#{live-boot}# en un entorno chroot. Si la distribución de destino coincide
+con la distribución actual, se puede crear directamente sobre el sistema de
+creación con #{dpkg-buildpackage}# (proporcionada por el paquete
/{dpkg-dev}/ ):
code{
@@ -172,11 +172,11 @@ adicionales}#additional-repositories.
Se puede dejar que live-build utilice automáticamente las últimas
instantáneas de live-boot y live-config mediante la configuración de
repósitorios de terceros en el directorio de configuración de
-live-build. Suponiendo que ya se haya creado un árbol de configuración con
-#{lb config}#:
+live-build. Suponiendo que ya se haya creado un árbol de configuración en el
+directorio actual con #{lb config}#:
code{
- $ lb config --repository live.debian.net
+ $ lb config --archives live.debian.net
}code
diff --git a/manual/es/user_managing_a_configuration.ssi b/manual/es/user_managing_a_configuration.ssi
index c653864..053af55 100644
--- a/manual/es/user_managing_a_configuration.ssi
+++ b/manual/es/user_managing_a_configuration.ssi
@@ -63,9 +63,9 @@ deben ser ejecutables (por ejemplo #{chmod 755 auto/*}#).
code{
-#!/bin/sh
+ #!/bin/sh
lb config noauto \
- --packages-lists "standard" \
+ --package-lists "standard" \
"${@}"
}code
@@ -102,7 +102,7 @@ code{
Se puede editar el script #{auto/config}#, modificándolo o añadiendo
cualquier opción que se acomode a las necesidades requeridas. En el ejemplo
-anterior, se asignará la opción #{--packages-lists standard}# como si fuese
+anterior, se asignará la opción #{--package-lists standard}# como si fuese
asignada por defecto. Se puede cambiar este valor a uno adecuado o
simplemente eliminarlo si no es necesario añadiendo cualquier otra opción
que se adecue a las necesidades requeridas por la imagen a crear, en líneas
diff --git a/manual/es/user_overview.ssi b/manual/es/user_overview.ssi
index 869ef06..da8e769 100644
--- a/manual/es/user_overview.ssi
+++ b/manual/es/user_overview.ssi
@@ -56,51 +56,20 @@ propenso a errores, se puede utilizar el comando #{lb config}# para crear el
esqueleto de directorios de configuración.
Ejecutar #{lb config}# sin argumentos crea un subdirectorio #{config/}# que
-se completa con algunas opciones por defecto:
+se completa con algunas opciones por defecto y un árbol de subdirectorios en
+forma de esqueleto #{auto/}#:
code{
$ lb config
+ P: Considering defaults defined in /etc/live/build.conf
P: Creating config tree
- $ ls -l
- total 8
- drwxr-xr-x 3 user user 4096 Sep 7 13:02 auto
- drwxr-xr-x 22 user user 4096 Sep 7 13:02 config
-
- $ ls -l config/
- total 104
- -rw-r--r-- 1 user user 4197 Sep 7 13:02 binary
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_debian-installer
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_debian-installer-includes
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_grub
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-debs
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-hooks
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-includes
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-packageslists
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-udebs
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_rootfs
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_syslinux
- -rw-r--r-- 1 user user 2051 Sep 7 13:02 bootstrap
- -rw-r--r-- 1 user user 1647 Sep 7 13:02 chroot
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_apt
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-hooks
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-includes
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-packages
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-packageslists
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-patches
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-preseed
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_sources
- -rw-r--r-- 1 user user 2954 Sep 7 13:02 common
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 includes
- -rw-r--r-- 1 user user 205 Sep 7 13:02 source
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 templates
-
}code
Usar #{lb config}# sin ningún argumento sería conveniente para los usuarios
que necesitan una imagen muy básica, o que tienen intención de proporcionar
-más tarde una configuración más completa a través de auto/config (ver
+más tarde una configuración más completa a través de #{auto/config}# (ver
{Gestionar una configuración}#managing-a-configuration para más detalles).
Normalmente, se tendrá que especificar algunas opciones. Por ejemplo, para
@@ -125,7 +94,7 @@ Una lista completa de opciones está disponible en la página del manual
3~lb-build El comando #{lb build}#
-El comando #{lb build}# lee la configuración del directorio config/ A
+El comando #{lb build}# lee la configuración del directorio #{config/}#. A
continuación, ejecuta los comandos del nivel inferior más bajo necesarios
para crear el sistema en vivo.
@@ -149,7 +118,7 @@ incluye las ISOs de Debian Live, archivos comprimidos en tar de netboot, e
imágenes para llaves USB.
En el momento del arranque, buscará en los medios de almacenamiento de sólo
-lectura un directorio "/ live" donde se encuentra un sistema de ficheros
+lectura un directorio #{/live/}# donde se encuentra un sistema de ficheros
raíz (a menudo una imagen del sistema de ficheros comprimidos como
squashfs). Si lo encuentra, creará un entorno de escritura, utilizando aufs,
para que arranquen los sistemas tipo Debian.
diff --git a/manual/fr/about_manual.ssi b/manual/fr/about_manual.ssi
index aaebc88..2793b64 100644
--- a/manual/fr/about_manual.ssi
+++ b/manual/fr/about_manual.ssi
@@ -7,29 +7,29 @@ les documents liés au projet Debian Live. Tandis qu'il est principalement
sur vous aider à construire un système Live et non pas sur des sujets de
l'utilisateur final, un utilisateur final peut trouver des informations
utiles dans ces sections: {Les Bases}#the-basics couvrent la préparation des
-images pour être démarrées à partir des médias ou depuis le réseau, et
+images pour être démarrées à partir des supports ou depuis le réseau, et
{Personnalisation des comportements au moment de
l'exécution}#customizing-run-time-behaviours décrit certaines options qui
peuvent être spécifiées à l'invite de démarrage, tels que la sélection d'un
clavier, des paramètres régionaux, et la utilisation de la persistance.
Certaines commandes mentionnées dans le texte doivent être exécutées avec
-les privilèges super-utilisateur, qui peuvent être obtenu en devenant root à
-l'aide de #{su}# ou en utilisant #{sudo}#. Afin de distinguer les commandes
-qui peuvent être exécutées par un utilisateur sans privilèges de celles
-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.
+les privilèges de super-utilisateur, qui peuvent être obtenus en devenant
+super-utilisateur à l'aide de #{su}# ou en utilisant #{sudo}#. Afin de
+distinguer les commandes qui peuvent être exécutées par un utilisateur sans
+privilèges de celles 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~ Pour les impatients
Même si nous croyons que tout dans ce manuel est important pour au moins
certains de nos utilisateurs, nous nous rendons compte qu'il y a beaucoup de
-matière à couvrir et que vous pouvez expérimenter avant d'entrer dans les
-détails. Par conséquent, nous avons fourni trois tutoriels dans la section
-{Exemples}#examples destinée à vous apprendre la construction de l'image et
-les bases de la personnalisation. Lire en premier {En utilisant les
-exemples}#using-the-examples, suivie par {Tutoriel 1: Une image
+matière à couvrir et que vous pouvez vouloir expérimenter avant d'entrer
+dans les détails. Par conséquent, nous avons fourni trois tutoriels dans la
+section {Exemples}#examples destinée à vous apprendre la construction de
+l'image et les bases de la personnalisation. Lire en premier {En utilisant
+les exemples}#using-the-examples, suivie par {Tutoriel 1: Une image
standard}#tutorial-1, {Tutoriel 2: Un logiciel de navigateur Web}#tutorial-2
et finalement {Tutoriel 3: Une image personnalisée}#tutorial-3. À la fin de
ces tutoriels, vous aurez un avant-goût de ce qui peut être fait avec Debian
@@ -39,7 +39,7 @@ la prochaine lecture peut-être {Les bases}#the-basics, passer pour
lecture de la{Vue d'ensemble de la personnalisation}#customization-overview
et les autres sections suivantes. En ce point, nous espérons que vous êtes
complètement excités par ce que on peut faire avec Debian Live et motivés
-pour lire le reste du manuel, du début à la fin
+pour lire le reste du manuel, du début à la fin.
2~terms Terminologie
@@ -47,8 +47,9 @@ _* *{Système Live}*: Un système d'exploitation pouvant être démarré sans
installation préalable sur disque dur. Les Systèmes Live ne modifient pas le
système d'exploitation local ou les fichiers installés sur le disque dur
sans qu'on leur en donne explicitement l'instruction. D'habitude, les
-systèmes Live sont démarrés à partir de media tels que des CD, DVD, ou des
-clés USB. Certains peuvent également être démarrés depuis le réseau.
+systèmes Live sont démarrés à partir des supports tels que des CD, DVD, ou
+des clés USB. Certains systèmes peuvent également être démarrés depuis le
+réseau.
_* *{Debian Live}*: Le sous-projet Debian qui maintient les paquets
live-boot, live-build, live-config, et live-manual.
@@ -81,7 +82,7 @@ _* *{Debian Installer (d-i)}*: Le système d'installation officiel pour la
distribution Debian.
_* *{Paramètres de démarrage}*: Les paramètres pouvant être entrés à
-l'invite de démarrage afin de modifier le kernel ou live-config.
+l'invite de démarrage afin de modifier le noyau ou live-config.
_* *{chroot}*: Le programme chroot, #{chroot(8)}#, nous permet de faire
tourner plusieurs instances concurrentes de l'environnement GNU/Linux sur un
@@ -168,8 +169,8 @@ code{
}code
-Vous pouvez compiler live-manual depuis le répertoire racine de votre
-checkout git en exécutant:
+Vous pouvez compiler live-manual depuis le répertoire racine de votre Git
+checkout en exécutant:
code{
@@ -187,10 +188,10 @@ code{
}code
-3~ Appliquer des patches
+3~ Appliquer des correctifs
Les contributions directes au référentiel sont possibles pour tout le
-monde. Cependant, nous vous demandons d'envoyer les changements conséquents
+monde. Cependant, nous vous demandons d'envoyer les changements importants
sur la liste de diffusion au préalable. Afin de faire un push sur le
référentiel, les étapes suivantes sont nécessaires.
@@ -275,6 +276,6 @@ au manuel (avec les fichiers po) et l'activer dans l'autobuild.
_* Une fois la nouvelle langue est ajoutée, vous pouvez commencer à traduire
de façon aléatoire tous les fichiers po dans #{manual/po/}#.
-_* N'oubliez pas que vous devez #{make commit}# pour assurer la traduction
-des manuels sont mis à jour à partir des fichiers po, avant #{git commit
--a}# et #{git push}#.
+_* N'oubliez pas que vous devez faire un #{make commit}# pour assurer que la
+traduction des manuels sont mis à jour à partir des fichiers po, avant #{git
+commit -a}# et #{git push}#.
diff --git a/manual/fr/about_project.ssi b/manual/fr/about_project.ssi
index 24a566e..7d47451 100644
--- a/manual/fr/about_project.ssi
+++ b/manual/fr/about_project.ssi
@@ -24,8 +24,8 @@ dépouillant pour économiser l'espace.
_* Ils comprennent des paquets provenant en dehors de l'archive Debian.
-_* Ils offrent kernels personnalisés avec des patches supplémentaires qui ne
-font pas partie de Debian.
+_* Ils offrent noyaus personnalisés avec des correctifs supplémentaires qui
+ne font pas partie de Debian.
_* Ils sont grands et lents en raison de leur dimension et donc pas
recommandés comme systémes de sauvetage.
@@ -49,7 +49,7 @@ _* Il seulement se compose de paquets Debian inchangés.
_* Il ne contient pas de paquets qui ne sont pas dans l'archive Debian.
-_* Il utilise un kernel Debian inchangé sans patches supplémentaires.
+_* Il utilise un noyau Debian inchangé sans correctifs supplémentaires.
2~ Philosophie
@@ -106,10 +106,10 @@ réponse. Si aucune réponse n'est donnée, s'il vous plaît envoyez un courriel
à la liste de diffusion.
_* *{BTS}*: Le Debian Bug Tracking System (BTS) contient les détails des
-bugs rapportés par les utilisateurs et les développeurs. Chaque bug reçoit
-un numéro, et il est conservé jusqu'à ce qu'il soit marqué comme
+bogues rapportés par les utilisateurs et les développeurs. Chaque bogue
+reçoit un numéro, et il est conservé jusqu'à ce qu'il soit marqué comme
traité. Pour plus d'informations, s'il vous plaît voir {Rapporter des
-bugs}#bugs.
+bogues}#bugs.
_* *{Wiki}*: Le wiki Debian Live à http://wiki.debian.org/DebianLive est un
lieu pour recueillir des informations, discuter des technologies appliquées,
diff --git a/manual/fr/index.html.in b/manual/fr/index.html.in
index 268e942..2ecf6ad 100644
--- a/manual/fr/index.html.in
+++ b/manual/fr/index.html.in
@@ -9,25 +9,32 @@
<h2>Manuel Debian Live</h2>
<p>
+ <i>live-manual</i> est disponible en formats de fichiers différents et il
+est traduit en plusieurs langues. Rappelez que certaines traductions peuvent
+être incomplètes ou ne pas être à jour.
+ </p>
+
+ <p>
+
Veuillez transmettre les erreurs, omissions, patches et suggestions sur
notre liste de discussion <a
href="mailto:debian-live at lists.debian.org">debian-live at lists.debian.org</a>
-et lire <a href="html/about-manual.html#how-to-contribute">comment
+et lire <a href="html/about-manual.fr.html#how-to-contribute">comment
contribuer</a> au manuel.
</p>
<h3>Formats disponibles</h3>
<ul>
- <li><a href="epub/live-manual.epub">EPUB</a></li>
- <li>HTML: <a href="html/index.html">multi pages</a>, <a
-href="html/live-manual.html">page unique</a></li>
- <li><a href="odf/live-manual.odt">ODF</a></li>
- <li>PDF: <a href="pdf/live-manual.portrait-a4.pdf">A4 portrait</a>, <a
-href="pdf/live-manual.landscape-a4.pdf">A4 paysage</a>, <a
-href="pdf/live-manual.portrait-letter.pdf">US portrait</a>, <a
-href="pdf/live-manual.landscape-letter.pdf">US paysage</a></li>
- <li><a href="txt/live-manual.txt">Texte brut</a></li>
+ <li><a href="epub/live-manual.fr.epub">EPUB</a></li>
+ <li>HTML: <a href="html/index.fr.html">multi pages</a>, <a
+href="html/live-manual.fr.html">page unique</a></li>
+ <li><a href="odf/live-manual.fr.odt">ODF</a></li>
+ <li>PDF: <a href="pdf/live-manual.portrait-a4.fr.pdf">A4 portrait</a>, <a
+href="pdf/live-manual.landscape-a4.fr.pdf">A4 paysage</a>, <a
+href="pdf/live-manual.portrait-letter.fr.pdf">US portrait</a>, <a
+href="pdf/live-manual.landscape-letter.fr.pdf">US paysage</a></li>
+ <li><a href="txt/live-manual.fr.txt">Texte brut</a></li>
</ul>
<p>
diff --git a/manual/fr/live-manual.ssm b/manual/fr/live-manual.ssm
index dea5f58..1b61293 100644
--- a/manual/fr/live-manual.ssm
+++ b/manual/fr/live-manual.ssm
@@ -9,7 +9,7 @@
:license: Ce programme est un logiciel libre; vous pouvez le redistribuer ou le modifier suivant les termes de la Licence Générale Publique GNU telle que publiée par la Free Software Foundation: soit la version 3 de cette licence, soit (à votre gré) toute version ultérieure.<br><br>Ce programme est distribué dans l’espoir qu’il vous sera utile, mais SANS AUCUNE GARANTIE: sans même la garantie implicite de COMMERCIALISABILITÉ ni d’ADÉQUATION À UN OBJECTIF PARTICULIER. Consultez la Licence Générale Publique GNU pour plus de détails.<br><br>Vous devriez avoir reçu une copie de la Licence Générale Publique GNU avec ce programme ; si ce n’est pas le cas, consultez http://www.gnu.org/licenses/. <br><br>Le texte complet de la Licence Générale Publique GNU peut être trouvé dans le fichier / usr/share/common-licenses/GPL-3
@date:
- :published: 2011-09-30
+ :published: 2011-12-04
@publisher: Debian Live Project <debian-live at lists.debian.org>
diff --git a/manual/fr/user_basics.ssi b/manual/fr/user_basics.ssi
index d792395..d1d62e8 100644
--- a/manual/fr/user_basics.ssi
+++ b/manual/fr/user_basics.ssi
@@ -245,7 +245,7 @@ live-build. Sinon, la résolution est limitée à 800x600.
code{
- $ lb config --packages virtualbox-ose-guest-x11
+ $ echo virtualbox-ose-guest-x11 >> config/package-lists/my.list.chroot
}code
diff --git a/manual/fr/user_customization-contents.ssi b/manual/fr/user_customization-contents.ssi
index 8d8a735..90aec25 100644
--- a/manual/fr/user_customization-contents.ssi
+++ b/manual/fr/user_customization-contents.ssi
@@ -48,14 +48,14 @@ ajoutés ou remplacés à l'image sans traitement, voir {Live/chroot local
hooks}#live-chroot-local-hooks si le traitement est nécessaire.
Pour inclure des fichiers, il suffit de les ajouter à votre répertoire
-#{config/chroot_local-includes}#. Ce répertoire correspond au répertoire
-racine (#{/}#) du système live. Par exemple, pour ajouter un fichier
+#{config/includes.chroot}#. Ce répertoire correspond au répertoire racine
+(#{/}#) du système live. Par exemple, pour ajouter un fichier
#{/var/www/index.html}# dans le système live, utilisez:
code{
- $ mkdir -p config/chroot_local-includes/var/www
- $ cp /path/to/my/index.html config/chroot_local-includes/var/www
+ $ mkdir -p config/includes.chroot/var/www
+ $ cp /path/to/my/index.html config/includes.chroot/var/www
}code
@@ -65,7 +65,7 @@ code{
-- config
[...]
- |-- chroot_local-includes
+ |-- includes.chroot
| `-- var
| `-- www
| `-- index.html
@@ -85,12 +85,12 @@ du support sans avoir à démarrer le système live, vous pouvez utiliser
binary local includes. Cela fonctionne de façon similaire aux chroot local
includes. Par exemple, supposons que les fichiers #{~/video_demo.*}# sont
des vidéos de démonstration du système live décrit par et lié par une page
-d'index HTML. Copiez simplement le matériel à
-#{config/binary_local-includes/}# comme suit:
+d'index HTML. Copiez simplement le matériel dans #{config/includes.binary/}#
+comme suit:
code{
- $ cp ~/video_demo.* config/binary_local-includes/
+ $ cp ~/video_demo.* config/includes.binary/
}code
@@ -120,13 +120,13 @@ et binaire de la construction afin de personnaliser l'image.
3~live-chroot-local-hooks Live/chroot local hooks
-Pour exécuter des commandes à l'étape chroot, créer un script hook contenant
-les commandes dans le répertoire #{config/chroot_local-hooks}#. Le hook
-s'exécutera dans le chroot après le reste de votre configuration chroot a
-été appliquée, donc n'oubliez pas de vous assurer que votre configuration
-inclut tous les paquets et les fichiers que votre hook a besoin pour
-fonctionner. Voir les exemples de scripts chroot hook pour diverses tâches
-courantes de personnalisation chroot fournis dans
+Pour exécuter des commandes à l'étape chroot, créer un script hook avec le
+suffixe #{.chroot}# contenant les commandes dans le répertoire
+#{config/hooks/}#. Le hook s'exécutera dans le chroot après le reste de
+votre configuration chroot a été appliquée, donc n'oubliez pas de vous
+assurer que votre configuration inclut tous les paquets et les fichiers que
+votre hook a besoin pour fonctionner. Voir les exemples de scripts chroot
+hook pour diverses tâches courantes de personnalisation chroot fournis dans
#{/usr/share/live/build/examples/hooks}# que vous pouvez copier ou symlink
pour les utiliser dans votre propre configuration.
@@ -137,28 +137,30 @@ live-config hooks comme expliqué dans la section "Personnalisation" de sa
page de manuel. Examiner les hooks de live-config fournis dans
#{/lib/live/config/}#, en notant les numéros de séquence. Puis fournir votre
propre hook préfixée avec un numéro de séquence appropriée, soit comme un
-chroot local include dans #{config/chroot_local-includes/lib/live/config/}#,
-ou comme un paquet personnalisé tel que discuté dans {Installation des
-paquets modifiés ou de tiers}#installing-modified-or-third-party-packages.
+chroot local include dans #{config/includes.chroot/lib/live/config/}#, ou
+comme un paquet personnalisé tel que discuté dans {Installation des paquets
+modifiés ou de tiers}#installing-modified-or-third-party-packages.
3~ Binary local hooks
-Pour exécuter des commandes à l'étape binaire, créer un script hook
-contenant les commandes dans #{config/binary_local-hooks}#. Le hook sera
-exécuté après toutes les autres commandes binaires sont exécutées, mais
-avant binary_checksums, les dernièrs commandes binaires. Les commandes de
-votre hook ne s'exécutent pas dans le chroot, afin de prendre soin de ne pas
-modifier les fichiers en dehors de l'arbre de construction, ou vous pourriez
-endommager votre système de construction! Voir les exemples de scripts hook
-binaires pour diverses tâches courantes de personnalisation binaires fournis
-dans #{/usr/share/live/build/examples/hooks}# que vous pouvez copier ou
-symlink pour les utiliser dans votre propre configuration.
+Pour exécuter des commandes à l'étape binaire, créer un script hook avec le
+suffixe #{.binary}# contenant les commandes dans le répertoire
+#{config/hooks/}#. Le hook sera exécuté après toutes les autres commandes
+binaires sont exécutées, mais avant binary_checksums, les dernièrs commandes
+binaires. Les commandes de votre hook ne s'exécutent pas dans le chroot,
+afin de prendre soin de ne pas modifier les fichiers en dehors de l'arbre de
+construction, ou vous pourriez endommager votre système de construction!
+Voir les exemples de scripts hook binaires pour diverses tâches courantes de
+personnalisation binaires fournis dans
+#{/usr/share/live/build/examples/hooks}# que vous pouvez copier ou symlink
+pour les utiliser dans votre propre configuration.
2~ Préconfigurer questions de debconf
-Les fichiers dans le répertoire #{config/chroot_local-preseed}# sont
-considérés comme des fichiers de préconfiguration debconf et sont installés
-par live-build en utilisant #{debconf-set-selections}#.
+Les fichiers dans le répertoire #{config/preseed/}# avec le suffixe
+#{.preseed}# suivi de l'étape (#{.chroot}# or #{.binary}#) sont considérés
+comme des fichiers de préconfiguration debconf et sont installés par
+live-build en utilisant #{debconf-set-selections}#.
Pour plus d'informations sur debconf, s'il vous plaît voir debconf(7) dans
le paquet #{debconf}#.
diff --git a/manual/fr/user_customization-installer.ssi b/manual/fr/user_customization-installer.ssi
index 65afc6c..59d6724 100644
--- a/manual/fr/user_customization-installer.ssi
+++ b/manual/fr/user_customization-installer.ssi
@@ -55,7 +55,8 @@ bureau" fonctionne le noyau du système live doit correspondre au noyau que
code{
$ lb config --architecture i386 --linux-flavours 486 \
- --debian-installer live --packages debian-installer-launcher
+ --debian-installer live
+ $ echo debian-installer-launcher >> config/package-lists/my.list.chroot
}code
@@ -84,7 +85,7 @@ code{
Pour des fins expérimentales ou de débogage, vous pouvez inclure paquets
udeb #{d-i}# construits localement. Les placer dans
-#{config/binary_local-udebs/}# pour les inclure dans l'image. Fichiers
+#{config/packages.binary/}# pour les inclure dans l'image. Fichiers
supplémentaires ou de remplacement et répertoires peuvent être inclus dans
l'initrd de l'installateur ainsi, d'une manière similaire à {Live/chroot
local includes}#live-chroot-local-includes en plaçant le matériau dans
diff --git a/manual/fr/user_customization-packages.ssi b/manual/fr/user_customization-packages.ssi
index 9115244..875dc24 100644
--- a/manual/fr/user_customization-packages.ssi
+++ b/manual/fr/user_customization-packages.ssi
@@ -28,13 +28,13 @@ sont installés via APT pinning, pour n'en nommer quelques possibilités.
La distribution que vous choisissez a le plus large impact sur les paquets
qui sont disponibles à inclure dans votre image live. Indiquez le nom de
-code, qui est par défaut #{squeeze}# pour la version de live-build dans
-Squeeze. Toute distribution actuelle dans l'archive Debian peut être
-spécifié par son nom de code ici. (Voir {Termes}#terms pour plus de
-détails.) L'option #{--distribution}# non seulement influence la source des
-paquets dans l'archive, mais aussi dit #{live-build}# comme it doit
-construire chaque distribution supportée. Par exemple, pour construire
-contre *unstable*, Sid, précisez:
+code, qui est par défaut #{wheezy}# pour la version de live-build dans
+Wheezy. Toute distribution actuelle dans l'archive Debian peut être spécifié
+par son nom de code ici. (Voir {Termes}#terms pour plus de détails.)
+L'option #{--distribution}# non seulement influence la source des paquets
+dans l'archive, mais aussi dit #{live-build}# comme it doit construire
+chaque distribution soutenue. Par exemple, pour construire contre
+*unstable*, Sid, précisez:
code{
@@ -54,66 +54,68 @@ code{
}code
-Support expérimental est disponible pour certains dérivés de Debian par
+Soutien expérimental est disponible pour certains dérivés de Debian par
l'option #{--mode}#. L'option #{debian}# est définie par défaut, même si
vous êtes en créant sur un système non-Debian. Si vous spécifiez #{--mode
-ubuntu}# ou #{--mode emdebian}#, les noms de distribution et des archive
-areas pour les dérivés spécifiés sont supportés au lieu de ceux de Debian.
-Le mode modifie également le comportement de live-build en fonction des
-dérivés.
+ubuntu}# ou #{--mode emdebian}#, les noms de distribution et des areas des
+archives pour les dérivés spécifiés sont soutenues au lieu de ceux de
+Debian. Le mode modifie également le comportement de live-build en fonction
+des dérivés.
-*{Remarque:}* Les projets pour lesquels ces modes ont été ajoutés sont principalement responsables de aider les utilisateurs de ces options. Le projet Debian Live, à son tour, fournit un support de développement sur une base des meilleurs efforts seulement, en fonction des commentaires sur les projets dérivés que nous n'avons pas développé ou supporté nous-mêmes.
+*{Remarque:}* Les projets pour lesquels ces modes ont été ajoutés sont principalement responsables de aider les utilisateurs de ces options. Le projet Debian Live, à son tour, fournit un soutien de développement sur une base des meilleurs efforts seulement, en fonction des commentaires sur les projets dérivés que nous n'avons pas développé ou soutenu nous-mêmes.
3~ Miroirs de distribution
L'archive Debian est répliqué à travers un large réseau de miroirs autour du
monde pour que les gens dans chaque région peuvent choisir un miroir proche
avec la meilleur vitesse de téléchargement. Chacune des options
-#{--mirror-*}# qui régit quel miroir de distribution est utilisée à
+#{--parent-mirror-*}# qui régit quel miroir de distribution est utilisée à
différents stades de la construction. Rappelez-vous de {Etapes de la
construction}#stages-of-the-build que l'étape *bootstrap* c'est quand le
chroot est initialement peuplée par debootstrap avec un système minimal, et
l'étape *chroot* c'est quand le chroot utilisé pour construire le système de
fichiers du système live est construit. Ainsi, les commutateurs des miroirs
correspondants sont utilisées pour ces étapes, et plus tard, dans le
-*binary* stade les valeurs #{--mirror-binary}# et
-#{--mirror-binary-security}# sont utilisées, remplaçant tout miroir utilisé
-dans une étape antérieure.
+*binary* stade les valeurs #{--parent-mirror-binary}# et
+#{--parent-mirror-binary-security}# sont utilisées, remplaçant tout miroir
+utilisé dans une étape antérieure.
3~distribution-mirrors-build-time Miroirs de distribution utilisés au temps
de construction
Pour définir les miroirs de distribution utilisés au temps de construction
-pour pointer vers un miroir local, il suffit de fixer #{--mirror-bootstrap}#
-et #{--mirror-chroot-security}# comme suit.
+pour pointer vers un miroir local, il suffit de fixer
+#{--parent-mirror-bootstrap}# , #{--parent-mirror-chroot-security}# et
+#{--parent-mirror-chroot-backports}# comme suit.
code{
- $ lb config --mirror-bootstrap http://localhost/debian/ \
- --mirror-chroot-security http://localhost/debian-security/
+ $ lb config --parent-mirror-bootstrap http://localhost/debian/ \
+ --parent-mirror-chroot-security http://localhost/debian-security/ \
+ --parent-mirror-chroot-backports http://localhost/debian-backports/
}code
-Le miroir chroot, spécifiée par #{--mirror-chroot}#, par défaut, c'est la
-valeur #{--mirror-bootstrap}#.
+Le miroir chroot, spécifiée par #{--parent-mirror-chroot}#, par défaut,
+c'est la valeur #{--parent-mirror-bootstrap}#.
3~ Miroirs de distribution utilisés au moment de l'exécution
-Les options #{--mirror-binary*}# régissent les miroirs de distribution
-placés dans l'image binaire. Ils peuvent être utilisés pour installer des
-paquets supplémentaires lors de l'exécution du système live. Les valeurs par
-défaut emploient #{cdn.debian.net}#, un service qui choisit un miroir
-géographiquement proche basé sur le numéro IP de l'utilisateur. C'est un
-choix approprié lorsque vous ne pouvez pas prédire quel miroir sera mieux
-pour tous vos utilisateurs. Ou vous pouvez spécifier vos propres valeurs,
-comme indiqué dans l'exemple ci-dessous. Une image construite avec cette
-configuration seulement serait approprié pour les utilisateurs sur un réseau
-où "#{mirror}#" est accessible.
+Les options #{--parent-mirror-binary*}# régissent les miroirs de
+distribution placés dans l'image binaire. Ils peuvent être utilisés pour
+installer des paquets supplémentaires lors de l'exécution du système
+live. Les valeurs par défaut emploient #{cdn.debian.net}#, un service qui
+choisit un miroir géographiquement proche basé sur le numéro IP de
+l'utilisateur. C'est un choix approprié lorsque vous ne pouvez pas prédire
+quel miroir sera mieux pour tous vos utilisateurs. Ou vous pouvez spécifier
+vos propres valeurs, comme indiqué dans l'exemple ci-dessous. Une image
+construite avec cette configuration seulement serait approprié pour les
+utilisateurs sur un réseau où "#{mirror}#" est accessible.
code{
- $ lb config --mirror-binary http://mirror/debian/ \
- --mirror-binary-security http://mirror/debian-security/
+ $ lb config --parent-mirror-binary http://mirror/debian/ \
+ --parent-mirror-binary-security http://mirror/debian-security/
}code
@@ -123,13 +125,14 @@ Vous pouvez ajouter plus de référentiels, élargir vos choix de paquets
au-delà ceux disponibles dans votre distribution objectif. Il peut être, par
exemple, pour backports, expérimentaux ou des paquets personnalisés. Pour
configurer des référentiels supplémentaires, créer les fichiers
-#{config/chroot_sources/your-repository.chroot}#, et/ou
-#{config/chroot_sources/your-repository.binary}#. Comme avec les options
-#{--mirror-*}#, elles gouvernent les référentiels utilisés dans l'étape
-*chroot* lors de la construction de l'image, et dans l'étape *binaire*,
-c'est à dire pour une utilisation au moment de l'exécution du système live.
-
-Par exemple, #{config/chroot_sources/live.chroot}# vous permet d'installer
+#{config/archives/your-repository.list.chroot}#, et/ou
+#{config/archives/your-repository.list.binary}#. Comme avec les options
+#{--parent-mirror-*}#, elles gouvernent les référentiels utilisés dans
+l'étape *chroot* lors de la construction de l'image, et dans l'étape
+*binaire*, c'est à dire pour une utilisation au moment de l'exécution du
+système live.
+
+Par exemple, #{config/archives/live.list.chroot}# vous permet d'installer
des paquets du référentiel des instantanés debian live au moment de la
construction du système live.
@@ -139,20 +142,20 @@ code{
}code
-Si vous ajoutez la même ligne à #{config/chroot_sources/live.binary}#, le
-référentiel sera ajouté à le répertoire #{/etc/apt/sources.list.d/}# de
-votre système live.
+Si vous ajoutez la même ligne à #{config/archives/live.list.binary}#, le
+référentiel sera ajouté au répertoire #{/etc/apt/sources.list.d/}# de votre
+système live.
Si ces fichiers existent, ils seront sélectionnés automatiquement.
Vous devriez également mettre la clé GPG utilisée pour signer le référentiel
-dans fichiers #{config/chroot_sources/your-repository.{binary,chroot}.gpg}#
+dans fichiers #{config/archives/your-repository.gpg.{binary,chroot}}#
-*{Remarque:}* certains référentiels de paquets préconfigurés sont disponibles pour une sélection facile grâce à l'option #{--repository}#, par exemple pour permettre des instantanés live, une simple commande suffit pour l'activer:
+*{Remarque:}* certains référentiels de paquets préconfigurés sont disponibles pour une sélection facile grâce à l'option #{--archives}#, par exemple pour permettre des instantanés live, une simple commande suffit pour l'activer:
code{
- $ lb config --repository live.debian.net
+ $ lb config --archives live.debian.net
}code
@@ -160,38 +163,17 @@ code{
Il y a un certain nombre de façons de choisir quels paquets live-build va
installer dans votre image, couvrant une variété de besoins différents. Vous
-pouvez tout simplement nommer les paquets individuels à installer, que ce
-soit avec l'option #{--packages}# pour quelques paquets, ou dans une liste
-de paquets pour un grand nombre de paquets. Vous pouvez également choisir
-grandes listes prédéfinies de paquets, ou utilisez des tâches APT. Et enfin,
-vous pouvez placer paquets dans votre arbre #{config/}# qui est bien adapté
-aux essais de nouveaux paquets ou expérimentaux avant qu'ils ne soient
-disponibles à partir d'un référentiel.
-
-3~ Choisir un certain nombre de paquets
-
-Si le nombre de paquets ajoutée est petit il suffit de spécifier
-#{--packages}#. Par exemple:
-
-code{
-
- $ lb config --packages "package1 package2 package3"
-
-}code
-
-Le comportement de live-build pour spécifier un paquet qui n'existe pas est
-déterminé par votre choix de l'utilité APT. Voir {Choisir apt ou
-aptitude}#choosing-apt-or-aptitude pour plus de détails.
-
-Si vous avez besoin de spécifier un grand nombre de paquets à installer ou
-vous avez besoin de flexibilité en ce qui concerne les paquets à installer,
-utilisez des listes de paquets tel que discuté dans la section suivante,
-{Listes de paquets}#package-lists.
+pouvez tout simplement nommer les paquets individuels à installer dans une
+liste de paquets. Vous pouvez également choisir grandes listes prédéfinies
+de paquets, ou utilisez des tâches APT. Et enfin, vous pouvez placer paquets
+dans votre arbre #{config/}# qui est bien adapté aux essais de nouveaux
+paquets ou expérimentaux avant qu'ils ne soient disponibles sur un
+référentiel.
3~package-lists Listes de paquets
Les listes de paquets sont un excellent moyen d'exprimer quels paquets
-doivent être installés. La syntaxe de la liste supporte les fichiers inclus
+doivent être installés. La syntaxe de la liste soutient les fichiers inclus
et sections conditionnelles qui les rend facile de construire à partir
d'autres listes et de les adapter pour une utilisation dans configurations
multiples. Vous pouvez utiliser des listes de paquets prédéfinies, offrant
@@ -200,67 +182,58 @@ de bureau majeurs et certaines listes de but spécial, ainsi que les autres
listes standard sont basées sur elles. Vous pouvez également fournir votre
propre liste de paquets, ou utiliser une combinaison des deux.
+*{Remarque:}* Le comportement de live-build pour spécifier un paquet qui n'existe pas est déterminé par votre choix de l'utilité APT. Voir {Choisir apt ou aptitude}#choosing-apt-or-aptitude pour plus de détails.
+
3~ Listes de paquets prédéfinies
La façon la plus simple d'utiliser des listes consiste à spécifier une ou
-plusieurs listes prédéfinies avec la option #{--packages-lists}#. Par
+plusieurs listes prédéfinies avec la option #{--package-lists}#. Par
exemple:
code{
- $ lb config --packages-lists "gnome-core rescue"
+ $ lb config --package-lists "gnome rescue"
}code
-En plus de ces listes, live-build supporte quatre listes de paquets
-virtuels: #{gnome-desktop}#, #{kde-desktop}#, #{lxde-desktop}# et
-#{xfce-desktop}#, chacun d'entre eux offrent une sélection plus grande de
-paquets qui correspond à valeurs par défaut de l'installateur Debian pour
-ces environnements de bureau. Voir {Tâches de bureau et de la
-langue}#desktop-and-language-tasks pour plus de détails.
-
-*{Remarque:}* Les images préconstruites GNOME, KDE, LXDE et XFCE disponibles pour téléchargement à http://live.debian.net sont construites en utilisant les listes virtuels correspondantes #{*-desktop}#.
-
L'emplacement par défaut pour les fichiers liste sur votre système est
-#{/usr/share/live/build/lists/}#. Pour déterminer les paquets dans une liste
-donnée, lire le fichier correspondant, en accordant une attention aux
-fichiers inclus et les conditionnels tels que décrits dans les sections
+#{/usr/share/live/build/package-lists/}#. Pour déterminer les paquets dans
+une liste donnée, lire le fichier correspondant, en accordant une attention
+aux fichiers inclus et les conditionnels tels que décrits dans les sections
suivantes.
3~ Listes de paquets locaux
Vous pouvez compléter ou remplacer entièrement les listes fournies en
-utilisant listes de paquets locaux stockées dans
-#{config/chroot_local-packageslists/}#.
+utilisant listes de paquets locaux stockées dans #{config/package-lists/}#.
Les listes de paquets qui existent dans ce répertoire ont besoin d'avoir un
-suffixe #{.list}# pour être traitées. Les listes locaux de paquets ont
-toujours priorité sur les listes de paquets distribués avec live-build. Cela
-peut causer des effets indésirables, nous recommandons donc d'utiliser des
-noms uniques pour listes de paquets locaux.
+suffixe #{.list}# pour être traitées, puis un suffixe d'étape
+supplémentaire#{.chroot}# ou #{.binary}# pour indiquer à quelle étape la
+liste est destinée.
-3~ Listes locaux de paquets binaires
+*{Remarque:}* Si vous ne spécifiez pas le suffixe de l'étape, la liste sera utilisée pour les deux étapes. Normalement, vous voulez spécifier #{.list.chroot}# de sorte que les paquets seront seulement installés dans le système de fichiers live et ne pas avoir une copie supplémentaire du #{.deb}# placé sur le support.
-Dans le cas où vous voulez inclure certains paquets .deb dans #{pool/}# de
-votre support live (sans les installer sur l'image live) vous pouvez avoir
-besoin d'utiliser des listes à l'aide de listes locaux de paquets binaires
-stockées dans #{config/binary_local-packageslists/}#. Ces supports peuvent
-être utilisés comme une image d'installation de Debian personnalisés pour
-les installations hors-ligne.
+3~ Listes locaux de paquets binaires
-Les listes de paquets qui existent dans ce répertoire ont besoin d'avoir un
-suffixe #{.list}# pour être traitées.
+Pour faire une liste pour l'étape binary, placez un fichier avec le suffixe
+#{.list.binary}# dans #{config/package-lists/}#. Ces paquets ne sont pas
+installés dans le système de fichiers live, mais sont inclus sur les
+supports live sous #{pool/}#. Vous utiliserez généralement cette liste avec
+une des variantes d'installation non-live. Comme mentionné ci-dessus, si
+vous voulez que cette liste soit le même que votre liste pour l'étape
+chroot, utilisez simplement le suffixe #{.list}#.
3~ Extension d'un liste de paquets fournis à l'aide de «includes»
Les listes de paquets qui sont incluses avec live-build font un grand usage
des «includes». Reportez-vous à ceux-ci dans le répertoire
-#{/usr/share/live/build/lists/}#, car ils servent d'exemples pour savoir
-comment écrire vos propres listes.
+#{/usr/share/live/build/package-lists/}#, car ils servent d'exemples pour
+savoir comment écrire vos propres listes.
Par exemple, pour faire une liste qui comprend la liste prédéfinie
-#{gnome}#, plus iceweasel, créer
-#{config/chroot_local-packageslists/mygnome.list}# avec le contenu suivant:
+#{gnome}#, plus iceweasel, créer #{config/package-lists/my.list.chroot}#
+avec le contenu suivant:
code{
@@ -324,7 +297,7 @@ code{
}code
-L'imbrication des conditionnels n'est pas supportée.
+L'imbrication des conditionnels n'est pas soutenu.
3~ Tâches
@@ -332,13 +305,15 @@ L'installateur Debian offre l'utilisateur le choix d'un certain nombre de
listes présélectionnées de paquets, chacun centré sur un type particulier de
système ou d'une tâche pour laquelle un système peut être utilisé, comme
«environnement de bureau graphique», «serveur de messagerie» ou
-«portable». Ces listes sont appelés «tâches» et sont supportés par APT à
-travers l'option «Task:» Vous pouvez spécifier une ou plusieurs tâches en
-live-build via l'option #{--tasks}#, comme dans l'exemple ci-dessous.
+«portable». Ces listes sont appelés «tâches» (Tasks) et sont soutenus par
+APT grâce à l'option «Task:» Vous pouvez spécifier une ou plusieurs tâches à
+live-build en les plaçant dans une liste dans #{config/task-lists/}#, comme
+dans l'exemple ci-dessous.
code{
- $ lb config --tasks "mail-server file-server"
+ $ lb config
+ $ echo "mail-server file-server" >> config/task-lists/my.list.chroot
}code
@@ -349,61 +324,55 @@ n'importe quelle tâche, y compris ceux non inclus dans cette liste, peuvent
3~desktop-and-language-tasks Tâches de bureau et de la langue
-Les tâches de bureau et de la langue sont des cas particuliers. Dans
-l'installateur Debian, si le milieu a été préparé pour un environnement de
-bureau particulier, la tâche correspondante sera automatiquement
-installée. Ainsi, il y a tâches #{gnome-desktop}#, #{kde-desktop}#,
-#{lxde-desktop}# et #{xfce-desktop}#, dont aucun n'est offert dans le menu
-#{tasksel}#. De même, il n'y a pas entrées de menu pour les tâches de les
-langues, mais le choix de la langue de l'utilisateur lors de l'installation
-influence le choix des tâches de la langue correspondante.
-
-En live-build, par conséquent, ces cas particuliers sont également d'une
-attention particulière, mais avec trois différences notables au moment de
-l'écriture.
-
-D'abord, il n'existe aucune disposition fait encore automatiquement pour des
-tâches de la langue, même si un sous-ensemble de ces packages sont inclus si
-vous spécifiez #{lb config --language}#. Si vous avez besoin de ces tâches,
-qui comprennent des éléments tels que des polices spécifiques de la lange et
-des paquets de méthodes d'entrée, vous devez les spécifier dans votre
-configuration. Par exemple:
+Les tâches de bureau et de la langue sont des cas particuliers qui ont
+besoin d'une certaine planification et de configuration supplémentaire
+. Dans l'installateur Debian, si le support a été préparé pour un
+environnement de bureau particulier, la tâche correspondante sera
+automatiquement installée. Ainsi, il y a tâches internes #{gnome-desktop}#,
+#{kde-desktop}#, #{lxde-desktop}# et #{xfce-desktop}#, dont aucun n'est
+offert dans le menu #{tasksel}#. De même, il n'y a pas entrées de menu pour
+les tâches de les langues, mais le choix de la langue de l'utilisateur lors
+de l'installation influence le choix des tâches de la langue correspondante.
+
+Lors du développement d'une image de bureau live, l'image généralement
+démarre directement à un bureau de travail, le choix des deux
+environnements de bureau et la langue par défaut ayant été faite au moment
+de la construction, non pas au moment de l'exécution comme dans le cas de
+l'installateur de Debian. Cela ne veut pas dire qu'une image live ne pouvait
+être construite pour soutenir plusieurs environnements de bureau ou de
+plusieurs langues et offrir à l'utilisateur un choix, mais ce n'est pas le
+comportement par défaut de live-build.
+
+Parce qu'il n'ya pas de disposition fait automatiquement pour les tâches de
+la langue, qui comprennent des éléments tels que des polices spécifiques de
+la langue et des paquets de méthodes d'entrée, si vous les voulez, vous
+devez les spécifier dans votre configuration. Par exemple, une image de
+bureau GNOME contenant de soutien pour le japonais pourrait inclure les
+tâches suivantes:
code{
- $ lb config --tasks "japanese japanese-desktop japanese-gnome-desktop"
+ $ lb config
+ $ echo "gnome-desktop desktop standard laptop" >> config/task-lists/my.list.chroot
+ $ echo "japanese japanese-desktop japanese-gnome-desktop" >> config/task-lists/my.list.chroot
}code
-En second lieu, live-build supporte #{*-desktop}# listes de paquets virtuels
-pour chacune des saveurs de bureau mentionnés ci-dessus, qui sélectionnent
-la liste prédéfinie de paquets #{standard-x11}#, le correspondant
-#{*-desktop}# et trois tâches supplémentaires: #{desktop}#, #{standard}# et
-#{laptop}#. Ainsi, par exemple, si vous spécifiez #{--packages-lists
-gnome-desktop}#, il est équivalent à spécifier #{--packages
-debian-installer-launcher --packages-lists standard-x11 --tasks
-"gnome-desktop desktop standard laptop"}#.
-
-En troisième lieu, si une des tâches de bureau pour ces saveurs sont
-sélectionnés, soit explicitement par #{--tasks}# ou implicitement par
-#{--packages-lists}#, live-build préconfigurera la valeur de bureau
-correspondante pour l'installateur Debian (si elle est incluse) pour
-s'assurer qu'il suit ses propres règles pour l'installation de saveurs de
-bureau différents.
-
-*{Remarque:}* Il existe également une option expérimental #{--language}# qui a un objectif qui se chevauche avec des tâches des langues. Pour toute langue pour laquelle il est connu qu'il y a des paquets #{*-l10n}#, si #{--language}# est spécifié, ces paquets seront installés. Par ailleurs, si tous les modèles #{syslinux}# correspondants à la langue sont trouvés, ils seront utilisés au lieu des modèles par défaut en anglais. La sélection des paquets fait par #{--language}# est une mauvaise approximation aux tâches de langue, car elle exige que la liste des paquets à inclure par langue sera maintenu en interne en live-build, et d'ailleurs, des langues sont plus complets et flexibles. Cependant, l'aspect #{syslinux}# est encore utile. Ainsi, si vous utilisez #{--bootloader syslinux}# et des modèles pour la langue spécifiée existe, soit dans #{/usr/share/live/build/templates/syslinux/}# ou #{config/templates/syslinux/}#, pensez à utiliser cette option, évent
uellement en combinaison avec des tâches pour s'assurer que tous les paquets concernés sont installés. Par exemple:
+Comme les tâches de bureau sont des tâches «internes», pour chaque tâche de
+saveur de bureau inclus dans l'image, la valeur correspondante, si elle
+diffère de la valeur par défaut, "gnome", doit être préconfiguré dans la
+variable debconf «tasksel/desktop", ou bien tasksel ne la reconnaîtra pas et
+ne l'installera pas. Ainsi:
code{
- $ lb config --language es
+ $ lb config
+ $ echo 'tasksel tasksel/desktop multiselect kde' >> config/preseed/my.preseed.chroot
}code
-Même ainsi, elle est limitée en ce qu'elle ne supporte que d'une seule
-langue et un chargeur de démarrage unique. Par conséquent, pour toutes ces
-raisons, l'avenir de cette option est à l'étude, qui pourrait être remplacé
-par quelque chose d'entièrement différent dans la prochaine version majeure
-de live-build.
+Ce paramètre peut prendre plusieurs valeurs, par exemple "lxde xfce" au lieu
+de "kde".
2~installing-modified-or-third-party-packages Installation des paquets
modifiés ou de tiers
@@ -426,41 +395,41 @@ http://www.debian.org/doc/maint-guide/ et ailleurs
Il y a deux façons d'installer des paquets personnalisés modifiés:
-_* #{chroot_local-packages}#
+_* #{packages.chroot}#
_* En utilisant un référentiel APT personnalisé
-Utilisant #{chroot_local-packages}# est plus simple à réaliser et utile pour
-les personnalisations ponctuels mais a un certain nombre d'inconvénients,
-tout en utilisant un réferéntiel personnalisé APT est plus fastidieux à
-mettre en place.
+Utilisant #{packages.chroot}# est plus simple à réaliser et utile pour les
+personnalisations ponctuels mais a un certain nombre d'inconvénients, tout
+en utilisant un réferéntiel personnalisé APT est plus fastidieux à mettre en
+place.
-3~ Utilisant #{chroot_local-packages}# pour installer paquets personnalisés
+3~ Utilisant #{packages.chroot}# pour installer paquets personnalisés
Pour installer un paquet personnalisé, il suffit de le copier dans le
-répertoire #{config/chroot_local-packages/}#. Les paquets qui sont dans ce
+répertoire #{config/packages.chroot/}#. Les paquets qui sont dans ce
répertoire seront automatiquement installés dans le système live pendant la
construction du systéme - vous n'avez pas besoin de les spécifier ailleurs.
Les paquets *{doivent}* être nommés de la manière prescrite. Une façon
simple de le faire consiste à utiliser #{dpkg-name}#.
-L'utilisation de #{chroot_local-packages}# pour l'installation de paquets
+L'utilisation de #{packages.chroot}# pour l'installation de paquets
personnalisés a des inconvénients:
_* Il n'est pas possible d'utiliser secure APT.
_* Vous devez installer tous les paquets appropriés dans le répertoire
-#{config/chroot_local-packages/}#.
+#{config/packages.chroot/}#.
_* Il ne se prête pas au stockage de configurations Debian Live dans le
contrôle de révision.
3~ Utilisant un référentiel APT pour installer des paquets personnalisés.
-Contrairement à l'utilisation de #{chroot_local-packages}#, lorsque vous
-utilisez un réferéntiel personnalisé APT vous devez vous assurer que vous
-spécifiez les paquets ailleurs. Voir {Choisir les paquets à
+Contrairement à l'utilisation de #{packages.chroot}#, lorsque vous utilisez
+un réferéntiel personnalisé APT vous devez vous assurer que vous spécifiez
+les paquets ailleurs. Voir {Choisir les paquets à
installer}#choosing-packages-to-install pour plus de détails.
Si créer un référentiel APT pour installer des packages personnalisés peut
@@ -488,8 +457,8 @@ plus d'informations.
Vous pouvez configurer APT par un certain nombre d'options appliquées
uniquement au moment de la construction. (La configuration d'APT utilisé
dans le système live en fonctionnement peut être configurée de façon normale
-pour un système live, qui est, en incluant les configurations appropriées à
-#{config/chroot_local_includes/}#.) Pour une liste complète, regardez les
+pour un système live, qui est, en incluant les configurations appropriées
+dans #{config/includes.chroot/}#.) Pour une liste complète, regardez les
options commençant par #{apt}# dans la page de manuel de #{lb_config}#.
3~choosing-apt-or-aptitude Choisir apt ou aptitude
@@ -530,7 +499,7 @@ pouvez omettre avec:
code{
- $ lb config --binary-indices false
+ $ lb config --apt-indices false
}code
@@ -577,19 +546,19 @@ Pour le contexte, s'il vous plaît lire d'abord la page de manuel
#{apt_preferences(5)}#. APT pinning peut être configuré soit pour le temps
de construction, ou encore pendant l'exécution. Pour le premier, créez
#{config/chroot_apt/preferences}#. Pour ce dernier, créez
-#{config/chroot_local-includes/etc/apt/preferences}#.
+#{config/includes.chroot/etc/apt/preferences}#.
-Imaginons que vous voulez construire un système live Squeeze mais il faut
+Imaginons que vous voulez construire un système live Wheezy mais il faut
installer tous les paquets live qui finissent dans l'image binaire depuis
Sid au moment de la construction. Vous devez ajouter Sid à votre APT sources
et le fixer de sorte que seulement les paquets que vous voulez sont
installés au temps de construction et tous les autres sont de la
-distribution du système cible, Squeeze. Ce qui suit devrait accomplir ça:
+distribution du système cible, Wheezy. Ce qui suit devrait accomplir ça:
code{
- $ echo "deb http://mirror/debian sid main" > config/chroot_sources/sid.chroot
- $ cat >>config/chroot_apt/preferences <<END
+ $ echo "deb http://mirror/debian sid main" > config/archives/sid.list.chroot
+ $ cat >> config/chroot_apt/preferences <<END
Package: live-boot live-boot-initramfs-tools live-config live-config-sysvinit
Pin: release n=sid
Pin-Priority: 600
@@ -612,7 +581,7 @@ $ lb config --distribution wheezy
Une priorité pin négative évitera installér un paquet, comme dans le cas où
vous ne voulez pas un paquet qui est recommandé par un autre
paquet. Supposons que vous construisez une image LXDE en utilisant l'option
-#{--packages-lists lxde}# mais ne veulez pas que l'utilisateur soit invité à
+#{--package-lists lxde}# mais ne veulez pas que l'utilisateur soit invité à
stocker les mots de passe wifi dans le trousseau de clés. Cette liste
comprend #{gdm}#, que dépend de #{gksu}#, que à son tour recommends
#{gnome-keyring}#. Donc, vous voulez omettre le paquet recommandé
diff --git a/manual/fr/user_customization-runtime.ssi b/manual/fr/user_customization-runtime.ssi
index f2f919e..63b65ff 100644
--- a/manual/fr/user_customization-runtime.ssi
+++ b/manual/fr/user_customization-runtime.ssi
@@ -19,12 +19,16 @@ tous les groupes et les autorisations associées à l'utilisateur live.
Vous pouvez spécifier d'autres groupes pour l'utilisateur live en
préconfigurant la valeur debconf #{passwd/user-default-groups}#. Par
-exemple, pour ajouter l'utilisateur live au groupe #{fuse}# ajoutez la ligne
-suivante à un fichier dans le répertoire #{config/chroot_local-preseed}#:
+exemple, pour ajouter l'utilisateur live au groupe #{fuse}# pendant l'étape
+chroot, ajoutez la ligne suivante à un fichier dans le répertoire
+#{config/chroot_local-preseed}#:
code{
- user-setup passwd/user-default-groups string audio cdrom dip floppy video plugdev netdev powerdev scanner bluetooth fuse
+ $ lb config
+ $ echo user-setup passwd/user-default-groups string audio cdrom \
+ dip floppy video plugdev netdev powerdev scanner bluetooth fuse \
+ >> config/preseed/my.preseed.chroot
}code
@@ -46,7 +50,7 @@ hook comme décrit dans {Hooks au moment du démarrage}#boot-time-hooks. Pour
ce faire vous pouvez utiliser le hook "passwd" de
#{/usr/share/doc/live-config/examples/hooks}#, ajouter un préfixe correct
(par exemple 200-passwd) et l'ajouter à
-#{config/chroot_local-includes/lib/live/config/}#
+#{config/includes.chroot/lib/live/config/}#
2~customizing-locale-and-language Personnalisation des paramètres régionaux
et la langue
diff --git a/manual/fr/user_examples.ssi b/manual/fr/user_examples.ssi
index 0f543f0..60730c1 100644
--- a/manual/fr/user_examples.ssi
+++ b/manual/fr/user_examples.ssi
@@ -1,44 +1,50 @@
:B~ Exemples
-1~examples Examples
-
-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~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:
+1~examples Exemples
+
+Ce chapitre s'occupe d'exemples de constructions pour les cas d'utilisation
+spécifiques avec Debian Live. Si vous êtes nouveau avec la construction de
+vos propres images Debian Live, nous vous recommandons d'abord regarder les
+trois tutoriels en séquence, comme chacun apprend nouvelles techniques qui
+vous aideront à utiliser et à comprendre les exemples restants.
+
+2~using-the-examples En utilisant les exemples
+
+Pour utiliser ces exemples vous avez besoin d'un système pour les
+construire, lequel répond aux exigences énumérées dans
+{Exigences}#requirements et vous avez live-build installe comme décrit à
+{Installation de live-build}#installing-live-build.
+
+Notez que, pour des raisons de concision, dans ces exemples, nous ne
+spécifions pas un miroir local à utiliser pour la construction. Vous pouvez
+accélérer considérablement les téléchargements si vous utilisez un miroir
+local. Vous pouvez spécifier les options lorsque vous utilisez #{lb
+config}#, tel que décrit dans {Miroirs de distribution utilisés au temps de
+construction}#distribution-mirrors-build-time, ou pour plus de commodité,
+fixez par défaut votre système de construction dans
+#{/etc/live/build.conf}#. Il suffit de créer ce fichier et de définir les
+variables #{LB_PARENT_MIRROR_*}# correspondantes à votre miroir
+préféré. Tous les autres miroirs utilisés dans la construction seront par
+défaut à partir de ces valeurs. Par exemple:
code{
- LB_MIRROR_BOOTSTRAP="http://mirror/debian"
- LB_MIRROR_CHROOT="http://mirror/debian"
- LB_MIRROR_CHROOT_SECURITY="http://mirror/debian-security"
+ LB_PARENT_MIRROR_BOOTSTRAP="http://mirror/debian"
+ LB_PARENT_MIRROR_CHROOT_SECURITY="http://mirror/debian-security"
+ LB_PARENT_MIRROR_CHROOT_BACKPORTS="http://mirror/debian-updates"
}code
-2~tutorial-1 Tutorial 1: A standard image
+2~tutorial-1 Tutorial 1: Une image standard
-*{Use case:}* Create a simple first image, learning the basics of live-build.
+*{Cas d'utilisation:}* Créer une image simple d'abord, apprenant les bases de 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.
+Dans ce tutoriel, nous construirons une image Debian Live ISO hybride par
+défaut contenant uniquement paquets de base (pas de Xorg) et quelques
+paquets Debian de soutien live, comme un premier exercice en utilisant
+live-build.
-You can't get much simpler than this:
+Vous ne pouvez pas obtenir beaucoup plus simple que cela:
code{
@@ -46,11 +52,13 @@ code{
}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.
+Examinez le contenu du répertoire #{config/}# si vous le souhaitez. Vous
+verrez stockés ici une configuration du squelette, pour être personnalise
+ou, dans ce cas, utiliser immédiatement pour construire une image par
+défaut.
-Now, as superuser, build the image, saving a log as you build with #{tee}#.
+Maintenant, en tant que superutilisateur, construire l'image en enregistrant
+un journal avec #{tee}#.
code{
@@ -58,38 +66,42 @@ code{
}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 an ISO hybrid image to a USB
-stick}#copying-iso-hybrid-to-usb, respectively.
+En supposant que tout se passe bien, après un certain temps, le répertoire
+courant contient #{binary-hybrid.iso}#. Cette image ISO hybride peut être
+démarré directement dans une machine virtuelle comme décrit dans {Test d'une
+image ISO avec QEMU}#testing-iso-with-qemu et {Test d'une image ISO avec
+virtualbox-ose}#testing-iso-with-virtualbox, ou bien copiés sur un support
+optique ou un périphérique USB comme décrit dans {Graver une image ISO sur
+un support physique}#burning-iso-image et {Copie d'un image ISO hybride sur
+une clé USB}#copying-iso-hybrid-to-usb, respectivement.
-2~tutorial-2 Tutorial 2: A web browser utility
+2~tutorial-2 Tutoriel 2: Un utilitaire de navigateur Web
-*{Use case:}* Create a web browser utility image, learning how to apply customizations.
+*{Cas d'utilisation:}* Créer une image d'un utilitaire de navigateur Web, en apprenant à appliquer des personnalisations.
-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.
+Dans ce tutoriel, nous allons créer une image utilisable comme un utilitaire
+de navigateur Web, en servant d'introduction à la personnalisation d'images
+Debian Live.
code{
- $ mkdir tutorial2 ; cd tutorial2 ; lb config -p lxde --packages iceweasel
+ $ mkdir tutorial2
+ $ cd tutorial2
+ $ lb config -p lxde
+ $ echo iceweasel >> config/package-lists/my.list.chroot
}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.
+Notre choix de LXDE pour cet exemple reflète notre volonté de fournir un
+environnement de bureau minime, puisque le point de l'image est
+l'utilisation unique, nous avons à l'esprit, le navigateur web. On pourrait
+aller encore plus loin et offrir une configuration par défaut pour le
+navigateur web dans #{config/includes.chroot/etc/iceweasel/profile/}#, ou
+des paquets de soutien supplémentaires pour visualiser différents types de
+contenu web, mais nous laissons cela comme une exercice pour le lecteur.
-Build the image, again as superuser, keeping a log as in {Tutorial
-1}#tutorial-1:
+Construire l'image, encore une fois en tant que superutilisateur, tenir un
+journal comme dans {Tutoriel 1}#tutorial-1:
code{
@@ -97,20 +109,22 @@ code{
}code
-Again, verify the image is OK and test, as in {Tutorial 1}#tutorial-1.
+Encore une fois, vérifiez que l'image est OK et faire un test, comme dans
+{Tutoriel 1}#tutorial-1:
-2~tutorial-3 Tutorial 3: A personalized image
+2~tutorial-3 Tutoriel 3: Une image personnalisée
-*{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.
+*{Cas d'utilisation:}* Créer un projet pour construire une image personnalisée, contenant vos logiciels préférés à emporter avec vous sur une clé USB où que vous alliez, et évoluant dans des révisions successives selon vos besoins et vos préférences changent.
-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.
+Puisque nous allons changer notre image personnalisée pendant un certain
+nombre de révisions, et nous voulons suivre ces changements, d'essayer des
+choses expérimentalement et éventuellement de les revenir si les choses ne
+fonctionnent pas, nous garderons notre configuration dans le populaire
+système de contrôle de version #{git}#. Nous allons également utiliser les
+meilleures pratiques d'autoconfiguration via #{auto}# scripts tel que décrit
+dans {Gestion d'une configuration}#managing-a-configuration.
-3~ First revision
+3~ Première révision
code{
@@ -120,7 +134,7 @@ code{
}code
-Edit #{auto/config}# to read as follows:
+Éditer #{auto/config}# pour lire comme suit:
code{
@@ -128,21 +142,30 @@ code{
lb config noauto \
--architecture i386 \
- --linux-flavours 686 \
- --packages-lists lxde \
- --packages "iceweasel xchat" \
+ --linux-flavours 686-pae \
+ --package-lists lxde \
"${@}"
}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}#.
+Maintenant remplir votre liste de paquets locaux:
+
+code{
+
+ $ echo "iceweasel xchat" >> config/package-lists/my.list.chroot
+
+}code
+
+Tout d'abord, #{--architecture i386}# assure que sur notre système de
+construction #{amd64}#, nous construisons une version 32 bits qui peut être
+utilisé sur la plupart des machines. Deuxièmement, nous utilisons
+#{--linux-flavours 686-pae}# parce que nous ne prévoyons pas utiliser cette
+image sur des systèmes beaucoup plus anciens. Troisièmement, nous avons
+choisi la liste des paquets #{lxde}# pour nous donner un bureau minimal. Et
+enfin, nous avons ajouté deux premiers paquets préférés: #{iceweasel}# et
+#{xchat}#.
-Now, build the image:
+Maintenant, construire l'image:
code{
@@ -150,12 +173,14 @@ code{
}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}#.
+Notez que contrairement aux deux premiers tutoriels, nous n'avons plus
+besoin de taper #{2>&1 | tee binary.log}# parce que cela est maintenant
+inclus dans #{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:
+Une fois que vous avez testé l'image (comme dans {Tutoriel 1}#tutorial-1) et
+êtes satisfait avec son fonctionnement, il est temps pour initialiser notre
+référentiel #{git}#, ajoutant que les scripts d'auto que nous avons juste
+créé, et ensuite faire le premier commit:
code{
@@ -165,15 +190,17 @@ code{
}code
-3~ Second revision
+3~ Deuxième révision
-In this revision, we're going to clean up from the first build, add the
-#{vlc}# package to our configuration, rebuild, test and commit.
+Dans cette révision, nous allons nettoyer à partir de la première
+construction, ajouter le paquet #{vlc}# à notre configuration, reconstruire,
+tester et faire le 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.
+La commande #{lb clean}# va nettoyer tous les fichiers générés par la
+construction précédente à l'exception du cache, ça évite d'avoir à
+re-télécharger les paquets. Cela garantit que le #{lb build}# postérieure
+ré-exécutera toutes les étapes pour régénérer les fichiers de notre nouvelle
+configuration.
code{
@@ -181,22 +208,16 @@ code{
}code
-Now edit #{auto/config}# to add the #{vlc}# package:
+Maintenant ajouter le paquet #{vlc}# à votre liste de paquets local dans
+#{config/package-lists/my.list.chroot}#:
code{
- #!/bin/sh
-
- lb config noauto \
- --architecture i386 \
- --linux-flavours 686 \
- --packages-lists lxde \
- --packages "iceweasel xchat vlc" \
- "${@}"
+ $ echo vlc >> config/package-lists/my.list.chroot
}code
-Build again:
+Construire à nouveau:
code{
@@ -204,7 +225,7 @@ code{
}code
-Test, and when you're satisfied, commit the next revision:
+Tester, et quand vous êtes satisfaits, commit la prochaine révision:
code{
@@ -212,45 +233,47 @@ code{
}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.
+Bien sûr, des changements plus compliqués à la configuration sont possibles,
+peut-être l'ajout de fichiers dans les sous-répertoires de
+#{config/}#. Quand vous livrez des nouvelles révisions, il suffit de prendre
+soin de ne pas modifier à la main ou commit les fichiers de niveau supérieur
+dans #{config}# contenant variables #{LB_*}#, car ce sont des produits de
+creation, aussi, et sont toujours nettoyés par #{lb clean}# et re-créés avec
+#{lb config}# via leur respectives #{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.
+Nous sommes arrivés à la fin de notre série de tutoriels. Alors que de
+nombreux types de personnalisations sont possibles, même juste en utilisant
+les fonctionnalités explorées dans ces exemples simples, une variété presque
+infinie d'images différentes peuvent être crées. Les autres exemples de
+cette section couvrent plusieurs autres cas d'utilisation tirés des
+expériences recueillies des utilisateurs de Debian Live.
-2~ A VNC Kiosk Client
+2~ Un client Kiosk VNC
-*{Use case:}* Create an image with live-build to boot directly to a VNC server.
+*{Cas d'utilisation:}* Créer une image avec live-build pour démarrer directement à un serveur VNC.
-Make a build directory and create a skeletal configuration in it built
-around the standard-x11 list, including #{gdm3}#, #{metacity}# and
-#{xtightvncviewer}#, disabling recommends to make a minimal system:
+Faire un répertoire de construction et créer une configuration du squelette
+construit autour de la liste standard x11, avec #{gdm3}#, #{metacity}# et
+#{xvnc4viewer}#, désactivant «recommends» pour faire un système minimal:
code{
$ mkdir vnc_kiosk_client
$ cd vnc_kiosk_client
- $ lb config -a i386 -k 686 -p standard-x11 \
- --packages "gdm3 metacity xvnc4viewer" \
+ $ lb config -a i386 -k 686-pae -p standard-x11 \
--apt-recommends false
+ $ echo "gdm3 metacity xvnc4viewer" >> config/package-lists/my.list.chroot
}code
-Create the directory #{/etc/skel}# and put a custom #{.xsession}# in it for
-the default user that will launch metacity and start xvncviewer, connecting
-to port #{5901}# on a server at #{192.168.1.2}#:
+Créez le répertoire #{/etc/skel}# avec une #{.xsession}# personnalisée pour
+l'utilisateur par défaut qui va lancer metacity et commencer xvncviewer, en
+reliant le port #{5901}# sur un serveur à #{192.168.1.2}#:
code{
- $ mkdir -p config/chroot_local-includes/etc/skel
- $ cat >config/chroot_local-includes/etc/skel/.xsession <<END
+ $ mkdir -p config/includes.chroot/etc/skel
+ $ cat > config/includes.chroot/etc/skel/.xsession <<END
#!/bin/sh
/usr/bin/metacity &
@@ -261,7 +284,7 @@ code{
}code
-Build the image:
+Construire l'image:
code{
@@ -269,30 +292,31 @@ code{
}code
-Enjoy.
+Amusez-vous bien!
-2~ A base image for a 128M USB key
+2~ Une image de base pour une clé USB de 128M
-*{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.
+*{Cas d'utilisation:}* Créer une image standard avec certains composants éliminés afin de s'adapter sur une clé USB avec 128M avec espace laissé pour l'utiliser à votre convenance.
-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.
+Lorsque l'optimisation d'une image adaptée à une dimension des certains
+supports, vous avez besoin de comprendre le compromis que vous faites entre
+la taille et la fonctionnalité. Dans cet exemple, nous réduisons uniquement
+que pour faire place à du matériel supplémentaire au sein d'une taille de
+128M, mais sans rien faire pour détruire l'intégrité des paquets contenus,
+telles que la purge des données de localisation via le paquet
+#{localepurge}#, ou d'autres tels optimisations "intrusives". On notera en
+particulier, vous ne devriez pas utiliser #{--bootstrap-flavour minimal}#
+sauf si vous savez vraiment ce que vous faites, que l'omission de paquets de
+priorité #{importants}# produira probablement un système live cassé.
code{
- $ lb config -k 486 -p minimal --binary-indices false \
+ $ lb config -k 486 -p minimal --apt-indices false \
--memtest none --apt-recommends false --includes none
}code
-Now, build the image in the usual way:
+Maintenant, construire l'image de la manière habituelle:
code{
@@ -300,37 +324,41 @@ code{
}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.
-
-2~ A localized KDE desktop and installer
-
-*{Use case:}* Create a KDE desktop image, localized for Brazilian Portuguese and including an installer.
-
-We want to make an iso-hybrid image for i386 architecture using our
-preferred desktop, in this case KDE, containing all of the same packages
-that would be installed by the standard Debian installer for KDE.
-
-Our initial problem is the discovery of the names of the appropriate
-tasks. Currently, live-build cannot help with this. While we might get lucky
-and find this by trial-and-error, there is a tool, #{grep-dctrl}#, which can
-be used to dig it out of the task descriptions in tasksel-data, so to
-prepare, make sure you have both of those things:
+Sur le système de l'auteur au moment de l'écriture, la configuration
+ci-dessus produit une image de 78Mbyte. Cela se compare favorablement avec
+l'image de 166Mbyte produite par la configuration par défaut dans {Tutoriel
+1}#tutorial-1.
+
+Le plus grand espace-économiseur ici, par rapport à la construction d'une
+image standard sur une architecture #{i386}#, est de sélectionner uniquement
+le saveur du noyau #{486}# au lieu de la valeur par défaut #{-k "486
+686-pae"}#. Laissant hors indices APT avec #{--apt-indices false}# permet
+aussi d'économiser une bonne quantité d'espace, le compromis étant que vous
+devez faire #{apt-get update}# avant d'utiliser apt dans le système
+live. Le choix de la liste #{minimal}# laisse de côté les grands paquets de
+#{locales}# et les services associés. Laissant hors les paquets recommandés
+avec #{--apt-recommends false}# économise de l'espace supplémentaire, au
+détriment d'omettre certains paquets vous pourriez autrement s'attendre à
+être là, tel que #{firmware-linux-free}# qui peuvent être nécessaires pour
+prise en charge matérielle de certains supports matériels. Les options
+restantes économisent petites quantités d'espace supplémentaires. C'est à
+vous de décider si la fonctionnalité qui est sacrifié avec chaque
+optimisation est en vaut la perte de fonctionnalité.
+
+2~ Un bureau KDE localisé et installateur
+
+*{Cas d'utilisation:}* Créer une image de bureau KDE, localisé pour le portugais brésilien et incluant un installateur.
+
+Nous voulons faire une image iso-hybride pour l'architecture i386 en
+utilisant notre bureau préféré, dans ce cas, KDE, contenant tous les paquets
+mêmes qui seraient installés par l'installateur Debian standard pour KDE.
+
+Notre premier problème est la découverte des noms des tâches
+appropriées. Actuellement, live-build ne peut pas aider. Alors que nous
+pourrions être chanceux et trouver ce par essais et erreurs, il y a un
+outil, #{grep-dctrl}#, qui peut être utilisé pour découvrir des descriptions
+de tâches dans tasksel-data, de sorte à préparer, assurez-vous que vous avez
+ces deux choses:
code{
@@ -338,40 +366,33 @@ code{
}code
-Now we can search for the appropriate tasks, first with:
+Maintenant, nous pouvons rechercher les tâches appropriées, d'abord avec:
code{
- $ grep-dctrl -FTest-lang pt_BR /usr/share/tasksel/debian-tasks.desc -sTask,Description
+ $ grep-dctrl -FTest-lang pt_BR /usr/share/tasksel/descs/debian-tasks.desc -sTask
Task: brazilian-portuguese
- Description: Brazilian Portuguese environment
- This task installs programs, data files, and
- documentation that make it easier for Brazilian Portuguese speakers
- to use Debian.
}code
-By this command, we discover the task is called, plainly enough,
-brazilian-portuguese. Now to find the related tasks:
+Par cette commande, nous découvrons la tâche est appelée, assez clairement,
+brazilian-portuguese. Maintenant, pour trouver les tâches liées:
code{
- $ grep-dctrl -FEnhances brazilian-portuguese /usr/share/tasksel/debian-tasks.desc -sTask,Description
+ $ grep-dctrl -FEnhances brazilian-portuguese /usr/share/tasksel/descs/debian-tasks.desc -sTask
Task: brazilian-portuguese-desktop
- Description: Brazilian Portuguese desktop
- This task localises the desktop in Brasilian Portuguese.
-
Task: brazilian-portuguese-kde-desktop
- Description: Brazilian Portuguese KDE desktop
- This task localises the KDE desktop in Brazilian Portuguese.
}code
-We will use the experimental #{--language}# option, as live-build happens to
-include #{syslinux}# templates for pt_BR (see {Desktop and language
-tasks}#desktop-and-language-tasks for details). And at boot time we will
-generate the pt_BR.UTF-8 locale and select the pt-latin1 keyboard
-layout. Now let's put the pieces together:
+Au démarrage nous allons générer les paramètres régionaux pt_BR.UTF-8 et
+sélectionner la configuration du clavier pt-latin1. Nous aurons aussi besoin
+de préconfigurer notre choix de bureau, "kde" de sorte que tasksel
+installera la tâche de bureau correcte, car elle diffère de la valeur par
+défaut (Voir {Tâches de bureau et de la
+langue}#desktop-and-language-tasks). Maintenant, nous allons assembler les
+pièces:
code{
@@ -380,16 +401,17 @@ code{
$ lb config \
-a i386 \
-k 486 \
- -p kde-desktop \
- --language pt_BR \
- --tasks "brazilian-portuguese brazilian-portuguese-desktop brazilian-portuguese-kde-desktop" \
--bootappend-live "locales=pt_BR.UTF-8 keyboard-layouts=pt-latin1" \
- --debian-installer live \
- --packages debian-installer-launcher
+ --debian-installer live
+ $ echo kde-desktop brazilian-portuguese brazilian-portuguese-desktop \
+ brazilian-portuguese-kde-desktop >> config/task-lists/my.list.chroot
+ $ echo debian-installer-launcher >> config/package-lists/my.list.chroot
+ $ echo tasksel tasksel/desktop multiselect kde >> config/preseed/my.preseed.chroot
}code
-Note that we have included the #{debian-installer-launcher}# package to
-launch the installer from the live desktop, and have also specified the 486
-flavour kernel, as it is currently necessary to make the installer and live
-system kernels match for the launcher to work properly.
+Notez que nous avons inclus le paquet #{debian-installer-launcher}# pour
+lancer l'installateur depuis le bureau live, et ont également précisé que le
+noyau 486, tel qu'il est actuellement nécessaire pour faire que
+l'installateur et le noyau du systéme live matchent pour que le lanceur
+fonctionne correctement.
diff --git a/manual/fr/user_installation.ssi b/manual/fr/user_installation.ssi
index 3c90db8..07e4e94 100644
--- a/manual/fr/user_installation.ssi
+++ b/manual/fr/user_installation.ssi
@@ -22,7 +22,8 @@ avec les exigences ci-dessus.
2~installing-live-build Installation de live-build
-Vous pouvez installer live-build en un certain nombre de façons différentes:
+Vous pouvez installer live-build dans un certain nombre de façons
+différentes:
_* Depuis le référentiel Debian
@@ -55,7 +56,7 @@ code{
live-build est développé en utilisant le système de contrôle de version
Git. Dans les systèmes basés sur Debian, cela est fourni par le paquet
-/{git}/ Pour examiner le dernier code, exécutez:
+/{git}/. Pour examiner le dernier code, exécutez:
code{
@@ -108,7 +109,7 @@ disponibles à http://live.debian.net/debian/.
2~ live-boot et live-config
-*{Remarque:}* Vous n'avez pas besoin d'installer live-boot ou live-config sur votre système afin de créer des systèmes Debian Live. Cependant, cela ne fera aucun mal et est utile à des fins de référence.
+*{Remarque:}* Vous n'avez pas besoin d'installer live-boot ou live-config sur votre système afin de créer des systèmes Debian Live. Cependant, cela ne fera aucun mal et est utile à des fins de référence. Si vous voulez seulement la documentation, vous pouvez maintenant installer les paquets live-boot-doc et live-config-doc séparément.
3~ Depuis le référentiel Debian
@@ -137,14 +138,14 @@ vos paquets depuis les sources.
_* Créer les fichiers .deb de live-boot et live-config
Vous devez créer sur votre distribution objectif ou en chroot contenant
-votre plateforme objectif: cela signifie que si votre objectif est Squeeze
-alors vous devez créer sur Squeeze.
+votre plateforme objectif: cela signifie que si votre objectif est Wheezy
+alors vous devez créer sur Wheezy.
Utilisez un système de construction automatique personnel tels que
/{pbuilder}/ ou /{sbuild}/ si vous avez besoin pour créer #{live-boot}# pour
une distribution objectif qui diffère de votre système de construction. Par
-exemple, pour les images live de Squeeze, créez #{live-boot}# dans un chroot
-Squeeze. Si votre distribution objectif correspond à votre distribution vous
+exemple, pour les images live de Wheezy, créez #{live-boot}# dans un chroot
+Wheezy. Si votre distribution objectif correspond à votre distribution vous
pouvez créer directement sur le système de construction en utilisant
#{dpkg-buildpackage}# (fournis par le paquet /{dpkg-dev}/):
@@ -172,10 +173,11 @@ supplémentaires}#additional-repositories.
Vous pouvez laisser live-build utiliser automatiquement les derniers
instantanés de live-boot et live-config configurant un référentiel de tierce
partie dans votre répertoire de configuration de live-build. En supposant
-que vous avez déjà créé un arbre de configuration avec #{lb config}#:
+que vous avez déjà créé un arbre de configuration dans le répertoire courant
+avec #{lb config}#:
code{
- $ lb config --repository live.debian.net
+ $ lb config --archives live.debian.net
}code
diff --git a/manual/fr/user_managing_a_configuration.ssi b/manual/fr/user_managing_a_configuration.ssi
index ed49dc0..dd3dc97 100644
--- a/manual/fr/user_managing_a_configuration.ssi
+++ b/manual/fr/user_managing_a_configuration.ssi
@@ -56,7 +56,7 @@ code{
#!/bin/sh
lb config noauto \
- --packages-lists "standard" \
+ --package-lists "standard" \
"${@}"
}code
@@ -92,7 +92,7 @@ code{
}code
Editer #{auto/config}#, en changeant ou en ajoutant des options comme bon
-vous semble. Dans l'exemple ci-dessus, #{--packages-lists standard}# est
-fixé à la valeur par défaut. Changez ce à une valeur appropriée pour votre
-image (ou le supprimer si vous voulez utiliser par défaut) et ajouter des
-options supplémentaires dans les lignes de continuation qui suivent.
+vous semble. Dans l'exemple ci-dessus, #{--package-lists standard}# est fixé
+à la valeur par défaut. Changez ce à une valeur appropriée pour votre image
+(ou le supprimer si vous voulez utiliser par défaut) et ajouter des options
+supplémentaires dans les lignes de continuation qui suivent.
diff --git a/manual/fr/user_overview.ssi b/manual/fr/user_overview.ssi
index 1c09740..eb86b08 100644
--- a/manual/fr/user_overview.ssi
+++ b/manual/fr/user_overview.ssi
@@ -57,52 +57,21 @@ config}# peut être utilisée pour créer des répertoires de configuration de
squelette.
Exécuter #{lb config}# sans aucun argument crée un sous-répertoire
-#{config/}# dont il remplit avec certains paramètres par défaut:
+#{config/}# dont il remplit avec certains paramètres, et un sous-répertoire
+en squelette #{auto/}#.
code{
$ lb config
+ P: Considering defaults defined in /etc/live/build.conf
P: Creating config tree
- $ ls -l
- total 8
- drwxr-xr-x 3 user user 4096 Sep 7 13:02 auto
- drwxr-xr-x 22 user user 4096 Sep 7 13:02 config
-
- $ ls -l config/
- total 104
- -rw-r--r-- 1 user user 4197 Sep 7 13:02 binary
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_debian-installer
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_debian-installer-includes
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_grub
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-debs
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-hooks
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-includes
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-packageslists
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-udebs
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_rootfs
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_syslinux
- -rw-r--r-- 1 user user 2051 Sep 7 13:02 bootstrap
- -rw-r--r-- 1 user user 1647 Sep 7 13:02 chroot
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_apt
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-hooks
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-includes
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-packages
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-packageslists
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-patches
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-preseed
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_sources
- -rw-r--r-- 1 user user 2954 Sep 7 13:02 common
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 includes
- -rw-r--r-- 1 user user 205 Sep 7 13:02 source
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 templates
-
}code
L'utilisation de #{lb config}# sans aucun argument serait approprié pour les
utilisateurs qui ont besoin d'une image de base, ou qui ont l'intention
-d'offrir plus tard, une configuration plus complète via auto/config (voir
-{Gestion d'une configuration}#managing-a-configuration pour plus de
+d'offrir plus tard, une configuration plus complète via #{auto/config}#
+(voir {Gestion d'une configuration}#managing-a-configuration pour plus de
détails).
Normalement, vous voulez spécifier certaines options. Par exemple, pour
@@ -128,8 +97,8 @@ Une liste complète des options est disponible dans la page de manuel de
3~lb-build La commande #{lb build}#
La commande #{lb build}# lit dans votre configuration à partir du répertoire
-config/. Il exécute alors les commandes de niveau inférieur nécessaires pour
-construire votre système Live.
+#{config/}#. Il exécute alors les commandes de niveau inférieur nécessaires
+pour construire votre système Live.
3~lb-clean La commande #{lb clean}#
@@ -150,7 +119,7 @@ systèmes live, comme ceux créés par live-build. Cela inclut les ISOs de
Debian Live, netboot tarballs, et les images clé USB.
Au démarrage il va chercher un support en lecture seule qui contient un
-répertoire «/live» où un système de fichiers racine (souvent une image de
+répertoire #{/live/}# où un système de fichiers racine (souvent une image de
système de fichiers compressé comme squashfs) est stocké. S'il est trouvé,
il va créer un environnement accessible en écriture, en utilisant aufs, afin
que systémes similaires à Debian puissent démarrer à partir de ça.
diff --git a/manual/it/index.html.in b/manual/it/index.html.in
index c52644f..19632e2 100644
--- a/manual/it/index.html.in
+++ b/manual/it/index.html.in
@@ -9,25 +9,32 @@
<h2>Manuale Debian Live</h2>
<p>
+ <i>live-manual</i> is available in different file formats and it is
+translated into several languages. Keep in mind that some translations may
+be incomplete or may not be up to date.
+ </p>
+
+ <p>
+
Si prega di segnalare errori, omissioni, patch e suggerimenti sulla nostra
mailing list <a
href="mailto:debian-live at lists.debian.org">debian-live at lists.debian.org</a>
-e leggere <a href="html/about-manual.html#how-to-contribute">come
+e leggere <a href="html/about-manual.it.html#how-to-contribute">come
contribuire</a> al manuale.
</p>
<h3>Formati disponibili</h3>
<ul>
- <li><a href="epub/live-manual.epub">EPUB</a></li>
- <li>HTML: <a href="html/index.html">multi-pagina</a>, <a
-href="html/live-manual.html">pagina unica</a></li>
- <li><a href="odf/live-manual.odt">ODF</a></li>
- <li>PDF: <a href="pdf/live-manual.portrait-a4.pdf">A4 verticale</a>, <a
-href="pdf/live-manual.landscape-a4.pdf">A4 orizzontale</a>, <a
-href="pdf/live-manual.portrait-letter.pdf">lettera verticale</a>, <a
-href="pdf/live-manual.landscape-letter.pdf">lettera orizzontale</a></li>
- <li><a href="txt/live-manual.txt">Testo semplice</a></li>
+ <li><a href="epub/live-manual.it.epub">EPUB</a></li>
+ <li>HTML: <a href="html/index.it.html">multi-pagina</a>, <a
+href="html/live-manual.it.html">pagina unica</a></li>
+ <li><a href="odf/live-manual.it.odt">ODF</a></li>
+ <li>PDF: <a href="pdf/live-manual.portrait-a4.it.pdf">A4 verticale</a>, <a
+href="pdf/live-manual.landscape-a4.it.pdf">A4 orizzontale</a>, <a
+href="pdf/live-manual.portrait-letter.it.pdf">lettera verticale</a>, <a
+href="pdf/live-manual.landscape-letter.it.pdf">lettera orizzontale</a></li>
+ <li><a href="txt/live-manual.it.txt">Testo semplice</a></li>
</ul>
<p>
diff --git a/manual/it/live-manual.ssm b/manual/it/live-manual.ssm
index 99b1052..3e72090 100644
--- a/manual/it/live-manual.ssm
+++ b/manual/it/live-manual.ssm
@@ -9,7 +9,7 @@
:license: Questo programma è software libero: è possibile ridistribuirlo e modificarlo secondo i termini della GNU General Public License come pubblicata dalla Free Software Foundation, sia la versione 3 della licenza o (a scelta) una versione successiva.<br><br>Questo programma è distribuito nella speranza che possa essere utile, ma SENZA ALCUNA GARANZIA, nemmeno la garanzia implicita di COMMERCIABILITÀ o IDONEITÀ PER UN PARTICOLARE SCOPO. Vedere la GNU General Public License per ulteriori dettagli.<br><br>Si dovrebbe aver ricevuto una copia della GNU General Public License con questo programma. In caso contrario, vedere http://www.gnu.org/licenses/. <br><br>Il testo completo della GNU General Public License può essere trovato nel file /usr/share/common-licenses/GPL-3.
@date:
- :published: 2011-09-30
+ :published: 2011-12-04
@publisher: Debian Live Project <debian-live at lists.debian.org>
diff --git a/manual/it/user_basics.ssi b/manual/it/user_basics.ssi
index 6acf0af..8652ce2 100644
--- a/manual/it/user_basics.ssi
+++ b/manual/it/user_basics.ssi
@@ -238,7 +238,7 @@ live-build. In caso contrario la risoluzione è limitata a 800x600.
code{
- $ lb config --packages virtualbox-ose-guest-x11
+ $ echo virtualbox-ose-guest-x11 >> config/package-lists/my.list.chroot
}code
diff --git a/manual/it/user_customization-contents.ssi b/manual/it/user_customization-contents.ssi
index f1a1ce6..c1e77d2 100644
--- a/manual/it/user_customization-contents.ssi
+++ b/manual/it/user_customization-contents.ssi
@@ -43,15 +43,15 @@ possono essere semplicemente aggiunti o sostituiti nell'immagine senza
elaborazione; si veda {Live/chroot hook locali}#live-chroot-local-hooks se è
necessaria l'elaborazione.
-Per includere i file si aggiungano semplicemente alla directory
-#{config/chroot_local-includes}#. Questa corrisponde alla directory root
-(#{/}#) del sistema live. Per esempio, per aggiungere un file
-#{/var/www/index.html}# nel sistema live, si usi:
+To include files, simply add them to your #{config/includes.chroot}#
+directory. This directory corresponds to the root directory (#{/}#) of the
+live system. For example, to add a file #{/var/www/index.html}# in the live
+system, use:
code{
- $ mkdir -p config/chroot_local-includes/var/www
- $ cp /path/to/my/index.html config/chroot_local-includes/var/www
+ $ mkdir -p config/includes.chroot/var/www
+ $ cp /path/to/my/index.html config/includes.chroot/var/www
}code
@@ -61,7 +61,7 @@ code{
-- config
[...]
- |-- chroot_local-includes
+ |-- includes.chroot
| `-- var
| `-- www
| `-- index.html
@@ -75,17 +75,17 @@ pacchetti in modo che tali file vengano in seguito sovrascitti.
3~binary-local-includes Include locali binari
-Si possono utilizzare include locali binari per inserire sul filesystem del
-supporto materiale come documentazione o video affinché sia immediatamente
-accessibile dopo l'inserimento dello stesso senza avviare il sistema
-live. Ciò funziona in modo simile agli include locali del chroot; supponendo
-che i file #{~/video_demo.*}# siano video dimostrativi del sistema descritti
-da e collegati a una pagina HTML indice, basta copiare il materiale in
-#{config/binary_local-includes/}# come segue:
+To include material such as documentation or videos on the media filesystem
+so that it is accessible immediately upon insertion of the media without
+booting the Live system, you can use binary local includes. This works in a
+similar fashion to chroot local includes. For example, suppose the files
+#{~/video_demo.*}# are demo videos of the live system described by and
+linked to by an HTML index page. Simply copy the material to
+#{config/includes.binary/}# as follows:
code{
- $ cp ~/video_demo.* config/binary_local-includes/
+ $ cp ~/video_demo.* config/includes.binary/
}code
@@ -114,44 +114,44 @@ della creazione al fine di personalizzare l'immagine.
3~live-chroot-local-hooks Live/chroot hook locali
-Per eseguire comandi nella fase chroot, creare uno script hook contenente i
-comandi nella directory #{config/chroot_local-hooks}#. L'hook verrà eseguito
-nel chroot dopo che verrà applicata il resto della configurazione del
-chroot, ricordare quindi di garantire che la propria configurazione includa
-tutti i pacchetti e i file che l'hook necessita per funzionare. Vedere gli
-script d'esempio degli hook di chroot per i vari compiti di
-personalizzazione del chroot contenuti in
-#{/usr/share/live/build/examples/hooks}# da copiare o collegare nella
-propria configurazione.
+To run commands in the chroot stage, create a hook script with a #{.chroot}#
+suffix containing the commands in the #{config/hooks/}# directory. The hook
+will run in the chroot after the rest of your chroot configuration has been
+applied, so remember to ensure your configuration includes all packages and
+files your hook needs in order to run. See the example chroot hook scripts
+for various common chroot customization tasks provided in
+#{/usr/share/live/build/examples/hooks}# which you can copy or symlink to
+use them in your own configuration.
3~boot-time-hooks Hook in fase di avvio
-Per eseguire comandi all'avvio, è possibile fornire degli hook a live-config
-come spiegato nella sezione "Customization" del suo manuale. Controllare gli
-hook di live-config in #{/lib/live/config/}# e notare i numeri sequenziali;
-fornire quindi i propri hook con una sequenza numerica appropriata, sia come
-include locali del chroot in
-#{config/chroot_local-includes/lib/live/config/}#, sia come pacchetto
-personalizzato come discusso in {Installare pacchetti modificati o di terze
-parti}#installing-modified-or-third-party-packages.
+To execute commands at boot time, you can supply live-config hooks as
+explained in the "Customization" section of its man page. Examine
+live-config's own hooks provided in #{/lib/live/config/}#, noting the
+sequence numbers. Then provide your own hook prefixed with an appropriate
+sequence number, either as a chroot local include in
+#{config/includes.chroot/lib/live/config/}#, or as a custom package as
+discussed in {Installing modified or third-party
+packages}#installing-modified-or-third-party-packages.
3~ Hook binari locali
-Per eseguire comandi nella fase binaria, creare uno script hook che contenga
-i comandi in #{config/binary_local-hooks}#. L'hook verrà eseguito dopo tutti
-gli altri comandi binari, ma prima del binary_checksums, l'ultimo definitivo
-comando. I comandi nel proprio hook non vengono eseguiti nel chroot, perciò
-si faccia attenzione a non modificare nessun file al di fuori dell'albero di
-costruzione o si danneggerà il sistema! Vedere gli script d'esempio per gli
-hook binari per i vari compiti di personalizzazione dei binari in
-#{/usr/share/live/build/examples/hooks}# da copiare o collegare nella
-propria configurazione.
+To run commands in the binary stage, create a hook script with a #{.binary}#
+suffix containing the commands in the #{config/hooks/}# directory. The hook
+will run after all other binary commands are run, but before
+binary_checksums, the very last binary command. The commands in your hook do
+not run in the chroot, so take care to not modify any files outside of the
+build tree, or you may damage your build system! See the example binary hook
+scripts for various common binary customization tasks provided in
+#{/usr/share/live/build/examples/hooks}# which you can copy or symlink to
+use them in your own configuration.
2~ Preconfigurare le domande di Debconf
-I file nella directory #{config/chroot_local-preseed}# sono considerati file
-di preconfigurazione di debconf e sono installati da live-build usando
-#{debconf-set-selections}#.
+Files in the #{config/preseed/}# directory suffixed with #{.preseed}#
+followed by the stage (#{.chroot}# or #{.binary}#) are considered to be
+debconf preseed files and are installed by live-build using
+#{debconf-set-selections}# during the corresponding stage.
Per ulteriori informazioni su debconf, vedere debconf(7) nel pacchetto
#{debconf}#.
diff --git a/manual/it/user_customization-installer.ssi b/manual/it/user_customization-installer.ssi
index 1b1e907..22a1076 100644
--- a/manual/it/user_customization-installer.ssi
+++ b/manual/it/user_customization-installer.ssi
@@ -54,7 +54,8 @@ l'architettura specificata. Per esempio:
code{
$ lb config --architecture i386 --linux-flavours 486 \
- --debian-installer live --packages debian-installer-launcher
+ --debian-installer live
+ $ echo debian-installer-launcher >> config/package-lists/my.list.chroot
}code
@@ -80,10 +81,10 @@ code{
2~ Personalizzare il contenuto del Debian Installer
-Si può voler includere pacchetti udeb compilati localmente come componenti
-del #{d-i}# per scopi di sperimentazione o debug; per includerli
-nell'immagine inserirli in #{config/binary_local-udebs/}#. I file e le
-directory aggiuntivi o di rimpiazzo si possono includere nell'initrd
-dell'installatore in maniera simile agli {Include locali del
-Live/chroot}#live-chroot-local-includes, inserendo il materiale in
+For experimental or debugging purposes, you might want to include locally
+built #{d-i}# component udeb packages. Place these in
+#{config/packages.binary/}# to include them in the image. Additional or
+replacement files and directories may be included in the installer initrd as
+well, in a similar fashion to {Live/chroot local
+includes}#live-chroot-local-includes, by placing the material in
#{config/binary_debian-installer-includes/}#.
diff --git a/manual/it/user_customization-packages.ssi b/manual/it/user_customization-packages.ssi
index 1fab27b..dc567a5 100644
--- a/manual/it/user_customization-packages.ssi
+++ b/manual/it/user_customization-packages.ssi
@@ -27,11 +27,11 @@ installate con il pinning, giusto per citare alcune possibilità.
La distribuzione che viene scelta ha un ampio impatto su quali pacchetti
siano disponibili per essere inclusi nell'immagine live. Specificare il nome
-in codice, il predefinito per la versione Squeeze di live-build è
-#{squeeze}#; qualsiasi attuale distribuzione mantenuta negli archivi Debian
-può essere qui specificata con il suo nome in codice. (Per ulteriori
-dettagli consultare il {Glossario}#terms). L'opzione #{--distribution}# non
-solo influenza la sorgente dei pacchetti nell'archivio, ma indica a
+in codice, il predefinito per la versione Wheezy di live-build è #{wheezy}#;
+qualsiasi attuale distribuzione mantenuta negli archivi Debian può essere
+qui specificata con il suo nome in codice. (Per ulteriori dettagli
+consultare il {Glossario}#terms). L'opzione #{--distribution}# non solo
+influenza la sorgente dei pacchetti nell'archivio, ma indica a
#{live-build}# di comportarsi secondo la necessità per compilare ciascuna
distribuzione supportata. Ad esempio se si vuole costruire un rilascio
*unstable*, Sid, specificare:
@@ -65,71 +65,68 @@ comportamento di live-build per adattarlo alle derivate.
3~ Mirror delle distribuzioni
-L'archivio Debian è replicato attraverso una vasta rete di mirror in tutto
-il mondo cosicché chiunque in ogni nazione può selezionare il mirror più
-vicino per la migliore velocità di scaricamento. Ciascuna delle opzioni
-#{--mirror-*}# determina quale mirror della distribuzione è usato nei vari
-stadi della compilazione. Ricordando dalle {Fasi della
-creazione}#stages-of-the-build che la fase di *avvio* è quando il chroot è
-inizialmente popolato da debootstrap con un sistema minimale e quella di
-*chroot* è quando viene creato il chroot usato per costruire il file system
-del sistema live. Perciò per queste fasi vengono usati i corrispondenti
-cambi di mirror, e in seguito, nella fase *binaria* vengono usati i valori
-di #{--mirror-binary}# e #{--mirror-binary-security}# sostituendo qualsiasi
-altro mirror usato nelle fasi iniziali.
+The Debian archive is replicated across a large network of mirrors around
+the world so that people in each region can choose a nearby mirror for best
+download speed. Each of the #{--parent-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
+#{--parent-mirror-binary}# and #{--parent-mirror-binary-security}# values
+are used, superceding any mirrors used in an earlier stage.
3~distribution-mirrors-build-time Mirror delle distribuzioni usati in fase
di compilazione
-Per impostare i mirror delle distribuzioni usati in fase di compilazione ad
-uno locale, è sufficiente impostare #{--mirror-bootstrap}# e
-#{--mirror-chroot-security}# come segue.
+To set the distribution mirrors used at build time to point at a local
+mirror, it is sufficient to set #{--parent-mirror-bootstrap}#,
+#{--parent-mirror-chroot-security}# and #{--parent-mirror-chroot-backports}#
+as follows.
code{
- $ lb config --mirror-bootstrap http://localhost/debian/ \
- --mirror-chroot-security http://localhost/debian-security/
+ $ lb config --parent-mirror-bootstrap http://localhost/debian/ \
+ --parent-mirror-chroot-security http://localhost/debian-security/ \
+ --parent-mirror-chroot-backports http://localhost/debian-backports/
}code
-Il mirror chroot, specificato da #{--mirror-chroot}#, è impostato al valore
-di #{--mirror-bootstrap}#.
+The chroot mirror, specified by #{--parent-mirror-chroot}#, defaults to the
+#{--parent-mirror-bootstrap}# value.
3~ Mirror delle distribuzioni usate durante l'esecuzione
-Le opzioni #{--mirror-binary*}# determinano i mirror delle distribuzioni
-inseriti nell'immagine binaria. Questi possono essere usati per installare
-pacchetti aggiuntivi mentre il sistema live è in funzione. Le impostazioni
-predefinite impiegano #{cdn.debian.net}#, un servizio che sceglie un mirror
-geograficamente vicino basandosi sul numero IP dell'utente. Questo è una
-scelta conveniente quando non si può pronosticare quale sarà il mirror
-migliore per tutti gli utenti. Oppure si può specificare il proprio valore
-come mostrato nell'esempio qui sotto. Un'immagine compilata con questa
-configurazione sarebbe adatta solamente ad utenti di una rete dove sia
-raggiungibile il "#{mirror}#".
+The #{--parent-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-binary http://mirror/debian/ \
- --mirror-binary-security http://mirror/debian-security/
+ $ lb config --parent-mirror-binary http://mirror/debian/ \
+ --parent-mirror-binary-security http://mirror/debian-security/
}code
3~additional-repositories Repository addizionali
-Si possono aggiungere altri repository, ampliando così la scelta dei
-pacchetti al di là di quelli disponibili nella distribuzione di
-destinazione. Questi possono essere, per esempio, pacchetti di backport,
-sperimentali o personalizzati. Per configurare repository aggiuntivi, creare
-i file #{config/chroot_sources/vostro-repository.chroot}#, o
-#{config/chroot_sources/vostro-repository.binary}#. Come per le opzioni
-#{--mirror-*}#, queste controlleranno i repository usati nella fase *chroot*
-quando si compila l'immagine, e nella fase *binary*, ad esempio per usarli
-quando il sistema live è avviato.
+You may add more repositories, broadening your package choices beyond what
+is available in your target distribution. These may be, for example, for
+backports, experimental or custom packages. To configure additional
+repositories, create #{config/archives/your-repository.list.chroot}#, and/or
+#{config/archives/your-repository.list.binary}# files. As with the
+#{--parent-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.
-Per esempio, #{config/chroot_sources/live.chroot}# permette di installare
-pacchetti dal repository snapshot di debian live al momento della creazione
-del sistema live.
+For example, #{config/archives/live.list.chroot}# allows you to install
+packages from the debian live snapshot repository at live system build time.
code{
@@ -137,52 +134,31 @@ code{
}code
-Se si aggiunge la stessa riga in #{config/chroot_sources/live.binary}#, il
-repository verrà aggiunto alla directory #{/etc/apt/sources.list.d/}# del
-sistema live.
+If you add the same line to #{config/archives/live.list.binary}#, the
+repository will be added to your live system's #{/etc/apt/sources.list.d/}#
+directory.
Se il file esiste, saranno prelevati automaticamente.
-Bisogna inoltre inserire la chiave GPG usata per firmare il repository nei
-file #{config/chroot_sources/vostro-repository.{binary,chroot}.gpg}#.
+You should also put the GPG key used to sign the repository into
+#{config/archives/your-repository.gpg.{binary,chroot}}# files.
-*{Nota:}* alcuni repository di pacchetti preconfigurati sono disponibili per una facile selezione attraverso l'opzione #{--repository}#, per abilitare gli snapshot live è sufficiente un semplice comando:
+*{Note:}* some preconfigured package repositories are available for easy selection through the #{--archives}# option, e.g. for enabling live snapshots, a simple command is enough to enable it:
code{
- $ lb config --repository live.debian.net
+ $ lb config --archives live.debian.net
}code
2~choosing-packages-to-install Scegliere i pacchetti da installare
-Ci sono diversi modi per scegliere quali pacchetti live-build installerà
-nell'immagine, coprendo una gamma di esigenze diverse. Si possono scegliere
-i pacchetti singolarmente, con l'opzione #{--packages}# per un numero
-limitato, o da un elenco per una quantità maggiore di pacchetti. È inoltre
-possibile selezionare elenchi predefiniti più grandi o utilizzare i task di
-APT. E infine inserire i file dei pacchetti nell'albero #{config/}#, che ben
-si adatta alla alle prove di pacchetti nuovi o sperimentali prima che siano
-disponibili in un repository.
-
-3~ Scegliere pochi pacchetti
-
-Quando il numero dei pacchetti da aggiungere è esiguo è sufficiente
-specificare #{--packages}#. Per esempio:
-
-code{
-
- $ lb config --packages "package1 package2 package3"
-
-}code
-
-Quando si specifica un pacchetto che non esiste, il comportamento di
-live-build è determinato dalla scelta delle utilità di APT. Per ulteriori
-dettagli si veda {Scegliere apt o aptitude}#choosing-apt-or-aptitude.
-
-Se si necessita di specificare un gran numero di pacchetti o si desidera
-flessibilità su quali installare, usare gli elenchi dei pacchetti come
-discusso nella prossima sezione, {Elenchi di pacchetti}#package-lists.
+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 in a package list. You can also choose
+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.
3~package-lists Elenchi di pacchetti
@@ -195,61 +171,53 @@ principali ambienti desktop e alcuni elenchi per uso speciale, così come
elenchi standard sui quali vi si basano altri. È inoltre possibile fornire i
propri elenchi o usare una combinazione di entrambi.
+*{Note:}* 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.
+
3~ Elenchi predefiniti di pacchetti
-Il modo più semplice per usare gli elenchi è di specificarne uno o più con
-l'opzione #{--packages-lists}#. Per esempio:
+The simplest way to use lists is to specify one or more predefined lists
+with the #{--package-lists}# option. For example:
code{
- $ lb config --packages-lists "gnome-core rescue"
+ $ lb config --package-lists "gnome rescue"
}code
-In aggiunta a questi elenchi, live-build ne gestisce quattro virtuali:
-#{gnome-desktop}#, #{kde-desktop}#, #{lxde-desktop}# and #{xfce-desktop}#,
-ciascuno dei quali fornisce una selezione più estesa di pacchetti che
-corrisponde ai predefiniti dell'installatore Debian per ciascun ambiente
-desktop. Per ulteriori dettagli si veda {Task per desktop e
-lingua}#desktop-and-language-tasks.
-
-*{Nota:}* le immagini pre-costruite di GNOME, KDE, LXDE e XFCE disponibili per essere scaricate da http://live.debian.net sono costruite usando i corrispondenti elenchi #{*-desktop}# virtuali.
-
-Il percorso predefinito per i file elenco sul sistema è
-#{/usr/share/live/build/lists/}#. Per determinare i pacchetti in un dato
-elenco, si legga il file corrispondente, prestando attenzione ai file
-inclusi e condizionali come descritto nella sezioni seguenti.
+The default location for the list files on your system is
+#{/usr/share/live/build/package-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~ Elenchi locali dei pacchetti
-Gli elenchi si possono integrare o sostituire interamente usando quelli
-locali dei pacchetti in #{config/chroot_local-packageslists/}#.
+You may supplement the predefined lists using local package lists stored in
+#{config/package-lists/}#.
-Per essere processati, questi elenchi devono avere il suffisso #{.list}#. I
-locali sovrascrivono sempre quelli forniti con live-build, questo può
-causare effetti indesiderati perciò si raccomanda di usare nomi univoci.
+Package lists that exist in this directory need to have a #{.list}# suffix
+in order to be processed, and then an additional stage suffix, #{.chroot}#
+or #{.binary}# to indicate which stage the list is for.
-3~ Elenchi locali di pacchetti binari
+*{Note:}* If you don't specify the stage suffix, the list will be used for both stages. Normally, you want to specify #{.list.chroot}# so that the packages will only be installed in the live filesystem and not have an extra copy of the #{.deb}# placed on the media.
-Nel caso in cui si desideri includere dei pacchetti .deb alla directory
-#{pool/}# della live (senza installarli sull'immagine) bisogna usare gli
-elenchi utilizzando quelli locali dei pacchetti binari situati in
-#{config/binary_local-packageslists/}#. Tale supporto può essere utilizzato
-come immagine personalizzata di Debian per installazioni non in linea.
+3~ Elenchi locali di pacchetti binari
-Per essere processate le liste dei pacchetti che si trovano nella directory
-deve avere un suffisso #{.list}#.
+To make a binary stage list, place a file suffixed with #{.list.binary}# in
+#{config/package-lists/}#. These packages are not installed in the live
+filesystem, but are included on the live media under #{pool/}#. You would
+typically use such a list with one of the non-live installer variants. As
+mentioned above, if you want this list to be the same as your chroot stage
+list, simply use the #{.list}# suffix by itself.
3~ Estendere un'elenco di pacchetti usando gli include
-Gli elenchi di pacchetti inclusi in live-build fanno un notevole uso di
-include. Far riferimento a questi nella directory
-#{/usr/share/live/build/lists/}#, in quanto portano ottimi esempi su come
-scrivere i propri.
+The package lists that are included with live-build make extensive use of
+includes. Refer to these in the #{/usr/share/live/build/package-lists/}#
+directory, as they serve as good examples of how to write your own lists.
-Per esempio, per creare un elenco che includa quello predefinito di
-#{gnome}# più iceweasel, creare
-#{config/chroot_local-packageslists/mygnome.list}# con i seguenti contenuti:
+For example, to make a list that includes the predefined #{gnome}# list plus
+iceweasel, create #{config/package-lists/my.list.chroot}# with the following
+contents:
code{
@@ -317,17 +285,18 @@ Le condizioni nidificate non sono supportate.
3~ Task
-L'installatore Debian offre all'utente la scelta di vari elenchi di
-pacchetti pre-selezionati, ognuno dei quali focalizzato su un particolare
-tipo di sistema, o il tipo di attività per cui utilizzarlo, come "Graphical
-desktop environment", "Mail server" o "Laptop". Questi elenchi sono chiamati
-"task" e sono gestiti da APT atraverso il campo"Task:". In live-build si
-possono specificare uno o più task per mezzo dell'opzione #{--tasks}#, come
-nell'esempio seguente.
+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
+by putting them in a list in #{config/task-lists/}#, as in the example
+below.
code{
- $ lb config --tasks "mail-server file-server"
+ $ lb config
+ $ echo "mail-server file-server" >> config/task-lists/my.list.chroot
}code
@@ -338,56 +307,50 @@ con #{tasksel --task-packages}#.
3~desktop-and-language-tasks Task per desktop e lingua
-I task per i desktop e la lingua sono un caso speciale. Nell'installatore
-Debian, se il supporto è stato preparato per un particolare ambiente
-desktop, il corrispondente task verrà automaticamente installato. Perciò ci
-sono i task #{gnome-desktop}#, #{kde-desktop}#, #{lxde-desktop}# e
-#{xfce-desktop}#, nessuno dei quali è offerto nel menu di #{tasksel}#. Allo
-stesso modo, non c'è nessuna voce nel menu per i task delle lingue, ma la
-scelta della lingua dell'utente durante l'installazione influenza la
-selezione dei corrispondenti task della lingua.
-
-Perciò in live-build a questi casi particolari è anche data particolare
-considerazione, ma con tre differenze notevoli al momento in cui si scrive.
-
-Primo, non è stata fatta ancora alcuna previsione sui task della lingua,
-sebbene sia incluso un sottoinsieme di questi pacchetti specificando #{lb
-config --language}#. Se servono questi task, i quali includono cose come
-caratteri specifici per la lingua e pacchetti dei metodi di input, vanno
-specificati nella configurazione. Per esempio:
+Desktop and language tasks are special cases that need some extra planning
+and configuration. Live images are different from Debian Installer images in
+this respect. 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 internal #{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.
+
+When developing a desktop live image, the image typically boots directly to
+a working desktop, the choices of both desktop and default language having
+been made at build time, not at run time as in the case of the Debian
+Installer. That's not to say that a live image couldn't be built to support
+multiple desktops or multiple languages and offer the user a choice, but
+that is not live-build's default behaviour.
+
+Because there is no provision made automatically for language tasks, which
+include such things as language-specific fonts and input-method packages, if
+you want them, you need to specify them in your configuration. For example,
+a GNOME desktop image containing support for Japanese might include these
+tasks:
code{
- $ lb config --tasks "japanese japanese-desktop japanese-gnome-desktop"
+ $ lb config
+ $ echo "gnome-desktop desktop standard laptop" >> config/task-lists/my.list.chroot
+ $ echo "japanese japanese-desktop japanese-gnome-desktop" >> config/task-lists/my.list.chroot
}code
-Secondo, live-build gestisce gli elenchi #{*-desktop}# virtuali dei
-pacchetti per ogni tipo di desktop menzionato sopra, il quale seleziona
-l'elenco predefinito #{standard-x11}#, il corrispondente task #{*-desktop}#
-e tre task addizionali: #{desktop}#, #{standard}# e #{laptop}#. Così per
-esempio, se si specifica #{--packages-lists gnome-desktop}#, è l'equivalente
-di #{--packages debian-installer-launcher --packages-lists standard-x11
---tasks "gnome-desktop desktop standard laptop"}#.
-
-Terzo, se viene selezionato uno qualsiasi dei task per i vari desktop, sia
-esplicitamente con #{--tasks}# o implicitamente con #{--packages-lists}#,
-live-build pre-imposterà il corrispondente valore desktop per l'installatore
-Debian (se incluso) per garantire che segua le proprie regole per installare
-i vari tipi di desktop.
-
-*{Nota:}* esiste anche l'opzione sperimentale #{--language}# con lo scopo di sovrapporsi ai task della lingua. Se #{--language}# è specificato, per ogni lingua per la quale sia nota la presenza di pacchetti #{*-l10n}# questi verranno installati. Inoltre se uno dei modelli #{syslinux}# corrisponde alla lingua trovata, questi saranno usati al posto di quello inglese predefinito. La selezione dei pacchetti fatta con #{--language}# è un'approssimazione dei task della lingua, in quanto richiede che l'elenco dei pacchetti da includere per ogni lingua sia mantenuta all'interno di live-build, oltretutto i task della lingua sono più completi e flessibili; per quanto l'aspetto di #{syslinux}# sia comunque utile. Quindi utilizzando #{--bootloader syslinux}#, e se i modelli per la lingua specificata esistono in #{/usr/share/live/build/templates/syslinux/}# o in #{config/templates/syslinux/}#, si può considerare questa opzione, eventualmente in combinazione con i task per garantire c
he vengano installati tutti i pacchetti interessati. Esempio:
+Since desktop tasks are "internal" tasks, for every desktop flavour task
+included in the image, the corresponding value, if it differs from the
+default, "gnome", must be preseeded in the "tasksel/desktop" debconf
+variable or else tasksel will not recognize and install it. Thus:
code{
- $ lb config --language es
+ $ lb config
+ $ echo 'tasksel tasksel/desktop multiselect kde' >> config/preseed/my.preseed.chroot
}code
-Anche così è limitato dal fatto che gestisce una sola lingua e un solo
-bootloader. Pertanto, per tutte queste ragioni, il futuro di questa opzione
-è in revisione, potrebbe essere sostituito con qualcosa di totalmente
-diverso nel prossimo rilascio di live-build.
+This parameter can take multiple values, e.g. "lxde xfce" instead of "kde".
2~installing-modified-or-third-party-packages Installare pacchetti
modificati o di terze parti
@@ -408,42 +371,40 @@ Maintainer" all'indirizzo http://www.debian.org/doc/maint-guide/ e altrove.
Ci sono due modi per installare pacchetti personalizzati:
-_* #{chroot_local-packages}#
+_* #{packages.chroot}#
_* Utilizzare repository APT personalizzati
-Usando #{chroot_local-packages}# è più semplice da ottenere e utile per una
-personalizzazione "una tantum" ma ha una serie di svantaggi, mentre un
-repository APT personalizzato è più laborioso da configurare.
+Using #{packages.chroot}# 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~ Utilizzare #{chroot_local-packages}# per installare pacchetti
-personalizzati
+3~ Using #{packages.chroot}# to install custom packages
-Per installare un pacchetto personalizzato copiarlo nella directory
-#{config/chroot_local-packages/}#; i pacchetti al suo interno verranno
-installati automaticamente durante la creazione del sistema live, non è
-necessario specificarli altrove.
+To install a custom package, simply copy it to the
+#{config/packages.chroot/}# 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.
I pacchetti *{devono}* essere nominati nel modo prescritto, un metodo
semplice per farlo è usare #{dpkg-name}#.
-L'utilizzo di #{chroot_local-packages}# per l'installazione di pacchetti
-personalizzati presenta degli svantaggi:
+Using #{packages.chroot}# for installation of custom packages has
+disadvantages:
_* non è possibile usare secure APT
-_* è necessario installare i pacchetti adeguati nella directory
-#{config/chroot_local-packages/}#.
+_* You must install all appropriate packages in the
+#{config/packages.chroot/}# directory.
_* non si presta a salvare le configurazioni di Debian Live nel controllo di
versione.
3~ Utilizzare un repository APT per installare pacchetti personalizzati
-A differenza di #{chroot_local-packages}#, quando si usa un repository APT
-personalizzato è necessario assicurarsi di specificare altrove i
-pacchetti. Per i dettagli si veda {Scegliere i pacchetti da
-installare}#choosing-packages-to-install.
+Unlike using #{packages.chroot}#, 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.
Sebbene creare un repository APT possa sembrare uno sforzo inutile,
l'infrastruttura può facilmente essere riutilizzata in un secondo momento
@@ -465,12 +426,12 @@ veda {APT pinning}#apt-pinning per maggiori informazioni.
2~ Configurare APT in fase di costruzione
-APT è configurabile tramite una serie di opzioni applicate solo in fase di
-costruzione (la configurazione di APT utilizzata nel sistema live in
-esecuzione può essere configurata nel solito modo, ovvero includendo le
-impostazioni appropriate attraverso #{config/chroot_local_includes/}#). Per
-un elenco completo, cercare nel manuale di #{lb_config}# le opzioni che
-iniziano con #{apt}#.
+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/includes.chroot/}#.) For a
+complete list, look for options starting with #{apt}# in the #{lb_config}#
+man page.
3~choosing-apt-or-aptitude Scegliere apt o aptitude
@@ -508,7 +469,7 @@ d'interesse.
code{
- $ lb config --binary-indices false
+ $ lb config --apt-indices false
}code
@@ -548,22 +509,22 @@ di #{apt}# e #{aptitude}# per i dettagli.
3~apt-pinning APT pinning
-Si prega di leggere prima il manuale di #{apt_preferences(5)}#. Il pinning
-può essere configurato sia in fase di costruzione sia di esecuzione; per la
-prima creare #{config/chroot_apt/preferences}#, per quest'ultima creare
-#{config/chroot_local-includes/etc/apt/preferences}#.
+For background, please first read the #{apt_preferences(5)}# man page. APT
+pinning can be configured either for build time, or else for run time. For
+the former, create #{config/chroot_apt/preferences}#. For the latter, create
+#{config/includes.chroot/etc/apt/preferences}#.
-Nell'ipotesi di creare un sistema live Squeeze e avendo la necessità di
+Nell'ipotesi di creare un sistema live Wheezy e avendo la necessità di
installare da Sid tutti i pacchetti live destinati all'immagine binaria
questa fase, bisogna aggiungere Sid alle fonti di APT e farne il pinning
affinché verranno installati da lì solo i pacchetti voluti, mentre per tutti
-gli altri si attingerà dalla distribuzione principale, Squeeze. Quanto segue
+gli altri si attingerà dalla distribuzione principale, Wheezy. Quanto segue
servirà allo scopo:
code{
- $ echo "deb http://mirror/debian sid main" > config/chroot_sources/sid.chroot
- $ cat >>config/chroot_apt/preferences <<END
+ $ echo "deb http://mirror/debian sid main" > config/archives/sid.list.chroot
+ $ cat >> config/chroot_apt/preferences <<END
Package: live-boot live-boot-initramfs-tools live-config live-config-sysvinit
Pin: release n=sid
Pin-Priority: 600
@@ -583,14 +544,14 @@ $ lb config --distribution wheezy
}code
-Un valore negativo della priorità evita che un pacchetto venga installato,
-come nel caso in cui non se ne voglia uno raccomandato da un altro. Si
-suppone di costruire un'immagine di LXDE utilizzando l'opzione
-#{--packages-lists lxde}# ma non si desidera che all'utente venga richiesto
-di salvare la password del wifi nel portachiavi. L'elenco include #{gdm}#
-che dipende da #{gksu}# che a sua volta raccomanda #{gnome-keyring}#, in
-questo caso si vorrà omettere il pacchetto #{gnome-keyring}# aggiungendo a
-#{config/chroot_apt/preferences}# la seguente definizione:
+Negative pin priorities will prevent a package from being installed, as in
+the case where you do not want a package that is recommended by another
+package. Suppose you are building an LXDE image using #{--package-lists
+lxde}# option, but don't want the user prompted to store wifi passwords in
+the keyring. This list includes #{gdm}#, which depends on #{gksu}#, which in
+turn recommends #{gnome-keyring}#. So you want to omit the recommended
+#{gnome-keyring}# package. This can be done by adding the following stanza
+to #{config/chroot_apt/preferences}#:
code{
diff --git a/manual/it/user_customization-runtime.ssi b/manual/it/user_customization-runtime.ssi
index 74095a0..8ba36b2 100644
--- a/manual/it/user_customization-runtime.ssi
+++ b/manual/it/user_customization-runtime.ssi
@@ -17,14 +17,17 @@ creazione, come discusso in {Live/chroot include
locali}#live-chroot-local-includes, ma anche ogni gruppo e permesso
associato all'utente live.
-È possibile specificare gruppi aggiuntivi ai quali l'utente live apparterrà
-preconfigurando il valore #{passwd/user-default-groups}# di debconf. Ad
-esempio, per aggiungere l'utente al gruppo #{fuse}#, inserire quanto segue
-ad un file nella directory #{config/chroot_local-preseed}#:
+You can specify additional groups that the live user will belong to by
+preseeding the #{passwd/user-default-groups}# debconf value. For example, to
+add the live user to the #{fuse}# group, add the following preseed under
+#{config/preseed/}# for the chroot stage:
code{
- user-setup passwd/user-default-groups string audio cdrom dip floppy video plugdev netdev powerdev scanner bluetooth fuse
+ $ lb config
+ $ echo user-setup passwd/user-default-groups string audio cdrom \
+ dip floppy video plugdev netdev powerdev scanner bluetooth fuse \
+ >> config/preseed/my.preseed.chroot
}code
@@ -44,7 +47,7 @@ One possible way of changing the default password is by means of a hook as
described in {Boot-time hooks}#boot-time-hooks. In order to do that you can
use the "passwd" hook from #{/usr/share/doc/live-config/examples/hooks}#,
prefix it accordingly (e.g. 200-passwd) and add it to
-#{config/chroot_local-includes/lib/live/config/}#
+#{config/includes.chroot/lib/live/config/}#
2~customizing-locale-and-language Personalizzare la localizzazione e la
lingua
diff --git a/manual/it/user_examples.ssi b/manual/it/user_examples.ssi
index 3c7c464..8832e9b 100644
--- a/manual/it/user_examples.ssi
+++ b/manual/it/user_examples.ssi
@@ -14,21 +14,21 @@ Per usare questi esempi è necessario un sistema per costruirveli sopra che
soddisfi i requisiti elencati in {Requisiti}#requirements e avere live-build
installato come descritto in {Installare live-build}#installing-live-build.
-Si noti che, per brevità, in questi esempi non specifichiamo un mirror
-locale da usare per la costruzione. Usando un mirror locale, si possono
-accelerare considerevolmente i download. Si possono specificare le opzioni
-quando si usa #{lb config}#, come descritto in {Mirror delle distribuzioni
-usati in fase di compilazione}#distribution-mirrors-build-time o, più
-convenientemente, impostare il predefinito per il proprio sistema in
-#{/etc/live/build.conf}#. Si crei semplicemente questo file e si impostino
-in esso le corrispondenti variabili #{LB_MIRROR_*}# per il mirror
-desiderato. Ad esempio:
+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_PARENT_MIRROR_*}# variables
+to your preferred mirror. All other mirrors used in the build will be
+defaulted from these values. For example:
code{
- LB_MIRROR_BOOTSTRAP="http://mirror/debian"
- LB_MIRROR_CHROOT="http://mirror/debian"
- LB_MIRROR_CHROOT_SECURITY="http://mirror/debian-security"
+ LB_PARENT_MIRROR_BOOTSTRAP="http://mirror/debian"
+ LB_PARENT_MIRROR_CHROOT_SECURITY="http://mirror/debian-security"
+ LB_PARENT_MIRROR_CHROOT_BACKPORTS="http://mirror/debian-updates"
}code
@@ -80,17 +80,20 @@ Live.
code{
- $ mkdir tutorial2 ; cd tutorial2 ; lb config -p lxde --packages iceweasel
+ $ mkdir tutorial2
+ $ cd tutorial2
+ $ lb config -p lxde
+ $ echo iceweasel >> config/package-lists/my.list.chroot
}code
-La scelta di LXDE per questo esempio riflette il desiderio di fornire un
-ambiente desktop minimale, dato che il punto focale dell'immagine è il
-singolo uso che abbiamo in mente, il browser web. Potremmo anche spingerci
-oltre e fornire una configurazione predefinita per il browser web in
-#{config/chroot_local-includes/etc/iceweasel/profile/}#, o pacchetti
-addizionali di supporto per la fruizione di vari tipi di contenuti web, ma
-lasciamo questo come esercizio per il lettore.
+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/includes.chroot/etc/iceweasel/profile/}#, or additional support
+packages for viewing various kinds of web content, but we leave this as an
+exercise for the reader.
Si generi l'immagine, ancora come super-utente, conservando un log come in
{Tutorial 1}#tutorial-1:
@@ -134,20 +137,26 @@ code{
lb config noauto \
--architecture i386 \
- --linux-flavours 686 \
- --packages-lists lxde \
- --packages "iceweasel xchat" \
+ --linux-flavours 686-pae \
+ --package-lists lxde \
"${@}"
}code
-Per prima cosa, #{--architecture i386}# assicura che sul nostro sistema
-#{amd64}# costruiamo una versione a 32-bit utilizzabile sulla maggior parte
-delle macchine. In secondo luogo, usiamo #{--linux-flavours 686}# dato che
-non prevediamo di usare questa immagine su sistemi troppo vecchi. Terzo,
-abbiamo scelto la lista di pacchetti #{lxde}# per avere un desktop
-minimale. Infine, abbiamo aggiunto due pacchetti preferiti per cominciare:
-#{iceweasel}# e #{xchat}#.
+Now populate your local package list:
+
+code{
+
+ $ echo "iceweasel xchat" >> config/package-lists/my.list.chroot
+
+}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-pae}# 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}#.
Costruire quindi l'immagine:
@@ -190,18 +199,12 @@ code{
}code
-Si modifichi ora #{auto/config}# per aggiungere il pacchetto #{vlc}#:
+Now append the #{vlc}# package to our local package list in
+#{config/package-lists/my.list.chroot}#:
code{
- #!/bin/sh
-
- lb config noauto \
- --architecture i386 \
- --linux-flavours 686 \
- --packages-lists lxde \
- --packages "iceweasel xchat vlc" \
- "${@}"
+ $ echo vlc >> config/package-lists/my.list.chroot
}code
@@ -241,18 +244,17 @@ utenti Debian Live.
*{Caso d'uso:}* creazione di un'immagine con live-build per avviare direttamente un server VNC.
-Creare una directory con al suo interno una configurazione scheletrica
-costruita sulla base dell'elenco di standard-x11, tra cui #{gdm3}#,
-#{metacity}# e #{xtightvncviewer}#, disabilitando i raccomandati per
-ottenere un sistema minimale:
+Make a build directory and create a skeletal configuration in it built
+around the standard-x11 list, including #{gdm3}#, #{metacity}# and
+#{xvnc4viewer}#, disabling recommends to make a minimal system:
code{
$ mkdir vnc_kiosk_client
$ cd vnc_kiosk_client
- $ lb config -a i386 -k 686 -p standard-x11 \
- --packages "gdm3 metacity xvnc4viewer" \
+ $ lb config -a i386 -k 686-pae -p standard-x11 \
--apt-recommends false
+ $ echo "gdm3 metacity xvnc4viewer" >> config/package-lists/my.list.chroot
}code
@@ -263,8 +265,8 @@ xvncviewer, connesso alla porta #{5901}# su un server all'indirizzo
code{
- $ mkdir -p config/chroot_local-includes/etc/skel
- $ cat >config/chroot_local-includes/etc/skel/.xsession <<END
+ $ mkdir -p config/includes.chroot/etc/skel
+ $ cat > config/includes.chroot/etc/skel/.xsession <<END
#!/bin/sh
/usr/bin/metacity &
@@ -301,7 +303,7 @@ sappia cosa si sta facendo, come omettere la priorità dei pacchetti
code{
- $ lb config -k 486 -p minimal --binary-indices false \
+ $ lb config -k 486 -p minimal --apt-indices false \
--memtest none --apt-recommends false --includes none
}code
@@ -318,19 +320,19 @@ All'autore del sistema al momento di scrivere, la seguente configurazione ha
prodotto una immagine di 78Mbyte. Comparabile favorevolmente con i 166Mbyte
prodotta dalla configurazione predefinita nel {Tutorial 1}#tutorial-1.
-Ciò che salva più spazio, comparato alla costruzione di un'immagine standard
-su un sistema con architettura #{i386}#, è la selezione del solo kernel
-#{486}# invece che quello predefinito #{-k "486 686"}#. Lasciando fuori
-anche gli indici di APT con #{--binary-indices false}# si può salvare una
-certa quantità di spazio, il compromesso è usare #{apt-get update}# prima di
-usare apt nel sistema live. Scegliendo la lista #{minima}# dei pacchetti si
-esclude il grosso pacchetto #{locales}# e le utilità associate. Saltare i
-pacchetti raccomandati con #{--apt-recommends false}# salva altro spazio, a
-scapito di alcuni pacchetti che ci si aspetta di trovare, come
-#{firmware-linux-free}# che potrebbe servire a supportare un certo
-hardware. Le restanti opzioni limano altre piccole quantità di spazio. Sta a
-voi decidere se le funzionalità sacrificate con ciascuna ottimizzazione
-valgono la pena.
+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-pae"}#. Leaving off APT's indices with
+#{--apt-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.
2~ Un desktop KDE localizzato e l'installer
@@ -341,11 +343,11 @@ nostro desktop preferito, in questo caso KDE, contenente tutti gli stessi
pacchetti che verrebbero installati dall'installatore Debian standard per
KDE.
-Il problema iniziale è di scoprire i nomi dei task appropriati, attualmente,
-live-build non aiuta in questo. Si può essere fortunati o arrivarci con vari
-tentativi, ma c'è uno strumento #{grep-dctrl}# il quale può essere
-utilizzato per scavare nelle descrizioni in tasksel-data, perciò assicursi
-di avere entrambi questi pacchetti:
+Our initial problem is the discovery of the names of the appropriate
+language tasks. Currently, live-build cannot help with this. While we might
+get lucky and find this by trial-and-error, there is a tool, #{grep-dctrl}#,
+which can be used to dig it out of the task descriptions in tasksel-data, so
+to prepare, make sure you have both of those things:
code{
@@ -357,12 +359,8 @@ Ora si possono cercare i task appropriati:
code{
- $ grep-dctrl -FTest-lang pt_BR /usr/share/tasksel/debian-tasks.desc -sTask,Description
+ $ grep-dctrl -FTest-lang pt_BR /usr/share/tasksel/descs/debian-tasks.desc -sTask
Task: brazilian-portuguese
- Description: Brazilian Portuguese environment
- This task installs programs, data files, and
- documentation that make it easier for Brazilian Portuguese speakers
- to use Debian.
}code
@@ -371,22 +369,17 @@ chiaramente, brazilian-portuguese. Ora per trovare i task correlati:
code{
- $ grep-dctrl -FEnhances brazilian-portuguese /usr/share/tasksel/debian-tasks.desc -sTask,Description
+ $ grep-dctrl -FEnhances brazilian-portuguese /usr/share/tasksel/descs/debian-tasks.desc -sTask
Task: brazilian-portuguese-desktop
- Description: Brazilian Portuguese desktop
- This task localises the desktop in Brasilian Portuguese.
-
Task: brazilian-portuguese-kde-desktop
- Description: Brazilian Portuguese KDE desktop
- This task localises the KDE desktop in Brazilian Portuguese.
}code
-Si userà l'opzione sperimentale #{--language}#, poiché live-build contempla
-i template #{syslinux}# per pt_BR (vedere {Task per desktop e
-lingua}#desktop-and-language-tasks per i dettagli). All'avvio verrà generata
-la lingua pt_BR.UTF-8 e selezionato pt-latin1 come layout della
-tastiera. Ora mettiamo insieme i pezzi:
+At boot time we will generate the pt_BR.UTF-8 locale and select the
+pt-latin1 keyboard layout. We will also need to preseed our desktop choice,
+"kde" so that tasksel will install the correct desktop task, as it differs
+from the default (see {Desktop and languages
+tasks}#desktop-and-language-tasks). Now let's put the pieces together:
code{
@@ -395,12 +388,12 @@ code{
$ lb config \
-a i386 \
-k 486 \
- -p kde-desktop \
- --language pt_BR \
- --tasks "brazilian-portuguese brazilian-portuguese-desktop brazilian-portuguese-kde-desktop" \
--bootappend-live "locales=pt_BR.UTF-8 keyboard-layouts=pt-latin1" \
- --debian-installer live \
- --packages debian-installer-launcher
+ --debian-installer live
+ $ echo kde-desktop brazilian-portuguese brazilian-portuguese-desktop \
+ brazilian-portuguese-kde-desktop >> config/task-lists/my.list.chroot
+ $ echo debian-installer-launcher >> config/package-lists/my.list.chroot
+ $ echo tasksel tasksel/desktop multiselect kde >> config/preseed/my.preseed.chroot
}code
diff --git a/manual/it/user_installation.ssi b/manual/it/user_installation.ssi
index c3b4051..fe9f9bd 100644
--- a/manual/it/user_installation.ssi
+++ b/manual/it/user_installation.ssi
@@ -108,7 +108,7 @@ presente su Git e disponibili su http://live.debian.net/debian/.
2~ live-boot e live-config
-*{Nota:}* non è necessario installare live-boot o live-config sul proprio sistema per creare sistemi Debian Live personalizzati. Tuttavia, farlo non nuoce.
+*{Nota:}* non è necessario installare live-boot o live-config sul proprio sistema per creare sistemi Debian Live personalizzati. Tuttavia, farlo non nuoce. Se si vuole la documentazione è possibile installare i pacchetti live-boot-doc e live-config-doc separatamente.
3~ Dal repository Debian
@@ -138,12 +138,12 @@ _* Costruire un .deb di live-boot e live-config
È necessario compilare sulla distribuzione di destinazione, oppure in un
chroot contenente la piattaforma di destinazione: significa che se
-l'obiettivo è Squeeze allora bisogna compilare su Squeeze.
+l'obiettivo è Wheezy allora bisogna compilare su Wheezy.
Se si deve compilare #{live-boot}# per una distribuzione di destinazione
diversa dal proprio sistema, utilizzare un compilatore tipo /{pbuilder}/ o
-/{sbuild}/. Ad esempio, per immagini live Squeeze, si generi #{live-boot}#
-in un chroot Squeeze. Se la distribuzione di destinazione corrisponde con la
+/{sbuild}/. Ad esempio, per immagini live Wheezy, si generi #{live-boot}# in
+un chroot Wheezy. Se la distribuzione di destinazione corrisponde con la
distribuzione del proprio sistema, si può costruire direttamente sul sistema
usando #{dpkg-buildpackage}# (fornito dal pacchetto /{dpkg-dev}/):
@@ -170,10 +170,10 @@ attenzione a {Repository aggiuntivi}#additional-repositories.
Si può lasciare che live-build usi automaticamente l'ultima istantanea di
live-boot e live-config configurando un repository esterno nella directory
di configurazione di live-build. Assumendo che si sia già creato un albero
-di configurazione con #{lb config}#:
+di configurazione nell'attuale directory con #{lb config}#:
code{
- $ lb config --repository live.debian.net
+ $ lb config --archives live.debian.net
}code
diff --git a/manual/it/user_managing_a_configuration.ssi b/manual/it/user_managing_a_configuration.ssi
index 956f64d..1a31b47 100644
--- a/manual/it/user_managing_a_configuration.ssi
+++ b/manual/it/user_managing_a_configuration.ssi
@@ -52,7 +52,7 @@ code{
#!/bin/sh
lb config noauto \
- --packages-lists "standard" \
+ --package-lists "standard" \
"${@}"
}code
@@ -87,8 +87,8 @@ code{
}code
-Modifica #{auto/config}# aggiungendo o togliendo le opzioni come meglio
-credi. Nel precedente esempio #{--packages-lists standard}# è impostato il
-valore predefinito.Cambiare questo in un valore appropriato per l'immagine (
-o cancellarlo se si desidera utilizzare un valore predefinito) e aggiungere
-eventuali opzioni aggiuntive in continuazione delle righe che seguono.
+Edit #{auto/config}#, changing or adding any options as you see fit. In the
+example above, #{--package-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/it/user_overview.ssi b/manual/it/user_overview.ssi
index a082cd4..9404a20 100644
--- a/manual/it/user_overview.ssi
+++ b/manual/it/user_overview.ssi
@@ -54,53 +54,22 @@ singola directory chiamata #{config/}#. Dal momento che crearla a mano
sarebbe dispendioso in termini di tempo e soggetto a errori, si può usare il
comando #{lb config}# per creare la directory scheletro di configurazione.
-L'esecuzione di #{lb config}# senza argomenti crea una sottodirectory di
-#{config/}# popolata con alcune impostazioni predefinite:
+Issuing #{lb config}# without any arguments creates a #{config/}#
+subdirectory which it populates with some default settings, and a skeleton
+#{auto/}# subdirectory tree.
code{
$ lb config
+ P: Considering defaults defined in /etc/live/build.conf
P: Creating config tree
- $ ls -l
- total 8
- drwxr-xr-x 3 user user 4096 Sep 7 13:02 auto
- drwxr-xr-x 22 user user 4096 Sep 7 13:02 config
-
- $ ls -l config/
- total 104
- -rw-r--r-- 1 user user 4197 Sep 7 13:02 binary
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_debian-installer
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_debian-installer-includes
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_grub
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-debs
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-hooks
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-includes
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-packageslists
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-udebs
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_rootfs
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_syslinux
- -rw-r--r-- 1 user user 2051 Sep 7 13:02 bootstrap
- -rw-r--r-- 1 user user 1647 Sep 7 13:02 chroot
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_apt
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-hooks
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-includes
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-packages
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-packageslists
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-patches
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-preseed
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_sources
- -rw-r--r-- 1 user user 2954 Sep 7 13:02 common
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 includes
- -rw-r--r-- 1 user user 205 Sep 7 13:02 source
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 templates
-
}code
-L'uso di #{lb config}# senza argomenti è adatto ad utenti che necessitano di
-un'immagine di base o che intendono fornire in seguito una configurazione
-più completa tramite auto/config (per i dettagli vedere {Gestire una
-configurazione}#managing-a-configuration).
+Using #{lb config}# without any arguments would be suitable for users who
+need a very basic image, or who intend to later provide a more complete
+configuration via #{auto/config}# (see {Managing a
+configuration}#managing-a-configuration for details).
Normalmente si vorranno specificare delle opzioni, ad esempio per includere
nella propria configurazione l'elenco del pacchetto "gnome":
@@ -123,9 +92,9 @@ Una lista completa delle opzioni è disponibile nel manuale di #{lb_config}#.
3~lb-build Il comando #{lb build}#
-Il comando #{lb build}# legge la configurazione dalla directory #{config/}#
-ed esegue ad un livello inferiore i comandi necessari a costruire il sistema
-live.
+The #{lb build}# command reads in your configuration from the #{config/}#
+directory. It then runs the lower level commands needed to build your Live
+system.
3~lb-clean Il comando #{lb clean}#
@@ -145,10 +114,10 @@ utilizzato per generare un initramfs in grado di avviare sistemi live, come
quelli creati da live-build. Questo include le ISO di Debian Live, archivi
per l'avvio da rete e immagini per penne USB.
-All'avvio cercherà supporti in sola lettura che contengano una directory
-"/live" dove sia presente un filesystem root (spesso un'immagine compressa
-come squashfs). Se trovata, creerà un ambiente scrivibile usando aufs, per
-avviarsi da sistemi simili a Debian.
+At boot time it will look for read-only media containing a #{/live/}#
+directory where a root filesystem (often a compressed filesystem image like
+squashfs) is stored. If found, it will create a writable environment, using
+aufs, for Debian like systems to boot from.
Si possono trovare maggiori informazioni sui ramfs iniziali nel capitolo su
initramfs del Debian Linux Kernel Handbook all'indirizzo
diff --git a/manual/po/de/index.html.in.po b/manual/po/de/index.html.in.po
index 697c4e9..aa9d073 100644
--- a/manual/po/de/index.html.in.po
+++ b/manual/po/de/index.html.in.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 3.0~a3-1\n"
-"POT-Creation-Date: 2011-04-23 14:15+0300\n"
+"POT-Creation-Date: 2011-12-03 18:55+0100\n"
"PO-Revision-Date: 2011-04-23 14:15+0300\n"
"Last-Translator: Daniel Baumann <daniel at debian.org>\n"
"Language-Team: none\n"
@@ -28,76 +28,84 @@ msgstr "Debian Live Handbuch"
#. type: Content of: <html><body><p>
#: en/index.html.in:12
msgid ""
+"<i>live-manual</i> is available in different file formats and it is "
+"translated into several languages. Keep in mind that some translations may "
+"be incomplete or may not be up to date."
+msgstr ""
+
+#. type: Content of: <html><body><p>
+#: en/index.html.in:17
+msgid ""
"Please report errors, omissions, patches and suggestions to our mailinglist "
"at <a href=\"mailto:debian-live at lists.debian.org\">debian-live at lists.debian."
-"org</a> and read about <a href=\"html/about-manual.html#how-to-contribute"
+"org</a> and read about <a href=\"html/about-manual.en.html#how-to-contribute"
"\">how to contribute</a> to the manual."
msgstr ""
"Fehler, Vergessenes, Patches und Vorschläge können an unsere Mailing Liste "
"unter <a href=\"mailto:debian-live at lists.debian.org\">debian-live at lists."
"debian.org</a> (englischspraching) gemeldet werden. Informationen wie man <a "
-"href=\"html/about-manual.html#how-to-contribute\">zum Handbuch beitragen</a> "
-"kann, können im Handbuch gefunden werden."
+"href=\"html/about-manual.de.html#how-to-contribute\">zum Handbuch beitragen</"
+"a> kann, können im Handbuch gefunden werden."
#. type: Content of: <html><body><h3>
-#: en/index.html.in:15
+#: en/index.html.in:20
msgid "Available Formats"
msgstr "Verfügbare Formate"
#. type: Content of: <html><body><ul><li>
-#: en/index.html.in:18
-msgid "<a href=\"epub/live-manual.epub\">EPUB</a>"
-msgstr "<a href=\"epub/live-manual.epub\">EPUB</a>"
+#: en/index.html.in:23
+msgid "<a href=\"epub/live-manual.en.epub\">EPUB</a>"
+msgstr "<a href=\"epub/live-manual.de.epub\">EPUB</a>"
#. type: Content of: <html><body><ul><li>
-#: en/index.html.in:19
+#: en/index.html.in:24
msgid ""
-"HTML: <a href=\"html/index.html\">multi page</a>, <a href=\"html/live-manual."
-"html\">single page</a>"
+"HTML: <a href=\"html/index.en.html\">multi page</a>, <a href=\"html/live-"
+"manual.en.html\">single page</a>"
msgstr ""
-"HTML: <a href=\"html/index.html\">mehrere Seiten</a>, <a href=\"html/live-"
-"manual.html\">einzelne Seite</a>"
+"HTML: <a href=\"html/index.de.html\">mehrere Seiten</a>, <a href=\"html/live-"
+"manual.de.html\">einzelne Seite</a>"
#. type: Content of: <html><body><ul><li>
-#: en/index.html.in:20
-msgid "<a href=\"odf/live-manual.odt\">ODF</a>"
-msgstr "<a href=\"odf/live-manual.odt\">ODF</a>"
+#: en/index.html.in:25
+msgid "<a href=\"odf/live-manual.en.odt\">ODF</a>"
+msgstr "<a href=\"odf/live-manual.de.odt\">ODF</a>"
#. type: Content of: <html><body><ul><li>
-#: en/index.html.in:21
+#: en/index.html.in:26
msgid ""
-"PDF: <a href=\"pdf/live-manual.portrait-a4.pdf\">A4 portrait</a>, <a href="
-"\"pdf/live-manual.landscape-a4.pdf\">A4 landscape</a>, <a href=\"pdf/live-"
-"manual.portrait-letter.pdf\">letter portrait</a>, <a href=\"pdf/live-manual."
-"landscape-letter.pdf\">letter landscape</a>"
+"PDF: <a href=\"pdf/live-manual.portrait-a4.en.pdf\">A4 portrait</a>, <a href="
+"\"pdf/live-manual.landscape-a4.en.pdf\">A4 landscape</a>, <a href=\"pdf/live-"
+"manual.portrait-letter.en.pdf\">letter portrait</a>, <a href=\"pdf/live-"
+"manual.landscape-letter.en.pdf\">letter landscape</a>"
msgstr ""
-"PDF: <a href=\"pdf/live-manual.portrait-a4.pdf\">A4 Hochformat</a>, <a href="
-"\"pdf/live-manual.landscape-a4.pdf\">A4 Querformat</a>, <a href=\"pdf/live-"
-"manual.portrait-letter.pdf\">Letter Hochformat</a>, <a href=\"pdf/live-"
-"manual.landscape-letter.pdf\">Letter Querformat</a>"
+"PDF: <a href=\"pdf/live-manual.portrait-a4.de.pdf\">A4 Hochformat</a>, <a "
+"href=\"pdf/live-manual.landscape-a4.de.pdf\">A4 Querformat</a>, <a href="
+"\"pdf/live-manual.portrait-letter.de.pdf\">Letter Hochformat</a>, <a href="
+"\"pdf/live-manual.landscape-letter.de.pdf\">Letter Querformat</a>"
#. type: Content of: <html><body><ul><li>
-#: en/index.html.in:22
-msgid "<a href=\"txt/live-manual.txt\">Plain text</a>"
-msgstr "<a href=\"txt/live-manual.txt\">Text</a>"
+#: en/index.html.in:27
+msgid "<a href=\"txt/live-manual.en.txt\">Plain text</a>"
+msgstr "<a href=\"txt/live-manual.de.txt\">Text</a>"
#. type: Content of: <html><body><p>
-#: en/index.html.in:26
+#: en/index.html.in:31
msgid "Last changed: @DATE_CHANGE@"
msgstr "Letzte Änderung: @DATE_CHANGE@"
#. type: Content of: <html><body><p>
-#: en/index.html.in:27
+#: en/index.html.in:32
msgid "Last built: @DATE_BUILD@"
msgstr "Letzte Aktualisierung: @DATE_BUILD@"
#. type: Content of: <html><body><h3>
-#: en/index.html.in:30
+#: en/index.html.in:35
msgid "Source"
msgstr "Quellen"
#. type: Content of: <html><body><p>
-#: en/index.html.in:33
+#: en/index.html.in:38
msgid ""
"The sources for this manual is available in a <a href=\"http://git.or.cz/"
"\">Git</a> repository at live.debian.net."
@@ -106,7 +114,7 @@ msgstr ""
"\">Git</a> Repository auf live.debian.net verfügbar."
#. type: Content of: <html><body><ul><li>
-#: en/index.html.in:37
+#: en/index.html.in:42
msgid ""
"Browse: <a href=\"http://live.debian.net/gitweb/?p=live-manual.git"
"\"><small><tt>http://live.debian.net/gitweb/?p=live-manual.git</tt></small></"
@@ -117,7 +125,7 @@ msgstr ""
"a>"
#. type: Content of: <html><body><ul><li>
-#: en/index.html.in:38
+#: en/index.html.in:43
msgid ""
"Git: <a href=\"git://live.debian.net/git/live-manual.git\"><small><tt>git://"
"live.debian.net/git/live-manual.git</tt></small></a>"
@@ -126,7 +134,7 @@ msgstr ""
"live.debian.net/git/live-manual.git</tt></small></a>"
#. type: Content of: <html><body><p>
-#: en/index.html.in:42
+#: en/index.html.in:47
msgid ""
"<a href=\"http://live.debian.net/\">Debian Live</a> <<a href=\"mailto:"
"debian-live at lists.debian.org\">debian-live at lists.debian.org</a>> - <a "
diff --git a/manual/po/de/live-manual.ssm.po b/manual/po/de/live-manual.ssm.po
index 97563df..add5468 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: 2011-09-30 14:54+0300\n"
+"POT-Creation-Date: 2011-12-04 10:22+0100\n"
"PO-Revision-Date: 2011-04-23 14:15+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -19,17 +19,17 @@ msgstr ""
#. type: Plain text
#: en/live-manual.ssm:2
msgid "% SiSU 2.0"
-msgstr ""
+msgstr "% SiSU 2.0"
#. type: Plain text
#: en/live-manual.ssm:4
msgid "@title: Debian Live Manual"
-msgstr ""
+msgstr "@title: Debian Live Handbuch"
#. type: Plain text
#: en/live-manual.ssm:6
msgid "@creator: Debian Live Project <debian-live at lists.debian.org>"
-msgstr ""
+msgstr "@creator: Debian Live Projekt <debian-live at lists.debian.org>"
#. type: Plain text
#: en/live-manual.ssm:10
@@ -39,19 +39,22 @@ msgid ""
" :copyright: Copyright (C) 2006-2011 Debian Live Project\n"
" :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>The complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-3 file.\n"
msgstr ""
+"@rights:\n"
+" :copyright: Copyright (C) 2006-2011 Debian Live Projekt\n"
+" :license: Dieses Programm ist freie Software. Sie können es unter den Bedingungen der GNU General Public License, wie von der Free Software Foundation veröffentlicht, weitergeben und/oder modifizieren, entweder gemäss Version 3 der Lizenz oder (nach Ihrer Option) jeder späteren Version.<br><br>Die Veröffentlichung dieses Programms erfolgt in der Hoffnung, dass es Ihnen von Nutzen sein wird, aber OHNE IRGENDEINE GARANTIE, sogar ohne die implizite Garantie der MARKTREIFE oder der VERWENDBARKEIT FÜR EINEN BESTIMMTEN ZWECK. Details finden Sie in der GNU General Public License.<br><br>Sie sollten ein Exemplar der GNU General Public License zusammen mit diesem Programm erhalten haben. Falls nicht, siehe <http://www.gnu.org/licenses/>.<br><br>Der komplette Text der GNU General Public License kann in der Datei /usr/share/common-licenses/GPL-3 gefunden werden.\n"
#. type: Plain text
#: en/live-manual.ssm:13
#, no-wrap
msgid ""
"@date:\n"
-" :published: 2011-09-30\n"
+" :published: 2011-12-04\n"
msgstr ""
#. type: Plain text
#: en/live-manual.ssm:15
msgid "@publisher: Debian Live Project <debian-live at lists.debian.org>"
-msgstr ""
+msgstr "@publisher: Debian Live Projekt <debian-live at lists.debian.org>"
#. type: Plain text
#: en/live-manual.ssm:21
@@ -63,108 +66,113 @@ msgid ""
" :num_top: 1\n"
" :skin: skin_debian-live\n"
msgstr ""
+"@make:\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"
#. type: Plain text
#: en/live-manual.ssm:23
msgid ":A~ @title"
-msgstr ""
+msgstr ":A~ @title"
#. type: Plain text
#: en/live-manual.ssm:25
msgid ":B~ About"
-msgstr ""
+msgstr ":B~ Über Debian Live"
#. type: Plain text
#: en/live-manual.ssm:27
msgid "<< about_manual.ssi"
-msgstr ""
+msgstr "<< about_manual.ssi"
#. type: Plain text
#: en/live-manual.ssm:29
msgid "<< about_project.ssi"
-msgstr ""
+msgstr "<< about_project.ssi"
#. type: Plain text
#: en/live-manual.ssm:31
msgid ":B~ User"
-msgstr ""
+msgstr ":B~ Benutzer"
#. type: Plain text
#: en/live-manual.ssm:33
msgid "<< user_installation.ssi"
-msgstr ""
+msgstr "<< user_installation.ssi"
#. type: Plain text
#: en/live-manual.ssm:35
msgid "<< user_basics.ssi"
-msgstr ""
+msgstr "<< user_basics.ssi"
#. type: Plain text
#: en/live-manual.ssm:37
msgid "<< user_overview.ssi"
-msgstr ""
+msgstr "<< user_overview.ssi"
#. type: Plain text
#: en/live-manual.ssm:39
msgid "<< user_managing_a_configuration.ssi"
-msgstr ""
+msgstr "<< user_managing_a_configuration.ssi"
#. type: Plain text
#: en/live-manual.ssm:41
msgid "<< user_customization-overview.ssi"
-msgstr ""
+msgstr "<< user_customization-overview.ssi"
#. type: Plain text
#: en/live-manual.ssm:43
msgid "<< user_customization-packages.ssi"
-msgstr ""
+msgstr "<< user_customization-packages.ssi"
#. type: Plain text
#: en/live-manual.ssm:45
msgid "<< user_customization-contents.ssi"
-msgstr ""
+msgstr "<< user_customization-contents.ssi"
#. type: Plain text
#: en/live-manual.ssm:47
msgid "<< user_customization-runtime.ssi"
-msgstr ""
+msgstr "<< user_customization-runtime.ssi"
#. type: Plain text
#: en/live-manual.ssm:49
msgid "<< user_customization-binary.ssi"
-msgstr ""
+msgstr "<< user_customization-binary.ssi"
#. type: Plain text
#: en/live-manual.ssm:51
msgid "<< user_customization-installer.ssi"
-msgstr ""
+msgstr "<< user_customization-installer.ssi"
#. type: Plain text
#: en/live-manual.ssm:53
msgid ":B~ Project"
-msgstr ""
+msgstr ":B~ Projekt"
#. type: Plain text
#: en/live-manual.ssm:55
msgid "<< project_bugs.ssi"
-msgstr ""
+msgstr "<< project_bugs.ssi"
#. type: Plain text
#: en/live-manual.ssm:57
msgid "<< project_coding-style.ssi"
-msgstr ""
+msgstr "<< project_coding-style.ssi"
#. type: Plain text
#: en/live-manual.ssm:59
msgid "<< project_procedures.ssi"
-msgstr ""
+msgstr "<< project_procedures.ssi"
#. type: Plain text
#: en/live-manual.ssm:61 en/user_examples.ssi:2
msgid ":B~ Examples"
-msgstr ""
+msgstr ":B~ Beispiele"
#. type: Plain text
#: en/live-manual.ssm:62
msgid "<< user_examples.ssi"
-msgstr ""
+msgstr "<< user_examples.ssi"
diff --git a/manual/po/de/user_basics.ssi.po b/manual/po/de/user_basics.ssi.po
index c943ed2..b9830a3 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: 2011-04-23 14:15+0300\n"
+"POT-Creation-Date: 2011-11-02 12:23-0200\n"
"PO-Revision-Date: 2011-04-23 14:15+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -37,37 +37,38 @@ msgstr ""
#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
-#: en/user_customization-installer.ssi:43
+#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
-#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:53
-#: en/user_customization-packages.ssi:66 en/user_customization-packages.ssi:80
-#: en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:112
-#: en/user_customization-packages.ssi:142
-#: en/user_customization-packages.ssi:155
-#: en/user_customization-packages.ssi:165
-#: en/user_customization-packages.ssi:175
-#: en/user_customization-packages.ssi:185
-#: en/user_customization-packages.ssi:199
-#: en/user_customization-packages.ssi:215
-#: en/user_customization-packages.ssi:227
-#: en/user_customization-packages.ssi:291
-#: en/user_customization-packages.ssi:303
-#: en/user_customization-packages.ssi:313
-#: en/user_customization-packages.ssi:331
-#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
-#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
-#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
-#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
-#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:105
-#: 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:178 en/user_examples.ssi:190
-#: en/user_examples.ssi:206 en/user_examples.ssi:220 en/user_examples.ssi:229
-#: en/user_examples.ssi:247 en/user_examples.ssi:255 en/user_examples.ssi:268
-#: en/user_examples.ssi:283 en/user_installation.ssi:38
+#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:54
+#: en/user_customization-packages.ssi:67 en/user_customization-packages.ssi:81
+#: en/user_customization-packages.ssi:101
+#: en/user_customization-packages.ssi:131
+#: en/user_customization-packages.ssi:144
+#: en/user_customization-packages.ssi:154
+#: en/user_customization-packages.ssi:164
+#: en/user_customization-packages.ssi:174
+#: en/user_customization-packages.ssi:188
+#: en/user_customization-packages.ssi:204
+#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:320
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:345 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:24 en/user_customization-runtime.ssi:44
+#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:63
+#: en/user_customization-runtime.ssi:71 en/user_customization-runtime.ssi:80
+#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:111
+#: en/user_customization-runtime.ssi:119 en/user_examples.ssi:14
+#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
+#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
+#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
+#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
+#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
+#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
+#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:271
+#: en/user_examples.ssi:286 en/user_installation.ssi:38
#: en/user_installation.ssi:46 en/user_installation.ssi:56
#: en/user_installation.ssi:64 en/user_installation.ssi:74
#: en/user_installation.ssi:82 en/user_installation.ssi:90
@@ -100,38 +101,39 @@ msgstr ""
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
-#: en/user_customization-installer.ssi:37
-#: en/user_customization-installer.ssi:48
+#: en/user_customization-installer.ssi:38
+#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:70 en/user_customization-packages.ssi:84
-#: en/user_customization-packages.ssi:98
-#: en/user_customization-packages.ssi:116
-#: en/user_customization-packages.ssi:147
-#: en/user_customization-packages.ssi:161
-#: en/user_customization-packages.ssi:171
-#: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:191
-#: en/user_customization-packages.ssi:203
-#: en/user_customization-packages.ssi:219
-#: en/user_customization-packages.ssi:231
-#: en/user_customization-packages.ssi:295
-#: en/user_customization-packages.ssi:307
-#: en/user_customization-packages.ssi:317
-#: en/user_customization-packages.ssi:344
-#: en/user_customization-packages.ssi:353 en/user_customization-runtime.ssi:18
-#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
-#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
-#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
-#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:110
-#: 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:186 en/user_examples.ssi:202
-#: en/user_examples.ssi:210 en/user_examples.ssi:225 en/user_examples.ssi:233
-#: en/user_examples.ssi:251 en/user_examples.ssi:264 en/user_examples.ssi:279
-#: en/user_examples.ssi:297 en/user_installation.ssi:42
+#: en/user_customization-packages.ssi:46 en/user_customization-packages.ssi:59
+#: en/user_customization-packages.ssi:71 en/user_customization-packages.ssi:85
+#: en/user_customization-packages.ssi:105
+#: en/user_customization-packages.ssi:136
+#: en/user_customization-packages.ssi:150
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:180
+#: en/user_customization-packages.ssi:192
+#: en/user_customization-packages.ssi:208
+#: en/user_customization-packages.ssi:220
+#: en/user_customization-packages.ssi:284
+#: en/user_customization-packages.ssi:296
+#: en/user_customization-packages.ssi:306
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341
+#: en/user_customization-packages.ssi:350 en/user_customization-runtime.ssi:18
+#: en/user_customization-runtime.ssi:28 en/user_customization-runtime.ssi:48
+#: en/user_customization-runtime.ssi:59 en/user_customization-runtime.ssi:67
+#: en/user_customization-runtime.ssi:76 en/user_customization-runtime.ssi:85
+#: en/user_customization-runtime.ssi:105 en/user_customization-runtime.ssi:115
+#: en/user_customization-runtime.ssi:124 en/user_examples.ssi:20
+#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
+#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
+#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
+#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
+#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
+#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
+#: en/user_examples.ssi:254 en/user_examples.ssi:267 en/user_examples.ssi:282
+#: en/user_examples.ssi:300 en/user_installation.ssi:42
#: en/user_installation.ssi:50 en/user_installation.ssi:60
#: en/user_installation.ssi:70 en/user_installation.ssi:78
#: en/user_installation.ssi:86 en/user_installation.ssi:94
@@ -291,7 +293,7 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:44 en/user_basics.ssi:170 en/user_basics.ssi:238
-#: en/user_examples.ssi:109 en/user_examples.ssi:208
+#: en/user_examples.ssi:119 en/user_examples.ssi:211
#, no-wrap
msgid " # lb build\n"
msgstr ""
@@ -545,7 +547,7 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:142
#, no-wrap
-msgid " $ lb config --packages virtualbox-ose-guest-x11\n"
+msgid " $ echo virtualbox-ose-guest-x11 >> config/package-lists/my.list.chroot\n"
msgstr ""
#. type: Plain text
diff --git a/manual/po/de/user_customization-contents.ssi.po b/manual/po/de/user_customization-contents.ssi.po
index 56239ed..205e71a 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: 2011-08-25 15:56+0300\n"
+"POT-Creation-Date: 2011-11-07 21:01-0400\n"
"PO-Revision-Date: 2011-04-23 14:15+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -37,48 +37,47 @@ msgstr ""
#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
-#: en/user_customization-installer.ssi:43
+#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
-#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:53
-#: en/user_customization-packages.ssi:66 en/user_customization-packages.ssi:80
-#: en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:112
-#: en/user_customization-packages.ssi:142
-#: en/user_customization-packages.ssi:155
-#: en/user_customization-packages.ssi:165
-#: en/user_customization-packages.ssi:175
-#: en/user_customization-packages.ssi:185
-#: en/user_customization-packages.ssi:199
-#: en/user_customization-packages.ssi:215
-#: en/user_customization-packages.ssi:227
-#: en/user_customization-packages.ssi:291
-#: en/user_customization-packages.ssi:303
-#: en/user_customization-packages.ssi:313
-#: en/user_customization-packages.ssi:331
-#: en/user_customization-packages.ssi:348
-#: en/user_customization-packages.ssi:356 en/user_customization-runtime.ssi:14
-#: en/user_customization-runtime.ssi:24 en/user_customization-runtime.ssi:44
-#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:63
-#: en/user_customization-runtime.ssi:71 en/user_customization-runtime.ssi:80
-#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:111
-#: en/user_customization-runtime.ssi:119 en/user_examples.ssi:14
+#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:54
+#: en/user_customization-packages.ssi:67 en/user_customization-packages.ssi:81
+#: en/user_customization-packages.ssi:101
+#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:140
+#: en/user_customization-packages.ssi:150
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:184
+#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:276
+#: en/user_customization-packages.ssi:288
+#: en/user_customization-packages.ssi:298
+#: en/user_customization-packages.ssi:316
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
+#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
+#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
+#: en/user_customization-runtime.ssi:104 en/user_customization-runtime.ssi:114
+#: en/user_customization-runtime.ssi:122 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:178 en/user_examples.ssi:190 en/user_examples.ssi:206
-#: en/user_examples.ssi:220 en/user_examples.ssi:229 en/user_examples.ssi:247
-#: en/user_examples.ssi:255 en/user_examples.ssi:268 en/user_examples.ssi:283
-#: en/user_installation.ssi:38 en/user_installation.ssi:46
-#: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi:74 en/user_installation.ssi:82
-#: en/user_installation.ssi:90 en/user_installation.ssi:114
-#: en/user_installation.ssi:129 en/user_installation.ssi:146
-#: en/user_managing_a_configuration.ssi:24
+#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
+#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
+#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
+#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
+#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
+#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
+#: en/user_examples.ssi:277 en/user_installation.ssi:38
+#: en/user_installation.ssi:46 en/user_installation.ssi:56
+#: en/user_installation.ssi:64 en/user_installation.ssi:74
+#: en/user_installation.ssi:82 en/user_installation.ssi:90
+#: en/user_installation.ssi:114 en/user_installation.ssi:129
+#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:80 en/user_overview.ssi:88
+#: en/user_overview.ssi:48 en/user_overview.ssi:56
msgid "code{"
msgstr ""
@@ -102,49 +101,48 @@ msgstr ""
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
-#: en/user_customization-installer.ssi:37
-#: en/user_customization-installer.ssi:48
+#: en/user_customization-installer.ssi:38
+#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:70 en/user_customization-packages.ssi:84
-#: en/user_customization-packages.ssi:98
-#: en/user_customization-packages.ssi:116
-#: en/user_customization-packages.ssi:147
-#: en/user_customization-packages.ssi:161
-#: en/user_customization-packages.ssi:171
-#: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:191
-#: en/user_customization-packages.ssi:203
-#: en/user_customization-packages.ssi:219
-#: en/user_customization-packages.ssi:231
-#: en/user_customization-packages.ssi:295
-#: en/user_customization-packages.ssi:307
-#: en/user_customization-packages.ssi:317
-#: en/user_customization-packages.ssi:344
-#: en/user_customization-packages.ssi:352
-#: en/user_customization-packages.ssi:361 en/user_customization-runtime.ssi:18
-#: en/user_customization-runtime.ssi:28 en/user_customization-runtime.ssi:48
-#: en/user_customization-runtime.ssi:59 en/user_customization-runtime.ssi:67
-#: en/user_customization-runtime.ssi:76 en/user_customization-runtime.ssi:85
-#: en/user_customization-runtime.ssi:105 en/user_customization-runtime.ssi:115
-#: en/user_customization-runtime.ssi:124 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:186 en/user_examples.ssi:202 en/user_examples.ssi:210
-#: en/user_examples.ssi:225 en/user_examples.ssi:233 en/user_examples.ssi:251
-#: en/user_examples.ssi:264 en/user_examples.ssi:279 en/user_examples.ssi:297
-#: en/user_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi:70
-#: en/user_installation.ssi:78 en/user_installation.ssi:86
-#: en/user_installation.ssi:94 en/user_installation.ssi:119
-#: en/user_installation.ssi:136 en/user_installation.ssi:149
-#: en/user_managing_a_configuration.ssi:31
+#: en/user_customization-packages.ssi:46 en/user_customization-packages.ssi:59
+#: en/user_customization-packages.ssi:71 en/user_customization-packages.ssi:85
+#: en/user_customization-packages.ssi:105
+#: en/user_customization-packages.ssi:132
+#: en/user_customization-packages.ssi:146
+#: en/user_customization-packages.ssi:156
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:329
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:346 en/user_customization-runtime.ssi:21
+#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
+#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
+#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
+#: en/user_customization-runtime.ssi:108 en/user_customization-runtime.ssi:118
+#: en/user_customization-runtime.ssi:127 en/user_examples.ssi:20
+#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
+#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
+#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
+#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
+#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
+#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
+#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
+#: en/user_examples.ssi:291 en/user_installation.ssi:42
+#: en/user_installation.ssi:50 en/user_installation.ssi:60
+#: en/user_installation.ssi:70 en/user_installation.ssi:78
+#: en/user_installation.ssi:86 en/user_installation.ssi:94
+#: en/user_installation.ssi:119 en/user_installation.ssi:136
+#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
-#: en/user_overview.ssi:84 en/user_overview.ssi:92
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:42
+#: en/user_overview.ssi:52 en/user_overview.ssi:60
msgid "}code"
msgstr ""
@@ -235,7 +233,7 @@ msgstr ""
#. type: Plain text
#: en/user_customization-contents.ssi:24
msgid ""
-"To include files, simply add them to your #{config/chroot_local-includes}# "
+"To include files, simply add them to your #{config/includes.chroot}# "
"directory. This directory corresponds to the root directory (#{/}#) of the "
"live system. For example, to add a file #{/var/www/index.html}# in the live "
"system, use:"
@@ -245,8 +243,8 @@ msgstr ""
#: en/user_customization-contents.ssi:29
#, no-wrap
msgid ""
-" $ mkdir -p config/chroot_local-includes/var/www\n"
-" $ cp /path/to/my/index.html config/chroot_local-includes/var/www\n"
+" $ mkdir -p config/includes.chroot/var/www\n"
+" $ cp /path/to/my/index.html config/includes.chroot/var/www\n"
msgstr ""
#. type: Plain text
@@ -260,7 +258,7 @@ msgstr ""
msgid ""
" -- config\n"
" [...]\n"
-" |-- chroot_local-includes\n"
+" |-- includes.chroot\n"
" | `-- var\n"
" | `-- www\n"
" | `-- index.html\n"
@@ -288,14 +286,14 @@ msgid ""
"booting the Live system, you can use binary local includes. This works in a "
"similar fashion to chroot local includes. For example, suppose the files #{~/"
"video_demo.*}# are demo videos of the live system described by and linked to "
-"by an HTML index page. Simply copy the material to #{config/binary_local-"
-"includes/}# as follows:"
+"by an HTML index page. Simply copy the material to #{config/includes.binary/}"
+"# as follows:"
msgstr ""
#. type: Plain text
#: en/user_customization-contents.ssi:56
#, no-wrap
-msgid " $ cp ~/video_demo.* config/binary_local-includes/\n"
+msgid " $ cp ~/video_demo.* config/includes.binary/\n"
msgstr ""
#. type: Plain text
@@ -349,12 +347,12 @@ msgstr ""
#. type: Plain text
#: en/user_customization-contents.ssi:80
msgid ""
-"To run commands in the chroot stage, create a hook script containing the "
-"commands in the #{config/chroot_local-hooks}# directory. The hook will run "
-"in the chroot after the rest of your chroot configuration has been applied, "
-"so remember to ensure your configuration includes all packages and files "
-"your hook needs in order to run. See the example chroot hook scripts for "
-"various common chroot customization tasks provided in #{/usr/share/live/"
+"To run commands in the chroot stage, create a hook script with a #{.chroot}# "
+"suffix containing the commands in the #{config/hooks/}# directory. The hook "
+"will run in the chroot after the rest of your chroot configuration has been "
+"applied, so remember to ensure your configuration includes all packages and "
+"files your hook needs in order to run. See the example chroot hook scripts "
+"for various common chroot customization tasks provided in #{/usr/share/live/"
"build/examples/hooks}# which you can copy or symlink to use them in your own "
"configuration."
msgstr ""
@@ -371,10 +369,9 @@ msgid ""
"explained in the \"Customization\" section of its man page. Examine live-"
"config's own hooks provided in #{/lib/live/config/}#, noting the sequence "
"numbers. Then provide your own hook prefixed with an appropriate sequence "
-"number, either as a chroot local include in #{config/chroot_local-includes/"
-"lib/live/config/}#, or as a custom package as discussed in {Installing "
-"modified or third-party packages}#installing-modified-or-third-party-"
-"packages."
+"number, either as a chroot local include in #{config/includes.chroot/lib/"
+"live/config/}#, or as a custom package as discussed in {Installing modified "
+"or third-party packages}#installing-modified-or-third-party-packages."
msgstr ""
#. type: Plain text
@@ -385,14 +382,15 @@ msgstr ""
#. type: Plain text
#: en/user_customization-contents.ssi:88
msgid ""
-"To run commands in the binary stage, create a hook script containing the "
-"commands in the #{config/binary_local-hooks}#. The hook will run after all "
-"other binary commands are run, but before binary_checksums, the very last "
-"binary commands The commands in your hook do not run in the chroot, so take "
-"care to not modify any files outside of the build tree, or you may damage "
-"your build system! See the example binary hook scripts for various common "
-"binary customization tasks provided in #{/usr/share/live/build/examples/"
-"hooks}# which you can copy or symlink to use them in your own configuration."
+"To run commands in the binary stage, create a hook script with a #{.binary}# "
+"suffix containing the commands in the #{config/hooks/}# directory. The hook "
+"will run after all other binary commands are run, but before "
+"binary_checksums, the very last binary command. The commands in your hook do "
+"not run in the chroot, so take care to not modify any files outside of the "
+"build tree, or you may damage your build system! See the example binary hook "
+"scripts for various common binary customization tasks provided in #{/usr/"
+"share/live/build/examples/hooks}# which you can copy or symlink to use them "
+"in your own configuration."
msgstr ""
#. type: Plain text
@@ -403,9 +401,10 @@ msgstr ""
#. type: Plain text
#: en/user_customization-contents.ssi:92
msgid ""
-"Files in the #{config/chroot_local-preseed}# directory are considered to be "
+"Files in the #{config/preseed/}# directory suffixed with #{.preseed}# "
+"followed by the stage (#{.chroot}# or #{.binary}#) are considered to be "
"debconf preseed files and are installed by live-build using #{debconf-set-"
-"selections}#."
+"selections}# during the corresponding stage."
msgstr ""
#. type: Plain text
diff --git a/manual/po/de/user_customization-installer.ssi.po b/manual/po/de/user_customization-installer.ssi.po
index 76966db..2c9c46d 100644
--- a/manual/po/de/user_customization-installer.ssi.po
+++ b/manual/po/de/user_customization-installer.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2011-04-23 14:15+0300\n"
+"POT-Creation-Date: 2011-11-07 21:19-0400\n"
"PO-Revision-Date: 2011-04-23 14:15+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -37,37 +37,38 @@ msgstr ""
#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
-#: en/user_customization-installer.ssi:43
+#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
-#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:53
-#: en/user_customization-packages.ssi:66 en/user_customization-packages.ssi:80
-#: en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:112
-#: en/user_customization-packages.ssi:142
-#: en/user_customization-packages.ssi:155
-#: en/user_customization-packages.ssi:165
-#: en/user_customization-packages.ssi:175
-#: en/user_customization-packages.ssi:185
-#: en/user_customization-packages.ssi:199
-#: en/user_customization-packages.ssi:215
-#: en/user_customization-packages.ssi:227
-#: en/user_customization-packages.ssi:291
-#: en/user_customization-packages.ssi:303
-#: en/user_customization-packages.ssi:313
-#: en/user_customization-packages.ssi:331
-#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
-#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
-#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
-#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
-#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:105
-#: 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:178 en/user_examples.ssi:190
-#: en/user_examples.ssi:206 en/user_examples.ssi:220 en/user_examples.ssi:229
-#: en/user_examples.ssi:247 en/user_examples.ssi:255 en/user_examples.ssi:268
-#: en/user_examples.ssi:283 en/user_installation.ssi:38
+#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:54
+#: en/user_customization-packages.ssi:67 en/user_customization-packages.ssi:81
+#: en/user_customization-packages.ssi:101
+#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:140
+#: en/user_customization-packages.ssi:150
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:184
+#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:276
+#: en/user_customization-packages.ssi:288
+#: en/user_customization-packages.ssi:298
+#: en/user_customization-packages.ssi:316
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
+#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
+#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
+#: en/user_customization-runtime.ssi:104 en/user_customization-runtime.ssi:114
+#: en/user_customization-runtime.ssi:122 en/user_examples.ssi:14
+#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
+#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
+#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
+#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
+#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
+#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
+#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
+#: en/user_examples.ssi:277 en/user_installation.ssi:38
#: en/user_installation.ssi:46 en/user_installation.ssi:56
#: en/user_installation.ssi:64 en/user_installation.ssi:74
#: en/user_installation.ssi:82 en/user_installation.ssi:90
@@ -76,7 +77,7 @@ msgstr ""
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:80 en/user_overview.ssi:88
+#: en/user_overview.ssi:48 en/user_overview.ssi:56
msgid "code{"
msgstr ""
@@ -100,38 +101,39 @@ msgstr ""
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
-#: en/user_customization-installer.ssi:37
-#: en/user_customization-installer.ssi:48
+#: en/user_customization-installer.ssi:38
+#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:70 en/user_customization-packages.ssi:84
-#: en/user_customization-packages.ssi:98
-#: en/user_customization-packages.ssi:116
-#: en/user_customization-packages.ssi:147
-#: en/user_customization-packages.ssi:161
-#: en/user_customization-packages.ssi:171
-#: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:191
-#: en/user_customization-packages.ssi:203
-#: en/user_customization-packages.ssi:219
-#: en/user_customization-packages.ssi:231
-#: en/user_customization-packages.ssi:295
-#: en/user_customization-packages.ssi:307
-#: en/user_customization-packages.ssi:317
-#: en/user_customization-packages.ssi:344
-#: en/user_customization-packages.ssi:353 en/user_customization-runtime.ssi:18
-#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
-#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
-#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
-#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:110
-#: 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:186 en/user_examples.ssi:202
-#: en/user_examples.ssi:210 en/user_examples.ssi:225 en/user_examples.ssi:233
-#: en/user_examples.ssi:251 en/user_examples.ssi:264 en/user_examples.ssi:279
-#: en/user_examples.ssi:297 en/user_installation.ssi:42
+#: en/user_customization-packages.ssi:46 en/user_customization-packages.ssi:59
+#: en/user_customization-packages.ssi:71 en/user_customization-packages.ssi:85
+#: en/user_customization-packages.ssi:105
+#: en/user_customization-packages.ssi:132
+#: en/user_customization-packages.ssi:146
+#: en/user_customization-packages.ssi:156
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:329
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:346 en/user_customization-runtime.ssi:21
+#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
+#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
+#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
+#: en/user_customization-runtime.ssi:108 en/user_customization-runtime.ssi:118
+#: en/user_customization-runtime.ssi:127 en/user_examples.ssi:20
+#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
+#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
+#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
+#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
+#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
+#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
+#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
+#: en/user_examples.ssi:291 en/user_installation.ssi:42
#: en/user_installation.ssi:50 en/user_installation.ssi:60
#: en/user_installation.ssi:70 en/user_installation.ssi:78
#: en/user_installation.ssi:86 en/user_installation.ssi:94
@@ -139,8 +141,8 @@ msgstr ""
#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
-#: en/user_overview.ssi:84 en/user_overview.ssi:92
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:42
+#: en/user_overview.ssi:52 en/user_overview.ssi:60
msgid "}code"
msgstr ""
@@ -253,20 +255,21 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-installer.ssi:35
+#: en/user_customization-installer.ssi:36
#, no-wrap
msgid ""
" $ lb config --architecture i386 --linux-flavours 486 \\\n"
-" --debian-installer live --packages debian-installer-launcher\n"
+" --debian-installer live\n"
+" $ echo debian-installer-launcher >> config/package-lists/my.list.chroot\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-installer.ssi:39
+#: en/user_customization-installer.ssi:40
msgid "2~ Customizing Debian Installer by preseeding"
msgstr ""
#. type: Plain text
-#: en/user_customization-installer.ssi:41
+#: en/user_customization-installer.ssi:42
msgid ""
"As described in the Debian Installer Manual, Appendix B at http://www.debian."
"org/releases/stable/i386/apb.html, \"Preseeding provides a way to set "
@@ -280,7 +283,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-installer.ssi:46
+#: en/user_customization-installer.ssi:47
#, no-wrap
msgid ""
" $ echo \"d-i debian-installer/locale string en_US\" \\\n"
@@ -288,16 +291,16 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-installer.ssi:50
+#: en/user_customization-installer.ssi:51
msgid "2~ Customizing Debian Installer content"
msgstr ""
#. type: Plain text
-#: en/user_customization-installer.ssi:51
+#: en/user_customization-installer.ssi:52
msgid ""
"For experimental or debugging purposes, you might want to include locally "
-"built #{d-i}# component udeb packages. Place these in #{config/binary_local-"
-"udebs/}# to include them in the image. Additional or replacement files and "
+"built #{d-i}# component udeb packages. Place these in #{config/packages."
+"binary/}# to include them in the image. Additional or replacement files and "
"directories may be included in the installer initrd as well, in a similar "
"fashion to {Live/chroot local includes}#live-chroot-local-includes, by "
"placing the material in #{config/binary_debian-installer-includes/}#."
diff --git a/manual/po/de/user_customization-packages.ssi.po b/manual/po/de/user_customization-packages.ssi.po
index 67b393c..7a7669d 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: 2011-08-14 16:53+0300\n"
+"POT-Creation-Date: 2011-11-07 21:01-0400\n"
"PO-Revision-Date: 2011-04-23 14:15+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -37,38 +37,38 @@ msgstr ""
#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
-#: en/user_customization-installer.ssi:43
+#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
-#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:53
-#: en/user_customization-packages.ssi:66 en/user_customization-packages.ssi:80
-#: en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:112
-#: en/user_customization-packages.ssi:142
-#: en/user_customization-packages.ssi:155
-#: en/user_customization-packages.ssi:165
-#: en/user_customization-packages.ssi:175
-#: en/user_customization-packages.ssi:185
-#: en/user_customization-packages.ssi:199
-#: en/user_customization-packages.ssi:215
-#: en/user_customization-packages.ssi:227
-#: en/user_customization-packages.ssi:291
-#: en/user_customization-packages.ssi:303
-#: en/user_customization-packages.ssi:313
-#: en/user_customization-packages.ssi:331
-#: en/user_customization-packages.ssi:348
-#: en/user_customization-packages.ssi:356 en/user_customization-runtime.ssi:14
-#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
-#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
-#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
-#: en/user_customization-runtime.ssi:99 en/user_customization-runtime.ssi:107
-#: 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:178 en/user_examples.ssi:190
-#: en/user_examples.ssi:206 en/user_examples.ssi:220 en/user_examples.ssi:229
-#: en/user_examples.ssi:247 en/user_examples.ssi:255 en/user_examples.ssi:268
-#: en/user_examples.ssi:283 en/user_installation.ssi:38
+#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:54
+#: en/user_customization-packages.ssi:67 en/user_customization-packages.ssi:81
+#: en/user_customization-packages.ssi:101
+#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:140
+#: en/user_customization-packages.ssi:150
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:184
+#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:276
+#: en/user_customization-packages.ssi:288
+#: en/user_customization-packages.ssi:298
+#: en/user_customization-packages.ssi:316
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
+#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
+#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
+#: en/user_customization-runtime.ssi:104 en/user_customization-runtime.ssi:114
+#: en/user_customization-runtime.ssi:122 en/user_examples.ssi:14
+#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
+#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
+#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
+#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
+#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
+#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
+#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
+#: en/user_examples.ssi:277 en/user_installation.ssi:38
#: en/user_installation.ssi:46 en/user_installation.ssi:56
#: en/user_installation.ssi:64 en/user_installation.ssi:74
#: en/user_installation.ssi:82 en/user_installation.ssi:90
@@ -77,7 +77,7 @@ msgstr ""
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:80 en/user_overview.ssi:88
+#: en/user_overview.ssi:48 en/user_overview.ssi:56
msgid "code{"
msgstr ""
@@ -101,39 +101,39 @@ msgstr ""
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
-#: en/user_customization-installer.ssi:37
-#: en/user_customization-installer.ssi:48
+#: en/user_customization-installer.ssi:38
+#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:70 en/user_customization-packages.ssi:84
-#: en/user_customization-packages.ssi:98
-#: en/user_customization-packages.ssi:116
-#: en/user_customization-packages.ssi:147
-#: en/user_customization-packages.ssi:161
-#: en/user_customization-packages.ssi:171
-#: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:191
-#: en/user_customization-packages.ssi:203
-#: en/user_customization-packages.ssi:219
-#: en/user_customization-packages.ssi:231
-#: en/user_customization-packages.ssi:295
-#: en/user_customization-packages.ssi:307
-#: en/user_customization-packages.ssi:317
-#: en/user_customization-packages.ssi:344
-#: en/user_customization-packages.ssi:352
-#: en/user_customization-packages.ssi:361 en/user_customization-runtime.ssi:18
-#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
-#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
-#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
-#: en/user_customization-runtime.ssi:103 en/user_customization-runtime.ssi:112
-#: 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:186 en/user_examples.ssi:202
-#: en/user_examples.ssi:210 en/user_examples.ssi:225 en/user_examples.ssi:233
-#: en/user_examples.ssi:251 en/user_examples.ssi:264 en/user_examples.ssi:279
-#: en/user_examples.ssi:297 en/user_installation.ssi:42
+#: en/user_customization-packages.ssi:46 en/user_customization-packages.ssi:59
+#: en/user_customization-packages.ssi:71 en/user_customization-packages.ssi:85
+#: en/user_customization-packages.ssi:105
+#: en/user_customization-packages.ssi:132
+#: en/user_customization-packages.ssi:146
+#: en/user_customization-packages.ssi:156
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:329
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:346 en/user_customization-runtime.ssi:21
+#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
+#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
+#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
+#: en/user_customization-runtime.ssi:108 en/user_customization-runtime.ssi:118
+#: en/user_customization-runtime.ssi:127 en/user_examples.ssi:20
+#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
+#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
+#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
+#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
+#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
+#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
+#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
+#: en/user_examples.ssi:291 en/user_installation.ssi:42
#: en/user_installation.ssi:50 en/user_installation.ssi:60
#: en/user_installation.ssi:70 en/user_installation.ssi:78
#: en/user_installation.ssi:86 en/user_installation.ssi:94
@@ -141,8 +141,8 @@ msgstr ""
#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
-#: en/user_overview.ssi:84 en/user_overview.ssi:92
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:42
+#: en/user_overview.ssi:52 en/user_overview.ssi:60
msgid "}code"
msgstr ""
@@ -191,7 +191,7 @@ msgstr ""
msgid ""
"The distribution you choose has the broadest impact on which packages are "
"available to include in your live image. Specify the codename, which "
-"defaults to #{squeeze}# for the Squeeze version of live-build. Any current "
+"defaults to #{wheezy}# for the Wheezy version of live-build. Any current "
"distribution carried in the Debian archive may be specified by its codename "
"here. (See {Terms}#terms for more details.) The #{--distribution}# option "
"not only influences the source of packages within the archive, but also "
@@ -248,15 +248,15 @@ msgstr ""
msgid ""
"The Debian archive is replicated across a large network of mirrors around "
"the world so that people in each region can choose a nearby mirror for best "
-"download speed. Each of the #{--mirror-*}# options governs which "
+"download speed. Each of the #{--parent-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."
+"those stages, and later, in the *binary* stage, the #{--parent-mirror-binary}"
+"# and #{--parent-mirror-binary-security}# values are used, superceding any "
+"mirrors used in an earlier stage."
msgstr ""
#. type: Plain text
@@ -269,173 +269,138 @@ msgstr ""
#: en/user_customization-packages.ssi:38
msgid ""
"To set the distribution mirrors used at build time to point at a local "
-"mirror, it is sufficient to set #{--mirror-bootstrap}# and #{--mirror-chroot-"
-"security}# as follows."
+"mirror, it is sufficient to set #{--parent-mirror-bootstrap}#, #{--parent-"
+"mirror-chroot-security}# and #{--parent-mirror-chroot-backports}# as follows."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:43
+#: en/user_customization-packages.ssi:44
#, no-wrap
msgid ""
-" $ lb config --mirror-bootstrap http://localhost/debian/ \\\n"
-" --mirror-chroot-security http://localhost/debian-security/\n"
+" $ lb config --parent-mirror-bootstrap http://localhost/debian/ \\\n"
+" --parent-mirror-chroot-security http://localhost/debian-security/ \\\n"
+"\t --parent-mirror-chroot-backports http://localhost/debian-backports/\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:47
+#: en/user_customization-packages.ssi:48
msgid ""
-"The chroot mirror, specified by #{--mirror-chroot}#, defaults to the #{--"
-"mirror-bootstrap}# value."
+"The chroot mirror, specified by #{--parent-mirror-chroot}#, defaults to the #"
+"{--parent-mirror-bootstrap}# value."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:49
+#: en/user_customization-packages.ssi:50
msgid "3~ Distribution mirrors used at run time"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:51
+#: en/user_customization-packages.ssi:52
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."
+"The #{--parent-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:56
+#: en/user_customization-packages.ssi:57
#, no-wrap
msgid ""
-" $ lb config --mirror-binary http://mirror/debian/ \\\n"
-" --mirror-binary-security http://mirror/debian-security/\n"
+" $ lb config --parent-mirror-binary http://mirror/debian/ \\\n"
+" --parent-mirror-binary-security http://mirror/debian-security/\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:60
+#: en/user_customization-packages.ssi:61
msgid "3~additional-repositories Additional repositories"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:62
+#: en/user_customization-packages.ssi:63
msgid ""
"You may add more repositories, broadening your package choices beyond what "
"is available in your target distribution. These may be, for example, for "
"backports, experimental or custom packages. To configure additional "
-"repositories, create #{config/chroot_sources/your-repository.chroot}#, and/"
-"or #{config/chroot_sources/your-repository.binary}# files. As with the #{--"
-"mirror-*}# options, these govern the repositories used in the *chroot* stage "
-"when building the image, and in the *binary* stage, i.e. for use when "
-"running the live system."
+"repositories, create #{config/archives/your-repository.list.chroot}#, and/or "
+"#{config/archives/your-repository.list.binary}# files. As with the #{--"
+"parent-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:64
+#: en/user_customization-packages.ssi:65
msgid ""
-"For example, #{config/chroot_sources/live.chroot}# allows you to install "
+"For example, #{config/archives/live.list.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:68
+#: en/user_customization-packages.ssi:69
#, no-wrap
msgid " deb http://live.debian.net/ sid-snapshots main contrib non-free\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:72
+#: en/user_customization-packages.ssi:73
msgid ""
-"If you add the same line to #{config/chroot_sources/live.binary}#, the "
+"If you add the same line to #{config/archives/live.list.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:74
+#: en/user_customization-packages.ssi:75
msgid "If such files exist, they will be picked up automatically."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:76
+#: en/user_customization-packages.ssi:77
msgid ""
"You should also put the GPG key used to sign the repository into #{config/"
-"chroot_sources/your-repository.{binary,chroot}.gpg}# files."
+"archives/your-repository.gpg.{binary,chroot}}# files."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:78
+#: en/user_customization-packages.ssi:79
#, no-wrap
-msgid "*{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:\n"
+msgid "*{Note:}* some preconfigured package repositories are available for easy selection through the #{--archives}# option, e.g. for enabling live snapshots, a simple command is enough to enable it:\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:82 en/user_installation.ssi:148
+#: en/user_customization-packages.ssi:83 en/user_installation.ssi:148
#, no-wrap
-msgid " $ lb config --repository live.debian.net\n"
+msgid " $ lb config --archives live.debian.net\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:86
+#: en/user_customization-packages.ssi:87
msgid "2~choosing-packages-to-install Choosing packages to install"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:88
+#: en/user_customization-packages.ssi:89
msgid ""
"There are a number of ways to choose which packages live-build will install "
"in your image, covering a variety of different needs. You can simply name "
-"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:90
-msgid "3~ Choosing a few packages"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:92
-msgid ""
-"When the number of packages added is small, simply specify #{--packages}#. "
-"For example:"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:96
-#, no-wrap
-msgid " $ lb config --packages \"package1 package2 package3\"\n"
+"individual packages to install in a package list. You can also choose "
+"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:100
-msgid ""
-"The behaviour of live-build when specifying a package that does not exist is "
-"determined by your choice of APT utility. See {Choosing apt or aptitude}"
-"#choosing-apt-or-aptitude for more details."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:102
-msgid ""
-"If you need to specify a large number of packages to be installed or you "
-"need flexibility regarding which packages to install, use package lists as "
-"discussed in the following section, {Package lists}#package-lists."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:104
+#: en/user_customization-packages.ssi:91
msgid "3~package-lists Package lists"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:106
+#: en/user_customization-packages.ssi:93
msgid ""
"Package lists are a powerful way of expressing which packages should be "
"installed. The list syntax supports included files and conditional sections "
@@ -448,114 +413,103 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:108
-msgid "3~ Predefined package lists"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:110
-msgid ""
-"The simplest way to use lists is to specify one or more predefined lists "
-"with the #{--packages-lists}# option. For example:"
+#: en/user_customization-packages.ssi:95
+#, no-wrap
+msgid "*{Note:}* 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.\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:114
-#, no-wrap
-msgid " $ lb config --packages-lists \"gnome-core rescue\"\n"
+#: en/user_customization-packages.ssi:97
+msgid "3~ Predefined package lists"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:118
+#: en/user_customization-packages.ssi:99
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."
+"The simplest way to use lists is to specify one or more predefined lists "
+"with the #{--package-lists}# option. For example:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:120
+#: en/user_customization-packages.ssi:103
#, no-wrap
-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.\n"
+msgid " $ lb config --package-lists \"gnome rescue\"\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:122
+#: en/user_customization-packages.ssi:107
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 "
+"build/package-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:124
+#: en/user_customization-packages.ssi:109
msgid "3~ Local package lists"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:126
+#: en/user_customization-packages.ssi:111
msgid ""
-"You may supplement or replace entirely the supplied lists using local "
-"package lists stored in #{config/chroot_local-packageslists/}#."
+"You may supplement the predefined lists using local package lists stored in #"
+"{config/package-lists/}#."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:128
+#: en/user_customization-packages.ssi:113
msgid ""
"Package lists that exist in this directory need to have a #{.list}# suffix "
-"in order to be processed. Local package lists always override package lists "
-"distributed with live-build. This can cause undesired effects, we therefore "
-"recommend to use unique names for local package lists."
+"in order to be processed, and then an additional stage suffix, #{.chroot}# "
+"or #{.binary}# to indicate which stage the list is for."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:130
-msgid "3~ Local binary package lists"
+#: en/user_customization-packages.ssi:115
+#, no-wrap
+msgid "*{Note:}* If you don't specify the stage suffix, the list will be used for both stages. Normally, you want to specify #{.list.chroot}# so that the packages will only be installed in the live filesystem and not have an extra copy of the #{.deb}# placed on the media.\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:132
-msgid ""
-"In case you want to include some required .deb packages to live media's #"
-"{pool/}# (without installing them onto the live image) you may need to use "
-"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."
+#: en/user_customization-packages.ssi:117
+msgid "3~ Local binary package lists"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:134
+#: en/user_customization-packages.ssi:119
msgid ""
-"Package lists that exist in this directory need to have a #{.list}# suffix "
-"in order to be processed."
+"To make a binary stage list, place a file suffixed with #{.list.binary}# in #"
+"{config/package-lists/}#. These packages are not installed in the live "
+"filesystem, but are included on the live media under #{pool/}#. You would "
+"typically use such a list with one of the non-live installer variants. As "
+"mentioned above, if you want this list to be the same as your chroot stage "
+"list, simply use the #{.list}# suffix by itself."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:136
+#: en/user_customization-packages.ssi:121
msgid "3~ Extending a provided package list using includes"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:138
+#: en/user_customization-packages.ssi:123
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."
+"includes. Refer to these in the #{/usr/share/live/build/package-lists/}# "
+"directory, as they serve as good examples of how to write your own lists."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:140
+#: en/user_customization-packages.ssi:125
msgid ""
"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:"
+"iceweasel, create #{config/package-lists/my.list.chroot}# with the following "
+"contents:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:145
+#: en/user_customization-packages.ssi:130
#, no-wrap
msgid ""
" #include <gnome>\n"
@@ -563,12 +517,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:134
msgid "3~ Using conditionals inside package lists"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:151
+#: en/user_customization-packages.ssi:136
msgid ""
"Any of the live-build configuration variables stored in #{config/*}# (minus "
"the #{LB_}# prefix) may be used in conditional statements in package lists. "
@@ -579,14 +533,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:153
+#: en/user_customization-packages.ssi:138
msgid ""
"For example, to install #{ia32-libs}# if the #{--architecture amd64}# is "
"specified:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:159
+#: en/user_customization-packages.ssi:144
#, no-wrap
msgid ""
" #if ARCHITECTURE amd64\n"
@@ -595,14 +549,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:148
msgid ""
"You may test for any one of a number of values, e.g. to install #{memtest86+}"
"# if either #{--architecture i386}# or #{--architecture amd64}# is specified:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:169
+#: en/user_customization-packages.ssi:154
#, no-wrap
msgid ""
" #if ARCHITECTURE i386 amd64\n"
@@ -611,7 +565,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:173
+#: en/user_customization-packages.ssi:158
msgid ""
"You may also test against variables that may contain more than one value, e."
"g. to install #{vrms}# if either #{contrib}# or #{non-free}# is specified "
@@ -619,7 +573,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:179
+#: en/user_customization-packages.ssi:164
#, no-wrap
msgid ""
" #if ARCHIVE_AREAS contrib non-free\n"
@@ -628,12 +582,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:183
+#: en/user_customization-packages.ssi:168
msgid "A conditional may surround an #{#include}# directive:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:174
#, no-wrap
msgid ""
" #if ARCHITECTURE amd64\n"
@@ -642,34 +596,37 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:178
msgid "The nesting of conditionals is not supported."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:195
+#: en/user_customization-packages.ssi:180
msgid "3~ Tasks"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:197
+#: en/user_customization-packages.ssi:182
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."
+"live-build by putting them in a list in #{config/task-lists/}#, as in the "
+"example below."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:187
#, no-wrap
-msgid " $ lb config --tasks \"mail-server file-server\"\n"
+msgid ""
+" $ lb config\n"
+" $ echo \"mail-server file-server\" >> config/task-lists/my.list.chroot\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:205
+#: en/user_customization-packages.ssi:191
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, "
@@ -678,97 +635,87 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:193
msgid "3~desktop-and-language-tasks Desktop and language tasks"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:209
+#: en/user_customization-packages.ssi:195
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 #{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."
+"Desktop and language tasks are special cases that need some extra planning "
+"and configuration. Live images are different from Debian Installer images in "
+"this respect. 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 internal #{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:211
+#: en/user_customization-packages.ssi:197
msgid ""
-"In live-build, therefore, these special cases are also given special "
-"consideration, but with three notable differences at the time of writing."
+"When developing a desktop live image, the image typically boots directly to "
+"a working desktop, the choices of both desktop and default language having "
+"been made at build time, not at run time as in the case of the Debian "
+"Installer. That's not to say that a live image couldn't be built to support "
+"multiple desktops or multiple languages and offer the user a choice, but "
+"that is not live-build's default behaviour."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:213
+#: en/user_customization-packages.ssi:199
msgid ""
-"First, there is no provision made yet automatically for language tasks, "
-"although a subset of those packages are included if you specify #{lb config "
-"--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:"
+"Because there is no provision made automatically for language tasks, which "
+"include such things as language-specific fonts and input-method packages, if "
+"you want them, you need to specify them in your configuration. For example, "
+"a GNOME desktop image containing support for Japanese might include these "
+"tasks:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:217
+#: en/user_customization-packages.ssi:205
#, no-wrap
-msgid " $ lb config --tasks \"japanese japanese-desktop japanese-gnome-desktop\"\n"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:221
msgid ""
-"Second, live-build supports #{*-desktop}# virtual package lists for each of "
-"the desktop flavours mentioned above, which select the #{standard-x11}# "
-"predefined package list, the corresponding #{*-desktop}# task and three "
-"additional tasks: #{desktop}#, #{standard}# and #{laptop}#. So, for example, "
-"if you specify #{--packages-lists gnome-desktop}#, it is equivalent to "
-"specifying #{--packages debian-installer-launcher --packages-lists standard-"
-"x11 --tasks \"gnome-desktop desktop standard laptop\"}#."
+" $ lb config\n"
+" $ echo \"gnome-desktop desktop standard laptop\" >> config/task-lists/my.list.chroot\n"
+" $ echo \"japanese japanese-desktop japanese-gnome-desktop\" >> config/task-lists/my.list.chroot\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:223
+#: en/user_customization-packages.ssi:209
msgid ""
-"Third, if any of the tasks for these desktop flavours are selected, either "
-"explicitly through #{--tasks}# or implicitly by #{--packages-lists}#, 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."
+"Since desktop tasks are \"internal\" tasks, for every desktop flavour task "
+"included in the image, the corresponding value, if it differs from the "
+"default, \"gnome\", must be preseeded in the \"tasksel/desktop\" debconf "
+"variable or else tasksel will not recognize and install it. Thus:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:225
+#: en/user_customization-packages.ssi:214
#, no-wrap
-msgid "*{Note:}* There is also an experimental #{--language}# option that has an overlapping purpose with language tasks. For any language for which it is known that there are #{*-l10n}# packages, if #{--language}# is specified, those packages will be installed. Furthermore, if any #{syslinux}# templates matching the language are found, they will be used instead of the default English templates. The package selection done by #{--language}# is a poor approximation of language tasks, as it requires that the list of packages to include per language be maintained internally in live-build, and besides, language tasks are more comprehensive and flexible. However, the #{syslinux}# aspect is still useful. Thus, if you use #{--bootloader syslinux}# and templates for the specified language exist either in #{/usr/share/live/build/templates/syslinux/}# or #{config/templates/syslinux/}#, consider using this option, possibly in combination with tasks to ensure all relevant packages are in
stalled. For example:\n"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:229
-#, no-wrap
-msgid " $ lb config --language es\n"
+msgid ""
+" $ lb config\n"
+" $ echo 'tasksel tasksel/desktop multiselect kde' >> config/preseed/my.preseed.chroot\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:233
+#: en/user_customization-packages.ssi:218
msgid ""
-"Even so, it is limited in that it only supports a single language and a "
-"single bootloader. Therefore, for all of these reasons, the future of this "
-"option is under review, possibly to be replaced with something entirely "
-"different in the next major release of live-build."
+"This parameter can take multiple values, e.g. \"lxde xfce\" instead of \"kde"
+"\"."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:235
+#: en/user_customization-packages.ssi:220
msgid ""
"2~installing-modified-or-third-party-packages Installing modified or third-"
"party packages"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:237
+#: en/user_customization-packages.ssi:222
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 "
@@ -779,7 +726,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:239
+#: en/user_customization-packages.ssi:224
msgid ""
"This section does not cover advice regarding building or maintaining "
"modified packages. Joachim Breitner's 'How to fork privately' method from "
@@ -790,90 +737,90 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:241
+#: en/user_customization-packages.ssi:226
msgid "There are two ways of installing modified custom packages:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:243
-msgid "_* #{chroot_local-packages}#"
+#: en/user_customization-packages.ssi:228
+msgid "_* #{packages.chroot}#"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:245
+#: en/user_customization-packages.ssi:230
msgid "_* Using a custom APT repository"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:247
+#: en/user_customization-packages.ssi:232
msgid ""
-"Using #{chroot_local-packages}# is simpler to achieve and useful for \"one-"
-"off\" customizations but has a number of drawbacks, whilst using a custom "
-"APT repository is more time-consuming to set up."
+"Using #{packages.chroot}# 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:249
-msgid "3~ Using #{chroot_local-packages}# to install custom packages"
+#: en/user_customization-packages.ssi:234
+msgid "3~ Using #{packages.chroot}# to install custom packages"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:251
+#: en/user_customization-packages.ssi:236
msgid ""
-"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/packages.chroot/}"
+"# 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:253
+#: en/user_customization-packages.ssi:238
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:255
+#: en/user_customization-packages.ssi:240
msgid ""
-"Using #{chroot_local-packages}# for installation of custom packages has "
+"Using #{packages.chroot}# for installation of custom packages has "
"disadvantages:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:257
+#: en/user_customization-packages.ssi:242
msgid "_* It is not possible to use secure APT."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:259
+#: en/user_customization-packages.ssi:244
msgid ""
-"_* You must install all appropriate packages in the #{config/chroot_local-"
-"packages/}# directory."
+"_* You must install all appropriate packages in the #{config/packages."
+"chroot/}# directory."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:261
+#: en/user_customization-packages.ssi:246
msgid ""
"_* It does not lend itself to storing Debian Live configurations in revision "
"control."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:263
+#: en/user_customization-packages.ssi:248
msgid "3~ Using an APT repository to install custom packages"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:265
+#: en/user_customization-packages.ssi:250
msgid ""
-"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."
+"Unlike using #{packages.chroot}#, 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."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:267
+#: en/user_customization-packages.ssi:252
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 "
@@ -881,12 +828,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:269
+#: en/user_customization-packages.ssi:254
msgid "3~ Custom packages and APT"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:271
+#: en/user_customization-packages.ssi:256
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 "
@@ -896,7 +843,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:273
+#: en/user_customization-packages.ssi:258
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 "
@@ -906,28 +853,28 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:275
+#: en/user_customization-packages.ssi:260
msgid "2~ Configuring APT at build time"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:277
+#: en/user_customization-packages.ssi:262
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 "
+"appropriate configurations through #{config/includes.chroot/}#.) 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:279
+#: en/user_customization-packages.ssi:264
msgid "3~choosing-apt-or-aptitude Choosing apt or aptitude"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:281
+#: en/user_customization-packages.ssi:266
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 "
@@ -937,26 +884,26 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:283
+#: en/user_customization-packages.ssi:268
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:285
+#: en/user_customization-packages.ssi:270
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:287
+#: en/user_customization-packages.ssi:272
msgid "3~ Using a proxy with APT"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:289
+#: en/user_customization-packages.ssi:274
msgid ""
"One commonly required APT configuration is to deal with building an image "
"behind a proxy. You may specify your APT proxy with the #{--apt-ftp-proxy}# "
@@ -964,18 +911,18 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:293
+#: en/user_customization-packages.ssi:278
#, no-wrap
msgid " $ lb config --apt-http-proxy http://proxy/\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:297
+#: en/user_customization-packages.ssi:282
msgid "3~ Tweaking APT to save space"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:299
+#: en/user_customization-packages.ssi:284
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 "
@@ -983,20 +930,20 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:301
+#: en/user_customization-packages.ssi:286
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:305
+#: en/user_customization-packages.ssi:290
#, no-wrap
-msgid " $ lb config --binary-indices false\n"
+msgid " $ lb config --apt-indices false\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:309
+#: en/user_customization-packages.ssi:294
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 "
@@ -1006,20 +953,20 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:311
+#: en/user_customization-packages.ssi:296
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:315
+#: en/user_customization-packages.ssi:300
#, no-wrap
msgid " $ lb config --apt-recommends false\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:319
+#: en/user_customization-packages.ssi:304
msgid ""
"The tradeoff here is that if you don't install recommended packages for a "
"given package, that is, \"packages that would be found together with this "
@@ -1035,12 +982,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:321
+#: en/user_customization-packages.ssi:306
msgid "3~ Passing options to apt or aptitude"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:323
+#: en/user_customization-packages.ssi:308
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 "
@@ -1049,43 +996,43 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:325
+#: en/user_customization-packages.ssi:310
msgid "3~apt-pinning APT pinning"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:327
+#: en/user_customization-packages.ssi:312
msgid ""
"For background, please first read the #{apt_preferences(5)}# man page. APT "
"pinning can be configured either for build time, or else for run time. For "
"the former, create #{config/chroot_apt/preferences}#. For the latter, create "
-"#{config/chroot_local-includes/etc/apt/preferences}#."
+"#{config/includes.chroot/etc/apt/preferences}#."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:329
+#: en/user_customization-packages.ssi:314
msgid ""
-"Let's say you are building a Squeeze live system but need all the live "
+"Let's say you are building a Wheezy live system but need all the live "
"packages that end up in the binary image to be installed from Sid at build "
"time. You need to add Sid to your APT sources and pin it so that only the "
"packages you want are installed from it at build time and all others are "
-"taken from the target system distribution, Squeeze. The following will "
+"taken from the target system distribution, Wheezy. The following will "
"accomplish this:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:322
#, no-wrap
msgid ""
-" $ echo \"deb http://mirror/debian sid main\" > config/chroot_sources/sid.chroot\n"
-" $ cat >>config/chroot_apt/preferences <<END\n"
+" $ echo \"deb http://mirror/debian sid main\" > config/archives/sid.list.chroot\n"
+" $ cat >> config/chroot_apt/preferences <<END\n"
" Package: live-boot live-boot-initramfs-tools live-config live-config-sysvinit\n"
" Pin: release n=sid\n"
" Pin-Priority: 600\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:342
+#: en/user_customization-packages.ssi:327
#, no-wrap
msgid ""
" Package: *\n"
@@ -1095,31 +1042,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:346
+#: en/user_customization-packages.ssi:331
#, no-wrap
msgid "*{Note:}* Wildcards can be used in package names (e.g. *{Package: live-*}*) with Apt version 0.8.14 or higher. This means that it works with Wheezy using:\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:350
+#: en/user_customization-packages.ssi:335
msgid "$ lb config --distribution wheezy"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:354
+#: en/user_customization-packages.ssi:339
msgid ""
"Negative pin priorities will prevent a package from being installed, as in "
"the case where you do not want a package that is recommended by another "
-"package. Suppose you are building an LXDE image using #{--packages-lists "
-"lxde}# option, but don't want the user prompted to store wifi passwords in "
-"the keyring. This list includes #{gdm}#, which depends on #{gksu}#, which in "
+"package. Suppose you are building an LXDE image using #{--package-lists lxde}"
+"# option, but don't want the user prompted to store wifi passwords in the "
+"keyring. This list includes #{gdm}#, which depends on #{gksu}#, which in "
"turn recommends #{gnome-keyring}#. So you want to omit the recommended #"
"{gnome-keyring}# package. This can be done by adding the following stanza to "
"#{config/chroot_apt/preferences}#:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:360
+#: en/user_customization-packages.ssi:345
#, no-wrap
msgid ""
" Package: gnome-keyring\n"
diff --git a/manual/po/de/user_customization-runtime.ssi.po b/manual/po/de/user_customization-runtime.ssi.po
index b9ac446..22995c9 100644
--- a/manual/po/de/user_customization-runtime.ssi.po
+++ b/manual/po/de/user_customization-runtime.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2011-08-25 17:01+0300\n"
+"POT-Creation-Date: 2011-11-07 21:01-0400\n"
"PO-Revision-Date: 2011-04-23 14:15+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -37,48 +37,47 @@ msgstr ""
#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
-#: en/user_customization-installer.ssi:43
+#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
-#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:53
-#: en/user_customization-packages.ssi:66 en/user_customization-packages.ssi:80
-#: en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:112
-#: en/user_customization-packages.ssi:142
-#: en/user_customization-packages.ssi:155
-#: en/user_customization-packages.ssi:165
-#: en/user_customization-packages.ssi:175
-#: en/user_customization-packages.ssi:185
-#: en/user_customization-packages.ssi:199
-#: en/user_customization-packages.ssi:215
-#: en/user_customization-packages.ssi:227
-#: en/user_customization-packages.ssi:291
-#: en/user_customization-packages.ssi:303
-#: en/user_customization-packages.ssi:313
-#: en/user_customization-packages.ssi:331
-#: en/user_customization-packages.ssi:348
-#: en/user_customization-packages.ssi:356 en/user_customization-runtime.ssi:14
-#: en/user_customization-runtime.ssi:24 en/user_customization-runtime.ssi:44
-#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:63
-#: en/user_customization-runtime.ssi:71 en/user_customization-runtime.ssi:80
-#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:111
-#: en/user_customization-runtime.ssi:119 en/user_examples.ssi:14
+#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:54
+#: en/user_customization-packages.ssi:67 en/user_customization-packages.ssi:81
+#: en/user_customization-packages.ssi:101
+#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:140
+#: en/user_customization-packages.ssi:150
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:184
+#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:276
+#: en/user_customization-packages.ssi:288
+#: en/user_customization-packages.ssi:298
+#: en/user_customization-packages.ssi:316
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
+#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
+#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
+#: en/user_customization-runtime.ssi:104 en/user_customization-runtime.ssi:114
+#: en/user_customization-runtime.ssi:122 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:178 en/user_examples.ssi:190 en/user_examples.ssi:206
-#: en/user_examples.ssi:220 en/user_examples.ssi:229 en/user_examples.ssi:247
-#: en/user_examples.ssi:255 en/user_examples.ssi:268 en/user_examples.ssi:283
-#: en/user_installation.ssi:38 en/user_installation.ssi:46
-#: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi:74 en/user_installation.ssi:82
-#: en/user_installation.ssi:90 en/user_installation.ssi:114
-#: en/user_installation.ssi:129 en/user_installation.ssi:146
-#: en/user_managing_a_configuration.ssi:24
+#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
+#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
+#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
+#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
+#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
+#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
+#: en/user_examples.ssi:277 en/user_installation.ssi:38
+#: en/user_installation.ssi:46 en/user_installation.ssi:56
+#: en/user_installation.ssi:64 en/user_installation.ssi:74
+#: en/user_installation.ssi:82 en/user_installation.ssi:90
+#: en/user_installation.ssi:114 en/user_installation.ssi:129
+#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:80 en/user_overview.ssi:88
+#: en/user_overview.ssi:48 en/user_overview.ssi:56
msgid "code{"
msgstr ""
@@ -102,49 +101,48 @@ msgstr ""
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
-#: en/user_customization-installer.ssi:37
-#: en/user_customization-installer.ssi:48
+#: en/user_customization-installer.ssi:38
+#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:70 en/user_customization-packages.ssi:84
-#: en/user_customization-packages.ssi:98
-#: en/user_customization-packages.ssi:116
-#: en/user_customization-packages.ssi:147
-#: en/user_customization-packages.ssi:161
-#: en/user_customization-packages.ssi:171
-#: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:191
-#: en/user_customization-packages.ssi:203
-#: en/user_customization-packages.ssi:219
-#: en/user_customization-packages.ssi:231
-#: en/user_customization-packages.ssi:295
-#: en/user_customization-packages.ssi:307
-#: en/user_customization-packages.ssi:317
-#: en/user_customization-packages.ssi:344
-#: en/user_customization-packages.ssi:352
-#: en/user_customization-packages.ssi:361 en/user_customization-runtime.ssi:18
-#: en/user_customization-runtime.ssi:28 en/user_customization-runtime.ssi:48
-#: en/user_customization-runtime.ssi:59 en/user_customization-runtime.ssi:67
-#: en/user_customization-runtime.ssi:76 en/user_customization-runtime.ssi:85
-#: en/user_customization-runtime.ssi:105 en/user_customization-runtime.ssi:115
-#: en/user_customization-runtime.ssi:124 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:186 en/user_examples.ssi:202 en/user_examples.ssi:210
-#: en/user_examples.ssi:225 en/user_examples.ssi:233 en/user_examples.ssi:251
-#: en/user_examples.ssi:264 en/user_examples.ssi:279 en/user_examples.ssi:297
-#: en/user_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi:70
-#: en/user_installation.ssi:78 en/user_installation.ssi:86
-#: en/user_installation.ssi:94 en/user_installation.ssi:119
-#: en/user_installation.ssi:136 en/user_installation.ssi:149
-#: en/user_managing_a_configuration.ssi:31
+#: en/user_customization-packages.ssi:46 en/user_customization-packages.ssi:59
+#: en/user_customization-packages.ssi:71 en/user_customization-packages.ssi:85
+#: en/user_customization-packages.ssi:105
+#: en/user_customization-packages.ssi:132
+#: en/user_customization-packages.ssi:146
+#: en/user_customization-packages.ssi:156
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:329
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:346 en/user_customization-runtime.ssi:21
+#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
+#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
+#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
+#: en/user_customization-runtime.ssi:108 en/user_customization-runtime.ssi:118
+#: en/user_customization-runtime.ssi:127 en/user_examples.ssi:20
+#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
+#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
+#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
+#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
+#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
+#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
+#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
+#: en/user_examples.ssi:291 en/user_installation.ssi:42
+#: en/user_installation.ssi:50 en/user_installation.ssi:60
+#: en/user_installation.ssi:70 en/user_installation.ssi:78
+#: en/user_installation.ssi:86 en/user_installation.ssi:94
+#: en/user_installation.ssi:119 en/user_installation.ssi:136
+#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
-#: en/user_overview.ssi:84 en/user_overview.ssi:92
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:42
+#: en/user_overview.ssi:52 en/user_overview.ssi:60
msgid "}code"
msgstr ""
@@ -187,18 +185,22 @@ msgstr ""
msgid ""
"You can specify additional groups that the live user will belong to by "
"preseeding the #{passwd/user-default-groups}# debconf value. For example, to "
-"add the live user to the #{fuse}# group, add the following to a file in the #"
-"{config/chroot_local-preseed}# directory:"
+"add the live user to the #{fuse}# group, add the following preseed under #"
+"{config/preseed/}# for the chroot stage:"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:16
+#: en/user_customization-runtime.ssi:19
#, no-wrap
-msgid " user-setup passwd/user-default-groups string audio cdrom dip floppy video plugdev netdev powerdev scanner bluetooth fuse\n"
+msgid ""
+" $ lb config\n"
+" $ echo user-setup passwd/user-default-groups string audio cdrom \\\n"
+" dip floppy video plugdev netdev powerdev scanner bluetooth fuse \\\n"
+" >> config/preseed/my.preseed.chroot\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:20
+#: en/user_customization-runtime.ssi:23
msgid ""
"It is also possible to change the default username \"user\" and the default "
"password \"live\". If you want to do that for any reason, you can easily "
@@ -206,53 +208,53 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:22
+#: en/user_customization-runtime.ssi:25
msgid ""
"To change the default username you can simply specify it in your config:"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:26
+#: en/user_customization-runtime.ssi:29
msgid "$ lb config --bootappend-live \"username=live-user\""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:30
+#: en/user_customization-runtime.ssi:33
msgid ""
"One possible way of changing the default password is by means of a hook as "
"described in {Boot-time hooks}#boot-time-hooks. In order to do that you can "
"use the \"passwd\" hook from #{/usr/share/doc/live-config/examples/hooks}#, "
-"prefix it accordingly (e.g. 200-passwd) and add it to #{config/chroot_local-"
-"includes/lib/live/config/}#"
+"prefix it accordingly (e.g. 200-passwd) and add it to #{config/includes."
+"chroot/lib/live/config/}#"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:32
+#: en/user_customization-runtime.ssi:35
msgid "2~customizing-locale-and-language Customizing locale and language"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:34
+#: en/user_customization-runtime.ssi:37
msgid "When the live system boots, language is involved in three steps:"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:36
+#: en/user_customization-runtime.ssi:39
msgid "_* the locale generation"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:38
+#: en/user_customization-runtime.ssi:41
msgid "_* setting the keyboard layout for the console"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:40
+#: en/user_customization-runtime.ssi:43
msgid "_* setting the keyboard layout for X"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:42
+#: en/user_customization-runtime.ssi:45
msgid ""
"The default locale when building a Live system is \"locales=en_US.UTF-8\". "
"To define the locale that should be generated, use the #{locales}# parameter "
@@ -260,20 +262,20 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:46
+#: en/user_customization-runtime.ssi:49
#, no-wrap
msgid " $ lb config --bootappend-live \"locales=de_CH.UTF-8\"\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:50
+#: en/user_customization-runtime.ssi:53
msgid ""
"This parameter can also be used at the kernel command line. You can specify "
"a locale by a full #{language_country.encoding}# word."
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:52
+#: en/user_customization-runtime.ssi:55
msgid ""
"Both the console and X keyboard configuration depend on the #{keyboard-"
"layouts}# parameter of the #{--bootappend-live}# option. Valid options for X "
@@ -284,7 +286,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:57
+#: en/user_customization-runtime.ssi:60
#, no-wrap
msgid ""
" $ grep -i sweden -C3 /usr/share/X11/xkb/rules/base.xml | grep name\n"
@@ -292,26 +294,26 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:61
+#: en/user_customization-runtime.ssi:64
msgid ""
"To get the locale files for German and Swiss German keyboard layout in X use:"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:65
+#: en/user_customization-runtime.ssi:68
#, no-wrap
msgid " $ lb config --bootappend-live \"locales=de_CH.UTF-8 keyboard-layouts=ch\"\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:69
+#: en/user_customization-runtime.ssi:72
msgid ""
"A list of the valid values of the keyboards for the console can be figured "
"with the following command:"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:74
+#: en/user_customization-runtime.ssi:77
#, no-wrap
msgid ""
" $ for i in $(find /usr/share/keymaps/ -iname \"*kmap.gz\"); \\\n"
@@ -319,7 +321,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:78
+#: en/user_customization-runtime.ssi:81
msgid ""
"Alternatively, you can use the #{console-setup}# package, a tool to let you "
"configure console layout using X (XKB) definitions; you can then set your "
@@ -331,7 +333,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:83
+#: en/user_customization-runtime.ssi:86
#, no-wrap
msgid ""
" $ lb config --bootappend-live \\\n"
@@ -339,12 +341,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:87
+#: en/user_customization-runtime.ssi:90
msgid "2~persistence Persistence"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:89
+#: en/user_customization-runtime.ssi:92
msgid ""
"A live cd paradigm is a pre-installed system which runs from read-only "
"media, like a cdrom, where writes and modifications do not survive reboots "
@@ -352,7 +354,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:91
+#: en/user_customization-runtime.ssi:94
msgid ""
"A Debian Live system is a generalization of this paradigm and thus supports "
"other media in addition to CDs; but still, in its default behaviour, it "
@@ -361,7 +363,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:93
+#: en/user_customization-runtime.ssi:96
msgid ""
"Persistence is a common name for different kinds of solutions for saving "
"across reboots some, or all, of this run-time evolution of the system. To "
@@ -372,7 +374,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:95
+#: en/user_customization-runtime.ssi:98
msgid ""
"The data stored on this ramdisk should be saved on a writable persistent "
"medium like a Hard Disk, a USB key, a network share or even a session of a "
@@ -382,12 +384,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:97
+#: en/user_customization-runtime.ssi:100
msgid "3~ Full persistence"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:99
+#: en/user_customization-runtime.ssi:102
msgid ""
"By 'full persistence' it is meant that instead of using a tmpfs for storing "
"modifications to the read-only media (with the copy-on-write, COW, system) a "
@@ -399,31 +401,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:103
+#: en/user_customization-runtime.ssi:106
#, no-wrap
msgid " # mkfs.ext2 -L live-rw /dev/sdb1\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:107
+#: en/user_customization-runtime.ssi:110
msgid "See also {Using the space left on a USB stick}#using-usb-extra-space."
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:109
+#: en/user_customization-runtime.ssi:112
msgid ""
"If you already have a partition on your device, you could just change the "
"label with one of the following:"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:113
+#: en/user_customization-runtime.ssi:116
#, no-wrap
msgid " # tune2fs -L live-rw /dev/sdb1 # for ext2,3,4 filesystems\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:117
+#: en/user_customization-runtime.ssi:120
msgid ""
"But since live system users cannot always use a hard drive partition, and "
"considering that most USB keys have poor write speeds, 'full' persistence "
@@ -433,7 +435,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:122
+#: en/user_customization-runtime.ssi:125
#, no-wrap
msgid ""
" $ dd if=/dev/null of=live-rw bs=1G seek=1 # for a 1GB sized image file\n"
@@ -441,19 +443,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:126
+#: en/user_customization-runtime.ssi:129
msgid ""
"Then copy the #{live-rw}# file to a writable partition and reboot with the "
"boot parameter 'persistent'."
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:128
+#: en/user_customization-runtime.ssi:131
msgid "3~ Home automounting"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:130
+#: en/user_customization-runtime.ssi:133
msgid ""
"If during the boot a partition (filesystem) image file or a partition "
"labeled #{home-rw}# is discovered, this filesystem will be directly mounted "
@@ -462,12 +464,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:132
+#: en/user_customization-runtime.ssi:135
msgid "3~ Snapshots"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:134
+#: en/user_customization-runtime.ssi:137
msgid ""
"Snapshots are collections of files and directories which are not mounted "
"while running but which are copied from a persistent device to the system "
@@ -484,26 +486,26 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:136
+#: en/user_customization-runtime.ssi:139
msgid ""
"A /home version of snapshot exists too and its label is #{home-sn.*}#; it "
"works the same as the main snapshot but it is only applied to /home."
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:138
+#: en/user_customization-runtime.ssi:141
msgid ""
"Snapshots cannot currently handle file deletion but full persistence and "
"home automounting can."
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:140
+#: en/user_customization-runtime.ssi:143
msgid "3~ Persistent SubText"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:142
+#: en/user_customization-runtime.ssi:145
msgid ""
"If a user would need multiple persistent storage of the same type for "
"different locations or testing, such as #{live-rw-nonwork}# and #{live-rw-"
@@ -515,12 +517,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:144
+#: en/user_customization-runtime.ssi:147
msgid "3~ Partial remastering"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:145
+#: en/user_customization-runtime.ssi:148
msgid ""
"The run-time modification of the tmpfs could be collected using live-"
"snapshot in a squashfs and added to the cd by remastering the iso in the "
diff --git a/manual/po/de/user_examples.ssi.po b/manual/po/de/user_examples.ssi.po
index 33f256b..a412f7d 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: 2011-04-23 14:15+0300\n"
+"POT-Creation-Date: 2011-11-13 17:12+0100\n"
"PO-Revision-Date: 2011-04-23 14:15+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -19,7 +19,7 @@ msgstr ""
#. type: Plain text
#: en/live-manual.ssm:61 en/user_examples.ssi:2
msgid ":B~ Examples"
-msgstr ""
+msgstr ":B~ Beispiele"
#. type: Plain text
#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
@@ -42,37 +42,38 @@ msgstr ""
#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
-#: en/user_customization-installer.ssi:43
+#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
-#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:53
-#: en/user_customization-packages.ssi:66 en/user_customization-packages.ssi:80
-#: en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:112
-#: en/user_customization-packages.ssi:142
-#: en/user_customization-packages.ssi:155
-#: en/user_customization-packages.ssi:165
-#: en/user_customization-packages.ssi:175
-#: en/user_customization-packages.ssi:185
-#: en/user_customization-packages.ssi:199
-#: en/user_customization-packages.ssi:215
-#: en/user_customization-packages.ssi:227
-#: en/user_customization-packages.ssi:291
-#: en/user_customization-packages.ssi:303
-#: en/user_customization-packages.ssi:313
-#: en/user_customization-packages.ssi:331
-#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
-#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
-#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
-#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
-#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:105
-#: 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:178 en/user_examples.ssi:190
-#: en/user_examples.ssi:206 en/user_examples.ssi:220 en/user_examples.ssi:229
-#: en/user_examples.ssi:247 en/user_examples.ssi:255 en/user_examples.ssi:268
-#: en/user_examples.ssi:283 en/user_installation.ssi:38
+#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:54
+#: en/user_customization-packages.ssi:67 en/user_customization-packages.ssi:81
+#: en/user_customization-packages.ssi:101
+#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:140
+#: en/user_customization-packages.ssi:150
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:184
+#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:276
+#: en/user_customization-packages.ssi:288
+#: en/user_customization-packages.ssi:298
+#: en/user_customization-packages.ssi:316
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
+#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
+#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
+#: en/user_customization-runtime.ssi:104 en/user_customization-runtime.ssi:114
+#: en/user_customization-runtime.ssi:122 en/user_examples.ssi:14
+#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
+#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
+#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
+#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
+#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
+#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
+#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
+#: en/user_examples.ssi:277 en/user_installation.ssi:38
#: en/user_installation.ssi:46 en/user_installation.ssi:56
#: en/user_installation.ssi:64 en/user_installation.ssi:74
#: en/user_installation.ssi:82 en/user_installation.ssi:90
@@ -81,7 +82,7 @@ msgstr ""
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:80 en/user_overview.ssi:88
+#: en/user_overview.ssi:48 en/user_overview.ssi:56
msgid "code{"
msgstr ""
@@ -105,38 +106,39 @@ msgstr ""
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
-#: en/user_customization-installer.ssi:37
-#: en/user_customization-installer.ssi:48
+#: en/user_customization-installer.ssi:38
+#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:70 en/user_customization-packages.ssi:84
-#: en/user_customization-packages.ssi:98
-#: en/user_customization-packages.ssi:116
-#: en/user_customization-packages.ssi:147
-#: en/user_customization-packages.ssi:161
-#: en/user_customization-packages.ssi:171
-#: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:191
-#: en/user_customization-packages.ssi:203
-#: en/user_customization-packages.ssi:219
-#: en/user_customization-packages.ssi:231
-#: en/user_customization-packages.ssi:295
-#: en/user_customization-packages.ssi:307
-#: en/user_customization-packages.ssi:317
-#: en/user_customization-packages.ssi:344
-#: en/user_customization-packages.ssi:353 en/user_customization-runtime.ssi:18
-#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
-#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
-#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
-#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:110
-#: 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:186 en/user_examples.ssi:202
-#: en/user_examples.ssi:210 en/user_examples.ssi:225 en/user_examples.ssi:233
-#: en/user_examples.ssi:251 en/user_examples.ssi:264 en/user_examples.ssi:279
-#: en/user_examples.ssi:297 en/user_installation.ssi:42
+#: en/user_customization-packages.ssi:46 en/user_customization-packages.ssi:59
+#: en/user_customization-packages.ssi:71 en/user_customization-packages.ssi:85
+#: en/user_customization-packages.ssi:105
+#: en/user_customization-packages.ssi:132
+#: en/user_customization-packages.ssi:146
+#: en/user_customization-packages.ssi:156
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:329
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:346 en/user_customization-runtime.ssi:21
+#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
+#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
+#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
+#: en/user_customization-runtime.ssi:108 en/user_customization-runtime.ssi:118
+#: en/user_customization-runtime.ssi:127 en/user_examples.ssi:20
+#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
+#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
+#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
+#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
+#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
+#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
+#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
+#: en/user_examples.ssi:291 en/user_installation.ssi:42
#: en/user_installation.ssi:50 en/user_installation.ssi:60
#: en/user_installation.ssi:70 en/user_installation.ssi:78
#: en/user_installation.ssi:86 en/user_installation.ssi:94
@@ -144,14 +146,14 @@ msgstr ""
#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
-#: en/user_overview.ssi:84 en/user_overview.ssi:92
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:42
+#: en/user_overview.ssi:52 en/user_overview.ssi:60
msgid "}code"
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:44 en/user_basics.ssi:170 en/user_basics.ssi:238
-#: en/user_examples.ssi:109 en/user_examples.ssi:208
+#: en/user_examples.ssi:119 en/user_examples.ssi:211
#, no-wrap
msgid " # lb build\n"
msgstr ""
@@ -192,17 +194,18 @@ msgid ""
"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:"
+"and in it, set the corresponding #{LB_PARENT_MIRROR_*}# variables to your "
+"preferred mirror. All other mirrors used in the build will be defaulted from "
+"these values. For example:"
msgstr ""
#. type: Plain text
#: en/user_examples.ssi:18
#, no-wrap
msgid ""
-" LB_MIRROR_BOOTSTRAP=\"http://mirror/debian\"\n"
-" LB_MIRROR_CHROOT=\"http://mirror/debian\"\n"
-" LB_MIRROR_CHROOT_SECURITY=\"http://mirror/debian-security\"\n"
+" LB_PARENT_MIRROR_BOOTSTRAP=\"http://mirror/debian\"\n"
+" LB_PARENT_MIRROR_CHROOT_SECURITY=\"http://mirror/debian-security\"\n"
+" LB_PARENT_MIRROR_CHROOT_BACKPORTS=\"http://mirror/debian-updates\"\n"
msgstr ""
#. type: Plain text
@@ -250,7 +253,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:42 en/user_examples.ssi:66 en/user_examples.ssi:231
+#: en/user_examples.ssi:42 en/user_examples.ssi:69 en/user_examples.ssi:234
#, no-wrap
msgid " # lb build 2>&1 | tee binary.log\n"
msgstr ""
@@ -287,47 +290,51 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:56
+#: en/user_examples.ssi:59
#, no-wrap
-msgid " $ mkdir tutorial2 ; cd tutorial2 ; lb config -p lxde --packages iceweasel\n"
+msgid ""
+" $ mkdir tutorial2\n"
+" $ cd tutorial2\n"
+" $ lb config -p lxde\n"
+" $ echo iceweasel >> config/package-lists/my.list.chroot\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:60
+#: en/user_examples.ssi:63
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."
+"configuration for the web browser in #{config/includes.chroot/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
+#: en/user_examples.ssi:65
msgid ""
"Build the image, again as superuser, keeping a log as in {Tutorial 1}"
"#tutorial-1:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:70
+#: en/user_examples.ssi:73
msgid "Again, verify the image is OK and test, as in {Tutorial 1}#tutorial-1."
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:72
+#: en/user_examples.ssi:75
msgid "2~tutorial-3 Tutorial 3: A personalized image"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:74
+#: en/user_examples.ssi:77
#, 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
+#: en/user_examples.ssi:79
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 "
@@ -338,12 +345,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:78
+#: en/user_examples.ssi:81
msgid "3~ First revision"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:84
+#: en/user_examples.ssi:87
#, no-wrap
msgid ""
" $ mkdir -p tutorial3/auto\n"
@@ -352,53 +359,63 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:88
+#: en/user_examples.ssi:91
msgid "Edit #{auto/config}# to read as follows:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:92 en/user_examples.ssi:141
+#: en/user_examples.ssi:95
#, no-wrap
msgid " #!/bin/sh\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:99
+#: en/user_examples.ssi:101
#, no-wrap
msgid ""
" lb config noauto \\\n"
" --architecture i386 \\\n"
-" --linux-flavours 686 \\\n"
-" --packages-lists lxde \\\n"
-" --packages \"iceweasel xchat\" \\\n"
+" --linux-flavours 686-pae \\\n"
+" --package-lists lxde \\\n"
" \"${@}\"\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:103
+#: en/user_examples.ssi:105
+msgid "Now populate your local package list:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:109
+#, no-wrap
+msgid " $ echo \"iceweasel xchat\" >> config/package-lists/my.list.chroot\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:113
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}#."
+"{--linux-flavours 686-pae}# 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
+#: en/user_examples.ssi:115
msgid "Now, build the image:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:113
+#: en/user_examples.ssi:123
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
+#: en/user_examples.ssi:125
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 "
@@ -406,7 +423,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:121
+#: en/user_examples.ssi:131
#, no-wrap
msgid ""
" $ git init\n"
@@ -415,19 +432,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:125
+#: en/user_examples.ssi:135
msgid "3~ Second revision"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:127
+#: en/user_examples.ssi:137
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
+#: en/user_examples.ssi:139
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 "
@@ -436,51 +453,47 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:133
+#: en/user_examples.ssi:143
#, no-wrap
msgid " # lb clean\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:137
-msgid "Now edit #{auto/config}# to add the #{vlc}# package:"
+#: en/user_examples.ssi:147
+msgid ""
+"Now append the #{vlc}# package to our local package list in #{config/package-"
+"lists/my.list.chroot}#:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:148
+#: en/user_examples.ssi:151
#, no-wrap
-msgid ""
-" lb config noauto \\\n"
-" --architecture i386 \\\n"
-" --linux-flavours 686 \\\n"
-" --packages-lists lxde \\\n"
-" --packages \"iceweasel xchat vlc\" \\\n"
-" \"${@}\"\n"
+msgid " $ echo vlc >> config/package-lists/my.list.chroot\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:152
+#: en/user_examples.ssi:155
msgid "Build again:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:156
+#: en/user_examples.ssi:159
msgid "# lb build"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:160
+#: en/user_examples.ssi:163
msgid "Test, and when you're satisfied, commit the next revision:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:164
+#: en/user_examples.ssi:167
#, no-wrap
msgid " $ git commit -a -m \"Adding vlc media player.\"\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:168
+#: en/user_examples.ssi:171
msgid ""
"Of course, more complicated changes to the configuration are possible, "
"perhaps adding files in subdirectories of #{config/}#. When you commit new "
@@ -491,7 +504,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:170
+#: en/user_examples.ssi:173
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 "
@@ -501,37 +514,37 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:172
+#: en/user_examples.ssi:175
msgid "2~ A VNC Kiosk Client"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:174
+#: en/user_examples.ssi:177
#, no-wrap
msgid "*{Use case:}* Create an image with live-build to boot directly to a VNC server.\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:176
+#: en/user_examples.ssi:179
msgid ""
"Make a build directory and create a skeletal configuration in it built "
"around the standard-x11 list, including #{gdm3}#, #{metacity}# and #"
-"{xtightvncviewer}#, disabling recommends to make a minimal system:"
+"{xvnc4viewer}#, disabling recommends to make a minimal system:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:184
+#: en/user_examples.ssi:187
#, no-wrap
msgid ""
" $ mkdir vnc_kiosk_client\n"
" $ cd vnc_kiosk_client\n"
-" $ lb config -a i386 -k 686 -p standard-x11 \\\n"
-" --packages \"gdm3 metacity xvnc4viewer\" \\\n"
+" $ lb config -a i386 -k 686-pae -p standard-x11 \\\n"
" --apt-recommends false\n"
+" $ echo \"gdm3 metacity xvnc4viewer\" >> config/package-lists/my.list.chroot\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:188
+#: en/user_examples.ssi:191
msgid ""
"Create the directory #{/etc/skel}# and put a custom #{.xsession}# in it for "
"the default user that will launch metacity and start xvncviewer, connecting "
@@ -539,16 +552,16 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:194
+#: en/user_examples.ssi:197
#, no-wrap
msgid ""
-" $ mkdir -p config/chroot_local-includes/etc/skel\n"
-" $ cat >config/chroot_local-includes/etc/skel/.xsession <<END\n"
+" $ mkdir -p config/includes.chroot/etc/skel\n"
+" $ cat > config/includes.chroot/etc/skel/.xsession <<END\n"
" #!/bin/sh\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:197
+#: en/user_examples.ssi:200
#, no-wrap
msgid ""
" /usr/bin/metacity &\n"
@@ -556,7 +569,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:200
+#: en/user_examples.ssi:203
#, no-wrap
msgid ""
" exit\n"
@@ -564,28 +577,28 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:204
+#: en/user_examples.ssi:207
msgid "Build the image:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:212
+#: en/user_examples.ssi:215
msgid "Enjoy."
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:214
+#: en/user_examples.ssi:217
msgid "2~ A base image for a 128M USB key"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:216
+#: en/user_examples.ssi:219
#, 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:218
+#: en/user_examples.ssi:221
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 "
@@ -599,20 +612,20 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:223
+#: en/user_examples.ssi:226
#, no-wrap
msgid ""
-" $ lb config -k 486 -p minimal --binary-indices false \\\n"
+" $ lb config -k 486 -p minimal --apt-indices false \\\n"
" --memtest none --apt-recommends false --includes none\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:227
+#: en/user_examples.ssi:230
msgid "Now, build the image in the usual way:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:235
+#: en/user_examples.ssi:238
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 "
@@ -620,12 +633,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:237
+#: en/user_examples.ssi:240
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 "
+"instead of the default #{-k \"486 686-pae\"}#. Leaving off APT's indices "
+"with #{--apt-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 #{--"
@@ -638,18 +651,18 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:239
+#: en/user_examples.ssi:242
msgid "2~ A localized KDE desktop and installer"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:241
+#: en/user_examples.ssi:244
#, no-wrap
msgid "*{Use case:}* Create a KDE desktop image, localized for Brazilian Portuguese and including an installer.\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:243
+#: en/user_examples.ssi:246
msgid ""
"We want to make an iso-hybrid image for i386 architecture using our "
"preferred desktop, in this case KDE, containing all of the same packages "
@@ -657,76 +670,62 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:245
+#: en/user_examples.ssi:248
msgid ""
-"Our initial problem is the discovery of the names of the appropriate tasks. "
-"Currently, live-build cannot help with this. While we might get lucky and "
-"find this by trial-and-error, there is a tool, #{grep-dctrl}#, which can be "
-"used to dig it out of the task descriptions in tasksel-data, so to prepare, "
-"make sure you have both of those things:"
+"Our initial problem is the discovery of the names of the appropriate "
+"language tasks. Currently, live-build cannot help with this. While we might "
+"get lucky and find this by trial-and-error, there is a tool, #{grep-dctrl}#, "
+"which can be used to dig it out of the task descriptions in tasksel-data, so "
+"to prepare, make sure you have both of those things:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:249
+#: en/user_examples.ssi:252
#, no-wrap
msgid " # apt-get install dctrl-tools tasksel-data\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:253
+#: en/user_examples.ssi:256
msgid "Now we can search for the appropriate tasks, first with:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:262
+#: en/user_examples.ssi:261
#, no-wrap
msgid ""
-" $ grep-dctrl -FTest-lang pt_BR /usr/share/tasksel/debian-tasks.desc -sTask,Description\n"
+" $ grep-dctrl -FTest-lang pt_BR /usr/share/tasksel/descs/debian-tasks.desc -sTask\n"
" Task: brazilian-portuguese\n"
-" Description: Brazilian Portuguese environment\n"
-" This task installs programs, data files, and\n"
-" documentation that make it easier for Brazilian Portuguese speakers\n"
-" to use Debian.\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:266
+#: en/user_examples.ssi:265
msgid ""
"By this command, we discover the task is called, plainly enough, brazilian-"
"portuguese. Now to find the related tasks:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:273
+#: en/user_examples.ssi:271
#, no-wrap
msgid ""
-" $ grep-dctrl -FEnhances brazilian-portuguese /usr/share/tasksel/debian-tasks.desc -sTask,Description\n"
+" $ grep-dctrl -FEnhances brazilian-portuguese /usr/share/tasksel/descs/debian-tasks.desc -sTask\n"
" Task: brazilian-portuguese-desktop\n"
-" Description: Brazilian Portuguese desktop\n"
-" This task localises the desktop in Brasilian Portuguese.\n"
-msgstr ""
-
-#. type: Plain text
-#: en/user_examples.ssi:277
-#, no-wrap
-msgid ""
" Task: brazilian-portuguese-kde-desktop\n"
-" Description: Brazilian Portuguese KDE desktop\n"
-" This task localises the KDE desktop in Brazilian Portuguese.\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:281
+#: en/user_examples.ssi:275
msgid ""
-"We will use the experimental #{--language}# option, as live-build happens to "
-"include #{syslinux}# templates for pt_BR (see {Desktop and language tasks}"
-"#desktop-and-language-tasks for details). And at boot time we will generate "
-"the pt_BR.UTF-8 locale and select the pt-latin1 keyboard layout. Now let's "
-"put the pieces together:"
+"At boot time we will generate the pt_BR.UTF-8 locale and select the pt-"
+"latin1 keyboard layout. We will also need to preseed our desktop choice, "
+"\"kde\" so that tasksel will install the correct desktop task, as it differs "
+"from the default (see {Desktop and languages tasks}#desktop-and-language-"
+"tasks). Now let's put the pieces together:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:295
+#: en/user_examples.ssi:289
#, no-wrap
msgid ""
" $ mkdir live-pt_BR-kde\n"
@@ -734,16 +733,16 @@ msgid ""
" $ lb config \\\n"
" -a i386 \\\n"
" -k 486 \\\n"
-" -p kde-desktop \\\n"
-" --language pt_BR \\\n"
-" --tasks \"brazilian-portuguese brazilian-portuguese-desktop brazilian-portuguese-kde-desktop\" \\\n"
" --bootappend-live \"locales=pt_BR.UTF-8 keyboard-layouts=pt-latin1\" \\\n"
-" --debian-installer live \\\n"
-" --packages debian-installer-launcher\n"
+" --debian-installer live\n"
+" $ echo kde-desktop brazilian-portuguese brazilian-portuguese-desktop \\\n"
+" brazilian-portuguese-kde-desktop >> config/task-lists/my.list.chroot\n"
+" $ echo debian-installer-launcher >> config/package-lists/my.list.chroot\n"
+" $ echo tasksel tasksel/desktop multiselect kde >> config/preseed/my.preseed.chroot\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:298
+#: en/user_examples.ssi:292
msgid ""
"Note that we have included the #{debian-installer-launcher}# package to "
"launch the installer from the live desktop, and have also specified the 486 "
diff --git a/manual/po/de/user_installation.ssi.po b/manual/po/de/user_installation.ssi.po
index 785326f..08c96cf 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: 2011-06-21 09:17+0300\n"
+"POT-Creation-Date: 2011-11-07 17:40-0400\n"
"PO-Revision-Date: 2011-04-23 14:15+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -37,37 +37,38 @@ msgstr ""
#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
-#: en/user_customization-installer.ssi:43
+#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
-#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:53
-#: en/user_customization-packages.ssi:66 en/user_customization-packages.ssi:80
-#: en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:112
-#: en/user_customization-packages.ssi:142
-#: en/user_customization-packages.ssi:155
-#: en/user_customization-packages.ssi:165
-#: en/user_customization-packages.ssi:175
-#: en/user_customization-packages.ssi:185
-#: en/user_customization-packages.ssi:199
-#: en/user_customization-packages.ssi:215
-#: en/user_customization-packages.ssi:227
-#: en/user_customization-packages.ssi:291
-#: en/user_customization-packages.ssi:303
-#: en/user_customization-packages.ssi:313
-#: en/user_customization-packages.ssi:331
-#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
-#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
-#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
-#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
-#: en/user_customization-runtime.ssi:99 en/user_customization-runtime.ssi:107
-#: 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:178 en/user_examples.ssi:190
-#: en/user_examples.ssi:206 en/user_examples.ssi:220 en/user_examples.ssi:229
-#: en/user_examples.ssi:247 en/user_examples.ssi:255 en/user_examples.ssi:268
-#: en/user_examples.ssi:283 en/user_installation.ssi:38
+#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:54
+#: en/user_customization-packages.ssi:67 en/user_customization-packages.ssi:81
+#: en/user_customization-packages.ssi:101
+#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:140
+#: en/user_customization-packages.ssi:150
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:184
+#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:276
+#: en/user_customization-packages.ssi:288
+#: en/user_customization-packages.ssi:298
+#: en/user_customization-packages.ssi:316
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:24 en/user_customization-runtime.ssi:44
+#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:63
+#: en/user_customization-runtime.ssi:71 en/user_customization-runtime.ssi:80
+#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:111
+#: en/user_customization-runtime.ssi:119 en/user_examples.ssi:14
+#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
+#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
+#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
+#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
+#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
+#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
+#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
+#: en/user_examples.ssi:277 en/user_installation.ssi:38
#: en/user_installation.ssi:46 en/user_installation.ssi:56
#: en/user_installation.ssi:64 en/user_installation.ssi:74
#: en/user_installation.ssi:82 en/user_installation.ssi:90
@@ -76,7 +77,7 @@ msgstr ""
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:80 en/user_overview.ssi:88
+#: en/user_overview.ssi:48 en/user_overview.ssi:56
msgid "code{"
msgstr ""
@@ -100,38 +101,39 @@ msgstr ""
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
-#: en/user_customization-installer.ssi:37
-#: en/user_customization-installer.ssi:48
+#: en/user_customization-installer.ssi:38
+#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:70 en/user_customization-packages.ssi:84
-#: en/user_customization-packages.ssi:98
-#: en/user_customization-packages.ssi:116
-#: en/user_customization-packages.ssi:147
-#: en/user_customization-packages.ssi:161
-#: en/user_customization-packages.ssi:171
-#: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:191
-#: en/user_customization-packages.ssi:203
-#: en/user_customization-packages.ssi:219
-#: en/user_customization-packages.ssi:231
-#: en/user_customization-packages.ssi:295
-#: en/user_customization-packages.ssi:307
-#: en/user_customization-packages.ssi:317
-#: en/user_customization-packages.ssi:344
-#: en/user_customization-packages.ssi:353 en/user_customization-runtime.ssi:18
-#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
-#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
-#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
-#: en/user_customization-runtime.ssi:103 en/user_customization-runtime.ssi:112
-#: 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:186 en/user_examples.ssi:202
-#: en/user_examples.ssi:210 en/user_examples.ssi:225 en/user_examples.ssi:233
-#: en/user_examples.ssi:251 en/user_examples.ssi:264 en/user_examples.ssi:279
-#: en/user_examples.ssi:297 en/user_installation.ssi:42
+#: en/user_customization-packages.ssi:46 en/user_customization-packages.ssi:59
+#: en/user_customization-packages.ssi:71 en/user_customization-packages.ssi:85
+#: en/user_customization-packages.ssi:105
+#: en/user_customization-packages.ssi:132
+#: en/user_customization-packages.ssi:146
+#: en/user_customization-packages.ssi:156
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:329
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:346 en/user_customization-runtime.ssi:18
+#: en/user_customization-runtime.ssi:28 en/user_customization-runtime.ssi:48
+#: en/user_customization-runtime.ssi:59 en/user_customization-runtime.ssi:67
+#: en/user_customization-runtime.ssi:76 en/user_customization-runtime.ssi:85
+#: en/user_customization-runtime.ssi:105 en/user_customization-runtime.ssi:115
+#: en/user_customization-runtime.ssi:124 en/user_examples.ssi:20
+#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
+#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
+#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
+#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
+#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
+#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
+#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
+#: en/user_examples.ssi:291 en/user_installation.ssi:42
#: en/user_installation.ssi:50 en/user_installation.ssi:60
#: en/user_installation.ssi:70 en/user_installation.ssi:78
#: en/user_installation.ssi:86 en/user_installation.ssi:94
@@ -139,15 +141,15 @@ msgstr ""
#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
-#: en/user_overview.ssi:84 en/user_overview.ssi:92
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:42
+#: en/user_overview.ssi:52 en/user_overview.ssi:60
msgid "}code"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:82 en/user_installation.ssi:148
+#: en/user_customization-packages.ssi:83 en/user_installation.ssi:148
#, no-wrap
-msgid " $ lb config --repository live.debian.net\n"
+msgid " $ lb config --archives live.debian.net\n"
msgstr ""
#. type: Plain text
@@ -350,7 +352,7 @@ msgstr ""
#. type: Plain text
#: en/user_installation.ssi:102
#, no-wrap
-msgid "*{Note:}* You do not need to install live-boot or live-config on your system to create customized Debian Live systems. However, doing so will do no harm and is useful for reference purposes.\n"
+msgid "*{Note:}* You do not need to install live-boot or live-config on your system to create customized Debian Live systems. However, doing so will do no harm and is useful for reference purposes. If you only want the documentation, you may now install the live-boot-doc and live-config-doc packages separately.\n"
msgstr ""
#. type: Plain text
@@ -396,8 +398,8 @@ msgstr ""
#: en/user_installation.ssi:125
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 "
-"build against Squeeze."
+"your target platform: this means if your target is Wheezy then you should "
+"build against Wheezy."
msgstr ""
#. type: Plain text
@@ -405,9 +407,9 @@ msgstr ""
msgid ""
"Use a personal builder such as /{pbuilder}/ or /{sbuild}/ if you need to "
"build #{live-boot}# for a target distribution that differs from your build "
-"system. For example, for Squeeze live images, build #{live-boot}# in a "
-"Squeeze chroot. If your target distribution happens to match your build "
-"system distribution, you may build directly on the build system using #{dpkg-"
+"system. For example, for Wheezy live images, build #{live-boot}# in a Wheezy "
+"chroot. If your target distribution happens to match your build system "
+"distribution, you may build directly on the build system using #{dpkg-"
"buildpackage}# (provided by the /{dpkg-dev}/ package):"
msgstr ""
@@ -443,5 +445,5 @@ msgid ""
"You can let live-build automatically use the latest snapshots of live-boot "
"and live-config by configuring a third-party repository in your live-build "
"configuration directory. Assuming you have already created a configuration "
-"tree with #{lb config}#:"
+"tree in the current directory with #{lb config}#:"
msgstr ""
diff --git a/manual/po/de/user_managing_a_configuration.ssi.po b/manual/po/de/user_managing_a_configuration.ssi.po
index 357b518..d00b67a 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: 2011-04-23 14:15+0300\n"
+"POT-Creation-Date: 2011-11-02 12:23-0200\n"
"PO-Revision-Date: 2011-04-23 14:15+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -37,37 +37,38 @@ msgstr ""
#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
-#: en/user_customization-installer.ssi:43
+#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
-#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:53
-#: en/user_customization-packages.ssi:66 en/user_customization-packages.ssi:80
-#: en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:112
-#: en/user_customization-packages.ssi:142
-#: en/user_customization-packages.ssi:155
-#: en/user_customization-packages.ssi:165
-#: en/user_customization-packages.ssi:175
-#: en/user_customization-packages.ssi:185
-#: en/user_customization-packages.ssi:199
-#: en/user_customization-packages.ssi:215
-#: en/user_customization-packages.ssi:227
-#: en/user_customization-packages.ssi:291
-#: en/user_customization-packages.ssi:303
-#: en/user_customization-packages.ssi:313
-#: en/user_customization-packages.ssi:331
-#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
-#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
-#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
-#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
-#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:105
-#: 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:178 en/user_examples.ssi:190
-#: en/user_examples.ssi:206 en/user_examples.ssi:220 en/user_examples.ssi:229
-#: en/user_examples.ssi:247 en/user_examples.ssi:255 en/user_examples.ssi:268
-#: en/user_examples.ssi:283 en/user_installation.ssi:38
+#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:54
+#: en/user_customization-packages.ssi:67 en/user_customization-packages.ssi:81
+#: en/user_customization-packages.ssi:101
+#: en/user_customization-packages.ssi:131
+#: en/user_customization-packages.ssi:144
+#: en/user_customization-packages.ssi:154
+#: en/user_customization-packages.ssi:164
+#: en/user_customization-packages.ssi:174
+#: en/user_customization-packages.ssi:188
+#: en/user_customization-packages.ssi:204
+#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:320
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:345 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:24 en/user_customization-runtime.ssi:44
+#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:63
+#: en/user_customization-runtime.ssi:71 en/user_customization-runtime.ssi:80
+#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:111
+#: en/user_customization-runtime.ssi:119 en/user_examples.ssi:14
+#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
+#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
+#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
+#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
+#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
+#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
+#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:271
+#: en/user_examples.ssi:286 en/user_installation.ssi:38
#: en/user_installation.ssi:46 en/user_installation.ssi:56
#: en/user_installation.ssi:64 en/user_installation.ssi:74
#: en/user_installation.ssi:82 en/user_installation.ssi:90
@@ -100,38 +101,39 @@ msgstr ""
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
-#: en/user_customization-installer.ssi:37
-#: en/user_customization-installer.ssi:48
+#: en/user_customization-installer.ssi:38
+#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:70 en/user_customization-packages.ssi:84
-#: en/user_customization-packages.ssi:98
-#: en/user_customization-packages.ssi:116
-#: en/user_customization-packages.ssi:147
-#: en/user_customization-packages.ssi:161
-#: en/user_customization-packages.ssi:171
-#: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:191
-#: en/user_customization-packages.ssi:203
-#: en/user_customization-packages.ssi:219
-#: en/user_customization-packages.ssi:231
-#: en/user_customization-packages.ssi:295
-#: en/user_customization-packages.ssi:307
-#: en/user_customization-packages.ssi:317
-#: en/user_customization-packages.ssi:344
-#: en/user_customization-packages.ssi:353 en/user_customization-runtime.ssi:18
-#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
-#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
-#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
-#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:110
-#: 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:186 en/user_examples.ssi:202
-#: en/user_examples.ssi:210 en/user_examples.ssi:225 en/user_examples.ssi:233
-#: en/user_examples.ssi:251 en/user_examples.ssi:264 en/user_examples.ssi:279
-#: en/user_examples.ssi:297 en/user_installation.ssi:42
+#: en/user_customization-packages.ssi:46 en/user_customization-packages.ssi:59
+#: en/user_customization-packages.ssi:71 en/user_customization-packages.ssi:85
+#: en/user_customization-packages.ssi:105
+#: en/user_customization-packages.ssi:136
+#: en/user_customization-packages.ssi:150
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:180
+#: en/user_customization-packages.ssi:192
+#: en/user_customization-packages.ssi:208
+#: en/user_customization-packages.ssi:220
+#: en/user_customization-packages.ssi:284
+#: en/user_customization-packages.ssi:296
+#: en/user_customization-packages.ssi:306
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341
+#: en/user_customization-packages.ssi:350 en/user_customization-runtime.ssi:18
+#: en/user_customization-runtime.ssi:28 en/user_customization-runtime.ssi:48
+#: en/user_customization-runtime.ssi:59 en/user_customization-runtime.ssi:67
+#: en/user_customization-runtime.ssi:76 en/user_customization-runtime.ssi:85
+#: en/user_customization-runtime.ssi:105 en/user_customization-runtime.ssi:115
+#: en/user_customization-runtime.ssi:124 en/user_examples.ssi:20
+#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
+#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
+#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
+#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
+#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
+#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
+#: en/user_examples.ssi:254 en/user_examples.ssi:267 en/user_examples.ssi:282
+#: en/user_examples.ssi:300 en/user_installation.ssi:42
#: en/user_installation.ssi:50 en/user_installation.ssi:60
#: en/user_installation.ssi:70 en/user_installation.ssi:78
#: en/user_installation.ssi:86 en/user_installation.ssi:94
@@ -239,7 +241,7 @@ msgstr ""
msgid ""
" #!/bin/sh\n"
" lb config noauto \\\n"
-" --packages-lists \"standard\" \\\n"
+" --package-lists \"standard\" \\\n"
" \"${@}\"\n"
msgstr ""
@@ -289,7 +291,7 @@ msgstr ""
#: en/user_managing_a_configuration.ssi:61
msgid ""
"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. "
+"example above, #{--package-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/user_overview.ssi.po b/manual/po/de/user_overview.ssi.po
index 3e777e3..1f1f5c7 100644
--- a/manual/po/de/user_overview.ssi.po
+++ b/manual/po/de/user_overview.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2011-05-13 12:02-0200\n"
+"POT-Creation-Date: 2011-11-07 08:16-0400\n"
"PO-Revision-Date: 2011-04-23 14:15+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -37,37 +37,38 @@ msgstr ""
#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
-#: en/user_customization-installer.ssi:43
+#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
-#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:53
-#: en/user_customization-packages.ssi:66 en/user_customization-packages.ssi:80
-#: en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:112
-#: en/user_customization-packages.ssi:142
-#: en/user_customization-packages.ssi:155
-#: en/user_customization-packages.ssi:165
-#: en/user_customization-packages.ssi:175
-#: en/user_customization-packages.ssi:185
-#: en/user_customization-packages.ssi:199
-#: en/user_customization-packages.ssi:215
-#: en/user_customization-packages.ssi:227
-#: en/user_customization-packages.ssi:291
-#: en/user_customization-packages.ssi:303
-#: en/user_customization-packages.ssi:313
-#: en/user_customization-packages.ssi:331
-#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
-#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
-#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
-#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
-#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:105
-#: 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:178 en/user_examples.ssi:190
-#: en/user_examples.ssi:206 en/user_examples.ssi:220 en/user_examples.ssi:229
-#: en/user_examples.ssi:247 en/user_examples.ssi:255 en/user_examples.ssi:268
-#: en/user_examples.ssi:283 en/user_installation.ssi:38
+#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:54
+#: en/user_customization-packages.ssi:67 en/user_customization-packages.ssi:81
+#: en/user_customization-packages.ssi:101
+#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:140
+#: en/user_customization-packages.ssi:150
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:184
+#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:276
+#: en/user_customization-packages.ssi:288
+#: en/user_customization-packages.ssi:298
+#: en/user_customization-packages.ssi:316
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:24 en/user_customization-runtime.ssi:44
+#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:63
+#: en/user_customization-runtime.ssi:71 en/user_customization-runtime.ssi:80
+#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:111
+#: en/user_customization-runtime.ssi:119 en/user_examples.ssi:14
+#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
+#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
+#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
+#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
+#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
+#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
+#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
+#: en/user_examples.ssi:277 en/user_installation.ssi:38
#: en/user_installation.ssi:46 en/user_installation.ssi:56
#: en/user_installation.ssi:64 en/user_installation.ssi:74
#: en/user_installation.ssi:82 en/user_installation.ssi:90
@@ -76,7 +77,7 @@ msgstr ""
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:80 en/user_overview.ssi:88
+#: en/user_overview.ssi:48 en/user_overview.ssi:56
msgid "code{"
msgstr ""
@@ -100,38 +101,39 @@ msgstr ""
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
-#: en/user_customization-installer.ssi:37
-#: en/user_customization-installer.ssi:48
+#: en/user_customization-installer.ssi:38
+#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:70 en/user_customization-packages.ssi:84
-#: en/user_customization-packages.ssi:98
-#: en/user_customization-packages.ssi:116
-#: en/user_customization-packages.ssi:147
-#: en/user_customization-packages.ssi:161
-#: en/user_customization-packages.ssi:171
-#: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:191
-#: en/user_customization-packages.ssi:203
-#: en/user_customization-packages.ssi:219
-#: en/user_customization-packages.ssi:231
-#: en/user_customization-packages.ssi:295
-#: en/user_customization-packages.ssi:307
-#: en/user_customization-packages.ssi:317
-#: en/user_customization-packages.ssi:344
-#: en/user_customization-packages.ssi:353 en/user_customization-runtime.ssi:18
-#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
-#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
-#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
-#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:110
-#: 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:186 en/user_examples.ssi:202
-#: en/user_examples.ssi:210 en/user_examples.ssi:225 en/user_examples.ssi:233
-#: en/user_examples.ssi:251 en/user_examples.ssi:264 en/user_examples.ssi:279
-#: en/user_examples.ssi:297 en/user_installation.ssi:42
+#: en/user_customization-packages.ssi:46 en/user_customization-packages.ssi:59
+#: en/user_customization-packages.ssi:71 en/user_customization-packages.ssi:85
+#: en/user_customization-packages.ssi:105
+#: en/user_customization-packages.ssi:132
+#: en/user_customization-packages.ssi:146
+#: en/user_customization-packages.ssi:156
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:329
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:346 en/user_customization-runtime.ssi:18
+#: en/user_customization-runtime.ssi:28 en/user_customization-runtime.ssi:48
+#: en/user_customization-runtime.ssi:59 en/user_customization-runtime.ssi:67
+#: en/user_customization-runtime.ssi:76 en/user_customization-runtime.ssi:85
+#: en/user_customization-runtime.ssi:105 en/user_customization-runtime.ssi:115
+#: en/user_customization-runtime.ssi:124 en/user_examples.ssi:20
+#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
+#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
+#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
+#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
+#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
+#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
+#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
+#: en/user_examples.ssi:291 en/user_installation.ssi:42
#: en/user_installation.ssi:50 en/user_installation.ssi:60
#: en/user_installation.ssi:70 en/user_installation.ssi:78
#: en/user_installation.ssi:86 en/user_installation.ssi:94
@@ -139,8 +141,8 @@ msgstr ""
#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
-#: en/user_overview.ssi:84 en/user_overview.ssi:92
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:42
+#: en/user_overview.ssi:52 en/user_overview.ssi:60
msgid "}code"
msgstr ""
@@ -261,118 +263,77 @@ msgstr ""
#: en/user_overview.ssi:34
msgid ""
"Issuing #{lb config}# without any arguments creates a #{config/}# "
-"subdirectory which it populates with some default settings:"
+"subdirectory which it populates with some default settings, and a skeleton #"
+"{auto/}# subdirectory tree."
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:39
+#: en/user_overview.ssi:40
#, no-wrap
msgid ""
" $ lb config\n"
+" P: Considering defaults defined in /etc/live/build.conf\n"
" P: Creating config tree\n"
msgstr ""
#. type: Plain text
#: en/user_overview.ssi:44
-#, no-wrap
-msgid ""
-" $ ls -l\n"
-" total 8\n"
-" drwxr-xr-x 3 user user 4096 Sep 7 13:02 auto\n"
-" drwxr-xr-x 22 user user 4096 Sep 7 13:02 config\n"
-msgstr ""
-
-#. type: Plain text
-#: en/user_overview.ssi:72
-#, no-wrap
-msgid ""
-" $ ls -l config/\n"
-" total 104\n"
-" -rw-r--r-- 1 user user 4197 Sep 7 13:02 binary\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_debian-installer\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_debian-installer-includes\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_grub\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-debs\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-hooks\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-includes\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-packageslists\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-udebs\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_rootfs\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_syslinux\n"
-" -rw-r--r-- 1 user user 2051 Sep 7 13:02 bootstrap\n"
-" -rw-r--r-- 1 user user 1647 Sep 7 13:02 chroot\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_apt\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-hooks\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-includes\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-packages\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-packageslists\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-patches\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-preseed\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_sources\n"
-" -rw-r--r-- 1 user user 2954 Sep 7 13:02 common\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 includes\n"
-" -rw-r--r-- 1 user user 205 Sep 7 13:02 source\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 templates\n"
-msgstr ""
-
-#. type: Plain text
-#: en/user_overview.ssi:76
msgid ""
"Using #{lb config}# without any arguments would be suitable for users who "
"need a very basic image, or who intend to later provide a more complete "
-"configuration via auto/config (see {Managing a configuration}#managing-a-"
+"configuration via #{auto/config}# (see {Managing a configuration}#managing-a-"
"configuration for details)."
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:78
+#: en/user_overview.ssi:46
msgid ""
"Normally, you will want to specify some options. For example, to include the "
"'gnome' package list in your configuration:"
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:82
+#: en/user_overview.ssi:50
#, no-wrap
msgid " $ lb config -p gnome\n"
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:86
+#: en/user_overview.ssi:54
msgid "It is possible to specify many options, such as:"
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:90
+#: en/user_overview.ssi:58
#, no-wrap
msgid " $ lb config --binary-images net --hostname live-machine --username live-user ...\n"
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:94
+#: en/user_overview.ssi:62
msgid "A full list of options is available in the #{lb_config}# man page."
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:96
+#: en/user_overview.ssi:64
msgid "3~lb-build The #{lb build}# command"
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:98
+#: en/user_overview.ssi:66
msgid ""
-"The #{lb build}# command reads in your configuration from the config/ "
+"The #{lb build}# command reads in your configuration from the #{config/}# "
"directory. It then runs the lower level commands needed to build your Live "
"system."
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:100
+#: en/user_overview.ssi:68
msgid "3~lb-clean The #{lb clean}# command"
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:102
+#: en/user_overview.ssi:70
msgid ""
"It is the job of the #{lb clean}# command to remove various parts of a build "
"so subsequent builds can start from a clean state. By default, #{chroot}#, #"
@@ -384,12 +345,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:104
+#: en/user_overview.ssi:72
msgid "2~live-boot The live-boot package"
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:106
+#: en/user_overview.ssi:74
msgid ""
"live-boot is a collection of scripts providing hooks for the initramfs-"
"tools, used to generate an initramfs capable of booting live systems, such "
@@ -398,16 +359,16 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:108
+#: en/user_overview.ssi:76
msgid ""
-"At boot time it will look for read-only media containing a \"/live\" "
+"At boot time it will look for read-only media containing a #{/live/}# "
"directory where a root filesystem (often a compressed filesystem image like "
"squashfs) is stored. If found, it will create a writable environment, using "
"aufs, for Debian like systems to boot from."
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:110
+#: en/user_overview.ssi:78
msgid ""
"More information on initial ramfs in Debian can be found in the Debian Linux "
"Kernel Handbook at http://kernel-handbook.alioth.debian.org/ in the chapter "
@@ -415,12 +376,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:112
+#: en/user_overview.ssi:80
msgid "2~live-config The live-config package"
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:113
+#: en/user_overview.ssi:81
msgid ""
"live-config consists of the scripts that run at boot time after live-boot to "
"configure the live system automatically. It handles such tasks as setting "
diff --git a/manual/po/es/index.html.in.po b/manual/po/es/index.html.in.po
index 323920d..92bae4a 100644
--- a/manual/po/es/index.html.in.po
+++ b/manual/po/es/index.html.in.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: live-manual\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-03 18:22-0400\n"
-"PO-Revision-Date: 2011-03-12 05:53-0000\n"
+"POT-Creation-Date: 2011-12-03 18:55+0100\n"
+"PO-Revision-Date: 2011-12-03 19:03+0100\n"
"Last-Translator: José Luis Zabalza and Carlos Zuferri «chals» "
"<jlz.3008 at gmail.com> <chals at altorricon.com>\n"
"Language-Team: Debian live Spanish translation team <debian-live at lists."
@@ -34,76 +34,87 @@ msgstr "Manual de Debian Live"
#. type: Content of: <html><body><p>
#: en/index.html.in:12
msgid ""
+"<i>live-manual</i> is available in different file formats and it is "
+"translated into several languages. Keep in mind that some translations may "
+"be incomplete or may not be up to date."
+msgstr ""
+"<i>live-manual</i> se encuentra disponible en diferentes formatos y está "
+"traducido a varios idiomas. Pero hay que tener en cuenta que algunas "
+"traducciones pueden estar incompletas o sin actualizar."
+
+#. type: Content of: <html><body><p>
+#: en/index.html.in:17
+msgid ""
"Please report errors, omissions, patches and suggestions to our mailinglist "
"at <a href=\"mailto:debian-live at lists.debian.org\">debian-live at lists.debian."
-"org</a> and read about <a href=\"html/about-manual.html#how-to-contribute"
+"org</a> and read about <a href=\"html/about-manual.en.html#how-to-contribute"
"\">how to contribute</a> to the manual."
msgstr ""
-"Por favor, leer previamente <a href=\"html/about-manual.html#how-to-"
+"Por favor, leer previamente <a href=\"html/about-manual.es.html#how-to-"
"contribute\">como contribuir</a> para conocer como reportar errores, "
"omisiones, parches y sugerencias a este manual, utilizando la lista de "
"correos <a href=\"mailto:debian-live at lists.debian.org\">debian-live at lists."
"debian.org</a>."
#. type: Content of: <html><body><h3>
-#: en/index.html.in:15
+#: en/index.html.in:20
msgid "Available Formats"
msgstr "Formatos Disponibles"
#. type: Content of: <html><body><ul><li>
-#: en/index.html.in:18
-msgid "<a href=\"epub/live-manual.epub\">EPUB</a>"
-msgstr "<a href=\"epub/live-manual.epub\">EPUB</a>"
+#: en/index.html.in:23
+msgid "<a href=\"epub/live-manual.en.epub\">EPUB</a>"
+msgstr "<a href=\"epub/live-manual.es.epub\">EPUB</a>"
#. type: Content of: <html><body><ul><li>
-#: en/index.html.in:19
+#: en/index.html.in:24
msgid ""
-"HTML: <a href=\"html/index.html\">multi page</a>, <a href=\"html/live-manual."
-"html\">single page</a>"
+"HTML: <a href=\"html/index.en.html\">multi page</a>, <a href=\"html/live-"
+"manual.en.html\">single page</a>"
msgstr ""
-"HTML: <a href=\"html/index.html\">una página por capítulo</a>, <a href="
-"\"html/live-manual.html\">todo el manual en una página</a>"
+"HTML: <a href=\"html/index.es.html\">una página por capítulo</a>, <a href="
+"\"html/live-manual.es.html\">todo el manual en una página</a>"
#. type: Content of: <html><body><ul><li>
-#: en/index.html.in:20
-msgid "<a href=\"odf/live-manual.odt\">ODF</a>"
-msgstr "<a href=\"odf/live-manual.odt\">ODF</a>"
+#: en/index.html.in:25
+msgid "<a href=\"odf/live-manual.en.odt\">ODF</a>"
+msgstr "<a href=\"odf/live-manual.es.odt\">ODF</a>"
#. type: Content of: <html><body><ul><li>
-#: en/index.html.in:21
+#: en/index.html.in:26
msgid ""
-"PDF: <a href=\"pdf/live-manual.portrait-a4.pdf\">A4 portrait</a>, <a href="
-"\"pdf/live-manual.landscape-a4.pdf\">A4 landscape</a>, <a href=\"pdf/live-"
-"manual.portrait-letter.pdf\">letter portrait</a>, <a href=\"pdf/live-manual."
-"landscape-letter.pdf\">letter landscape</a>"
+"PDF: <a href=\"pdf/live-manual.portrait-a4.en.pdf\">A4 portrait</a>, <a href="
+"\"pdf/live-manual.landscape-a4.en.pdf\">A4 landscape</a>, <a href=\"pdf/live-"
+"manual.portrait-letter.en.pdf\">letter portrait</a>, <a href=\"pdf/live-"
+"manual.landscape-letter.en.pdf\">letter landscape</a>"
msgstr ""
-"PDF: <a href=\"pdf/live-manual.portrait-a4.pdf\">A4 vertical</a>, <a href="
-"\"pdf/live-manual.landscape-a4.pdf\">A4 apaisado</a>, <a href=\"pdf/live-"
-"manual.portrait-letter.pdf\">Carta (letter) vertical</a>, <a href=\"pdf/live-"
-"manual.landscape-letter.pdf\">Carta (letter) apaisado</a>"
+"PDF: <a href=\"pdf/live-manual.portrait-a4.es.pdf\">A4 vertical</a>, <a href="
+"\"pdf/live-manual.landscape-a4.es.pdf\">A4 apaisado</a>, <a href=\"pdf/live-"
+"manual.portrait-letter.es.pdf\">Carta (letter) vertical</a>, <a href=\"pdf/"
+"live-manual.landscape-letter.es.pdf\">Carta (letter) apaisado</a>"
#. type: Content of: <html><body><ul><li>
-#: en/index.html.in:22
-msgid "<a href=\"txt/live-manual.txt\">Plain text</a>"
-msgstr "<a href=\"txt/live-manual.txt\">Texto sin formato</a>"
+#: en/index.html.in:27
+msgid "<a href=\"txt/live-manual.en.txt\">Plain text</a>"
+msgstr "<a href=\"txt/live-manual.es.txt\">Texto sin formato</a>"
#. type: Content of: <html><body><p>
-#: en/index.html.in:26
+#: en/index.html.in:31
msgid "Last changed: @DATE_CHANGE@"
msgstr "Último cambio: @DATE_CHANGE@"
#. type: Content of: <html><body><p>
-#: en/index.html.in:27
+#: en/index.html.in:32
msgid "Last built: @DATE_BUILD@"
msgstr "Última generación: @DATE_BUILD@"
#. type: Content of: <html><body><h3>
-#: en/index.html.in:30
+#: en/index.html.in:35
msgid "Source"
msgstr "Originales"
#. type: Content of: <html><body><p>
-#: en/index.html.in:33
+#: en/index.html.in:38
msgid ""
"The sources for this manual is available in a <a href=\"http://git.or.cz/"
"\">Git</a> repository at live.debian.net."
@@ -112,7 +123,7 @@ msgstr ""
"\"http://git.or.cz/\">Git</a> de live.debian.net."
#. type: Content of: <html><body><ul><li>
-#: en/index.html.in:37
+#: en/index.html.in:42
msgid ""
"Browse: <a href=\"http://live.debian.net/gitweb/?p=live-manual.git"
"\"><small><tt>http://live.debian.net/gitweb/?p=live-manual.git</tt></small></"
@@ -123,7 +134,7 @@ msgstr ""
"a>"
#. type: Content of: <html><body><ul><li>
-#: en/index.html.in:38
+#: en/index.html.in:43
msgid ""
"Git: <a href=\"git://live.debian.net/git/live-manual.git\"><small><tt>git://"
"live.debian.net/git/live-manual.git</tt></small></a>"
@@ -132,7 +143,7 @@ msgstr ""
"live.debian.net/git/live-manual.git</tt></small></a>"
#. type: Content of: <html><body><p>
-#: en/index.html.in:42
+#: en/index.html.in:47
msgid ""
"<a href=\"http://live.debian.net/\">Debian Live</a> <<a href=\"mailto:"
"debian-live at lists.debian.org\">debian-live at lists.debian.org</a>> - <a "
diff --git a/manual/po/es/live-manual.ssm.po b/manual/po/es/live-manual.ssm.po
index 8bbe420..4b9d721 100644
--- a/manual/po/es/live-manual.ssm.po
+++ b/manual/po/es/live-manual.ssm.po
@@ -9,7 +9,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2011-09-30 14:54+0300\n"
+"POT-Creation-Date: 2011-12-04 10:22+0100\n"
"PO-Revision-Date: 2011-03-12 08:00-0000\n"
"Last-Translator: José Luis Zabalza and Carlos Zuferri «chals» "
"<jlz.3008 at gmail.com> <chals at altorricon.com\n"
@@ -53,7 +53,7 @@ msgstr ""
#, no-wrap
msgid ""
"@date:\n"
-" :published: 2011-09-30\n"
+" :published: 2011-12-04\n"
msgstr ""
#. type: Plain text
diff --git a/manual/po/es/user_basics.ssi.po b/manual/po/es/user_basics.ssi.po
index 0c37777..cbe6b4f 100644
--- a/manual/po/es/user_basics.ssi.po
+++ b/manual/po/es/user_basics.ssi.po
@@ -9,8 +9,8 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2011-04-14 18:03-0200\n"
-"PO-Revision-Date: 2011-04-15 15:11+0100\n"
+"POT-Creation-Date: 2011-11-02 12:23-0200\n"
+"PO-Revision-Date: 2011-11-02 20:28+0100\n"
"Last-Translator: José Luis Zabalza and Carlos Zuferri «chals» "
"<jlz.3008 at gmail.com> <chals at altorricon.com>\n"
"Language-Team: Debian live Spanish translation team <debian-live at lists."
@@ -42,37 +42,38 @@ msgstr ""
#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
-#: en/user_customization-installer.ssi:43
+#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
-#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:53
-#: en/user_customization-packages.ssi:66 en/user_customization-packages.ssi:80
-#: en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:112
-#: en/user_customization-packages.ssi:142
-#: en/user_customization-packages.ssi:155
-#: en/user_customization-packages.ssi:165
-#: en/user_customization-packages.ssi:175
-#: en/user_customization-packages.ssi:185
-#: en/user_customization-packages.ssi:199
-#: en/user_customization-packages.ssi:215
-#: en/user_customization-packages.ssi:227
-#: en/user_customization-packages.ssi:291
-#: en/user_customization-packages.ssi:303
-#: en/user_customization-packages.ssi:313
-#: en/user_customization-packages.ssi:331
-#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
-#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
-#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
-#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
-#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:105
-#: 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:178 en/user_examples.ssi:190
-#: en/user_examples.ssi:206 en/user_examples.ssi:220 en/user_examples.ssi:229
-#: en/user_examples.ssi:247 en/user_examples.ssi:255 en/user_examples.ssi:268
-#: en/user_examples.ssi:283 en/user_installation.ssi:38
+#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:54
+#: en/user_customization-packages.ssi:67 en/user_customization-packages.ssi:81
+#: en/user_customization-packages.ssi:101
+#: en/user_customization-packages.ssi:131
+#: en/user_customization-packages.ssi:144
+#: en/user_customization-packages.ssi:154
+#: en/user_customization-packages.ssi:164
+#: en/user_customization-packages.ssi:174
+#: en/user_customization-packages.ssi:188
+#: en/user_customization-packages.ssi:204
+#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:320
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:345 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:24 en/user_customization-runtime.ssi:44
+#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:63
+#: en/user_customization-runtime.ssi:71 en/user_customization-runtime.ssi:80
+#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:111
+#: en/user_customization-runtime.ssi:119 en/user_examples.ssi:14
+#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
+#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
+#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
+#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
+#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
+#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
+#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:271
+#: en/user_examples.ssi:286 en/user_installation.ssi:38
#: en/user_installation.ssi:46 en/user_installation.ssi:56
#: en/user_installation.ssi:64 en/user_installation.ssi:74
#: en/user_installation.ssi:82 en/user_installation.ssi:90
@@ -105,38 +106,39 @@ msgstr "code{"
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
-#: en/user_customization-installer.ssi:37
-#: en/user_customization-installer.ssi:48
+#: en/user_customization-installer.ssi:38
+#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:70 en/user_customization-packages.ssi:84
-#: en/user_customization-packages.ssi:98
-#: en/user_customization-packages.ssi:116
-#: en/user_customization-packages.ssi:147
-#: en/user_customization-packages.ssi:161
-#: en/user_customization-packages.ssi:171
-#: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:191
-#: en/user_customization-packages.ssi:203
-#: en/user_customization-packages.ssi:219
-#: en/user_customization-packages.ssi:231
-#: en/user_customization-packages.ssi:295
-#: en/user_customization-packages.ssi:307
-#: en/user_customization-packages.ssi:317
-#: en/user_customization-packages.ssi:344
-#: en/user_customization-packages.ssi:353 en/user_customization-runtime.ssi:18
-#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
-#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
-#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
-#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:110
-#: 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:186 en/user_examples.ssi:202
-#: en/user_examples.ssi:210 en/user_examples.ssi:225 en/user_examples.ssi:233
-#: en/user_examples.ssi:251 en/user_examples.ssi:264 en/user_examples.ssi:279
-#: en/user_examples.ssi:297 en/user_installation.ssi:42
+#: en/user_customization-packages.ssi:46 en/user_customization-packages.ssi:59
+#: en/user_customization-packages.ssi:71 en/user_customization-packages.ssi:85
+#: en/user_customization-packages.ssi:105
+#: en/user_customization-packages.ssi:136
+#: en/user_customization-packages.ssi:150
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:180
+#: en/user_customization-packages.ssi:192
+#: en/user_customization-packages.ssi:208
+#: en/user_customization-packages.ssi:220
+#: en/user_customization-packages.ssi:284
+#: en/user_customization-packages.ssi:296
+#: en/user_customization-packages.ssi:306
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341
+#: en/user_customization-packages.ssi:350 en/user_customization-runtime.ssi:18
+#: en/user_customization-runtime.ssi:28 en/user_customization-runtime.ssi:48
+#: en/user_customization-runtime.ssi:59 en/user_customization-runtime.ssi:67
+#: en/user_customization-runtime.ssi:76 en/user_customization-runtime.ssi:85
+#: en/user_customization-runtime.ssi:105 en/user_customization-runtime.ssi:115
+#: en/user_customization-runtime.ssi:124 en/user_examples.ssi:20
+#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
+#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
+#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
+#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
+#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
+#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
+#: en/user_examples.ssi:254 en/user_examples.ssi:267 en/user_examples.ssi:282
+#: en/user_examples.ssi:300 en/user_installation.ssi:42
#: en/user_installation.ssi:50 en/user_installation.ssi:60
#: en/user_installation.ssi:70 en/user_installation.ssi:78
#: en/user_installation.ssi:86 en/user_installation.ssi:94
@@ -363,7 +365,7 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:44 en/user_basics.ssi:170 en/user_basics.ssi:238
-#: en/user_examples.ssi:109 en/user_examples.ssi:208
+#: en/user_examples.ssi:119 en/user_examples.ssi:211
#, no-wrap
msgid " # lb build\n"
msgstr " # lb build\n"
@@ -694,8 +696,8 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:142
#, no-wrap
-msgid " $ lb config --packages virtualbox-ose-guest-x11\n"
-msgstr " $ lb config --packages virtualbox-ose-guest-x11\n"
+msgid " $ echo virtualbox-ose-guest-x11 >> config/package-lists/my.list.chroot\n"
+msgstr " $ echo virtualbox-ose-guest-x11 >> config/package-lists/my.list.chroot\n"
#. type: Plain text
#: en/user_basics.ssi:146
diff --git a/manual/po/es/user_customization-contents.ssi.po b/manual/po/es/user_customization-contents.ssi.po
index 46ee2d2..2232dad 100644
--- a/manual/po/es/user_customization-contents.ssi.po
+++ b/manual/po/es/user_customization-contents.ssi.po
@@ -6,8 +6,8 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2011-08-25 15:56+0300\n"
-"PO-Revision-Date: 2011-04-04 14:27+0100\n"
+"POT-Creation-Date: 2011-11-07 21:01-0400\n"
+"PO-Revision-Date: 2011-11-08 14:17+0100\n"
"Last-Translator: José Luis Zabalza and Carlos Zuferri «chals» "
"<jlz.3008 at gmail.com> <chals at altorricon.com>\n"
"Language-Team: none\n"
@@ -38,48 +38,47 @@ msgstr ""
#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
-#: en/user_customization-installer.ssi:43
+#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
-#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:53
-#: en/user_customization-packages.ssi:66 en/user_customization-packages.ssi:80
-#: en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:112
-#: en/user_customization-packages.ssi:142
-#: en/user_customization-packages.ssi:155
-#: en/user_customization-packages.ssi:165
-#: en/user_customization-packages.ssi:175
-#: en/user_customization-packages.ssi:185
-#: en/user_customization-packages.ssi:199
-#: en/user_customization-packages.ssi:215
-#: en/user_customization-packages.ssi:227
-#: en/user_customization-packages.ssi:291
-#: en/user_customization-packages.ssi:303
-#: en/user_customization-packages.ssi:313
-#: en/user_customization-packages.ssi:331
-#: en/user_customization-packages.ssi:348
-#: en/user_customization-packages.ssi:356 en/user_customization-runtime.ssi:14
-#: en/user_customization-runtime.ssi:24 en/user_customization-runtime.ssi:44
-#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:63
-#: en/user_customization-runtime.ssi:71 en/user_customization-runtime.ssi:80
-#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:111
-#: en/user_customization-runtime.ssi:119 en/user_examples.ssi:14
+#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:54
+#: en/user_customization-packages.ssi:67 en/user_customization-packages.ssi:81
+#: en/user_customization-packages.ssi:101
+#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:140
+#: en/user_customization-packages.ssi:150
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:184
+#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:276
+#: en/user_customization-packages.ssi:288
+#: en/user_customization-packages.ssi:298
+#: en/user_customization-packages.ssi:316
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
+#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
+#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
+#: en/user_customization-runtime.ssi:104 en/user_customization-runtime.ssi:114
+#: en/user_customization-runtime.ssi:122 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:178 en/user_examples.ssi:190 en/user_examples.ssi:206
-#: en/user_examples.ssi:220 en/user_examples.ssi:229 en/user_examples.ssi:247
-#: en/user_examples.ssi:255 en/user_examples.ssi:268 en/user_examples.ssi:283
-#: en/user_installation.ssi:38 en/user_installation.ssi:46
-#: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi:74 en/user_installation.ssi:82
-#: en/user_installation.ssi:90 en/user_installation.ssi:114
-#: en/user_installation.ssi:129 en/user_installation.ssi:146
-#: en/user_managing_a_configuration.ssi:24
+#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
+#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
+#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
+#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
+#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
+#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
+#: en/user_examples.ssi:277 en/user_installation.ssi:38
+#: en/user_installation.ssi:46 en/user_installation.ssi:56
+#: en/user_installation.ssi:64 en/user_installation.ssi:74
+#: en/user_installation.ssi:82 en/user_installation.ssi:90
+#: en/user_installation.ssi:114 en/user_installation.ssi:129
+#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:80 en/user_overview.ssi:88
+#: en/user_overview.ssi:48 en/user_overview.ssi:56
msgid "code{"
msgstr "code{"
@@ -103,49 +102,48 @@ msgstr "code{"
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
-#: en/user_customization-installer.ssi:37
-#: en/user_customization-installer.ssi:48
+#: en/user_customization-installer.ssi:38
+#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:70 en/user_customization-packages.ssi:84
-#: en/user_customization-packages.ssi:98
-#: en/user_customization-packages.ssi:116
-#: en/user_customization-packages.ssi:147
-#: en/user_customization-packages.ssi:161
-#: en/user_customization-packages.ssi:171
-#: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:191
-#: en/user_customization-packages.ssi:203
-#: en/user_customization-packages.ssi:219
-#: en/user_customization-packages.ssi:231
-#: en/user_customization-packages.ssi:295
-#: en/user_customization-packages.ssi:307
-#: en/user_customization-packages.ssi:317
-#: en/user_customization-packages.ssi:344
-#: en/user_customization-packages.ssi:352
-#: en/user_customization-packages.ssi:361 en/user_customization-runtime.ssi:18
-#: en/user_customization-runtime.ssi:28 en/user_customization-runtime.ssi:48
-#: en/user_customization-runtime.ssi:59 en/user_customization-runtime.ssi:67
-#: en/user_customization-runtime.ssi:76 en/user_customization-runtime.ssi:85
-#: en/user_customization-runtime.ssi:105 en/user_customization-runtime.ssi:115
-#: en/user_customization-runtime.ssi:124 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:186 en/user_examples.ssi:202 en/user_examples.ssi:210
-#: en/user_examples.ssi:225 en/user_examples.ssi:233 en/user_examples.ssi:251
-#: en/user_examples.ssi:264 en/user_examples.ssi:279 en/user_examples.ssi:297
-#: en/user_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi:70
-#: en/user_installation.ssi:78 en/user_installation.ssi:86
-#: en/user_installation.ssi:94 en/user_installation.ssi:119
-#: en/user_installation.ssi:136 en/user_installation.ssi:149
-#: en/user_managing_a_configuration.ssi:31
+#: en/user_customization-packages.ssi:46 en/user_customization-packages.ssi:59
+#: en/user_customization-packages.ssi:71 en/user_customization-packages.ssi:85
+#: en/user_customization-packages.ssi:105
+#: en/user_customization-packages.ssi:132
+#: en/user_customization-packages.ssi:146
+#: en/user_customization-packages.ssi:156
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:329
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:346 en/user_customization-runtime.ssi:21
+#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
+#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
+#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
+#: en/user_customization-runtime.ssi:108 en/user_customization-runtime.ssi:118
+#: en/user_customization-runtime.ssi:127 en/user_examples.ssi:20
+#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
+#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
+#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
+#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
+#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
+#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
+#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
+#: en/user_examples.ssi:291 en/user_installation.ssi:42
+#: en/user_installation.ssi:50 en/user_installation.ssi:60
+#: en/user_installation.ssi:70 en/user_installation.ssi:78
+#: en/user_installation.ssi:86 en/user_installation.ssi:94
+#: en/user_installation.ssi:119 en/user_installation.ssi:136
+#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
-#: en/user_overview.ssi:84 en/user_overview.ssi:92
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:42
+#: en/user_overview.ssi:52 en/user_overview.ssi:60
msgid "}code"
msgstr "}code"
@@ -275,14 +273,14 @@ msgstr ""
#. type: Plain text
#: en/user_customization-contents.ssi:24
msgid ""
-"To include files, simply add them to your #{config/chroot_local-includes}# "
+"To include files, simply add them to your #{config/includes.chroot}# "
"directory. This directory corresponds to the root directory (#{/}#) of the "
"live system. For example, to add a file #{/var/www/index.html}# in the live "
"system, use:"
msgstr ""
"Para incluir ficheros solamente hace falta añadirlos al directorio de "
-"configuración #{config/chroot_local-includes}#. Habrá una relación directa "
-"entre este directorio y el directorio raiz (#{/}#) del sistema en vivo. Por "
+"configuración #{config/includes.chroot}#. Habrá una relación directa entre "
+"este directorio y el directorio raiz (#{/}#) del sistema en vivo. Por "
"ejemplo, si se desea añadir un fichero para que sea el fichero #{/var/www/"
"index.html}# del sistema en vivo se puede hacer lo siguiente:"
@@ -290,11 +288,11 @@ msgstr ""
#: en/user_customization-contents.ssi:29
#, no-wrap
msgid ""
-" $ mkdir -p config/chroot_local-includes/var/www\n"
-" $ cp /path/to/my/index.html config/chroot_local-includes/var/www\n"
+" $ mkdir -p config/includes.chroot/var/www\n"
+" $ cp /path/to/my/index.html config/includes.chroot/var/www\n"
msgstr ""
-"$ mkdir -p config/chroot_local-includes/var/www\n"
-"$ cp /donde/esté/el/fichero/original/index.html config/chroot_local-includes/var/www\n"
+" $ mkdir -p config/includes.chroot/var/www\n"
+" $ cp /path/to/my/index.html config/includes.chroot/var/www\n"
#. type: Plain text
#: en/user_customization-contents.ssi:33
@@ -307,7 +305,7 @@ msgstr "El directorio de configuración presentará la siguiente jerarquía:"
msgid ""
" -- config\n"
" [...]\n"
-" |-- chroot_local-includes\n"
+" |-- includes.chroot\n"
" | `-- var\n"
" | `-- www\n"
" | `-- index.html\n"
@@ -316,7 +314,7 @@ msgid ""
msgstr ""
" -- config\n"
" [...]\n"
-" |-- chroot_local-includes\n"
+" |-- includes.chroot\n"
" | `-- var\n"
" | `-- www\n"
" | `-- index.html\n"
@@ -346,8 +344,8 @@ msgid ""
"booting the Live system, you can use binary local includes. This works in a "
"similar fashion to chroot local includes. For example, suppose the files #{~/"
"video_demo.*}# are demo videos of the live system described by and linked to "
-"by an HTML index page. Simply copy the material to #{config/binary_local-"
-"includes/}# as follows:"
+"by an HTML index page. Simply copy the material to #{config/includes.binary/}"
+"# as follows:"
msgstr ""
"Se puede incluir material como documentación, videos, etc en el sistema de "
"ficheros del medio de instalación (USB, CDROM, etc) donde se grabará la "
@@ -355,16 +353,17 @@ msgstr ""
"de arrancar el sistema en vivo. Para esto se utilizan los includes locales "
"en Binary. Funciona de manera similar a los includes locales en chroot "
"comentados anteriormente. Por ejemplo, supongamos que en el medio de "
-"instalación se desea añadir unos ficheros con videos de demostración sobre "
-"el funcionamiento del sistema en vivo de manera que el usuario pueda acceder "
-"a ellos a través de la página de indice HTML. Simplemente se debe copiar el "
-"material en #{config/binary_local-includes/}# de la siguiente manera:"
+"instalación se desea añadir unos ficheros con videos de demostración #{~/"
+"video_demo.*}# sobre el funcionamiento del sistema en vivo de manera que el "
+"usuario pueda acceder a ellos a través de la página de indice HTML. "
+"Simplemente se debe copiar el material en #{config/includes.binary/}# de la "
+"siguiente manera:"
#. type: Plain text
#: en/user_customization-contents.ssi:56
#, no-wrap
-msgid " $ cp ~/video_demo.* config/binary_local-includes/\n"
-msgstr " $ cp ~/video_demo.* config/binary_local-includes/\n"
+msgid " $ cp ~/video_demo.* config/includes.binary/\n"
+msgstr " $ cp ~/video_demo.* config/includes.binary/\n"
#. type: Plain text
#: en/user_customization-contents.ssi:60
@@ -428,26 +427,26 @@ msgstr "3~live-chroot-local-hooks Scripts gancho locales en Live/chroot"
#. type: Plain text
#: en/user_customization-contents.ssi:80
msgid ""
-"To run commands in the chroot stage, create a hook script containing the "
-"commands in the #{config/chroot_local-hooks}# directory. The hook will run "
-"in the chroot after the rest of your chroot configuration has been applied, "
-"so remember to ensure your configuration includes all packages and files "
-"your hook needs in order to run. See the example chroot hook scripts for "
-"various common chroot customization tasks provided in #{/usr/share/live/"
+"To run commands in the chroot stage, create a hook script with a #{.chroot}# "
+"suffix containing the commands in the #{config/hooks/}# directory. The hook "
+"will run in the chroot after the rest of your chroot configuration has been "
+"applied, so remember to ensure your configuration includes all packages and "
+"files your hook needs in order to run. See the example chroot hook scripts "
+"for various common chroot customization tasks provided in #{/usr/share/live/"
"build/examples/hooks}# which you can copy or symlink to use them in your own "
"configuration."
msgstr ""
-"Para ejecutar órdenes en la etapa chroot se deben crear scripts gancho que "
-"contengan dichas ordenes a ejecutar y depositarlos en el directorio #{config/"
-"chroot_local-hooks}#. Estos scripts serán ejecutados en el entorno del "
-"chroot después de que el resto de las tareas de preparación del chroot han "
-"sido realizadas. Se debe asegurar que previamente se han instalado en el "
-"entorno chroot cualquier paquete, fichero u órden que necesiten los scripts "
-"gancho. El paquete live-build instala en el directorio #{/usr/share/live/"
-"build/examples/hooks}# del sistema huésped unos cuantos scripts gancho para "
-"realizar tareas habituales de personalización del entorno chroot que pueden "
-"ser copiados o referenciados mediante enlace simbólico en el directorio de "
-"configuración #{config/chroot_local-hooks}#."
+"Para ejecutar órdenes en la etapa chroot se deben crear scripts gancho "
+"(hooks) con el sufijo #{.chroot}# que contengan dichas ordenes a ejecutar y "
+"depositarlos en el directorio #{config/hooks/}#. Estos scripts serán "
+"ejecutados en el entorno del chroot después de que el resto de las tareas de "
+"preparación del chroot han sido realizadas. Se debe asegurar que previamente "
+"se han instalado en el entorno chroot cualquier paquete, fichero u órden que "
+"necesiten los scripts gancho. El paquete live-build instala en el directorio "
+"#{/usr/share/live/build/examples/hooks}# del sistema huésped unos cuantos "
+"scripts gancho para realizar tareas habituales de personalización del "
+"entorno chroot que pueden ser copiados o referenciados mediante enlace "
+"simbólico en la propia configuración."
#. type: Plain text
#: en/user_customization-contents.ssi:82
@@ -461,15 +460,14 @@ msgid ""
"explained in the \"Customization\" section of its man page. Examine live-"
"config's own hooks provided in #{/lib/live/config/}#, noting the sequence "
"numbers. Then provide your own hook prefixed with an appropriate sequence "
-"number, either as a chroot local include in #{config/chroot_local-includes/"
-"lib/live/config/}#, or as a custom package as discussed in {Installing "
-"modified or third-party packages}#installing-modified-or-third-party-"
-"packages."
+"number, either as a chroot local include in #{config/includes.chroot/lib/"
+"live/config/}#, or as a custom package as discussed in {Installing modified "
+"or third-party packages}#installing-modified-or-third-party-packages."
msgstr ""
"Para ejecutar ordenes en el arranque del sistema en vivo, se puede "
"suministrar scripts gancho a live-config depositándolos en el directorio #"
-"{config/chroot_local-includes/lib/live/config/}#, tal y como se explica en "
-"la sección de \"Personalización\" de la página de manual de live-config. Es "
+"{config/includes.chroot/lib/live/config/}#, tal y como se explica en la "
+"sección de \"Personalización\" de la página de manual de live-config. Es "
"interesante examinar los scripts gancho que trae de serie live-config que "
"pueden verse en #{/lib/live/config/}# y fijarse en la secuencia de números. "
"Cuando se vaya a utilizar scripts propios deben ser prefijados con un número "
@@ -485,26 +483,28 @@ msgstr "3~ Scripts gancho locales en Binary"
#. type: Plain text
#: en/user_customization-contents.ssi:88
msgid ""
-"To run commands in the binary stage, create a hook script containing the "
-"commands in the #{config/binary_local-hooks}#. The hook will run after all "
-"other binary commands are run, but before binary_checksums, the very last "
-"binary commands The commands in your hook do not run in the chroot, so take "
-"care to not modify any files outside of the build tree, or you may damage "
-"your build system! See the example binary hook scripts for various common "
-"binary customization tasks provided in #{/usr/share/live/build/examples/"
-"hooks}# which you can copy or symlink to use them in your own configuration."
+"To run commands in the binary stage, create a hook script with a #{.binary}# "
+"suffix containing the commands in the #{config/hooks/}# directory. The hook "
+"will run after all other binary commands are run, but before "
+"binary_checksums, the very last binary command. The commands in your hook do "
+"not run in the chroot, so take care to not modify any files outside of the "
+"build tree, or you may damage your build system! See the example binary hook "
+"scripts for various common binary customization tasks provided in #{/usr/"
+"share/live/build/examples/hooks}# which you can copy or symlink to use them "
+"in your own configuration."
msgstr ""
-"Para ejecutar comandos en la etapa Binary se deben crear scripts gancho que "
-"contengan las ordenes y depositarlos en el directorio #{config/binary_local-"
-"hooks}#. Los scripts gancho se ejecutarán después de finalizar el resto de "
-"procesos de la etapa pero antes de crear los checksum con binary_checksum "
-"que es el último proceso que se ejecuta en esta etapa. Los scripts gancho no "
-"se ejecutan en el entorno del chroot, así que hay que tener cuidado de no "
-"modificar cualquier fichero fuera del árbol de creación, o se dañará el "
-"sistema de creación. En #{/usr/share/live/build/examples/hooks}# se pueden "
-"ver varios ejemplos de scripts gancho genéricos que permiten tareas de "
-"personalización para la etapa Binary. Estos scripts pueden ser utilizados "
-"copiandolos o creando enlaces simbólicos en #{config/binary_local-hooks}#."
+"Para ejecutar comandos en la etapa Binary se deben crear scripts gancho con "
+"el sufijo #{.binary}# que contengan las ordenes y depositarlos en el "
+"directorio #{config/hooks/}#. Los scripts gancho se ejecutarán después de "
+"finalizar el resto de procesos de la etapa pero antes de crear los checksum "
+"con binary_checksum que es el último proceso que se ejecuta en esta etapa. "
+"Los scripts gancho no se ejecutan en el entorno del chroot, así que hay que "
+"tener cuidado de no modificar cualquier fichero fuera del árbol de creación, "
+"o se dañará el sistema de creación. En #{/usr/share/live/build/examples/"
+"hooks}# se pueden ver varios ejemplos de scripts gancho genéricos que "
+"permiten tareas de personalización para la etapa Binary. Estos scripts "
+"pueden ser utilizados en la propia configuración copiándolos o creando "
+"enlaces simbólicos."
#. type: Plain text
#: en/user_customization-contents.ssi:90
@@ -514,13 +514,15 @@ msgstr "2~ Preconfiguración de las preguntas de Debconf"
#. type: Plain text
#: en/user_customization-contents.ssi:92
msgid ""
-"Files in the #{config/chroot_local-preseed}# directory are considered to be "
+"Files in the #{config/preseed/}# directory suffixed with #{.preseed}# "
+"followed by the stage (#{.chroot}# or #{.binary}#) are considered to be "
"debconf preseed files and are installed by live-build using #{debconf-set-"
-"selections}#."
+"selections}# during the corresponding stage."
msgstr ""
-"Los ficheros del directorio #{config/chroot_local-preseed}# son ficheros de "
+"Los ficheros del directorio #{config/preseed/}# con el sufijo #{.preseed}# "
+"seguido por la etapa (#{.chroot}# o #{.binary}#) son ficheros de "
"preconfiguración para debconf. live-build instalará estos ficheros mediante #"
-"{debconf-set-selections}#."
+"{debconf-set-selections}# durante la etapa correspondiente."
#. type: Plain text
#: en/user_customization-contents.ssi:93
diff --git a/manual/po/es/user_customization-installer.ssi.po b/manual/po/es/user_customization-installer.ssi.po
index 572f7e1..78f677f 100644
--- a/manual/po/es/user_customization-installer.ssi.po
+++ b/manual/po/es/user_customization-installer.ssi.po
@@ -9,8 +9,8 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2011-04-03 07:04-0200\n"
-"PO-Revision-Date: 2011-03-12 18:34+0100\n"
+"POT-Creation-Date: 2011-11-07 21:19-0400\n"
+"PO-Revision-Date: 2011-11-08 14:21+0100\n"
"Last-Translator: José Luis Zabalza and Carlos Zuferri «chals» "
"<jlz.3008 at gmail.com> <chals at altorricon.com>\n"
"Language-Team: none\n"
@@ -33,48 +33,49 @@ msgstr ""
#: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/user_basics.ssi:30 en/user_basics.ssi:40
-#: en/user_basics.ssi:56 en/user_basics.ssi:71 en/user_basics.ssi:106
-#: en/user_basics.ssi:114 en/user_basics.ssi:126 en/user_basics.ssi:138
-#: en/user_basics.ssi:150 en/user_basics.ssi:158 en/user_basics.ssi:166
-#: en/user_basics.ssi:182 en/user_basics.ssi:192 en/user_basics.ssi:200
-#: en/user_basics.ssi:216 en/user_basics.ssi:224 en/user_basics.ssi:234
-#: en/user_basics.ssi:252 en/user_basics.ssi:280 en/user_basics.ssi:296
-#: en/user_basics.ssi:304 en/user_basics.ssi:324 en/user_basics.ssi:349
+#: en/project_procedures.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
+#: en/user_basics.ssi:116 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:184 en/user_basics.ssi:194 en/user_basics.ssi:202
+#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
+#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
+#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
-#: en/user_customization-installer.ssi:43
+#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
-#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:53
-#: en/user_customization-packages.ssi:66 en/user_customization-packages.ssi:80
-#: en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:112
-#: en/user_customization-packages.ssi:142
-#: en/user_customization-packages.ssi:155
-#: en/user_customization-packages.ssi:165
-#: en/user_customization-packages.ssi:175
-#: en/user_customization-packages.ssi:185
-#: en/user_customization-packages.ssi:199
-#: en/user_customization-packages.ssi:215
-#: en/user_customization-packages.ssi:227
-#: en/user_customization-packages.ssi:291
-#: en/user_customization-packages.ssi:303
-#: en/user_customization-packages.ssi:313
-#: en/user_customization-packages.ssi:331
-#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
-#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
-#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
-#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
-#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:105
-#: 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:178 en/user_examples.ssi:190
-#: en/user_examples.ssi:206 en/user_examples.ssi:220 en/user_examples.ssi:229
-#: en/user_examples.ssi:247 en/user_examples.ssi:255 en/user_examples.ssi:268
-#: en/user_examples.ssi:283 en/user_installation.ssi:38
+#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:54
+#: en/user_customization-packages.ssi:67 en/user_customization-packages.ssi:81
+#: en/user_customization-packages.ssi:101
+#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:140
+#: en/user_customization-packages.ssi:150
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:184
+#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:276
+#: en/user_customization-packages.ssi:288
+#: en/user_customization-packages.ssi:298
+#: en/user_customization-packages.ssi:316
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
+#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
+#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
+#: en/user_customization-runtime.ssi:104 en/user_customization-runtime.ssi:114
+#: en/user_customization-runtime.ssi:122 en/user_examples.ssi:14
+#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
+#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
+#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
+#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
+#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
+#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
+#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
+#: en/user_examples.ssi:277 en/user_installation.ssi:38
#: en/user_installation.ssi:46 en/user_installation.ssi:56
#: en/user_installation.ssi:64 en/user_installation.ssi:74
#: en/user_installation.ssi:82 en/user_installation.ssi:90
@@ -83,7 +84,7 @@ msgstr ""
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:80 en/user_overview.ssi:88
+#: en/user_overview.ssi:48 en/user_overview.ssi:56
msgid "code{"
msgstr "code{"
@@ -97,48 +98,49 @@ msgstr "code{"
#: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/user_basics.ssi:34 en/user_basics.ssi:44
-#: en/user_basics.ssi:62 en/user_basics.ssi:75 en/user_basics.ssi:110
-#: en/user_basics.ssi:118 en/user_basics.ssi:132 en/user_basics.ssi:142
-#: en/user_basics.ssi:154 en/user_basics.ssi:162 en/user_basics.ssi:170
-#: en/user_basics.ssi:186 en/user_basics.ssi:196 en/user_basics.ssi:204
-#: en/user_basics.ssi:220 en/user_basics.ssi:228 en/user_basics.ssi:238
-#: en/user_basics.ssi:272 en/user_basics.ssi:284 en/user_basics.ssi:300
-#: en/user_basics.ssi:308 en/user_basics.ssi:335 en/user_basics.ssi:374
+#: en/project_procedures.ssi:131 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
+#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
+#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
+#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
+#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
-#: en/user_customization-installer.ssi:37
-#: en/user_customization-installer.ssi:48
+#: en/user_customization-installer.ssi:38
+#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:70 en/user_customization-packages.ssi:84
-#: en/user_customization-packages.ssi:98
-#: en/user_customization-packages.ssi:116
-#: en/user_customization-packages.ssi:147
-#: en/user_customization-packages.ssi:161
-#: en/user_customization-packages.ssi:171
-#: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:191
-#: en/user_customization-packages.ssi:203
-#: en/user_customization-packages.ssi:219
-#: en/user_customization-packages.ssi:231
-#: en/user_customization-packages.ssi:295
-#: en/user_customization-packages.ssi:307
-#: en/user_customization-packages.ssi:317
-#: en/user_customization-packages.ssi:344
-#: en/user_customization-packages.ssi:353 en/user_customization-runtime.ssi:18
-#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
-#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
-#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
-#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:110
-#: 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:186 en/user_examples.ssi:202
-#: en/user_examples.ssi:210 en/user_examples.ssi:225 en/user_examples.ssi:233
-#: en/user_examples.ssi:251 en/user_examples.ssi:264 en/user_examples.ssi:279
-#: en/user_examples.ssi:297 en/user_installation.ssi:42
+#: en/user_customization-packages.ssi:46 en/user_customization-packages.ssi:59
+#: en/user_customization-packages.ssi:71 en/user_customization-packages.ssi:85
+#: en/user_customization-packages.ssi:105
+#: en/user_customization-packages.ssi:132
+#: en/user_customization-packages.ssi:146
+#: en/user_customization-packages.ssi:156
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:329
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:346 en/user_customization-runtime.ssi:21
+#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
+#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
+#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
+#: en/user_customization-runtime.ssi:108 en/user_customization-runtime.ssi:118
+#: en/user_customization-runtime.ssi:127 en/user_examples.ssi:20
+#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
+#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
+#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
+#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
+#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
+#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
+#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
+#: en/user_examples.ssi:291 en/user_installation.ssi:42
#: en/user_installation.ssi:50 en/user_installation.ssi:60
#: en/user_installation.ssi:70 en/user_installation.ssi:78
#: en/user_installation.ssi:86 en/user_installation.ssi:94
@@ -146,8 +148,8 @@ msgstr "code{"
#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
-#: en/user_overview.ssi:84 en/user_overview.ssi:92
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:42
+#: en/user_overview.ssi:52 en/user_overview.ssi:60
msgid "}code"
msgstr "}code"
@@ -293,22 +295,24 @@ msgstr ""
"kernel que utiliza #{d-i}# en la arquitectura especificada. Por ejemplo:"
#. type: Plain text
-#: en/user_customization-installer.ssi:35
+#: en/user_customization-installer.ssi:36
#, no-wrap
msgid ""
" $ lb config --architecture i386 --linux-flavours 486 \\\n"
-" --debian-installer live --packages debian-installer-launcher\n"
+" --debian-installer live\n"
+" $ echo debian-installer-launcher >> config/package-lists/my.list.chroot\n"
msgstr ""
" $ lb config --architecture i386 --linux-flavours 486 \\\n"
-" --debian-installer live --packages debian-installer-launcher\n"
+" --debian-installer live\n"
+" $ echo debian-installer-launcher >> config/package-lists/my.list.chroot\n"
#. type: Plain text
-#: en/user_customization-installer.ssi:39
+#: en/user_customization-installer.ssi:40
msgid "2~ Customizing Debian Installer by preseeding"
msgstr "2~ Personalizando el Instalador de Debian mediante preconfiguración"
#. type: Plain text
-#: en/user_customization-installer.ssi:41
+#: en/user_customization-installer.ssi:42
msgid ""
"As described in the Debian Installer Manual, Appendix B at http://www.debian."
"org/releases/stable/i386/apb.html, \"Preseeding provides a way to set "
@@ -333,7 +337,7 @@ msgstr ""
"preconfigurar la variante local a #{es_ES}# se puede hacer:"
#. type: Plain text
-#: en/user_customization-installer.ssi:46
+#: en/user_customization-installer.ssi:47
#, no-wrap
msgid ""
" $ echo \"d-i debian-installer/locale string en_US\" \\\n"
@@ -343,26 +347,26 @@ msgstr ""
" >> config/binary_debian-installer/preseed.cfg\n"
#. type: Plain text
-#: en/user_customization-installer.ssi:50
+#: en/user_customization-installer.ssi:51
msgid "2~ Customizing Debian Installer content"
msgstr "2~ Personalizar el contenido del Instalador de Debian"
#. type: Plain text
-#: en/user_customization-installer.ssi:51
+#: en/user_customization-installer.ssi:52
msgid ""
"For experimental or debugging purposes, you might want to include locally "
-"built #{d-i}# component udeb packages. Place these in #{config/binary_local-"
-"udebs/}# to include them in the image. Additional or replacement files and "
+"built #{d-i}# component udeb packages. Place these in #{config/packages."
+"binary/}# to include them in the image. Additional or replacement files and "
"directories may be included in the installer initrd as well, in a similar "
"fashion to {Live/chroot local includes}#live-chroot-local-includes, by "
"placing the material in #{config/binary_debian-installer-includes/}#."
msgstr ""
-"Es posible que, con propósitos experimentales o para depuración, se desee "
-"incluir paquetes udeb creados localmente. Estos paquetes udeb son "
-"componentes del Instalador de Debian que definen su comportamiento. Para "
-"incluirlos en la imagen, basta con depositarlos en el directorio de "
-"configuración #{config/binary_local-udebs/}#. También pueden incluirse o "
-"reemplazarse ficheros y directorios en el initrd del instalador de una "
-"manera similar a la que se describe en {Includes locales en Live/chroot}"
-"#live-chroot-local-includes, depositando el material en el directorio #"
-"{config/binary_debian-installer-includes/}#."
+"Es posible que, con propósitos experimentales o para depuración de errores, "
+"se desee incluir paquetes udeb creados localmente para el #{d-i}#. Estos "
+"paquetes udeb son componentes del Instalador de Debian que definen su "
+"comportamiento. Para incluirlos en la imagen, basta con depositarlos en el "
+"directorio de configuración #{config/packages.binary/}#. También pueden "
+"incluirse o reemplazarse ficheros y directorios en el initrd del instalador "
+"de una manera similar a la que se describe en {Includes locales en Live/"
+"chroot}#live-chroot-local-includes, depositando el material en el directorio "
+"#{config/binary_debian-installer-includes/}#."
diff --git a/manual/po/es/user_customization-packages.ssi.po b/manual/po/es/user_customization-packages.ssi.po
index 6c4133d..135b908 100644
--- a/manual/po/es/user_customization-packages.ssi.po
+++ b/manual/po/es/user_customization-packages.ssi.po
@@ -9,9 +9,10 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2011-08-14 16:53+0300\n"
-"PO-Revision-Date: 2011-08-14 17:29+0200\n"
-"Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
+"POT-Creation-Date: 2011-11-07 21:01-0400\n"
+"PO-Revision-Date: 2011-11-08 14:26+0100\n"
+"Last-Translator: José Luis Zabalza and Carlos Zuferri «chals» "
+"<jlz.3008 at gmail.com> <chals at altorricon.com>\n"
"Language-Team: <debian-live at lists.debian.org>\n"
"Language: es\n"
"MIME-Version: 1.0\n"
@@ -43,38 +44,38 @@ msgstr ""
#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
-#: en/user_customization-installer.ssi:43
+#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
-#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:53
-#: en/user_customization-packages.ssi:66 en/user_customization-packages.ssi:80
-#: en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:112
-#: en/user_customization-packages.ssi:142
-#: en/user_customization-packages.ssi:155
-#: en/user_customization-packages.ssi:165
-#: en/user_customization-packages.ssi:175
-#: en/user_customization-packages.ssi:185
-#: en/user_customization-packages.ssi:199
-#: en/user_customization-packages.ssi:215
-#: en/user_customization-packages.ssi:227
-#: en/user_customization-packages.ssi:291
-#: en/user_customization-packages.ssi:303
-#: en/user_customization-packages.ssi:313
-#: en/user_customization-packages.ssi:331
-#: en/user_customization-packages.ssi:348
-#: en/user_customization-packages.ssi:356 en/user_customization-runtime.ssi:14
-#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
-#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
-#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
-#: en/user_customization-runtime.ssi:99 en/user_customization-runtime.ssi:107
-#: 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:178 en/user_examples.ssi:190
-#: en/user_examples.ssi:206 en/user_examples.ssi:220 en/user_examples.ssi:229
-#: en/user_examples.ssi:247 en/user_examples.ssi:255 en/user_examples.ssi:268
-#: en/user_examples.ssi:283 en/user_installation.ssi:38
+#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:54
+#: en/user_customization-packages.ssi:67 en/user_customization-packages.ssi:81
+#: en/user_customization-packages.ssi:101
+#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:140
+#: en/user_customization-packages.ssi:150
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:184
+#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:276
+#: en/user_customization-packages.ssi:288
+#: en/user_customization-packages.ssi:298
+#: en/user_customization-packages.ssi:316
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
+#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
+#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
+#: en/user_customization-runtime.ssi:104 en/user_customization-runtime.ssi:114
+#: en/user_customization-runtime.ssi:122 en/user_examples.ssi:14
+#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
+#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
+#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
+#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
+#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
+#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
+#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
+#: en/user_examples.ssi:277 en/user_installation.ssi:38
#: en/user_installation.ssi:46 en/user_installation.ssi:56
#: en/user_installation.ssi:64 en/user_installation.ssi:74
#: en/user_installation.ssi:82 en/user_installation.ssi:90
@@ -83,7 +84,7 @@ msgstr ""
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:80 en/user_overview.ssi:88
+#: en/user_overview.ssi:48 en/user_overview.ssi:56
msgid "code{"
msgstr "code{"
@@ -107,39 +108,39 @@ msgstr "code{"
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
-#: en/user_customization-installer.ssi:37
-#: en/user_customization-installer.ssi:48
+#: en/user_customization-installer.ssi:38
+#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:70 en/user_customization-packages.ssi:84
-#: en/user_customization-packages.ssi:98
-#: en/user_customization-packages.ssi:116
-#: en/user_customization-packages.ssi:147
-#: en/user_customization-packages.ssi:161
-#: en/user_customization-packages.ssi:171
-#: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:191
-#: en/user_customization-packages.ssi:203
-#: en/user_customization-packages.ssi:219
-#: en/user_customization-packages.ssi:231
-#: en/user_customization-packages.ssi:295
-#: en/user_customization-packages.ssi:307
-#: en/user_customization-packages.ssi:317
-#: en/user_customization-packages.ssi:344
-#: en/user_customization-packages.ssi:352
-#: en/user_customization-packages.ssi:361 en/user_customization-runtime.ssi:18
-#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
-#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
-#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
-#: en/user_customization-runtime.ssi:103 en/user_customization-runtime.ssi:112
-#: 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:186 en/user_examples.ssi:202
-#: en/user_examples.ssi:210 en/user_examples.ssi:225 en/user_examples.ssi:233
-#: en/user_examples.ssi:251 en/user_examples.ssi:264 en/user_examples.ssi:279
-#: en/user_examples.ssi:297 en/user_installation.ssi:42
+#: en/user_customization-packages.ssi:46 en/user_customization-packages.ssi:59
+#: en/user_customization-packages.ssi:71 en/user_customization-packages.ssi:85
+#: en/user_customization-packages.ssi:105
+#: en/user_customization-packages.ssi:132
+#: en/user_customization-packages.ssi:146
+#: en/user_customization-packages.ssi:156
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:329
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:346 en/user_customization-runtime.ssi:21
+#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
+#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
+#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
+#: en/user_customization-runtime.ssi:108 en/user_customization-runtime.ssi:118
+#: en/user_customization-runtime.ssi:127 en/user_examples.ssi:20
+#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
+#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
+#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
+#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
+#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
+#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
+#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
+#: en/user_examples.ssi:291 en/user_installation.ssi:42
#: en/user_installation.ssi:50 en/user_installation.ssi:60
#: en/user_installation.ssi:70 en/user_installation.ssi:78
#: en/user_installation.ssi:86 en/user_installation.ssi:94
@@ -147,8 +148,8 @@ msgstr "code{"
#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
-#: en/user_overview.ssi:84 en/user_overview.ssi:92
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:42
+#: en/user_overview.ssi:52 en/user_overview.ssi:60
msgid "}code"
msgstr "}code"
@@ -218,7 +219,7 @@ msgstr "3~ Distribución, áreas de archivo y modo"
msgid ""
"The distribution you choose has the broadest impact on which packages are "
"available to include in your live image. Specify the codename, which "
-"defaults to #{squeeze}# for the Squeeze version of live-build. Any current "
+"defaults to #{wheezy}# for the Wheezy version of live-build. Any current "
"distribution carried in the Debian archive may be specified by its codename "
"here. (See {Terms}#terms for more details.) The #{--distribution}# option "
"not only influences the source of packages within the archive, but also "
@@ -228,7 +229,7 @@ msgid ""
msgstr ""
"La distribución seleccionada tiene gran impacto en qué paquetes están "
"disponibles para incluir en la imagen. Se debe indicar el nombre en clave de "
-"la distribución, que por defecto es #{squeeze}# para la versión Squeeze de "
+"la distribución, que por defecto es #{wheezy}# para la versión Wheezy de "
"live-build. Se puede especificar cualquier nombre de distribución disponible "
"en los repositorios Debian indicando su nombre en clave. (Para más detalles "
"ver {Términos}#terms). La opción #{--distribution}# no solamente influencia "
@@ -298,30 +299,31 @@ msgstr "3~ Réplicas de Distribución Debian"
msgid ""
"The Debian archive is replicated across a large network of mirrors around "
"the world so that people in each region can choose a nearby mirror for best "
-"download speed. Each of the #{--mirror-*}# options governs which "
+"download speed. Each of the #{--parent-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."
+"those stages, and later, in the *binary* stage, the #{--parent-mirror-binary}"
+"# and #{--parent-mirror-binary-security}# values are used, superceding any "
+"mirrors used in an earlier stage."
msgstr ""
"Los repositorios de Debian están replicados en una gran red alrededor del "
"mundo, de manera que se puede seleccionar la réplica más cercana con el fin "
"de obtener la mejor velocidad de descarga. Cada una de las opciones #{--"
-"mirror-*}# gobierna qué réplica de repositorio Debian se utiliza en las "
-"diferentes etapas de creación. Si se recuerda de {Etapas de la creación}"
+"parent-mirror-*}# gobierna qué réplica de repositorio Debian se utiliza en "
+"las diferentes etapas de creación. Si se recuerda de {Etapas de la creación}"
"#stages-of-the-build, en la etapa de *preinstalación (bootstrap)* es cuando "
"se crea el directorio chroot y se rellena con un sistema mínimo mediante "
"la herramienta debootstrap, y en la etapa *chroot* es cuando el directorio "
"chroot es completado con los paquetes necesarios para crear el sistema de "
"ficheros que será utilizado en el sistema en vivo. A cada una de estas "
-"etapas le corresponde su propia opción #{--mirror-*}#. Posteriormente, en la "
-"etapa *binary* se utilizarán las réplicas Debian indicadas en los valores de "
-"las opciones #{--mirror-binary}# y #{--mirror-binary-security}# en lugar de "
-"utilizar los indicados para las etapas anteriores."
+"etapas le corresponde su propia opción #{--parent-mirror-*}#. "
+"Posteriormente, en la etapa *binary* se utilizarán las réplicas Debian "
+"indicadas en los valores de las opciones #{--parent-mirror-binary}# y #{--"
+"parent-mirror-binary-security}# en lugar de utilizar los indicados para las "
+"etapas anteriores."
#. type: Plain text
#: en/user_customization-packages.ssi:36
@@ -335,228 +337,183 @@ msgstr ""
#: en/user_customization-packages.ssi:38
msgid ""
"To set the distribution mirrors used at build time to point at a local "
-"mirror, it is sufficient to set #{--mirror-bootstrap}# and #{--mirror-chroot-"
-"security}# as follows."
+"mirror, it is sufficient to set #{--parent-mirror-bootstrap}#, #{--parent-"
+"mirror-chroot-security}# and #{--parent-mirror-chroot-backports}# as follows."
msgstr ""
"Para indicar qué réplicas deben ser utilizadas en el momento de crear la "
-"imágen es suficiente con utilizar las opciones #{--mirror-bootstrap}# y #{--"
-"mirror-chroot-security}# como se muestra a continuación."
+"imagen es suficiente con utilizar las opciones #{--parent-mirror-bootstrap}"
+"# , #{--parent-mirror-chroot-security}# y #{--parent-mirror-chroot-backports}"
+"# como se muestra a continuación."
#. type: Plain text
-#: en/user_customization-packages.ssi:43
+#: en/user_customization-packages.ssi:44
#, no-wrap
msgid ""
-" $ lb config --mirror-bootstrap http://localhost/debian/ \\\n"
-" --mirror-chroot-security http://localhost/debian-security/\n"
+" $ lb config --parent-mirror-bootstrap http://localhost/debian/ \\\n"
+" --parent-mirror-chroot-security http://localhost/debian-security/ \\\n"
+"\t --parent-mirror-chroot-backports http://localhost/debian-backports/\n"
msgstr ""
-" $ lb config --mirror-bootstrap http://localhost/debian/ \\\n"
-" --mirror-chroot-security http://localhost/debian-security/\n"
+" $ lb config --parent-mirror-bootstrap http://localhost/debian/ \\\n"
+" --parent-mirror-chroot-security http://localhost/debian-security/ \\\n"
+"\t --parent-mirror-chroot-backports http://localhost/debian-backports/\n"
#. type: Plain text
-#: en/user_customization-packages.ssi:47
+#: en/user_customization-packages.ssi:48
msgid ""
-"The chroot mirror, specified by #{--mirror-chroot}#, defaults to the #{--"
-"mirror-bootstrap}# value."
+"The chroot mirror, specified by #{--parent-mirror-chroot}#, defaults to the #"
+"{--parent-mirror-bootstrap}# value."
msgstr ""
-"El valor indicado en #{--mirror-chroot}# es utilizado como valor por defecto "
-"para la opción #{--mirror-bootstrap}# si esta no es indicada."
+"El valor indicado en #{--parent-mirror-chroot}# es utilizado como valor por "
+"defecto para la opción #{--parent-mirror-bootstrap}# si esta no es indicada."
#. type: Plain text
-#: en/user_customization-packages.ssi:49
+#: en/user_customization-packages.ssi:50
msgid "3~ Distribution mirrors used at run time"
msgstr "3~ Réplicas de distribución Debian utilizadas en la ejecución."
#. type: Plain text
-#: en/user_customization-packages.ssi:51
+#: en/user_customization-packages.ssi:52
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."
+"The #{--parent-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 ""
-"Las opciones #{--mirror-binary*}# gobiernan las réplicas configuradas en la "
-"imagen binaria que serán utilizadas para instalar paquetes adicionales "
+"Las opciones #{--parent-mirror-binary*}# gobiernan las réplicas configuradas "
+"en la imagen binaria que serán utilizadas para instalar paquetes adicionales "
"mientras se ejecuta el sistema en vivo. Por defecto se utiliza #{cdn.debian."
"net}#, que es un servicio que selecciona la réplica más cercana basándose en "
"el número de IP. Es una elección bastante acertada siempre que no se pueda "
"predecir que réplica será la mejor para todos los usuarios. También se puede "
"especificar valores personalizados como se muestra en el siguiente ejemplo. "
-"Una imágen construida con esta configuración solamente sería accesible a los "
+"Una imagen construida con esta configuración solamente sería accesible a los "
"usuarios de una red donde \"#{mirror}#\" fuese alcanzable."
#. type: Plain text
-#: en/user_customization-packages.ssi:56
+#: en/user_customization-packages.ssi:57
#, no-wrap
msgid ""
-" $ lb config --mirror-binary http://mirror/debian/ \\\n"
-" --mirror-binary-security http://mirror/debian-security/\n"
+" $ lb config --parent-mirror-binary http://mirror/debian/ \\\n"
+" --parent-mirror-binary-security http://mirror/debian-security/\n"
msgstr ""
-" $ lb config --mirror-binary http://mirror/debian/ \\\n"
-" --mirror-binary-security http://mirror/debian-security/\n"
+" $ lb config --parent-mirror-binary http://mirror/debian/ \\\n"
+" --parent-mirror-binary-security http://mirror/debian-security/\n"
#. type: Plain text
-#: en/user_customization-packages.ssi:60
+#: en/user_customization-packages.ssi:61
msgid "3~additional-repositories Additional repositories"
msgstr "3~additional-repositories Repositorios adicionales"
#. type: Plain text
-#: en/user_customization-packages.ssi:62
+#: en/user_customization-packages.ssi:63
msgid ""
"You may add more repositories, broadening your package choices beyond what "
"is available in your target distribution. These may be, for example, for "
"backports, experimental or custom packages. To configure additional "
-"repositories, create #{config/chroot_sources/your-repository.chroot}#, and/"
-"or #{config/chroot_sources/your-repository.binary}# files. As with the #{--"
-"mirror-*}# options, these govern the repositories used in the *chroot* stage "
-"when building the image, and in the *binary* stage, i.e. for use when "
-"running the live system."
+"repositories, create #{config/archives/your-repository.list.chroot}#, and/or "
+"#{config/archives/your-repository.list.binary}# files. As with the #{--"
+"parent-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 ""
"Se pueden añadir más repositorios, ampliando la lista de paquetes "
"seleccionables más alla de aquellos disponibles para la distribución "
"indicada, como pueden ser paquetes de backports, paquetes experimentales o "
"personalizados. Para configurar repositorios adicionales se debe crear los "
-"ficheros #{config/chroot_sources/your-repository.chroot}#, y/o #{config/"
-"chroot_sources/your-repository.binary}#. Al igual que en las opciones #{--"
-"mirror-*}#, estos ficheros gobiernan los repositorios utilizados en las "
-"etapas *chroot* y *binary* respectivamente, esto es, los repositorios que "
-"serán utilizados cuando se ejecute el sistema en vivo."
+"ficheros #{config/archives/your-repository.list.chroot}# y/o #{config/"
+"archives/your-repository.list.binary}#. Al igual que en las opciones #{--"
+"parent-mirror-*}#, estos ficheros gobiernan los repositorios utilizados en "
+"las etapas *chroot* y *binary* respectivamente, esto es, los repositorios "
+"que serán utilizados cuando se ejecute el sistema en vivo."
#. type: Plain text
-#: en/user_customization-packages.ssi:64
+#: en/user_customization-packages.ssi:65
msgid ""
-"For example, #{config/chroot_sources/live.chroot}# allows you to install "
+"For example, #{config/archives/live.list.chroot}# allows you to install "
"packages from the debian live snapshot repository at live system build time."
msgstr ""
-"Por ejemplo, #{config/chroot_sources/live.chroot}# permite instalar paquetes "
-"de la instantánea del repositorio Debian Live en el momento de crear la "
+"Por ejemplo, #{config/archives/live.list.chroot}# permite instalar paquetes "
+"de las instantáneas del repositorio Debian Live en el momento de crear la "
"imagen."
#. type: Plain text
-#: en/user_customization-packages.ssi:68
+#: en/user_customization-packages.ssi:69
#, no-wrap
msgid " deb http://live.debian.net/ sid-snapshots main contrib non-free\n"
msgstr " deb http://live.debian.net/ sid-snapshots main contrib non-free\n"
#. type: Plain text
-#: en/user_customization-packages.ssi:72
+#: en/user_customization-packages.ssi:73
msgid ""
-"If you add the same line to #{config/chroot_sources/live.binary}#, the "
+"If you add the same line to #{config/archives/live.list.binary}#, the "
"repository will be added to your live system's #{/etc/apt/sources.list.d/}# "
"directory."
msgstr ""
-"Si se añade la misma línea a #{config/chroot_sources/live.binary}#, el "
+"Si se añade la misma línea a #{config/archives/live.list.binary}#, el "
"repositorio será añadido al directorio #{/etc/apt/sources.list.d/}# del "
"sistema en vivo."
#. type: Plain text
-#: en/user_customization-packages.ssi:74
+#: en/user_customization-packages.ssi:75
msgid "If such files exist, they will be picked up automatically."
msgstr "Estos ficheros serán seleccionados automáticamente si existen."
#. type: Plain text
-#: en/user_customization-packages.ssi:76
+#: en/user_customization-packages.ssi:77
msgid ""
"You should also put the GPG key used to sign the repository into #{config/"
-"chroot_sources/your-repository.{binary,chroot}.gpg}# files."
+"archives/your-repository.gpg.{binary,chroot}}# files."
msgstr ""
-"Se debería también incluir en el fichero #{config/chroot_sources/your-"
-"repository.{binary,chroot}.gpg}# la clave GPG a utilizar para firmar dicho "
-"repositorio."
+"Se debería también incluir en el fichero #{config/archives/your-repository."
+"gpg.{binary,chroot}}# la clave GPG a utilizar para firmar dicho repositorio."
#. type: Plain text
-#: en/user_customization-packages.ssi:78
+#: en/user_customization-packages.ssi:79
#, no-wrap
-msgid "*{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:\n"
-msgstr "*{Nota:}* Existen algunos repositorios de paquetes ya preconfigurados para facilitar la selección mediante la opción #{--repository}#. Por ejemplo, para utilizar las instantáneas del repositorio de Debian Live, sería suficiente con activarlo mediante:\n"
+msgid "*{Note:}* some preconfigured package repositories are available for easy selection through the #{--archives}# option, e.g. for enabling live snapshots, a simple command is enough to enable it:\n"
+msgstr "*{Nota:}* Existen algunos repositorios de paquetes ya preconfigurados para facilitar la selección mediante la opción #{--archives}#. Por ejemplo, para utilizar las instantáneas del repositorio de Debian Live, sería suficiente con activarlo mediante:\n"
#. type: Plain text
-#: en/user_customization-packages.ssi:82 en/user_installation.ssi:148
+#: en/user_customization-packages.ssi:83 en/user_installation.ssi:148
#, no-wrap
-msgid " $ lb config --repository live.debian.net\n"
-msgstr " $ lb config --repository live.debian.net\n"
+msgid " $ lb config --archives live.debian.net\n"
+msgstr " $ lb config --archives live.debian.net\n"
#. type: Plain text
-#: en/user_customization-packages.ssi:86
+#: en/user_customization-packages.ssi:87
msgid "2~choosing-packages-to-install Choosing packages to install"
msgstr "2~choosing-packages-to-install Selección de los paquetes a instalar"
#. type: Plain text
-#: en/user_customization-packages.ssi:88
+#: en/user_customization-packages.ssi:89
msgid ""
"There are a number of ways to choose which packages live-build will install "
"in your image, covering a variety of different needs. You can simply name "
-"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."
+"individual packages to install in a package list. You can also choose "
+"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 ""
"Hay varias maneras de seleccionar qué paquetes serán instalados por live-"
"build en la imagen que cubren una variedad de necesidades diversas. Se puede "
-"nombrar un paquete individual para que sea instalado o se pueden nombrar "
-"unos pocos paquetes mediante la opción #{--packages}#, o incluso se puede "
-"indicar un gran número de paquetes mediante una lista. También se puede "
-"seleccionar listas de paquetes predefinidos o incluso utilizar tareas de "
-"APT. Por último, también se pueden utilizar ficheros de paquetes de prueba o "
-"experimentales obtenidos antes de que aparezcan en los repositorios "
-"oficiales simplemente depositando estos ficheros directamente en el árbol de "
-"directorios #{config/}#."
+"nombrar paquetes individuales para instalar en una lista de paquetes. "
+"También se puede seleccionar listas de paquetes predefinidos o incluso "
+"utilizar tareas de APT. Por último, también se pueden utilizar ficheros de "
+"paquetes de prueba o experimentales obtenidos antes de que aparezcan en los "
+"repositorios oficiales simplemente depositando estos ficheros directamente "
+"en el árbol de directorios #{config/}#."
#. type: Plain text
-#: en/user_customization-packages.ssi:90
-msgid "3~ Choosing a few packages"
-msgstr "3~ Selección de unos pocos paquetes"
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:92
-msgid ""
-"When the number of packages added is small, simply specify #{--packages}#. "
-"For example:"
-msgstr ""
-"Cuando el número de paquetes a añadir es pequeño pueden indicarse mediante "
-"la opción #{--packages}#. Por ejemplo:"
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:96
-#, no-wrap
-msgid " $ lb config --packages \"package1 package2 package3\"\n"
-msgstr " $ lb config --packages \"package1 package2 package3\"\n"
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:100
-msgid ""
-"The behaviour of live-build when specifying a package that does not exist is "
-"determined by your choice of APT utility. See {Choosing apt or aptitude}"
-"#choosing-apt-or-aptitude for more details."
-msgstr ""
-"El comportamiento de live-build cuando se especifica un paquete que no "
-"existe es determinado por lo que se haya configurado en la utilidad APT. "
-"Para más detalles ver {Utilizar apt o aptitude}#choosing-apt-or-aptitude ."
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:102
-msgid ""
-"If you need to specify a large number of packages to be installed or you "
-"need flexibility regarding which packages to install, use package lists as "
-"discussed in the following section, {Package lists}#package-lists."
-msgstr ""
-"Si se necesita especificar un gran número de paquetes o se necesita cierta "
-"flexibilidad a la hora de indicar qué paquetes hay que instalar se puede "
-"utilizar las listas de paquetes tal y como se indica en la sección, {Listas "
-"de paquetes}#package-lists."
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:104
+#: en/user_customization-packages.ssi:91
msgid "3~package-lists Package lists"
msgstr "3~package-lists Listas de paquetes"
#. type: Plain text
-#: en/user_customization-packages.ssi:106
+#: en/user_customization-packages.ssi:93
msgid ""
"Package lists are a powerful way of expressing which packages should be "
"installed. The list syntax supports included files and conditional sections "
@@ -578,152 +535,132 @@ msgstr ""
"propias o una combinación de listas propias y listas predefinidas."
#. type: Plain text
-#: en/user_customization-packages.ssi:108
+#: en/user_customization-packages.ssi:95
+#, no-wrap
+msgid "*{Note:}* 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.\n"
+msgstr "*{Nota:}* El comportamiento de live-build cuando se especifica un paquete que no existe es determinado por lo que se haya configurado en la utilidad APT. Para más detalles ver {Utilizar apt o aptitude}#choosing-apt-or-aptitude ."
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:97
msgid "3~ Predefined package lists"
msgstr "3~ Listas de paquetes predefinidas"
#. type: Plain text
-#: en/user_customization-packages.ssi:110
+#: en/user_customization-packages.ssi:99
msgid ""
"The simplest way to use lists is to specify one or more predefined lists "
-"with the #{--packages-lists}# option. For example:"
+"with the #{--package-lists}# option. For example:"
msgstr ""
"La forma más simple de utilizar listas de paquetes es especificar una o más "
-"listas predefinidas mediante la opción #{--packages-lists}#, por ejemplo:"
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:114
-#, no-wrap
-msgid " $ lb config --packages-lists \"gnome-core rescue\"\n"
-msgstr " $ lb config --packages-lists \"gnome-core rescue\"\n"
+"listas predefinidas mediante la opción #{--package-lists}#, por ejemplo:"
#. type: Plain text
-#: en/user_customization-packages.ssi:118
-msgid ""
-"In addition to these lists, live-build supports four virtual package lists: #"
-"{gnome-desktop}#, #{kde-desktop}#, #{lxde-desktop}# and #{xfce-desktop}#, "
-"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 ""
-"Además de estas listas, live-build soporta cuatro listas de paquetes "
-"virtuales, #{gnome-desktop}#, #{kde-desktop}#, #{lxde-desktop}# y #{xfce-"
-"desktop}#, cada una de las cuales provee una selección de paquetes extensiva "
-"que corresponde con los valores por defecto del Instalador de Debian para "
-"estos entornos de escritorio. Para más información ver {Tareas de Escritorio "
-"e Idioma}#desktop-and-language-tasks ."
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:120
+#: en/user_customization-packages.ssi:103
#, no-wrap
-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.\n"
-msgstr "*{Nota:}* Existen imágenes listas para su descarga con los escritorios GNOME, KDE, LXDE y XFCE en http://live.debian.net. Estas imágenes han sido creadas utilizando la lista virtual #{*-desktop}# correspondiente.\n"
+msgid " $ lb config --package-lists \"gnome rescue\"\n"
+msgstr " $ lb config --package-lists \"gnome rescue\"\n"
#. type: Plain text
-#: en/user_customization-packages.ssi:122
+#: en/user_customization-packages.ssi:107
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 "
+"build/package-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 ""
"La ubicación por defecto de las listas de los ficheros en el sistema huésped "
-"es #{/usr/share/live/build/lists/}#. Para determinar qué paquetes componen "
-"una lista dada se debe leer el correspondiente fichero poniendo atención en "
-"los ficheros incluidos y en las secciones condicionales como se describen a "
-"continuación."
+"es #{/usr/share/live/build/package-lists/}#. Para determinar qué paquetes "
+"componen una lista dada se debe leer el correspondiente fichero poniendo "
+"atención en los ficheros incluidos y en las secciones condicionales como se "
+"describen a continuación."
#. type: Plain text
-#: en/user_customization-packages.ssi:124
+#: en/user_customization-packages.ssi:109
msgid "3~ Local package lists"
msgstr "3~ Listas de paquetes locales"
#. type: Plain text
-#: en/user_customization-packages.ssi:126
+#: en/user_customization-packages.ssi:111
msgid ""
-"You may supplement or replace entirely the supplied lists using local "
-"package lists stored in #{config/chroot_local-packageslists/}#."
+"You may supplement the predefined lists using local package lists stored in #"
+"{config/package-lists/}#."
msgstr ""
"Se pueden añadir o reemplazar completamente las listas predefinidas "
-"depositando listas de paquetes locales en el directorio #{config/"
-"chroot_local-packageslists/}#."
+"depositando listas de paquetes locales en el directorio #{config/package-"
+"lists/}#."
#. type: Plain text
-#: en/user_customization-packages.ssi:128
+#: en/user_customization-packages.ssi:113
msgid ""
"Package lists that exist in this directory need to have a #{.list}# suffix "
-"in order to be processed. Local package lists always override package lists "
-"distributed with live-build. This can cause undesired effects, we therefore "
-"recommend to use unique names for local package lists."
+"in order to be processed, and then an additional stage suffix, #{.chroot}# "
+"or #{.binary}# to indicate which stage the list is for."
msgstr ""
-"Para que sean procesadas, las listas de paquetes que existan en dicho "
-"directorio deben tener la extensión #{.list}#. Las listas de paquetes "
-"locales se superponen a las listas predefinidas por live-build. Esto puede "
-"causar efectos no deseados de manera que se recomienda utilizar nombres "
-"únicos para las listas de paquetes locales, que no coincidan con los nombres "
-"de listas de paquetes predefinidas."
+"Para que sean procesadas, las listas de paquetes que se depositen en este "
+"directorio deben tener la extensión #{.list}# además de la extensión de la "
+"etapa #{.chroot}# o #{.binary}# para indicar a qué etapa corresponde la "
+"lista."
#. type: Plain text
-#: en/user_customization-packages.ssi:130
-msgid "3~ Local binary package lists"
-msgstr "3~ Listas de paquetes locales para binary"
+#: en/user_customization-packages.ssi:115
+#, no-wrap
+msgid "*{Note:}* If you don't specify the stage suffix, the list will be used for both stages. Normally, you want to specify #{.list.chroot}# so that the packages will only be installed in the live filesystem and not have an extra copy of the #{.deb}# placed on the media.\n"
+msgstr "*{Nota:}* Si no se especifica el sufijo, la lista será usada en las dos etapas. En consecuencia, es conveniente especificar #{.list.chroot}# de modo que los paquetes se instalen únicamente en el sistema en vivo y no exista otra copia extra del paquete #{.deb}# \n"
#. type: Plain text
-#: en/user_customization-packages.ssi:132
-msgid ""
-"In case you want to include some required .deb packages to live media's #"
-"{pool/}# (without installing them onto the live image) you may need to use "
-"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 ""
-"En caso de que se desee incluir algún paquete .deb en el directorio #{pool/}"
-"# del medio de instalación sin instalarlo en la imágen del sistema en vivo "
-"se pueden utilizar las listas de paquetes locales para binary depositando "
-"dichas listas en el directoro #{config/binary_local-packageslists/}#, de "
-"manera que el medio de instalación pueda ser utilizado como un medio de "
-"instalación personalizado para instalaciones sin red local (modo offline)."
+#: en/user_customization-packages.ssi:117
+msgid "3~ Local binary package lists"
+msgstr "3~ Listas de paquetes locales para binary"
#. type: Plain text
-#: en/user_customization-packages.ssi:134
+#: en/user_customization-packages.ssi:119
msgid ""
-"Package lists that exist in this directory need to have a #{.list}# suffix "
-"in order to be processed."
+"To make a binary stage list, place a file suffixed with #{.list.binary}# in #"
+"{config/package-lists/}#. These packages are not installed in the live "
+"filesystem, but are included on the live media under #{pool/}#. You would "
+"typically use such a list with one of the non-live installer variants. As "
+"mentioned above, if you want this list to be the same as your chroot stage "
+"list, simply use the #{.list}# suffix by itself."
msgstr ""
-"Para que sean procesadas, las listas de paquetes que se depositen en este "
-"directorio deben tener la extensión #{.list}#."
+"Para crear una lista para la etapa «binary» crear un fichero con el sufijo #"
+"{.list.binary}# en #{config/package-lists/}#. Estos paquetes no son "
+"instalados en el sistema en vivo, pero son incluidos en él en #{pool/}#. El "
+"uso típico de una de estas lista sería para una de las variantes de "
+"instalador normal («non-live» N.del T.). Tal y como se mencionaba "
+"anteriormente, si se desea usar la misma lista para la etapa «chroot» basta "
+"con solamente añadir el sufijo #{.list}#"
#. type: Plain text
-#: en/user_customization-packages.ssi:136
+#: en/user_customization-packages.ssi:121
msgid "3~ Extending a provided package list using includes"
msgstr "3~ Extensión de una lista de paquetes dada mediante «includes»"
#. type: Plain text
-#: en/user_customization-packages.ssi:138
+#: en/user_customization-packages.ssi:123
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."
+"includes. Refer to these in the #{/usr/share/live/build/package-lists/}# "
+"directory, as they serve as good examples of how to write your own lists."
msgstr ""
"Las listas de paquetes predefinidas en live-build hacen un uso intensivo de "
-"las directivas «include». Los ficheros existentes en el directorio #{/usr/"
-"share/live/build/lists/}# pueden servir como buen ejemplo de como escribir "
-"listas de paquetes."
+"las directivas «includes». Los ficheros existentes en el directorio #{/usr/"
+"share/live/build/package-lists/}# pueden servir como buen ejemplo de como "
+"escribir listas de paquetes."
#. type: Plain text
-#: en/user_customization-packages.ssi:140
+#: en/user_customization-packages.ssi:125
msgid ""
"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:"
+"iceweasel, create #{config/package-lists/my.list.chroot}# with the following "
+"contents:"
msgstr ""
"Por ejemplo, para hacer una lista de paquetes que incluya la lista de "
"paquetes predefinida #{gnome}# y añadir el paquete iceweasel se puede crear "
-"un fichero llamado #{config/chroot_local-packageslists/mygnome.list}# con el "
-"siguiente contenido:"
+"un fichero llamado #{config/package-lists/my.list.chroot}# con el siguiente "
+"contenido:"
#. type: Plain text
-#: en/user_customization-packages.ssi:145
+#: en/user_customization-packages.ssi:130
#, no-wrap
msgid ""
" #include <gnome>\n"
@@ -733,12 +670,12 @@ msgstr ""
" iceweasel\n"
#. type: Plain text
-#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:134
msgid "3~ Using conditionals inside package lists"
msgstr "3~ Utilización de condiciones dentro de las listas de paquetes"
#. type: Plain text
-#: en/user_customization-packages.ssi:151
+#: en/user_customization-packages.ssi:136
msgid ""
"Any of the live-build configuration variables stored in #{config/*}# (minus "
"the #{LB_}# prefix) may be used in conditional statements in package lists. "
@@ -757,7 +694,7 @@ msgstr ""
"{ARCHIVE_AREAS}#."
#. type: Plain text
-#: en/user_customization-packages.ssi:153
+#: en/user_customization-packages.ssi:138
msgid ""
"For example, to install #{ia32-libs}# if the #{--architecture amd64}# is "
"specified:"
@@ -766,7 +703,7 @@ msgstr ""
"arquitectura amd64 (#{--architecture amd64}#) se puede utilizar:"
#. type: Plain text
-#: en/user_customization-packages.ssi:159
+#: en/user_customization-packages.ssi:144
#, no-wrap
msgid ""
" #if ARCHITECTURE amd64\n"
@@ -778,7 +715,7 @@ msgstr ""
" #endif\n"
#. type: Plain text
-#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:148
msgid ""
"You may test for any one of a number of values, e.g. to install #{memtest86+}"
"# if either #{--architecture i386}# or #{--architecture amd64}# is specified:"
@@ -789,7 +726,7 @@ msgstr ""
"especificar:"
#. type: Plain text
-#: en/user_customization-packages.ssi:169
+#: en/user_customization-packages.ssi:154
#, no-wrap
msgid ""
" #if ARCHITECTURE i386 amd64\n"
@@ -801,7 +738,7 @@ msgstr ""
" #endif\n"
#. type: Plain text
-#: en/user_customization-packages.ssi:173
+#: en/user_customization-packages.ssi:158
msgid ""
"You may also test against variables that may contain more than one value, e."
"g. to install #{vrms}# if either #{contrib}# or #{non-free}# is specified "
@@ -813,7 +750,7 @@ msgstr ""
"archive-areas}# se puede indicar:"
#. type: Plain text
-#: en/user_customization-packages.ssi:179
+#: en/user_customization-packages.ssi:164
#, no-wrap
msgid ""
" #if ARCHIVE_AREAS contrib non-free\n"
@@ -825,12 +762,12 @@ msgstr ""
" #endif\n"
#. type: Plain text
-#: en/user_customization-packages.ssi:183
+#: en/user_customization-packages.ssi:168
msgid "A conditional may surround an #{#include}# directive:"
msgstr "Es habitual que una condición incluya una directiva «include»:"
#. type: Plain text
-#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:174
#, no-wrap
msgid ""
" #if ARCHITECTURE amd64\n"
@@ -842,41 +779,46 @@ msgstr ""
" #endif\n"
#. type: Plain text
-#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:178
msgid "The nesting of conditionals is not supported."
msgstr "No se permite el anidamiento de estructuras condicionales."
#. type: Plain text
-#: en/user_customization-packages.ssi:195
+#: en/user_customization-packages.ssi:180
msgid "3~ Tasks"
msgstr "3~ Tareas"
#. type: Plain text
-#: en/user_customization-packages.ssi:197
+#: en/user_customization-packages.ssi:182
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."
+"live-build by putting them in a list in #{config/task-lists/}#, as in the "
+"example below."
msgstr ""
"El Instalador de Debian ofrece al usuario un conjunto de opciones con una "
"lista de paquetes preseleccionada enfocadas a configurar un tipo de sistema "
"o configurar el sistema para realizar una tarea como puede ser «Entorno de "
"escritorio gráfico», «Servidor de correo», «Portátil», etc. Estas listas son "
-"llamadas «tareas» y son soportadas por APT mediante el campo «Task:». Se "
-"puede especificar a live-build que seleccione estas tareas mediante la "
-"opción #{--task}# tal y como se muestra en el siguiente ejemplo:"
+"llamadas «tareas» (\"Tasks\") y son soportadas por APT mediante el campo "
+"«Task:». Se puede especificar una o más tareas a live-build poniéndolas en "
+"una lista en #{config/task-lists/}#, como en el ejemplo siguiente."
#. type: Plain text
-#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:187
#, no-wrap
-msgid " $ lb config --tasks \"mail-server file-server\"\n"
-msgstr " $ lb config --tasks \"mail-server file-server\"\n"
+msgid ""
+" $ lb config\n"
+" $ echo \"mail-server file-server\" >> config/task-lists/my.list.chroot\n"
+msgstr ""
+" $ lb config\n"
+" $ echo \"mail-server file-server\" >> config/task-lists/my.list.chroot\n"
#. type: Plain text
-#: en/user_customization-packages.ssi:205
+#: en/user_customization-packages.ssi:191
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, "
@@ -890,125 +832,115 @@ msgstr ""
"obtenerse mediante la orden #{tasksel --task-packages}#."
#. type: Plain text
-#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:193
msgid "3~desktop-and-language-tasks Desktop and language tasks"
msgstr "3~desktop-and-language-tasks Tareas de Escritorio e Idioma"
#. type: Plain text
-#: en/user_customization-packages.ssi:209
+#: en/user_customization-packages.ssi:195
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 #{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 ""
-"Las tareas de escritorio y de idioma son casos especiales. Si el medio de "
-"instalación fue preparado para una clase particular de entorno de "
-"escritorio, el Instalador de Debian instalará automáticamente la tarea de "
-"entorno de escritorio correspondiente. Para ello existen las tareas #{gnome-"
-"desktop}#, #{kde-desktop}#, #{lxde-desktop}# y #{xfce-desktop}# pero ninguna "
-"de ellas son presentadas en el menú de #{tasksel}#. De igual forma, las "
-"tareas para idiomas tampoco son presentadas en el menú de #{tasksel}#, pero "
-"la selección del idioma, al inicio de la instalación repercute en la "
-"selección de las correspondientes tareas del idioma."
+"Desktop and language tasks are special cases that need some extra planning "
+"and configuration. Live images are different from Debian Installer images in "
+"this respect. 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 internal #{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 ""
+"Las tareas de escritorio y de idioma son casos especiales que necesitan un "
+"poco de planificación y configuración extra. Si el medio de instalación fue "
+"preparado para una clase particular de entorno de escritorio, el Instalador "
+"de Debian instalará automáticamente la tarea de entorno de escritorio "
+"correspondiente. Para ello existen las tareas internas #{gnome-desktop}#, #"
+"{kde-desktop}#, #{lxde-desktop}# y #{xfce-desktop}# pero ninguna de ellas "
+"son presentadas en el menú de #{tasksel}#. De igual forma, las tareas para "
+"idiomas tampoco son presentadas en el menú de #{tasksel}#, pero la selección "
+"del idioma, al inicio de la instalación repercute en la selección de las "
+"correspondientes tareas del idioma."
#. type: Plain text
-#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:197
msgid ""
-"In live-build, therefore, these special cases are also given special "
-"consideration, but with three notable differences at the time of writing."
+"When developing a desktop live image, the image typically boots directly to "
+"a working desktop, the choices of both desktop and default language having "
+"been made at build time, not at run time as in the case of the Debian "
+"Installer. That's not to say that a live image couldn't be built to support "
+"multiple desktops or multiple languages and offer the user a choice, but "
+"that is not live-build's default behaviour."
msgstr ""
-"En live-build estos casos especiales también son tratados de manera "
-"especial, pero en el momento de escribir este manual, hay tres notables "
-"diferencias."
+"Cuando se desarolla una imagen de escritorio, la imagen normalmente arranca "
+"directamente a un escritorio de trabajo, las opciones de escritorio y de "
+"idioma por defecto han sido elegidas en tiempo de creación, no en tiempo de "
+"ejecución como en el caso del instalador de Debian. Eso no quiere decir que "
+"una imagen en vivo no pueda ser creada para admitir múltiples escritorios o "
+"varios idiomas y ofrecer al usuario una elección, pero ese no es un "
+"comportamiento por defecto de live-build."
#. type: Plain text
-#: en/user_customization-packages.ssi:213
+#: en/user_customization-packages.ssi:199
msgid ""
-"First, there is no provision made yet automatically for language tasks, "
-"although a subset of those packages are included if you specify #{lb config "
-"--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:"
+"Because there is no provision made automatically for language tasks, which "
+"include such things as language-specific fonts and input-method packages, if "
+"you want them, you need to specify them in your configuration. For example, "
+"a GNOME desktop image containing support for Japanese might include these "
+"tasks:"
msgstr ""
-"Primero, no se ha previsto, todavía, la instalación automática de tareas de "
-"idiomas, aunque se incluye un subconjunto de estos paquetes si se especifica "
-"un idioma mediante #{lb config --language}#. Se puede especificar en la "
-"configuración de live-build la utilización de estas tareas, que incluyen "
-"cosas específicas del idioma, como pueden ser paquetes tipos de letra y "
-"métodos de introducción. Por ejemplo:"
+"Ya que no se ha previsto la instalación automática de tareas de idiomas, que "
+"incluyen cosas tales como tipos de letra específicos de cada lengua o "
+"paquetes de métodos de entrada, si se quiere incluirlos, es necesario "
+"especificarlo en la configuración. Por ejemplo, una imagen de escritorio "
+"GNOME que contenga soporte para el japonés podría incluir las siguientes "
+"tareas:"
#. type: Plain text
-#: en/user_customization-packages.ssi:217
+#: en/user_customization-packages.ssi:205
#, no-wrap
-msgid " $ lb config --tasks \"japanese japanese-desktop japanese-gnome-desktop\"\n"
-msgstr " $ lb config --tasks \"japanese japanese-desktop japanese-gnome-desktop\"\n"
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:221
msgid ""
-"Second, live-build supports #{*-desktop}# virtual package lists for each of "
-"the desktop flavours mentioned above, which select the #{standard-x11}# "
-"predefined package list, the corresponding #{*-desktop}# task and three "
-"additional tasks: #{desktop}#, #{standard}# and #{laptop}#. So, for example, "
-"if you specify #{--packages-lists gnome-desktop}#, it is equivalent to "
-"specifying #{--packages debian-installer-launcher --packages-lists standard-"
-"x11 --tasks \"gnome-desktop desktop standard laptop\"}#."
+" $ lb config\n"
+" $ echo \"gnome-desktop desktop standard laptop\" >> config/task-lists/my.list.chroot\n"
+" $ echo \"japanese japanese-desktop japanese-gnome-desktop\" >> config/task-lists/my.list.chroot\n"
msgstr ""
-"Segundo, live-build soporta la lista de paquetes virtuales #{*-desktop}# "
-"para cada clase de escritorio mencionado anteriormente. Esto seleccionará la "
-"lista de paquetes predefinida #{standard-x11}#, la correspondiente tarea de "
-"escritorio #{*-desktop}# y tres tareas adicionales #{desktop}#, #{standard}"
-"# y #{laptop}#. Así, por ejemplo, si se especifica #{--packages-lists gnome-"
-"desktop}#, será equivalente a especificar #{--packages debian-installer-"
-"launcher --packages-lists standard-x11 --tasks \"gnome-desktop desktop "
-"standard laptop\"}#."
+" $ lb config\n"
+" $ echo \"gnome-desktop desktop standard laptop\" >> config/task-lists/my.list.chroot\n"
+" $ echo \"japanese japanese-desktop japanese-gnome-desktop\" >> config/task-lists/my.list.chroot\n"
#. type: Plain text
-#: en/user_customization-packages.ssi:223
+#: en/user_customization-packages.ssi:209
msgid ""
-"Third, if any of the tasks for these desktop flavours are selected, either "
-"explicitly through #{--tasks}# or implicitly by #{--packages-lists}#, 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."
+"Since desktop tasks are \"internal\" tasks, for every desktop flavour task "
+"included in the image, the corresponding value, if it differs from the "
+"default, \"gnome\", must be preseeded in the \"tasksel/desktop\" debconf "
+"variable or else tasksel will not recognize and install it. Thus:"
msgstr ""
-"Tercero, si se selecciona cualquier tarea de escritorio, explícitamente a "
-"través de #{--tasks}# o implícitamente mediante #{--packages-lists}#, live-"
-"build preconfigurará (preseed) en el Instalador de Debian (si es incluido) "
-"el escritorio correspondiente para asegurar que sigue sus propias reglas "
-"cuando sea instalado."
+"Ya que las tareas de escritorio son \"internas\", para cada tarea de sabor "
+"de escritorio incluido en la imagen, el valor correspondiente (si es "
+"diferente del predeterminado \"gnome\"), tiene que ser preconfigurado en la "
+"variable \"tasksel/desktop\" de lo contrario tasksel no lo va a reconocer e "
+"instalar. Por lo tanto:"
#. type: Plain text
-#: en/user_customization-packages.ssi:225
+#: en/user_customization-packages.ssi:214
#, no-wrap
-msgid "*{Note:}* There is also an experimental #{--language}# option that has an overlapping purpose with language tasks. For any language for which it is known that there are #{*-l10n}# packages, if #{--language}# is specified, those packages will be installed. Furthermore, if any #{syslinux}# templates matching the language are found, they will be used instead of the default English templates. The package selection done by #{--language}# is a poor approximation of language tasks, as it requires that the list of packages to include per language be maintained internally in live-build, and besides, language tasks are more comprehensive and flexible. However, the #{syslinux}# aspect is still useful. Thus, if you use #{--bootloader syslinux}# and templates for the specified language exist either in #{/usr/share/live/build/templates/syslinux/}# or #{config/templates/syslinux/}#, consider using this option, possibly in combination with tasks to ensure all relevant packages are in
stalled. For example:\n"
-msgstr "*{Nota:}* Existe también la opción experimental #{--language}# cuyo propósito se solapa con las tareas de idioma. Se instalarán los paquetes de soporte #{*-l10n}# siempre que existan y que se especifique un idioma mediante la opción #{--language}#. Además, si existe, se utilizará, en lugar de las plantillas por defecto en ingles, cualquier plantilla para #{syslinux}# del idioma indicado mediante esta opción. La selección de paquetes realizada mediante la opción #{--language}# es una pobre aproximación a las tareas de idiomas. Las tareas de idiomas son un método más completo y flexible que la utilización de la opción #{--language}# que requiere que la lista de paquetes a incluir por idioma sea mantenida internamente en live-build. Sin embargo el tratamiento de las plantillas de #{syslinux}# es útil. Por esto, si se utiliza la opción #{--bootloader syslinux}# y plantillas para un idioma existente en #{/usr/share/live/build/templates/syslinux/}# o #{con
fig/templates/syslinux/}#, esta opción es un punto a tener en cuenta, posiblemente en combinación con las tareas de idiomas para asegurar la instalación de los paquetes adecuados. Por ejemplo:\n"
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:229
-#, no-wrap
-msgid " $ lb config --language es\n"
-msgstr " $ lb config --language es\n"
+msgid ""
+" $ lb config\n"
+" $ echo 'tasksel tasksel/desktop multiselect kde' >> config/preseed/my.preseed.chroot\n"
+msgstr ""
+" $ lb config\n"
+" $ echo 'tasksel tasksel/desktop multiselect kde' >> config/preseed/my.preseed.chroot\n"
#. type: Plain text
-#: en/user_customization-packages.ssi:233
+#: en/user_customization-packages.ssi:218
msgid ""
-"Even so, it is limited in that it only supports a single language and a "
-"single bootloader. Therefore, for all of these reasons, the future of this "
-"option is under review, possibly to be replaced with something entirely "
-"different in the next major release of live-build."
+"This parameter can take multiple values, e.g. \"lxde xfce\" instead of \"kde"
+"\"."
msgstr ""
-"Esta opción solamente soporta un idioma y un gestor de arranque. Por todas "
-"estas razones, el futuro de esta opción está bajo revisión y posiblemente "
-"será reemplazada por algo completamente diferente en la proxima revisión "
-"general de live-build."
+"Este parámetro puede tener varios valores, por ejemplo, \"lxde xfce\" en "
+"lugar de \"kde\"."
#. type: Plain text
-#: en/user_customization-packages.ssi:235
+#: en/user_customization-packages.ssi:220
msgid ""
"2~installing-modified-or-third-party-packages Installing modified or third-"
"party packages"
@@ -1017,7 +949,7 @@ msgstr ""
"o paquetes modificados"
#. type: Plain text
-#: en/user_customization-packages.ssi:237
+#: en/user_customization-packages.ssi:222
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 "
@@ -1035,7 +967,7 @@ msgstr ""
"paquetes «de terceros» para añadir funcionalidades a medida o propietarias."
#. type: Plain text
-#: en/user_customization-packages.ssi:239
+#: en/user_customization-packages.ssi:224
msgid ""
"This section does not cover advice regarding building or maintaining "
"modified packages. Joachim Breitner's 'How to fork privately' method from "
@@ -1052,54 +984,53 @@ msgstr ""
"la creación de paquetes a medida."
#. type: Plain text
-#: en/user_customization-packages.ssi:241
+#: en/user_customization-packages.ssi:226
msgid "There are two ways of installing modified custom packages:"
msgstr "Existen dos formas de instalar paquetes personalizados:"
#. type: Plain text
-#: en/user_customization-packages.ssi:243
-msgid "_* #{chroot_local-packages}#"
-msgstr "_* #{chroot_local-packages}#"
+#: en/user_customization-packages.ssi:228
+msgid "_* #{packages.chroot}#"
+msgstr "_* #{packages.chroot}#"
#. type: Plain text
-#: en/user_customization-packages.ssi:245
+#: en/user_customization-packages.ssi:230
msgid "_* Using a custom APT repository"
msgstr "_* Utilizando un repositorio APT personalizado"
#. type: Plain text
-#: en/user_customization-packages.ssi:247
+#: en/user_customization-packages.ssi:232
msgid ""
-"Using #{chroot_local-packages}# is simpler to achieve and useful for \"one-"
-"off\" customizations but has a number of drawbacks, whilst using a custom "
-"APT repository is more time-consuming to set up."
+"Using #{packages.chroot}# 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 ""
-"El método #{chroot_local-packages}# es el más simple para añadir paquetes "
+"El método #{packages.chroot}# es el más simple para añadir paquetes "
"personalizados. Es muy útil para personalizaciones «rápidas» (one-off) pero "
"tiene unos cuantos inconvenientes mientras que la utilización de un "
"repositorio APT personalizado es más lento de poner en marcha."
#. type: Plain text
-#: en/user_customization-packages.ssi:249
-msgid "3~ Using #{chroot_local-packages}# to install custom packages"
-msgstr ""
-"3~ Método #{chroot_local-packages}# para instalar paquetes personalizados"
+#: en/user_customization-packages.ssi:234
+msgid "3~ Using #{packages.chroot}# to install custom packages"
+msgstr "3~ Método #{packages.chroot}# para instalar paquetes personalizados"
#. type: Plain text
-#: en/user_customization-packages.ssi:251
+#: en/user_customization-packages.ssi:236
msgid ""
-"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/packages.chroot/}"
+"# 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 ""
"Para instalar paquetes personalizados solamente hay que copiar el paquete en "
-"el directorio #{config/chroot_local-packages/}#. Los paquetes contenidos en "
-"este directorio serán automáticamente instalados en el sistema en vivo "
-"durante el proceso de creación. No es necesario especificar de dónde se "
-"deben obtener los paquetes."
+"el directorio #{config/packages.chroot/}#. Los paquetes contenidos en este "
+"directorio serán automáticamente instalados en el sistema en vivo durante el "
+"proceso de creación. No es necesario especificar de dónde se deben obtener "
+"los paquetes."
#. type: Plain text
-#: en/user_customization-packages.ssi:253
+#: en/user_customization-packages.ssi:238
msgid ""
"Packages *{must}* be named in the prescribed way. One simple way to do this "
"is to use #{dpkg-name}#."
@@ -1108,30 +1039,30 @@ msgstr ""
"es usar #{dpkg-name}#."
#. type: Plain text
-#: en/user_customization-packages.ssi:255
+#: en/user_customization-packages.ssi:240
msgid ""
-"Using #{chroot_local-packages}# for installation of custom packages has "
+"Using #{packages.chroot}# for installation of custom packages has "
"disadvantages:"
msgstr ""
-"El método #{chroot_local-packages}# para la instalación de paquetes "
-"personalizados tiene desventajas:"
+"El método #{packages.chroot}# para la instalación de paquetes personalizados "
+"tiene desventajas:"
#. type: Plain text
-#: en/user_customization-packages.ssi:257
+#: en/user_customization-packages.ssi:242
msgid "_* It is not possible to use secure APT."
msgstr "_* No es posible utilizar APT seguro."
#. type: Plain text
-#: en/user_customization-packages.ssi:259
+#: en/user_customization-packages.ssi:244
msgid ""
-"_* You must install all appropriate packages in the #{config/chroot_local-"
-"packages/}# directory."
+"_* You must install all appropriate packages in the #{config/packages."
+"chroot/}# directory."
msgstr ""
"_* Se deben depositar todos los paquetes necesarios para cumplir "
-"dependencias en el directorio #{config/chroot_local-packages/}#."
+"dependencias en el directorio #{config/packages.chroot/}#."
#. type: Plain text
-#: en/user_customization-packages.ssi:261
+#: en/user_customization-packages.ssi:246
msgid ""
"_* It does not lend itself to storing Debian Live configurations in revision "
"control."
@@ -1140,24 +1071,24 @@ msgstr ""
"control de versiones."
#. type: Plain text
-#: en/user_customization-packages.ssi:263
+#: en/user_customization-packages.ssi:248
msgid "3~ Using an APT repository to install custom packages"
msgstr "3~ Método de repositorio APT para instalar paquetes personalizados"
#. type: Plain text
-#: en/user_customization-packages.ssi:265
+#: en/user_customization-packages.ssi:250
msgid ""
-"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."
+"Unlike using #{packages.chroot}#, 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."
msgstr ""
-"Al contrario del método #{chroot_local-packages}#, cuando se utiliza el "
-"método de repositorio APT personalizado se debe asegurar que se especifica "
-"dónde se deben buscar los paquetes a instalar. Para más información ver "
-"{Selección de los paquetes a instalar}#choosing-packages-to-install."
+"Al contrario del método #{packages.chroot}#, cuando se utiliza el método de "
+"repositorio APT personalizado se debe asegurar que se especifica dónde se "
+"deben buscar los paquetes a instalar. Para más información ver {Selección de "
+"los paquetes a instalar}#choosing-packages-to-install."
#. type: Plain text
-#: en/user_customization-packages.ssi:267
+#: en/user_customization-packages.ssi:252
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 "
@@ -1168,12 +1099,12 @@ msgstr ""
"reutilizada posteriormente para ofrecer nuevas versiones de los paquetes."
#. type: Plain text
-#: en/user_customization-packages.ssi:269
+#: en/user_customization-packages.ssi:254
msgid "3~ Custom packages and APT"
msgstr "3~ Paquetes personalizados y APT"
#. type: Plain text
-#: en/user_customization-packages.ssi:271
+#: en/user_customization-packages.ssi:256
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 "
@@ -1188,7 +1119,7 @@ msgstr ""
"seleccionará para instalar el paquete con número de versión superior."
#. type: Plain text
-#: en/user_customization-packages.ssi:273
+#: en/user_customization-packages.ssi:258
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 "
@@ -1204,17 +1135,17 @@ msgstr ""
"{APT pinning}#apt-pinning."
#. type: Plain text
-#: en/user_customization-packages.ssi:275
+#: en/user_customization-packages.ssi:260
msgid "2~ Configuring APT at build time"
msgstr "2~ Configurar APT en la creación"
#. type: Plain text
-#: en/user_customization-packages.ssi:277
+#: en/user_customization-packages.ssi:262
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 "
+"appropriate configurations through #{config/includes.chroot/}#.) For a "
"complete list, look for options starting with #{apt}# in the #{lb_config}# "
"man page."
msgstr ""
@@ -1223,17 +1154,17 @@ msgstr ""
"ejecute el sistema en vivo puede ser configurada de la manera que "
"habitualmente se utiliza para introducir contenidos del sistema en vivo, "
"esto es, incluyendo las configuraciones apropiadas en el directorio #{config/"
-"chroot_local_includes/}#.) Se puede encontrar una lista completa de las "
-"opciones para configurar APT en la página de manual de #{lb_config}#. Son "
-"aquellas opciones que comienzan con #{apt}#."
+"includes.chroot/}#.) Se puede encontrar una lista completa de las opciones "
+"para configurar APT en la página de manual de #{lb_config}#. Son aquellas "
+"opciones que comienzan con #{apt}#."
#. type: Plain text
-#: en/user_customization-packages.ssi:279
+#: en/user_customization-packages.ssi:264
msgid "3~choosing-apt-or-aptitude Choosing apt or aptitude"
msgstr "3~choosing-apt-or-aptitude Utilizar apt o aptitude"
#. type: Plain text
-#: en/user_customization-packages.ssi:281
+#: en/user_customization-packages.ssi:266
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 "
@@ -1248,7 +1179,7 @@ msgstr ""
"manera de tratar los paquetes no disponibles."
#. type: Plain text
-#: en/user_customization-packages.ssi:283
+#: en/user_customization-packages.ssi:268
msgid ""
"_* #{apt}#: With this method, if a missing package is specified, the package "
"installation will fail. This is the default setting."
@@ -1257,7 +1188,7 @@ msgstr ""
"instalación fallará. Es el comportamiento por defecto."
#. type: Plain text
-#: en/user_customization-packages.ssi:285
+#: en/user_customization-packages.ssi:270
msgid ""
"_* #{aptitude}#: With this method, if a missing package is specified, the "
"package installation will succeed."
@@ -1266,12 +1197,12 @@ msgstr ""
"la instalación continuará sin error."
#. type: Plain text
-#: en/user_customization-packages.ssi:287
+#: en/user_customization-packages.ssi:272
msgid "3~ Using a proxy with APT"
msgstr "3~ Utilización de un proxy con APT"
#. type: Plain text
-#: en/user_customization-packages.ssi:289
+#: en/user_customization-packages.ssi:274
msgid ""
"One commonly required APT configuration is to deal with building an image "
"behind a proxy. You may specify your APT proxy with the #{--apt-ftp-proxy}# "
@@ -1282,18 +1213,18 @@ msgstr ""
"las opciones #{--apt-ftp-proxy}# o #{--apt-http-proxy}#. Por ejemplo:"
#. type: Plain text
-#: en/user_customization-packages.ssi:293
+#: en/user_customization-packages.ssi:278
#, no-wrap
msgid " $ lb config --apt-http-proxy http://proxy/\n"
msgstr " $ lb config --apt-http-proxy http://proxy/\n"
#. type: Plain text
-#: en/user_customization-packages.ssi:297
+#: en/user_customization-packages.ssi:282
msgid "3~ Tweaking APT to save space"
msgstr "3~ Ajuste de APT para ahorrar espacio"
#. type: Plain text
-#: en/user_customization-packages.ssi:299
+#: en/user_customization-packages.ssi:284
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 "
@@ -1303,7 +1234,7 @@ msgstr ""
"instalación. Las dos opciones descritas a continuación pueden ser de interes."
#. type: Plain text
-#: en/user_customization-packages.ssi:301
+#: en/user_customization-packages.ssi:286
msgid ""
"If you don't want to include APT indices in the image, you can omit those "
"with:"
@@ -1312,13 +1243,13 @@ msgstr ""
"utilizar la siguiente opción:"
#. type: Plain text
-#: en/user_customization-packages.ssi:305
+#: en/user_customization-packages.ssi:290
#, no-wrap
-msgid " $ lb config --binary-indices false\n"
-msgstr " $ lb config --binary-indices false\n"
+msgid " $ lb config --apt-indices false\n"
+msgstr " $ lb config --apt-indices false\n"
#. type: Plain text
-#: en/user_customization-packages.ssi:309
+#: en/user_customization-packages.ssi:294
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 "
@@ -1335,7 +1266,7 @@ msgstr ""
"# o #{apt-get install}#."
#. type: Plain text
-#: en/user_customization-packages.ssi:311
+#: en/user_customization-packages.ssi:296
msgid ""
"If you find the installation of recommended packages bloats your image too "
"much, you may disable that default option of APT with:"
@@ -1345,13 +1276,13 @@ msgstr ""
"con:"
#. type: Plain text
-#: en/user_customization-packages.ssi:315
+#: en/user_customization-packages.ssi:300
#, no-wrap
msgid " $ lb config --apt-recommends false\n"
msgstr " $ lb config --apt-recommends false\n"
#. type: Plain text
-#: en/user_customization-packages.ssi:319
+#: en/user_customization-packages.ssi:304
msgid ""
"The tradeoff here is that if you don't install recommended packages for a "
"given package, that is, \"packages that would be found together with this "
@@ -1379,12 +1310,12 @@ msgstr ""
"explica en {APT pinning}#apt-pinning."
#. type: Plain text
-#: en/user_customization-packages.ssi:321
+#: en/user_customization-packages.ssi:306
msgid "3~ Passing options to apt or aptitude"
msgstr "3~ Pasar opciones a apt o a aptitude"
#. type: Plain text
-#: en/user_customization-packages.ssi:323
+#: en/user_customization-packages.ssi:308
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 "
@@ -1398,60 +1329,60 @@ msgstr ""
"y #{aptitude}#."
#. type: Plain text
-#: en/user_customization-packages.ssi:325
+#: en/user_customization-packages.ssi:310
msgid "3~apt-pinning APT pinning"
msgstr "3~apt-pinning APT pinning"
#. type: Plain text
-#: en/user_customization-packages.ssi:327
+#: en/user_customization-packages.ssi:312
msgid ""
"For background, please first read the #{apt_preferences(5)}# man page. APT "
"pinning can be configured either for build time, or else for run time. For "
"the former, create #{config/chroot_apt/preferences}#. For the latter, create "
-"#{config/chroot_local-includes/etc/apt/preferences}#."
+"#{config/includes.chroot/etc/apt/preferences}#."
msgstr ""
"Como información básica, sería recomendable leer la página de manual #"
"{apt_preferences(5)}#. APT pinning puede ser configurado o en tiempo de "
"creación de la imagen, creando el fichero #{config/chroot_apt/preferences}# "
"o en tiempo de ejecución del sistema en vivo creando el fichero #{config/"
-"chroot_local-includes/etc/apt/preferences}#."
+"includes.chroot/etc/apt/preferences}#."
#. type: Plain text
-#: en/user_customization-packages.ssi:329
+#: en/user_customization-packages.ssi:314
msgid ""
-"Let's say you are building a Squeeze live system but need all the live "
+"Let's say you are building a Wheezy live system but need all the live "
"packages that end up in the binary image to be installed from Sid at build "
"time. You need to add Sid to your APT sources and pin it so that only the "
"packages you want are installed from it at build time and all others are "
-"taken from the target system distribution, Squeeze. The following will "
+"taken from the target system distribution, Wheezy. The following will "
"accomplish this:"
msgstr ""
-"Supongamos que se está creando un sistema en vivo basado en Squeeze pero se "
+"Supongamos que se está creando un sistema en vivo basado en Wheezy pero se "
"necesita instalar todos los paquetes \"live\" que terminan instalados en la "
"imagen binaria final desde la versión inestable «Sid» en el momento de crear "
"la imagen. Se deberá añadir Sid a los orígenes (sources) de APT y fijarlo "
"(pin) de manera que solamente los paquetes fijados sean instalados desde Sid "
-"mientras que el resto será obtenido desde la distribución base, Squeeze. "
-"Esto se puede realizar de la siguiente forma:"
+"mientras que el resto será obtenido desde la distribución base, Wheezy. Esto "
+"se puede realizar de la siguiente forma:"
#. type: Plain text
-#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:322
#, no-wrap
msgid ""
-" $ echo \"deb http://mirror/debian sid main\" > config/chroot_sources/sid.chroot\n"
-" $ cat >>config/chroot_apt/preferences <<END\n"
+" $ echo \"deb http://mirror/debian sid main\" > config/archives/sid.list.chroot\n"
+" $ cat >> config/chroot_apt/preferences <<END\n"
" Package: live-boot live-boot-initramfs-tools live-config live-config-sysvinit\n"
" Pin: release n=sid\n"
" Pin-Priority: 600\n"
msgstr ""
-" $ echo \"deb http://mirror/debian sid main\" > config/chroot_sources/sid.chroot\n"
-" $ cat >>config/chroot_apt/preferences <<END\n"
+" $ echo \"deb http://mirror/debian sid main\" > config/archives/sid.list.chroot\n"
+" $ cat >> config/chroot_apt/preferences <<END\n"
" Package: live-boot live-boot-initramfs-tools live-config live-config-sysvinit\n"
" Pin: release n=sid\n"
" Pin-Priority: 600\n"
#. type: Plain text
-#: en/user_customization-packages.ssi:342
+#: en/user_customization-packages.ssi:327
#, no-wrap
msgid ""
" Package: *\n"
@@ -1465,24 +1396,24 @@ msgstr ""
" END\n"
#. type: Plain text
-#: en/user_customization-packages.ssi:346
+#: en/user_customization-packages.ssi:331
#, no-wrap
msgid "*{Note:}* Wildcards can be used in package names (e.g. *{Package: live-*}*) with Apt version 0.8.14 or higher. This means that it works with Wheezy using:\n"
msgstr "*{Nota:}* Se pueden usar comodines en los nombres de los paquetes a fijar (p.ej. *{Package: live-*}*) si se usa una versión de apt igual o superior a 0.8.14. Esto significa que funciona con Wheezy usando:\n"
#. type: Plain text
-#: en/user_customization-packages.ssi:350
+#: en/user_customization-packages.ssi:335
msgid "$ lb config --distribution wheezy"
msgstr "$ lb config --distribution wheezy"
#. type: Plain text
-#: en/user_customization-packages.ssi:354
+#: en/user_customization-packages.ssi:339
msgid ""
"Negative pin priorities will prevent a package from being installed, as in "
"the case where you do not want a package that is recommended by another "
-"package. Suppose you are building an LXDE image using #{--packages-lists "
-"lxde}# option, but don't want the user prompted to store wifi passwords in "
-"the keyring. This list includes #{gdm}#, which depends on #{gksu}#, which in "
+"package. Suppose you are building an LXDE image using #{--package-lists lxde}"
+"# option, but don't want the user prompted to store wifi passwords in the "
+"keyring. This list includes #{gdm}#, which depends on #{gksu}#, which in "
"turn recommends #{gnome-keyring}#. So you want to omit the recommended #"
"{gnome-keyring}# package. This can be done by adding the following stanza to "
"#{config/chroot_apt/preferences}#:"
@@ -1490,15 +1421,15 @@ msgstr ""
"Una prioridad pin negativa previene la instalación de un paquete, como puede "
"ser el caso de que no se desee que un paquete recomendado por otro sea "
"instalado al instalar el primero. Supongamos que se está creando una imagen "
-"LXDE mediante la opción #{--packages-lists lxde}#, pero no se desea "
-"preguntar al usuario si desea almacenar las claves wifi en el almacen de "
-"claves. La lista lxde incluye #{gdm}#, la cual depende de #{gksu}# que a su "
-"vez recomienda #{gnome-keyring}#. Así que el objetivo es omitir la "
-"instalación del paquete #{gnome-keyring}#, que puede conseguirse añadiendo "
-"un fichero con el siguiente contenido a #{config/chroot_apt/preferences}#:"
+"LXDE mediante la opción #{--package-lists lxde}#, pero no se desea preguntar "
+"al usuario si desea almacenar las claves wifi en el almacen de claves. La "
+"lista lxde incluye #{gdm}#, la cual depende de #{gksu}# que a su vez "
+"recomienda #{gnome-keyring}#. Así que el objetivo es omitir la instalación "
+"del paquete #{gnome-keyring}#, que puede conseguirse añadiendo un fichero "
+"con el siguiente contenido a #{config/chroot_apt/preferences}#:"
#. type: Plain text
-#: en/user_customization-packages.ssi:360
+#: en/user_customization-packages.ssi:345
#, no-wrap
msgid ""
" Package: gnome-keyring\n"
diff --git a/manual/po/es/user_customization-runtime.ssi.po b/manual/po/es/user_customization-runtime.ssi.po
index bf6ea21..ade4504 100644
--- a/manual/po/es/user_customization-runtime.ssi.po
+++ b/manual/po/es/user_customization-runtime.ssi.po
@@ -9,8 +9,8 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2011-08-25 17:01+0300\n"
-"PO-Revision-Date: 2011-08-25 16:22+0100\n"
+"POT-Creation-Date: 2011-11-07 21:01-0400\n"
+"PO-Revision-Date: 2011-11-08 14:28+0100\n"
"Last-Translator: José Luis Zabalza and Carlos Zuferri «chals» "
"<jlz.3008 at gmail.com> <chals at altorricon.com>\n"
"Language-Team: Debian live Spanish translation team <debian-live at lists."
@@ -42,48 +42,47 @@ msgstr ""
#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
-#: en/user_customization-installer.ssi:43
+#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
-#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:53
-#: en/user_customization-packages.ssi:66 en/user_customization-packages.ssi:80
-#: en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:112
-#: en/user_customization-packages.ssi:142
-#: en/user_customization-packages.ssi:155
-#: en/user_customization-packages.ssi:165
-#: en/user_customization-packages.ssi:175
-#: en/user_customization-packages.ssi:185
-#: en/user_customization-packages.ssi:199
-#: en/user_customization-packages.ssi:215
-#: en/user_customization-packages.ssi:227
-#: en/user_customization-packages.ssi:291
-#: en/user_customization-packages.ssi:303
-#: en/user_customization-packages.ssi:313
-#: en/user_customization-packages.ssi:331
-#: en/user_customization-packages.ssi:348
-#: en/user_customization-packages.ssi:356 en/user_customization-runtime.ssi:14
-#: en/user_customization-runtime.ssi:24 en/user_customization-runtime.ssi:44
-#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:63
-#: en/user_customization-runtime.ssi:71 en/user_customization-runtime.ssi:80
-#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:111
-#: en/user_customization-runtime.ssi:119 en/user_examples.ssi:14
+#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:54
+#: en/user_customization-packages.ssi:67 en/user_customization-packages.ssi:81
+#: en/user_customization-packages.ssi:101
+#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:140
+#: en/user_customization-packages.ssi:150
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:184
+#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:276
+#: en/user_customization-packages.ssi:288
+#: en/user_customization-packages.ssi:298
+#: en/user_customization-packages.ssi:316
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
+#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
+#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
+#: en/user_customization-runtime.ssi:104 en/user_customization-runtime.ssi:114
+#: en/user_customization-runtime.ssi:122 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:178 en/user_examples.ssi:190 en/user_examples.ssi:206
-#: en/user_examples.ssi:220 en/user_examples.ssi:229 en/user_examples.ssi:247
-#: en/user_examples.ssi:255 en/user_examples.ssi:268 en/user_examples.ssi:283
-#: en/user_installation.ssi:38 en/user_installation.ssi:46
-#: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi:74 en/user_installation.ssi:82
-#: en/user_installation.ssi:90 en/user_installation.ssi:114
-#: en/user_installation.ssi:129 en/user_installation.ssi:146
-#: en/user_managing_a_configuration.ssi:24
+#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
+#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
+#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
+#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
+#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
+#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
+#: en/user_examples.ssi:277 en/user_installation.ssi:38
+#: en/user_installation.ssi:46 en/user_installation.ssi:56
+#: en/user_installation.ssi:64 en/user_installation.ssi:74
+#: en/user_installation.ssi:82 en/user_installation.ssi:90
+#: en/user_installation.ssi:114 en/user_installation.ssi:129
+#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:80 en/user_overview.ssi:88
+#: en/user_overview.ssi:48 en/user_overview.ssi:56
msgid "code{"
msgstr "code{"
@@ -107,49 +106,48 @@ msgstr "code{"
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
-#: en/user_customization-installer.ssi:37
-#: en/user_customization-installer.ssi:48
+#: en/user_customization-installer.ssi:38
+#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:70 en/user_customization-packages.ssi:84
-#: en/user_customization-packages.ssi:98
-#: en/user_customization-packages.ssi:116
-#: en/user_customization-packages.ssi:147
-#: en/user_customization-packages.ssi:161
-#: en/user_customization-packages.ssi:171
-#: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:191
-#: en/user_customization-packages.ssi:203
-#: en/user_customization-packages.ssi:219
-#: en/user_customization-packages.ssi:231
-#: en/user_customization-packages.ssi:295
-#: en/user_customization-packages.ssi:307
-#: en/user_customization-packages.ssi:317
-#: en/user_customization-packages.ssi:344
-#: en/user_customization-packages.ssi:352
-#: en/user_customization-packages.ssi:361 en/user_customization-runtime.ssi:18
-#: en/user_customization-runtime.ssi:28 en/user_customization-runtime.ssi:48
-#: en/user_customization-runtime.ssi:59 en/user_customization-runtime.ssi:67
-#: en/user_customization-runtime.ssi:76 en/user_customization-runtime.ssi:85
-#: en/user_customization-runtime.ssi:105 en/user_customization-runtime.ssi:115
-#: en/user_customization-runtime.ssi:124 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:186 en/user_examples.ssi:202 en/user_examples.ssi:210
-#: en/user_examples.ssi:225 en/user_examples.ssi:233 en/user_examples.ssi:251
-#: en/user_examples.ssi:264 en/user_examples.ssi:279 en/user_examples.ssi:297
-#: en/user_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi:70
-#: en/user_installation.ssi:78 en/user_installation.ssi:86
-#: en/user_installation.ssi:94 en/user_installation.ssi:119
-#: en/user_installation.ssi:136 en/user_installation.ssi:149
-#: en/user_managing_a_configuration.ssi:31
+#: en/user_customization-packages.ssi:46 en/user_customization-packages.ssi:59
+#: en/user_customization-packages.ssi:71 en/user_customization-packages.ssi:85
+#: en/user_customization-packages.ssi:105
+#: en/user_customization-packages.ssi:132
+#: en/user_customization-packages.ssi:146
+#: en/user_customization-packages.ssi:156
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:329
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:346 en/user_customization-runtime.ssi:21
+#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
+#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
+#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
+#: en/user_customization-runtime.ssi:108 en/user_customization-runtime.ssi:118
+#: en/user_customization-runtime.ssi:127 en/user_examples.ssi:20
+#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
+#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
+#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
+#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
+#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
+#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
+#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
+#: en/user_examples.ssi:291 en/user_installation.ssi:42
+#: en/user_installation.ssi:50 en/user_installation.ssi:60
+#: en/user_installation.ssi:70 en/user_installation.ssi:78
+#: en/user_installation.ssi:86 en/user_installation.ssi:94
+#: en/user_installation.ssi:119 en/user_installation.ssi:136
+#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
-#: en/user_overview.ssi:84 en/user_overview.ssi:92
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:42
+#: en/user_overview.ssi:52 en/user_overview.ssi:60
msgid "}code"
msgstr "}code"
@@ -205,23 +203,31 @@ msgstr ""
msgid ""
"You can specify additional groups that the live user will belong to by "
"preseeding the #{passwd/user-default-groups}# debconf value. For example, to "
-"add the live user to the #{fuse}# group, add the following to a file in the #"
-"{config/chroot_local-preseed}# directory:"
+"add the live user to the #{fuse}# group, add the following preseed under #"
+"{config/preseed/}# for the chroot stage:"
msgstr ""
"Se puede especificar grupos adicionales a los que pertenecerá el usuario por "
"defecto del sistema en vivo preconfigurando el valor debconf #{passwd/user-"
"default-groups}#. Por ejemplo, para agregar el usuario al grupo #{fuse}# "
-"añadir el siguiente código en un fichero en el directorio #{config/"
-"chroot_local-preseed}#."
+"durante la etapa chroot, añadir el siguiente código en un fichero en el "
+"directorio #{config/preseed/}#."
#. type: Plain text
-#: en/user_customization-runtime.ssi:16
+#: en/user_customization-runtime.ssi:19
#, no-wrap
-msgid " user-setup passwd/user-default-groups string audio cdrom dip floppy video plugdev netdev powerdev scanner bluetooth fuse\n"
-msgstr " user-setup passwd/user-default-groups string audio cdrom dip floppy video plugdev netdev powerdev scanner bluetooth fuse\n"
+msgid ""
+" $ lb config\n"
+" $ echo user-setup passwd/user-default-groups string audio cdrom \\\n"
+" dip floppy video plugdev netdev powerdev scanner bluetooth fuse \\\n"
+" >> config/preseed/my.preseed.chroot\n"
+msgstr ""
+" $ lb config\n"
+" $ echo user-setup passwd/user-default-groups string audio cdrom \\\n"
+" dip floppy video plugdev netdev powerdev scanner bluetooth fuse \\\n"
+" >> config/preseed/my.preseed.chroot\n"
#. type: Plain text
-#: en/user_customization-runtime.ssi:20
+#: en/user_customization-runtime.ssi:23
msgid ""
"It is also possible to change the default username \"user\" and the default "
"password \"live\". If you want to do that for any reason, you can easily "
@@ -232,7 +238,7 @@ msgstr ""
"conseguir de forma sencilla tal y como se explica a continuación:"
#. type: Plain text
-#: en/user_customization-runtime.ssi:22
+#: en/user_customization-runtime.ssi:25
msgid ""
"To change the default username you can simply specify it in your config:"
msgstr ""
@@ -240,56 +246,56 @@ msgstr ""
"en la configuración:"
#. type: Plain text
-#: en/user_customization-runtime.ssi:26
+#: en/user_customization-runtime.ssi:29
msgid "$ lb config --bootappend-live \"username=live-user\""
-msgstr ""
+msgstr "$ lb config --bootappend-live \"username=live-user\""
#. type: Plain text
-#: en/user_customization-runtime.ssi:30
+#: en/user_customization-runtime.ssi:33
msgid ""
"One possible way of changing the default password is by means of a hook as "
"described in {Boot-time hooks}#boot-time-hooks. In order to do that you can "
"use the \"passwd\" hook from #{/usr/share/doc/live-config/examples/hooks}#, "
-"prefix it accordingly (e.g. 200-passwd) and add it to #{config/chroot_local-"
-"includes/lib/live/config/}#"
+"prefix it accordingly (e.g. 200-passwd) and add it to #{config/includes."
+"chroot/lib/live/config/}#"
msgstr ""
"Una posible forma de cambiar la contraseña por defecto es usando un script "
"gancho (hook) tal y como se describe en {Scripts gancho en tiempo de "
"arranque}#boot-time-hooks. Para conseguirlo se puede usar el script gancho "
"«passwd» de #{/usr/share/doc/live-config/examples/hooks}#, ponerle un "
-"prefijo adecuado (p.ej. 200-passwd) y añadirlo a #{config/chroot_local-"
-"includes/lib/live/config/}#"
+"prefijo adecuado (p.ej. 200-passwd) y añadirlo a #{config/includes.chroot/"
+"lib/live/config/}#"
#. type: Plain text
-#: en/user_customization-runtime.ssi:32
+#: en/user_customization-runtime.ssi:35
msgid "2~customizing-locale-and-language Customizing locale and language"
msgstr ""
"2~customizing-locale-and-language Personalización de las variantes locales e "
"idioma"
#. type: Plain text
-#: en/user_customization-runtime.ssi:34
+#: en/user_customization-runtime.ssi:37
msgid "When the live system boots, language is involved in three steps:"
msgstr ""
"Cuando el sistema en vivo arranca, el idioma está implicado en tres pasos:"
#. type: Plain text
-#: en/user_customization-runtime.ssi:36
+#: en/user_customization-runtime.ssi:39
msgid "_* the locale generation"
msgstr "_* Generar las variantes locales"
#. type: Plain text
-#: en/user_customization-runtime.ssi:38
+#: en/user_customization-runtime.ssi:41
msgid "_* setting the keyboard layout for the console"
msgstr "_* Establecer la distribución del teclado para el consola"
#. type: Plain text
-#: en/user_customization-runtime.ssi:40
+#: en/user_customization-runtime.ssi:43
msgid "_* setting the keyboard layout for X"
msgstr "_* Establecer la distribución del teclado para el entorno gráfico X"
#. type: Plain text
-#: en/user_customization-runtime.ssi:42
+#: en/user_customization-runtime.ssi:45
msgid ""
"The default locale when building a Live system is \"locales=en_US.UTF-8\". "
"To define the locale that should be generated, use the #{locales}# parameter "
@@ -301,13 +307,13 @@ msgstr ""
"# de #{lb config}#, p.ej."
#. type: Plain text
-#: en/user_customization-runtime.ssi:46
+#: en/user_customization-runtime.ssi:49
#, no-wrap
msgid " $ lb config --bootappend-live \"locales=de_CH.UTF-8\"\n"
msgstr " $ lb config --bootappend-live \"locales=de_CH.UTF-8\"\n"
#. type: Plain text
-#: en/user_customization-runtime.ssi:50
+#: en/user_customization-runtime.ssi:53
msgid ""
"This parameter can also be used at the kernel command line. You can specify "
"a locale by a full #{language_country.encoding}# word."
@@ -317,7 +323,7 @@ msgstr ""
"{language_country.encoding}#."
#. type: Plain text
-#: en/user_customization-runtime.ssi:52
+#: en/user_customization-runtime.ssi:55
msgid ""
"Both the console and X keyboard configuration depend on the #{keyboard-"
"layouts}# parameter of the #{--bootappend-live}# option. Valid options for X "
@@ -335,7 +341,7 @@ msgstr ""
"idioma, por ejemplo:"
#. type: Plain text
-#: en/user_customization-runtime.ssi:57
+#: en/user_customization-runtime.ssi:60
#, no-wrap
msgid ""
" $ grep -i sweden -C3 /usr/share/X11/xkb/rules/base.xml | grep name\n"
@@ -345,7 +351,7 @@ msgstr ""
" <name>se</name>\n"
#. type: Plain text
-#: en/user_customization-runtime.ssi:61
+#: en/user_customization-runtime.ssi:64
msgid ""
"To get the locale files for German and Swiss German keyboard layout in X use:"
msgstr ""
@@ -353,13 +359,13 @@ msgstr ""
"disposición del teclado alemán y suizo-alemán en X usar:"
#. type: Plain text
-#: en/user_customization-runtime.ssi:65
+#: en/user_customization-runtime.ssi:68
#, no-wrap
msgid " $ lb config --bootappend-live \"locales=de_CH.UTF-8 keyboard-layouts=ch\"\n"
msgstr " $ lb config --bootappend-live \"locales=de_CH.UTF-8 keyboard-layouts=ch\"\n"
#. type: Plain text
-#: en/user_customization-runtime.ssi:69
+#: en/user_customization-runtime.ssi:72
msgid ""
"A list of the valid values of the keyboards for the console can be figured "
"with the following command:"
@@ -368,7 +374,7 @@ msgstr ""
"con el siguiente comando:"
#. type: Plain text
-#: en/user_customization-runtime.ssi:74
+#: en/user_customization-runtime.ssi:77
#, no-wrap
msgid ""
" $ for i in $(find /usr/share/keymaps/ -iname \"*kmap.gz\"); \\\n"
@@ -378,7 +384,7 @@ msgstr ""
" do basename $i | head -c -9; echo; done | sort | less\n"
#. type: Plain text
-#: en/user_customization-runtime.ssi:78
+#: en/user_customization-runtime.ssi:81
msgid ""
"Alternatively, you can use the #{console-setup}# package, a tool to let you "
"configure console layout using X (XKB) definitions; you can then set your "
@@ -398,7 +404,7 @@ msgstr ""
"TypeMatrix, tanto en consola X como X11, se puede utilizar:"
#. type: Plain text
-#: en/user_customization-runtime.ssi:83
+#: en/user_customization-runtime.ssi:86
#, no-wrap
msgid ""
" $ lb config --bootappend-live \\\n"
@@ -408,12 +414,12 @@ msgstr ""
" \"locales=fr_FR.UTF-8 keyboard-layouts=fr keyboard-variant=bepo keyboard-model=tm2030usb\"\n"
#. type: Plain text
-#: en/user_customization-runtime.ssi:87
+#: en/user_customization-runtime.ssi:90
msgid "2~persistence Persistence"
msgstr "2~persistence Persistencia (Modo guardar cambios)"
#. type: Plain text
-#: en/user_customization-runtime.ssi:89
+#: en/user_customization-runtime.ssi:92
msgid ""
"A live cd paradigm is a pre-installed system which runs from read-only "
"media, like a cdrom, where writes and modifications do not survive reboots "
@@ -425,7 +431,7 @@ msgstr ""
"reiniciar el sistema en que se ejecuta."
#. type: Plain text
-#: en/user_customization-runtime.ssi:91
+#: en/user_customization-runtime.ssi:94
msgid ""
"A Debian Live system is a generalization of this paradigm and thus supports "
"other media in addition to CDs; but still, in its default behaviour, it "
@@ -439,7 +445,7 @@ msgstr ""
"apagar el equipo."
#. type: Plain text
-#: en/user_customization-runtime.ssi:93
+#: en/user_customization-runtime.ssi:96
msgid ""
"Persistence is a common name for different kinds of solutions for saving "
"across reboots some, or all, of this run-time evolution of the system. To "
@@ -458,7 +464,7 @@ msgstr ""
"guardan tras reiniciar."
#. type: Plain text
-#: en/user_customization-runtime.ssi:95
+#: en/user_customization-runtime.ssi:98
msgid ""
"The data stored on this ramdisk should be saved on a writable persistent "
"medium like a Hard Disk, a USB key, a network share or even a session of a "
@@ -474,12 +480,12 @@ msgstr ""
"el momento del arranque: #{persistent}#."
#. type: Plain text
-#: en/user_customization-runtime.ssi:97
+#: en/user_customization-runtime.ssi:100
msgid "3~ Full persistence"
msgstr "3~ Persistencia total"
#. type: Plain text
-#: en/user_customization-runtime.ssi:99
+#: en/user_customization-runtime.ssi:102
msgid ""
"By 'full persistence' it is meant that instead of using a tmpfs for storing "
"modifications to the read-only media (with the copy-on-write, COW, system) a "
@@ -501,19 +507,19 @@ msgstr ""
"ejemplo:"
#. type: Plain text
-#: en/user_customization-runtime.ssi:103
+#: en/user_customization-runtime.ssi:106
#, no-wrap
msgid " # mkfs.ext2 -L live-rw /dev/sdb1\n"
msgstr " # mkfs.ext2 -L live-rw /dev/sdb1\n"
#. type: Plain text
-#: en/user_customization-runtime.ssi:107
+#: en/user_customization-runtime.ssi:110
msgid "See also {Using the space left on a USB stick}#using-usb-extra-space."
msgstr ""
"Ver {Usar el espacio libre en el dispositivo USB}#using-usb-extra-space."
#. type: Plain text
-#: en/user_customization-runtime.ssi:109
+#: en/user_customization-runtime.ssi:112
msgid ""
"If you already have a partition on your device, you could just change the "
"label with one of the following:"
@@ -522,13 +528,13 @@ msgstr ""
"etiqueta con uno de los siguientes:"
#. type: Plain text
-#: en/user_customization-runtime.ssi:113
+#: en/user_customization-runtime.ssi:116
#, no-wrap
msgid " # tune2fs -L live-rw /dev/sdb1 # for ext2,3,4 filesystems\n"
msgstr " # tune2fs -L live-rw /dev/sdb1 # for ext2,3,4 filesystems\n"
#. type: Plain text
-#: en/user_customization-runtime.ssi:117
+#: en/user_customization-runtime.ssi:120
msgid ""
"But since live system users cannot always use a hard drive partition, and "
"considering that most USB keys have poor write speeds, 'full' persistence "
@@ -545,7 +551,7 @@ msgstr ""
"esto:"
#. type: Plain text
-#: en/user_customization-runtime.ssi:122
+#: en/user_customization-runtime.ssi:125
#, no-wrap
msgid ""
" $ dd if=/dev/null of=live-rw bs=1G seek=1 # for a 1GB sized image file\n"
@@ -555,7 +561,7 @@ msgstr ""
" $ /sbin/mkfs.ext2 -F live-rw\n"
#. type: Plain text
-#: en/user_customization-runtime.ssi:126
+#: en/user_customization-runtime.ssi:129
msgid ""
"Then copy the #{live-rw}# file to a writable partition and reboot with the "
"boot parameter 'persistent'."
@@ -564,12 +570,12 @@ msgstr ""
"reiniciar el sistema con el parámetro de arranque «persistent»."
#. type: Plain text
-#: en/user_customization-runtime.ssi:128
+#: en/user_customization-runtime.ssi:131
msgid "3~ Home automounting"
msgstr "3~ Montar Home de forma automática"
#. type: Plain text
-#: en/user_customization-runtime.ssi:130
+#: en/user_customization-runtime.ssi:133
msgid ""
"If during the boot a partition (filesystem) image file or a partition "
"labeled #{home-rw}# is discovered, this filesystem will be directly mounted "
@@ -583,12 +589,12 @@ msgstr ""
"defecto. Se puede combinar con persistencia total."
#. type: Plain text
-#: en/user_customization-runtime.ssi:132
+#: en/user_customization-runtime.ssi:135
msgid "3~ Snapshots"
msgstr "3~ Instantáneas"
#. type: Plain text
-#: en/user_customization-runtime.ssi:134
+#: en/user_customization-runtime.ssi:137
msgid ""
"Snapshots are collections of files and directories which are not mounted "
"while running but which are copied from a persistent device to the system "
@@ -620,7 +626,7 @@ msgstr ""
"almacenamiento."
#. type: Plain text
-#: en/user_customization-runtime.ssi:136
+#: en/user_customization-runtime.ssi:139
msgid ""
"A /home version of snapshot exists too and its label is #{home-sn.*}#; it "
"works the same as the main snapshot but it is only applied to /home."
@@ -630,7 +636,7 @@ msgstr ""
"a /home."
#. type: Plain text
-#: en/user_customization-runtime.ssi:138
+#: en/user_customization-runtime.ssi:141
msgid ""
"Snapshots cannot currently handle file deletion but full persistence and "
"home automounting can."
@@ -639,12 +645,12 @@ msgstr ""
"la persistencia total y el montaje automático sí pueden."
#. type: Plain text
-#: en/user_customization-runtime.ssi:140
+#: en/user_customization-runtime.ssi:143
msgid "3~ Persistent SubText"
msgstr "3~ SubText persistente"
#. type: Plain text
-#: en/user_customization-runtime.ssi:142
+#: en/user_customization-runtime.ssi:145
msgid ""
"If a user would need multiple persistent storage of the same type for "
"different locations or testing, such as #{live-rw-nonwork}# and #{live-rw-"
@@ -663,12 +669,12 @@ msgstr ""
"parámetros de arranque de: #{persistent}# #{persistent-subtext=subText}#."
#. type: Plain text
-#: en/user_customization-runtime.ssi:144
+#: en/user_customization-runtime.ssi:147
msgid "3~ Partial remastering"
msgstr "3~ Remasterización parcial"
#. type: Plain text
-#: en/user_customization-runtime.ssi:145
+#: en/user_customization-runtime.ssi:148
msgid ""
"The run-time modification of the tmpfs could be collected using live-"
"snapshot in a squashfs and added to the cd by remastering the iso in the "
diff --git a/manual/po/es/user_examples.ssi.po b/manual/po/es/user_examples.ssi.po
index 1d5c81e..4645a16 100644
--- a/manual/po/es/user_examples.ssi.po
+++ b/manual/po/es/user_examples.ssi.po
@@ -9,8 +9,8 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2011-03-18 07:39-0200\n"
-"PO-Revision-Date: 2011-04-08 16:26+0100\n"
+"POT-Creation-Date: 2011-11-13 17:12+0100\n"
+"PO-Revision-Date: 2011-11-13 17:27+0100\n"
"Last-Translator: José Luis Zabalza and Carlos Zuferri «chals» "
"<jlz.3008 at gmail.com> <chals at altorricon.com>\n"
"Language-Team: Debian live Spanish translation team <debian-live at lists."
@@ -36,48 +36,49 @@ msgstr ":B~ Ejemplos"
#: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/user_basics.ssi:30 en/user_basics.ssi:40
-#: en/user_basics.ssi:56 en/user_basics.ssi:71 en/user_basics.ssi:106
-#: en/user_basics.ssi:114 en/user_basics.ssi:126 en/user_basics.ssi:138
-#: en/user_basics.ssi:150 en/user_basics.ssi:158 en/user_basics.ssi:166
-#: en/user_basics.ssi:182 en/user_basics.ssi:192 en/user_basics.ssi:200
-#: en/user_basics.ssi:216 en/user_basics.ssi:224 en/user_basics.ssi:234
-#: en/user_basics.ssi:252 en/user_basics.ssi:280 en/user_basics.ssi:296
-#: en/user_basics.ssi:304 en/user_basics.ssi:324 en/user_basics.ssi:349
+#: en/project_procedures.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
+#: en/user_basics.ssi:116 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:184 en/user_basics.ssi:194 en/user_basics.ssi:202
+#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
+#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
+#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
-#: en/user_customization-installer.ssi:43
+#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
-#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:53
-#: en/user_customization-packages.ssi:66 en/user_customization-packages.ssi:80
-#: en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:112
-#: en/user_customization-packages.ssi:142
-#: en/user_customization-packages.ssi:155
-#: en/user_customization-packages.ssi:165
-#: en/user_customization-packages.ssi:175
-#: en/user_customization-packages.ssi:185
-#: en/user_customization-packages.ssi:199
-#: en/user_customization-packages.ssi:215
-#: en/user_customization-packages.ssi:227
-#: en/user_customization-packages.ssi:291
-#: en/user_customization-packages.ssi:303
-#: en/user_customization-packages.ssi:313
-#: en/user_customization-packages.ssi:331
-#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
-#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
-#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
-#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
-#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:105
-#: 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:178 en/user_examples.ssi:190
-#: en/user_examples.ssi:206 en/user_examples.ssi:220 en/user_examples.ssi:229
-#: en/user_examples.ssi:247 en/user_examples.ssi:255 en/user_examples.ssi:268
-#: en/user_examples.ssi:283 en/user_installation.ssi:38
+#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:54
+#: en/user_customization-packages.ssi:67 en/user_customization-packages.ssi:81
+#: en/user_customization-packages.ssi:101
+#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:140
+#: en/user_customization-packages.ssi:150
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:184
+#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:276
+#: en/user_customization-packages.ssi:288
+#: en/user_customization-packages.ssi:298
+#: en/user_customization-packages.ssi:316
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
+#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
+#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
+#: en/user_customization-runtime.ssi:104 en/user_customization-runtime.ssi:114
+#: en/user_customization-runtime.ssi:122 en/user_examples.ssi:14
+#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
+#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
+#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
+#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
+#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
+#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
+#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
+#: en/user_examples.ssi:277 en/user_installation.ssi:38
#: en/user_installation.ssi:46 en/user_installation.ssi:56
#: en/user_installation.ssi:64 en/user_installation.ssi:74
#: en/user_installation.ssi:82 en/user_installation.ssi:90
@@ -86,7 +87,7 @@ msgstr ":B~ Ejemplos"
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:80 en/user_overview.ssi:88
+#: en/user_overview.ssi:48 en/user_overview.ssi:56
msgid "code{"
msgstr "code{"
@@ -100,48 +101,49 @@ msgstr "code{"
#: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/user_basics.ssi:34 en/user_basics.ssi:44
-#: en/user_basics.ssi:62 en/user_basics.ssi:75 en/user_basics.ssi:110
-#: en/user_basics.ssi:118 en/user_basics.ssi:132 en/user_basics.ssi:142
-#: en/user_basics.ssi:154 en/user_basics.ssi:162 en/user_basics.ssi:170
-#: en/user_basics.ssi:186 en/user_basics.ssi:196 en/user_basics.ssi:204
-#: en/user_basics.ssi:220 en/user_basics.ssi:228 en/user_basics.ssi:238
-#: en/user_basics.ssi:272 en/user_basics.ssi:284 en/user_basics.ssi:300
-#: en/user_basics.ssi:308 en/user_basics.ssi:335 en/user_basics.ssi:374
+#: en/project_procedures.ssi:131 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
+#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
+#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
+#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
+#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
-#: en/user_customization-installer.ssi:37
-#: en/user_customization-installer.ssi:48
+#: en/user_customization-installer.ssi:38
+#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:70 en/user_customization-packages.ssi:84
-#: en/user_customization-packages.ssi:98
-#: en/user_customization-packages.ssi:116
-#: en/user_customization-packages.ssi:147
-#: en/user_customization-packages.ssi:161
-#: en/user_customization-packages.ssi:171
-#: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:191
-#: en/user_customization-packages.ssi:203
-#: en/user_customization-packages.ssi:219
-#: en/user_customization-packages.ssi:231
-#: en/user_customization-packages.ssi:295
-#: en/user_customization-packages.ssi:307
-#: en/user_customization-packages.ssi:317
-#: en/user_customization-packages.ssi:344
-#: en/user_customization-packages.ssi:353 en/user_customization-runtime.ssi:18
-#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
-#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
-#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
-#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:110
-#: 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:186 en/user_examples.ssi:202
-#: en/user_examples.ssi:210 en/user_examples.ssi:225 en/user_examples.ssi:233
-#: en/user_examples.ssi:251 en/user_examples.ssi:264 en/user_examples.ssi:279
-#: en/user_examples.ssi:297 en/user_installation.ssi:42
+#: en/user_customization-packages.ssi:46 en/user_customization-packages.ssi:59
+#: en/user_customization-packages.ssi:71 en/user_customization-packages.ssi:85
+#: en/user_customization-packages.ssi:105
+#: en/user_customization-packages.ssi:132
+#: en/user_customization-packages.ssi:146
+#: en/user_customization-packages.ssi:156
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:329
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:346 en/user_customization-runtime.ssi:21
+#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
+#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
+#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
+#: en/user_customization-runtime.ssi:108 en/user_customization-runtime.ssi:118
+#: en/user_customization-runtime.ssi:127 en/user_examples.ssi:20
+#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
+#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
+#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
+#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
+#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
+#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
+#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
+#: en/user_examples.ssi:291 en/user_installation.ssi:42
#: en/user_installation.ssi:50 en/user_installation.ssi:60
#: en/user_installation.ssi:70 en/user_installation.ssi:78
#: en/user_installation.ssi:86 en/user_installation.ssi:94
@@ -149,14 +151,14 @@ msgstr "code{"
#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
-#: en/user_overview.ssi:84 en/user_overview.ssi:92
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:42
+#: en/user_overview.ssi:52 en/user_overview.ssi:60
msgid "}code"
msgstr "}code"
#. type: Plain text
-#: en/user_basics.ssi:42 en/user_basics.ssi:168 en/user_basics.ssi:236
-#: en/user_examples.ssi:109 en/user_examples.ssi:208
+#: en/user_basics.ssi:44 en/user_basics.ssi:170 en/user_basics.ssi:238
+#: en/user_examples.ssi:119 en/user_examples.ssi:211
#, no-wrap
msgid " # lb build\n"
msgstr " # lb build\n"
@@ -206,8 +208,9 @@ msgid ""
"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:"
+"and in it, set the corresponding #{LB_PARENT_MIRROR_*}# variables to your "
+"preferred mirror. All other mirrors used in the build will be defaulted from "
+"these values. For example:"
msgstr ""
"Hay que tener en cuenta que, para abreviar, en estos ejemplos no se "
"especifica una réplica local para la creación de la imagen. Es posible "
@@ -216,20 +219,22 @@ msgstr ""
"describe en {Réplicas de Distribution utilizadas durante la creación}"
"#distribution-mirrors-build-time, o para más comodidad, establecer el valor "
"por defecto para la creación del sistema en #{/etc/live/build.conf}#. Basta "
-"con crear este fichero y en el mismo, establecer las variables "
-"correspondientes a la réplica preferida. Por ejemplo:"
+"con crear este fichero y en el mismo, establecer las variables #"
+"{LB_PARENT_MIRROR_*}# correspondientes a la réplica preferida. Todas las "
+"demás réplicas usadas en el proceso de creación usarán estos valores por "
+"defecto. Por ejemplo:"
#. type: Plain text
#: en/user_examples.ssi:18
#, no-wrap
msgid ""
-" LB_MIRROR_BOOTSTRAP=\"http://mirror/debian\"\n"
-" LB_MIRROR_CHROOT=\"http://mirror/debian\"\n"
-" LB_MIRROR_CHROOT_SECURITY=\"http://mirror/debian-security\"\n"
+" LB_PARENT_MIRROR_BOOTSTRAP=\"http://mirror/debian\"\n"
+" LB_PARENT_MIRROR_CHROOT_SECURITY=\"http://mirror/debian-security\"\n"
+" LB_PARENT_MIRROR_CHROOT_BACKPORTS=\"http://mirror/debian-updates\"\n"
msgstr ""
-" LB_MIRROR_BOOTSTRAP=\"http://mirror/debian\"\n"
-" LB_MIRROR_CHROOT=\"http://mirror/debian\"\n"
-" LB_MIRROR_CHROOT_SECURITY=\"http://mirror/debian-security\"\n"
+" LB_PARENT_MIRROR_BOOTSTRAP=\"http://mirror/debian\"\n"
+" LB_PARENT_MIRROR_CHROOT_SECURITY=\"http://mirror/debian-security\"\n"
+" LB_PARENT_MIRROR_CHROOT_BACKPORTS=\"http://mirror/debian-updates\"\n"
#. type: Plain text
#: en/user_examples.ssi:22
@@ -286,7 +291,7 @@ msgstr ""
"mientras se crea."
#. type: Plain text
-#: en/user_examples.ssi:42 en/user_examples.ssi:66 en/user_examples.ssi:231
+#: en/user_examples.ssi:42 en/user_examples.ssi:69 en/user_examples.ssi:234
#, no-wrap
msgid " # lb build 2>&1 | tee binary.log\n"
msgstr " # lb build 2>&1 | tee binary.log\n"
@@ -334,31 +339,39 @@ msgstr ""
"imágenes de Debian Live."
#. type: Plain text
-#: en/user_examples.ssi:56
+#: en/user_examples.ssi:59
#, no-wrap
-msgid " $ mkdir tutorial2 ; cd tutorial2 ; lb config -p lxde --packages iceweasel\n"
-msgstr " $ mkdir tutorial2 ; cd tutorial2 ; lb config -p lxde --packages iceweasel\n"
+msgid ""
+" $ mkdir tutorial2\n"
+" $ cd tutorial2\n"
+" $ lb config -p lxde\n"
+" $ echo iceweasel >> config/package-lists/my.list.chroot\n"
+msgstr ""
+" $ mkdir tutorial2\n"
+" $ cd tutorial2\n"
+" $ lb config -p lxde\n"
+" $ echo iceweasel >> config/package-lists/my.list.chroot\n"
#. type: Plain text
-#: en/user_examples.ssi:60
+#: en/user_examples.ssi:63
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."
+"configuration for the web browser in #{config/includes.chroot/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 ""
"La elección de LXDE para este ejemplo refleja el deseo de ofrecer un entorno "
"de escritorio mínimo, ya que el enfoque de la imagen es el uso individual "
"que se tiene en mente, el navegador web. Se podría ir aún más lejos y "
"ofrecer una configuración por defecto para el navegador web en #{config/"
-"chroot_local-includes/etc/iceweasel/profile/}#, o paquetes adicionales de "
-"soporte para la visualización de diversos tipos de contenido web, pero se "
-"deja esto como un ejercicio para el lector."
+"includes.chroot/etc/iceweasel/profile/}#, o paquetes adicionales de soporte "
+"para la visualización de diversos tipos de contenido web, pero se deja esto "
+"como un ejercicio para el lector."
#. type: Plain text
-#: en/user_examples.ssi:62
+#: en/user_examples.ssi:65
msgid ""
"Build the image, again as superuser, keeping a log as in {Tutorial 1}"
"#tutorial-1:"
@@ -367,25 +380,25 @@ msgstr ""
"{Tutorial 1}#tutorial-1:"
#. type: Plain text
-#: en/user_examples.ssi:70
+#: en/user_examples.ssi:73
msgid "Again, verify the image is OK and test, as in {Tutorial 1}#tutorial-1."
msgstr ""
"De nuevo, verificar que la imagen está bien y probarla igual que en el "
"{Tutorial 1}#tutorial-1."
#. type: Plain text
-#: en/user_examples.ssi:72
+#: en/user_examples.ssi:75
msgid "2~tutorial-3 Tutorial 3: A personalized image"
msgstr "2~tutorial-3 Tutorial 3: Una imagen personalizada"
#. type: Plain text
-#: en/user_examples.ssi:74
+#: en/user_examples.ssi:77
#, 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 "*{Caso práctico:}* Crear un proyecto para conseguir una imagen personalizada, que contenga el software favorito para llevárselo en una memoria USB donde quiera que se vaya, y hacerlo evolucionar en revisiones sucesivas, tal y como vayan cambiando las necesidades y preferencias.\n"
#. type: Plain text
-#: en/user_examples.ssi:76
+#: en/user_examples.ssi:79
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 "
@@ -403,12 +416,12 @@ msgstr ""
"#managing-a-configuration."
#. type: Plain text
-#: en/user_examples.ssi:78
+#: en/user_examples.ssi:81
msgid "3~ First revision"
msgstr "3~ Primera revisión"
#. type: Plain text
-#: en/user_examples.ssi:84
+#: en/user_examples.ssi:87
#, no-wrap
msgid ""
" $ mkdir -p tutorial3/auto\n"
@@ -420,59 +433,68 @@ msgstr ""
" $ cd tutorial3\n"
#. type: Plain text
-#: en/user_examples.ssi:88
+#: en/user_examples.ssi:91
msgid "Edit #{auto/config}# to read as follows:"
msgstr "Editar #{auto/config}# del siguiente modo:"
#. type: Plain text
-#: en/user_examples.ssi:92 en/user_examples.ssi:141
+#: en/user_examples.ssi:95
#, no-wrap
msgid " #!/bin/sh\n"
msgstr " #!/bin/sh\n"
#. type: Plain text
-#: en/user_examples.ssi:99
+#: en/user_examples.ssi:101
#, no-wrap
msgid ""
" lb config noauto \\\n"
" --architecture i386 \\\n"
-" --linux-flavours 686 \\\n"
-" --packages-lists lxde \\\n"
-" --packages \"iceweasel xchat\" \\\n"
+" --linux-flavours 686-pae \\\n"
+" --package-lists lxde \\\n"
" \"${@}\"\n"
msgstr ""
" lb config noauto \\\n"
" --architecture i386 \\\n"
-" --linux-flavours 686 \\\n"
-" --packages-lists lxde \\\n"
-" --packages \"iceweasel xchat\" \\\n"
+" --linux-flavours 686-pae \\\n"
+" --package-lists lxde \\\n"
" \"${@}\"\n"
#. type: Plain text
-#: en/user_examples.ssi:103
+#: en/user_examples.ssi:105
+msgid "Now populate your local package list:"
+msgstr "Completar la lista de paquetes local:"
+
+#. type: Plain text
+#: en/user_examples.ssi:109
+#, no-wrap
+msgid " $ echo \"iceweasel xchat\" >> config/package-lists/my.list.chroot\n"
+msgstr " $ echo \"iceweasel xchat\" >> config/package-lists/my.list.chroot\n"
+
+#. type: Plain text
+#: en/user_examples.ssi:113
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}#."
+"{--linux-flavours 686-pae}# 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 ""
"En primer lugar con #{--architecture i386}# se asegura de que en nuestro "
"sistema de creación #{amd64}# se crea una versión de 32-bits adecuada para "
"ser usada en la mayoría de máquinas. En segundo lugar, se usa #{--linux-"
-"flavours 686}# porque no se espera usar esta imagen en sistemas mucho más "
-"viejos. En tercer lugar se elige la lista de paquetes #{lxde}# para "
+"flavours 686-pae}# porque no se espera usar esta imagen en sistemas mucho "
+"más viejos. En tercer lugar se elige la lista de paquetes #{lxde}# para "
"proporcionar un escritorio mínimo. Y, por último, se añaden dos paquetes "
"iniciales favoritos: #{iceweasel}# y #{xchat}#."
#. type: Plain text
-#: en/user_examples.ssi:105
+#: en/user_examples.ssi:115
msgid "Now, build the image:"
msgstr "Ahora, crear la imagen:"
#. type: Plain text
-#: en/user_examples.ssi:113
+#: en/user_examples.ssi:123
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}#."
@@ -482,7 +504,7 @@ msgstr ""
"#{auto/build}#."
#. type: Plain text
-#: en/user_examples.ssi:115
+#: en/user_examples.ssi:125
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 "
@@ -494,7 +516,7 @@ msgstr ""
"primer commit:"
#. type: Plain text
-#: en/user_examples.ssi:121
+#: en/user_examples.ssi:131
#, no-wrap
msgid ""
" $ git init\n"
@@ -506,22 +528,22 @@ msgstr ""
" $ git commit -a -m \"Initial import.\"\n"
#. type: Plain text
-#: en/user_examples.ssi:125
+#: en/user_examples.ssi:135
msgid "3~ Second revision"
msgstr "3~ Segunda revisión"
#. type: Plain text
-#: en/user_examples.ssi:127
+#: en/user_examples.ssi:137
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 ""
"En esta revisión, vamos a limpiar desde la primera creación, agregar el "
"paquete #{vlc}# a nuestra configuración, crear de nuevo, probar y enviar los "
-"cambios al git («commit» N.del T.)."
+"cambios al git."
#. type: Plain text
-#: en/user_examples.ssi:129
+#: en/user_examples.ssi:139
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 "
@@ -535,58 +557,50 @@ msgstr ""
"nueva configuración."
#. type: Plain text
-#: en/user_examples.ssi:133
+#: en/user_examples.ssi:143
#, no-wrap
msgid " # lb clean\n"
msgstr " # lb clean\n"
#. type: Plain text
-#: en/user_examples.ssi:137
-msgid "Now edit #{auto/config}# to add the #{vlc}# package:"
-msgstr "Editar ahora #{auto/config}# para añadir el paquete #{vlc}#:"
+#: en/user_examples.ssi:147
+msgid ""
+"Now append the #{vlc}# package to our local package list in #{config/package-"
+"lists/my.list.chroot}#:"
+msgstr ""
+"Añadir ahora el paquete #{vlc}# a nuestra lista de paquetes local en #"
+"{config/package-lists/my.list.chroot}#:"
#. type: Plain text
-#: en/user_examples.ssi:148
+#: en/user_examples.ssi:151
#, 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 ""
-" lb config noauto \\\n"
-" --architecture i386 \\\n"
-" --linux-flavours 686 \\\n"
-" --packages-lists lxde \\\n"
-" --packages \"iceweasel xchat vlc\" \\\n"
-" \"${@}\"\n"
+msgid " $ echo vlc >> config/package-lists/my.list.chroot\n"
+msgstr " $ echo vlc >> config/package-lists/my.list.chroot\n"
#. type: Plain text
-#: en/user_examples.ssi:152
+#: en/user_examples.ssi:155
msgid "Build again:"
msgstr "Crear de nuevo:"
#. type: Plain text
-#: en/user_examples.ssi:156
+#: en/user_examples.ssi:159
msgid "# lb build"
msgstr "# lb build"
#. type: Plain text
-#: en/user_examples.ssi:160
+#: en/user_examples.ssi:163
msgid "Test, and when you're satisfied, commit the next revision:"
msgstr ""
"Probar, y cuando se esté satisfecho, enviar la próxima revisión al git:"
#. type: Plain text
-#: en/user_examples.ssi:164
+#: en/user_examples.ssi:167
#, no-wrap
msgid " $ git commit -a -m \"Adding vlc media player.\"\n"
msgstr " $ git commit -a -m \"Adding vlc media player.\"\n"
#. type: Plain text
-#: en/user_examples.ssi:168
+#: en/user_examples.ssi:171
msgid ""
"Of course, more complicated changes to the configuration are possible, "
"perhaps adding files in subdirectories of #{config/}#. When you commit new "
@@ -604,7 +618,7 @@ msgstr ""
"scripts #{auto}#."
#. type: Plain text
-#: en/user_examples.ssi:170
+#: en/user_examples.ssi:173
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 "
@@ -620,45 +634,45 @@ msgstr ""
"experiencias recogidas de los usuarios de Debian Live."
#. type: Plain text
-#: en/user_examples.ssi:172
+#: en/user_examples.ssi:175
msgid "2~ A VNC Kiosk Client"
msgstr "2~ Un cliente VNC kiosk"
#. type: Plain text
-#: en/user_examples.ssi:174
+#: en/user_examples.ssi:177
#, no-wrap
msgid "*{Use case:}* Create an image with live-build to boot directly to a VNC server.\n"
msgstr "*{Caso Práctico:}* Crear una imagen con live-build para arrancar directamente un servidor VNC.\n"
#. type: Plain text
-#: en/user_examples.ssi:176
+#: en/user_examples.ssi:179
msgid ""
"Make a build directory and create a skeletal configuration in it built "
"around the standard-x11 list, including #{gdm3}#, #{metacity}# and #"
-"{xtightvncviewer}#, disabling recommends to make a minimal system:"
+"{xvnc4viewer}#, disabling recommends to make a minimal system:"
msgstr ""
"Hacer un directorio de creación y crear una configuración en esqueleto según "
-"la lista estándar-x11, incluyendo #{gdm3}#, #{metacity}# y #{xtightvncviewer}"
-"#, desactivando los paquetes recomendados para conseguir un sistema mínimo:"
+"la lista estándar-x11, incluyendo #{gdm3}#, #{metacity}# y #{xvnc4viewer}#, "
+"desactivando los paquetes recomendados para conseguir un sistema mínimo:"
#. type: Plain text
-#: en/user_examples.ssi:184
+#: en/user_examples.ssi:187
#, no-wrap
msgid ""
" $ mkdir vnc_kiosk_client\n"
" $ cd vnc_kiosk_client\n"
-" $ lb config -a i386 -k 686 -p standard-x11 \\\n"
-" --packages \"gdm3 metacity xvnc4viewer\" \\\n"
+" $ lb config -a i386 -k 686-pae -p standard-x11 \\\n"
" --apt-recommends false\n"
+" $ echo \"gdm3 metacity xvnc4viewer\" >> config/package-lists/my.list.chroot\n"
msgstr ""
" $ mkdir vnc_kiosk_client\n"
" $ cd vnc_kiosk_client\n"
-" $ lb config -a i386 -k 686 -p standard-x11 \\\n"
-" --packages \"gdm3 metacity xvnc4viewer\" \\\n"
+" $ lb config -a i386 -k 686-pae -p standard-x11 \\\n"
" --apt-recommends false\n"
+" $ echo \"gdm3 metacity xvnc4viewer\" >> config/package-lists/my.list.chroot\n"
#. type: Plain text
-#: en/user_examples.ssi:188
+#: en/user_examples.ssi:191
msgid ""
"Create the directory #{/etc/skel}# and put a custom #{.xsession}# in it for "
"the default user that will launch metacity and start xvncviewer, connecting "
@@ -670,19 +684,19 @@ msgstr ""
"#:"
#. type: Plain text
-#: en/user_examples.ssi:194
+#: en/user_examples.ssi:197
#, no-wrap
msgid ""
-" $ mkdir -p config/chroot_local-includes/etc/skel\n"
-" $ cat >config/chroot_local-includes/etc/skel/.xsession <<END\n"
+" $ mkdir -p config/includes.chroot/etc/skel\n"
+" $ cat > config/includes.chroot/etc/skel/.xsession <<END\n"
" #!/bin/sh\n"
msgstr ""
-" $ mkdir -p config/chroot_local-includes/etc/skel\n"
-" $ cat >config/chroot_local-includes/etc/skel/.xsession <<END\n"
+" $ mkdir -p config/includes.chroot/etc/skel\n"
+" $ cat > config/includes.chroot/etc/skel/.xsession <<END\n"
" #!/bin/sh\n"
#. type: Plain text
-#: en/user_examples.ssi:197
+#: en/user_examples.ssi:200
#, no-wrap
msgid ""
" /usr/bin/metacity &\n"
@@ -692,7 +706,7 @@ msgstr ""
" /usr/bin/xvncviewer 192.168.1.2:1\n"
#. type: Plain text
-#: en/user_examples.ssi:200
+#: en/user_examples.ssi:203
#, no-wrap
msgid ""
" exit\n"
@@ -702,28 +716,28 @@ msgstr ""
" END\n"
#. type: Plain text
-#: en/user_examples.ssi:204
+#: en/user_examples.ssi:207
msgid "Build the image:"
msgstr "Crear la imagen:"
#. type: Plain text
-#: en/user_examples.ssi:212
+#: en/user_examples.ssi:215
msgid "Enjoy."
msgstr "Disfrutar."
#. type: Plain text
-#: en/user_examples.ssi:214
+#: en/user_examples.ssi:217
msgid "2~ A base image for a 128M USB key"
msgstr "2~ Una imagen básica para un pendrive USB de 128M"
#. type: Plain text
-#: en/user_examples.ssi:216
+#: en/user_examples.ssi:219
#, 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 "*{Caso Práctico:}* Crear una imagen estándar quitando algunos componentes para que quepa en un pendrive USB de 128M dejándo espacio libre para poder usarlo.\n"
#. type: Plain text
-#: en/user_examples.ssi:218
+#: en/user_examples.ssi:221
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 "
@@ -747,22 +761,22 @@ msgstr ""
"probable es que se produzca un sistema roto."
#. type: Plain text
-#: en/user_examples.ssi:223
+#: en/user_examples.ssi:226
#, no-wrap
msgid ""
-" $ lb config -k 486 -p minimal --binary-indices false \\\n"
+" $ lb config -k 486 -p minimal --apt-indices false \\\n"
" --memtest none --apt-recommends false --includes none\n"
msgstr ""
-" $ lb config -k 486 -p minimal --binary-indices false \\\n"
+" $ lb config -k 486 -p minimal --apt-indices false \\\n"
" --memtest none --apt-recommends false --includes none\n"
#. type: Plain text
-#: en/user_examples.ssi:227
+#: en/user_examples.ssi:230
msgid "Now, build the image in the usual way:"
msgstr "Ahora, crear la imagen de forma habitual:"
#. type: Plain text
-#: en/user_examples.ssi:235
+#: en/user_examples.ssi:238
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 "
@@ -774,12 +788,12 @@ msgstr ""
"en el {Tutorial 1}#tutorial-1."
#. type: Plain text
-#: en/user_examples.ssi:237
+#: en/user_examples.ssi:240
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 "
+"instead of the default #{-k \"486 686-pae\"}#. Leaving off APT's indices "
+"with #{--apt-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 #{--"
@@ -792,8 +806,8 @@ msgid ""
msgstr ""
"El mayor ahorro de espacio aquí, en comparación con la creación de una "
"imagen estándar en un sistema de arquitectura #{i386}# es seleccionar sólo "
-"la versión del kernel #{486}# en lugar de la de por defecto #{-k \"486 686\"}"
-"#. Dejar fuera los índices de APT con #{--binary-indices false}# también "
+"la versión del kernel #{486}# en lugar de la de por defecto #{-k \"486 686-"
+"pae\"}#. Dejar fuera los índices de APT con #{--apt-indices false}# también "
"ahorra una cantidad importante de espacio, la desventaja es que es necesario "
"hacer un #{apt-get update}# antes de usar apt en el sistema en vivo. Elegir "
"la lista del paquete #{minimal}# deja fuera el gran paquete de #{locales}# y "
@@ -806,18 +820,18 @@ msgstr ""
"funcionalidad que se sacrifica con cada optimización."
#. type: Plain text
-#: en/user_examples.ssi:239
+#: en/user_examples.ssi:242
msgid "2~ A localized KDE desktop and installer"
msgstr "2~ Un escritorio KDE con variante local e instalador"
#. type: Plain text
-#: en/user_examples.ssi:241
+#: en/user_examples.ssi:244
#, no-wrap
msgid "*{Use case:}* Create a KDE desktop image, localized for Brazilian Portuguese and including an installer.\n"
msgstr "*{Caso práctico:}* Crear una imagen del escritorio KDE, con la variante local Portugués de Brasil con instalador incluido.\n"
#. type: Plain text
-#: en/user_examples.ssi:243
+#: en/user_examples.ssi:246
msgid ""
"We want to make an iso-hybrid image for i386 architecture using our "
"preferred desktop, in this case KDE, containing all of the same packages "
@@ -829,51 +843,43 @@ msgstr ""
"Debian para KDE."
#. type: Plain text
-#: en/user_examples.ssi:245
+#: en/user_examples.ssi:248
msgid ""
-"Our initial problem is the discovery of the names of the appropriate tasks. "
-"Currently, live-build cannot help with this. While we might get lucky and "
-"find this by trial-and-error, there is a tool, #{grep-dctrl}#, which can be "
-"used to dig it out of the task descriptions in tasksel-data, so to prepare, "
-"make sure you have both of those things:"
+"Our initial problem is the discovery of the names of the appropriate "
+"language tasks. Currently, live-build cannot help with this. While we might "
+"get lucky and find this by trial-and-error, there is a tool, #{grep-dctrl}#, "
+"which can be used to dig it out of the task descriptions in tasksel-data, so "
+"to prepare, make sure you have both of those things:"
msgstr ""
"El primer problema es descubrir los nombres de las tareas adecuadas. En la "
"actualidad, live-build no puede ayudar en esto. Aunque podríamos tener "
"suerte y encontrarlos a base de pruebas, hay una herramienta, #{grep-dctrl}"
"#, para extraerlos de las descripciones de tareas en tasksel-data, para "
-"prepararlos, asegurarse de tener ambas cosas:"
+"proceder, asegurarse de tener ambas cosas:"
#. type: Plain text
-#: en/user_examples.ssi:249
+#: en/user_examples.ssi:252
#, no-wrap
msgid " # apt-get install dctrl-tools tasksel-data\n"
msgstr " # apt-get install dctrl-tools tasksel-data\n"
#. type: Plain text
-#: en/user_examples.ssi:253
+#: en/user_examples.ssi:256
msgid "Now we can search for the appropriate tasks, first with:"
msgstr "Ahora podemos buscar las tareas apropiadas, primero con:"
#. type: Plain text
-#: en/user_examples.ssi:262
+#: en/user_examples.ssi:261
#, no-wrap
msgid ""
-" $ grep-dctrl -FTest-lang pt_BR /usr/share/tasksel/debian-tasks.desc -sTask,Description\n"
+" $ grep-dctrl -FTest-lang pt_BR /usr/share/tasksel/descs/debian-tasks.desc -sTask\n"
" Task: brazilian-portuguese\n"
-" Description: Brazilian Portuguese environment\n"
-" This task installs programs, data files, and\n"
-" documentation that make it easier for Brazilian Portuguese speakers\n"
-" to use Debian.\n"
msgstr ""
-" $ grep-dctrl -FTest-lang pt_BR /usr/share/tasksel/debian-tasks.desc -sTask,Description\n"
+" $ grep-dctrl -FTest-lang pt_BR /usr/share/tasksel/descs/debian-tasks.desc -sTask\n"
" Task: brazilian-portuguese\n"
-" Description: Brazilian Portuguese environment\n"
-" This task installs programs, data files, and\n"
-" documentation that make it easier for Brazilian Portuguese speakers\n"
-" to use Debian.\n"
#. type: Plain text
-#: en/user_examples.ssi:266
+#: en/user_examples.ssi:265
msgid ""
"By this command, we discover the task is called, plainly enough, brazilian-"
"portuguese. Now to find the related tasks:"
@@ -882,48 +888,35 @@ msgstr ""
"brazilian-portuguese. Ahora para encontrar las tareas relacionas: "
#. type: Plain text
-#: en/user_examples.ssi:273
+#: en/user_examples.ssi:271
#, no-wrap
msgid ""
-" $ grep-dctrl -FEnhances brazilian-portuguese /usr/share/tasksel/debian-tasks.desc -sTask,Description\n"
+" $ grep-dctrl -FEnhances brazilian-portuguese /usr/share/tasksel/descs/debian-tasks.desc -sTask\n"
" Task: brazilian-portuguese-desktop\n"
-" Description: Brazilian Portuguese desktop\n"
-" This task localises the desktop in Brasilian Portuguese.\n"
-msgstr ""
-"$ grep-dctrl -FEnhances brazilian-portuguese /usr/share/tasksel/debian-tasks.desc -sTask,Description\n"
-" Task: brazilian-portuguese-desktop\n"
-" Description: Brazilian Portuguese desktop\n"
-" This task localises the desktop in Brasilian Portuguese.\n"
-
-#. type: Plain text
-#: en/user_examples.ssi:277
-#, no-wrap
-msgid ""
" Task: brazilian-portuguese-kde-desktop\n"
-" Description: Brazilian Portuguese KDE desktop\n"
-" This task localises the KDE desktop in Brazilian Portuguese.\n"
msgstr ""
+" $ grep-dctrl -FEnhances brazilian-portuguese /usr/share/tasksel/descs/debian-tasks.desc -sTask\n"
+" Task: brazilian-portuguese-desktop\n"
" Task: brazilian-portuguese-kde-desktop\n"
-" Description: Brazilian Portuguese KDE desktop\n"
-" This task localises the KDE desktop in Brazilian Portuguese.\n"
#. type: Plain text
-#: en/user_examples.ssi:281
+#: en/user_examples.ssi:275
msgid ""
-"We will use the experimental #{--language}# option, as live-build happens to "
-"include #{syslinux}# templates for pt_BR (see {Desktop and language tasks}"
-"#desktop-and-language-tasks for details). And at boot time we will generate "
-"the pt_BR.UTF-8 locale and select the pt-latin1 keyboard layout. Now let's "
-"put the pieces together:"
+"At boot time we will generate the pt_BR.UTF-8 locale and select the pt-"
+"latin1 keyboard layout. We will also need to preseed our desktop choice, "
+"\"kde\" so that tasksel will install the correct desktop task, as it differs "
+"from the default (see {Desktop and languages tasks}#desktop-and-language-"
+"tasks). Now let's put the pieces together:"
msgstr ""
-"Se usará la opción experimental #{--language}#, ya que live-build incluye #"
-"{syslinux}# para pt_BR (ver {Tareas de Escritorio e Idioma}#desktop-and-"
-"language-tasks para más detalles). Y en el momento del arranque se generarán "
-"las variantes locales pt_BR.UTF-8 y se seleccionará el diseño del teclado pt-"
-"latin1. Ahora se ponen todas las piezas juntas:"
+"En el momento del arranque se van a generar las variantes locales pt_BR."
+"UTF-8 y seleccionar la distribución del teclado pt-latin1. También será "
+"necesario preconfigurar la opción de escritorio, \"kde\" para que tasksel "
+"instale la tarea de escritorio correcta, ya que difiere de la de por defecto "
+"(Ver {Tareas de Escritorio e Idioma}#desktop-and-language-tasks). Ahora "
+"vamos a poner las piezas juntas:"
#. type: Plain text
-#: en/user_examples.ssi:295
+#: en/user_examples.ssi:289
#, no-wrap
msgid ""
" $ mkdir live-pt_BR-kde\n"
@@ -931,27 +924,27 @@ msgid ""
" $ lb config \\\n"
" -a i386 \\\n"
" -k 486 \\\n"
-" -p kde-desktop \\\n"
-" --language pt_BR \\\n"
-" --tasks \"brazilian-portuguese brazilian-portuguese-desktop brazilian-portuguese-kde-desktop\" \\\n"
" --bootappend-live \"locales=pt_BR.UTF-8 keyboard-layouts=pt-latin1\" \\\n"
-" --debian-installer live \\\n"
-" --packages debian-installer-launcher\n"
+" --debian-installer live\n"
+" $ echo kde-desktop brazilian-portuguese brazilian-portuguese-desktop \\\n"
+" brazilian-portuguese-kde-desktop >> config/task-lists/my.list.chroot\n"
+" $ echo debian-installer-launcher >> config/package-lists/my.list.chroot\n"
+" $ echo tasksel tasksel/desktop multiselect kde >> config/preseed/my.preseed.chroot\n"
msgstr ""
" $ mkdir live-pt_BR-kde\n"
" $ cd live-pt_BR-kde\n"
" $ lb config \\\n"
" -a i386 \\\n"
" -k 486 \\\n"
-" -p kde-desktop \\\n"
-" --language pt_BR \\\n"
-" --tasks \"brazilian-portuguese brazilian-portuguese-desktop brazilian-portuguese-kde-desktop\" \\\n"
" --bootappend-live \"locales=pt_BR.UTF-8 keyboard-layouts=pt-latin1\" \\\n"
-" --debian-installer live \\\n"
-" --packages debian-installer-launcher\n"
+" --debian-installer live\n"
+" $ echo kde-desktop brazilian-portuguese brazilian-portuguese-desktop \\\n"
+" brazilian-portuguese-kde-desktop >> config/task-lists/my.list.chroot\n"
+" $ echo debian-installer-launcher >> config/package-lists/my.list.chroot\n"
+" $ echo tasksel tasksel/desktop multiselect kde >> config/preseed/my.preseed.chroot\n"
#. type: Plain text
-#: en/user_examples.ssi:298
+#: en/user_examples.ssi:292
msgid ""
"Note that we have included the #{debian-installer-launcher}# package to "
"launch the installer from the live desktop, and have also specified the 486 "
diff --git a/manual/po/es/user_installation.ssi.po b/manual/po/es/user_installation.ssi.po
index b09cd80..a8c05d1 100644
--- a/manual/po/es/user_installation.ssi.po
+++ b/manual/po/es/user_installation.ssi.po
@@ -2,19 +2,18 @@
# Copyright (C) 2011 Free Software Foundation, Inc.
# This file is distributed under the same license as the live-manual package.
# Automatically generated, 2011.
-# Translated and revised by:
+# Translated and revised by:
# José Luis Zabalza <jlz.3008 at gmail.com> and
-# Carlos Zuferri «chals» <chals at altorricon.com>
+# Carlos Zuferri «chals» <chals at altorricon.com>, 2011.
#
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2011-06-21 09:17+0300\n"
-"PO-Revision-Date: 2011-03-19 19:19+0100\n"
+"POT-Creation-Date: 2011-11-07 17:40-0400\n"
+"PO-Revision-Date: 2011-11-07 22:05+0100\n"
"Last-Translator: José Luis Zabalza and Carlos Zuferri «chals» "
"<jlz.3008 at gmail.com> <chals at altorricon.com>\n"
-"Language-Team: Debian live Spanish translation team <debian-live at lists."
-"debian.org>\n"
+"Language-Team: <debian-live at lists.debian.org>\n"
"Language: es\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -42,37 +41,38 @@ msgstr ""
#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
-#: en/user_customization-installer.ssi:43
+#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
-#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:53
-#: en/user_customization-packages.ssi:66 en/user_customization-packages.ssi:80
-#: en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:112
-#: en/user_customization-packages.ssi:142
-#: en/user_customization-packages.ssi:155
-#: en/user_customization-packages.ssi:165
-#: en/user_customization-packages.ssi:175
-#: en/user_customization-packages.ssi:185
-#: en/user_customization-packages.ssi:199
-#: en/user_customization-packages.ssi:215
-#: en/user_customization-packages.ssi:227
-#: en/user_customization-packages.ssi:291
-#: en/user_customization-packages.ssi:303
-#: en/user_customization-packages.ssi:313
-#: en/user_customization-packages.ssi:331
-#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
-#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
-#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
-#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
-#: en/user_customization-runtime.ssi:99 en/user_customization-runtime.ssi:107
-#: 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:178 en/user_examples.ssi:190
-#: en/user_examples.ssi:206 en/user_examples.ssi:220 en/user_examples.ssi:229
-#: en/user_examples.ssi:247 en/user_examples.ssi:255 en/user_examples.ssi:268
-#: en/user_examples.ssi:283 en/user_installation.ssi:38
+#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:54
+#: en/user_customization-packages.ssi:67 en/user_customization-packages.ssi:81
+#: en/user_customization-packages.ssi:101
+#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:140
+#: en/user_customization-packages.ssi:150
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:184
+#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:276
+#: en/user_customization-packages.ssi:288
+#: en/user_customization-packages.ssi:298
+#: en/user_customization-packages.ssi:316
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:24 en/user_customization-runtime.ssi:44
+#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:63
+#: en/user_customization-runtime.ssi:71 en/user_customization-runtime.ssi:80
+#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:111
+#: en/user_customization-runtime.ssi:119 en/user_examples.ssi:14
+#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
+#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
+#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
+#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
+#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
+#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
+#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
+#: en/user_examples.ssi:277 en/user_installation.ssi:38
#: en/user_installation.ssi:46 en/user_installation.ssi:56
#: en/user_installation.ssi:64 en/user_installation.ssi:74
#: en/user_installation.ssi:82 en/user_installation.ssi:90
@@ -81,7 +81,7 @@ msgstr ""
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:80 en/user_overview.ssi:88
+#: en/user_overview.ssi:48 en/user_overview.ssi:56
msgid "code{"
msgstr "code{"
@@ -105,38 +105,39 @@ msgstr "code{"
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
-#: en/user_customization-installer.ssi:37
-#: en/user_customization-installer.ssi:48
+#: en/user_customization-installer.ssi:38
+#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:70 en/user_customization-packages.ssi:84
-#: en/user_customization-packages.ssi:98
-#: en/user_customization-packages.ssi:116
-#: en/user_customization-packages.ssi:147
-#: en/user_customization-packages.ssi:161
-#: en/user_customization-packages.ssi:171
-#: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:191
-#: en/user_customization-packages.ssi:203
-#: en/user_customization-packages.ssi:219
-#: en/user_customization-packages.ssi:231
-#: en/user_customization-packages.ssi:295
-#: en/user_customization-packages.ssi:307
-#: en/user_customization-packages.ssi:317
-#: en/user_customization-packages.ssi:344
-#: en/user_customization-packages.ssi:353 en/user_customization-runtime.ssi:18
-#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
-#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
-#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
-#: en/user_customization-runtime.ssi:103 en/user_customization-runtime.ssi:112
-#: 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:186 en/user_examples.ssi:202
-#: en/user_examples.ssi:210 en/user_examples.ssi:225 en/user_examples.ssi:233
-#: en/user_examples.ssi:251 en/user_examples.ssi:264 en/user_examples.ssi:279
-#: en/user_examples.ssi:297 en/user_installation.ssi:42
+#: en/user_customization-packages.ssi:46 en/user_customization-packages.ssi:59
+#: en/user_customization-packages.ssi:71 en/user_customization-packages.ssi:85
+#: en/user_customization-packages.ssi:105
+#: en/user_customization-packages.ssi:132
+#: en/user_customization-packages.ssi:146
+#: en/user_customization-packages.ssi:156
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:329
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:346 en/user_customization-runtime.ssi:18
+#: en/user_customization-runtime.ssi:28 en/user_customization-runtime.ssi:48
+#: en/user_customization-runtime.ssi:59 en/user_customization-runtime.ssi:67
+#: en/user_customization-runtime.ssi:76 en/user_customization-runtime.ssi:85
+#: en/user_customization-runtime.ssi:105 en/user_customization-runtime.ssi:115
+#: en/user_customization-runtime.ssi:124 en/user_examples.ssi:20
+#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
+#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
+#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
+#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
+#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
+#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
+#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
+#: en/user_examples.ssi:291 en/user_installation.ssi:42
#: en/user_installation.ssi:50 en/user_installation.ssi:60
#: en/user_installation.ssi:70 en/user_installation.ssi:78
#: en/user_installation.ssi:86 en/user_installation.ssi:94
@@ -144,16 +145,16 @@ msgstr "code{"
#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
-#: en/user_overview.ssi:84 en/user_overview.ssi:92
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:42
+#: en/user_overview.ssi:52 en/user_overview.ssi:60
msgid "}code"
msgstr "}code"
#. type: Plain text
-#: en/user_customization-packages.ssi:82 en/user_installation.ssi:148
+#: en/user_customization-packages.ssi:83 en/user_installation.ssi:148
#, no-wrap
-msgid " $ lb config --repository live.debian.net\n"
-msgstr " $ lb config --repository live.debian.net\n"
+msgid " $ lb config --archives live.debian.net\n"
+msgstr " $ lb config --archives live.debian.net\n"
#. type: Plain text
#: en/user_installation.ssi:2
@@ -376,8 +377,8 @@ msgstr "2~ live-boot y live-config"
#. type: Plain text
#: en/user_installation.ssi:102
#, no-wrap
-msgid "*{Note:}* You do not need to install live-boot or live-config on your system to create customized Debian Live systems. However, doing so will do no harm and is useful for reference purposes.\n"
-msgstr "*{Nota:}* No es necesario instalar live-boot o live-config en el sistema para crear sistemas personalizados de Debian Live. Sin embargo, eso no causará ningún daño y es útil por motivos de referencia.\n"
+msgid "*{Note:}* You do not need to install live-boot or live-config on your system to create customized Debian Live systems. However, doing so will do no harm and is useful for reference purposes. If you only want the documentation, you may now install the live-boot-doc and live-config-doc packages separately.\n"
+msgstr "*{Nota:}* No es necesario instalar live-boot o live-config en el sistema para crear sistemas personalizados de Debian Live. Sin embargo, eso no causará ningún daño y es útil por motivos de referencia. Si únicamente se desea tener la documentación, es posible instalar los paquetes live-boot-doc y live-config-doc de forma independiente.\n"
#. type: Plain text
#: en/user_installation.ssi:106
@@ -432,30 +433,30 @@ msgstr "_* Creación de los paquetes .deb de live-boot y live-config"
#: en/user_installation.ssi:125
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 "
-"build against Squeeze."
+"your target platform: this means if your target is Wheezy then you should "
+"build against Wheezy."
msgstr ""
"Se debe crear ya sea en la distribución de destino o en un entorno chroot "
-"que contenga la plataforma de destino: es decir, si el objetivo es Squeeze "
-"entonces se debe crear usando Squeeze."
+"que contenga la plataforma de destino: es decir, si el objetivo es Wheezy "
+"entonces se debe crear usando Wheezy."
#. type: Plain text
#: en/user_installation.ssi:127
msgid ""
"Use a personal builder such as /{pbuilder}/ or /{sbuild}/ if you need to "
"build #{live-boot}# for a target distribution that differs from your build "
-"system. For example, for Squeeze live images, build #{live-boot}# in a "
-"Squeeze chroot. If your target distribution happens to match your build "
-"system distribution, you may build directly on the build system using #{dpkg-"
+"system. For example, for Wheezy live images, build #{live-boot}# in a Wheezy "
+"chroot. If your target distribution happens to match your build system "
+"distribution, you may build directly on the build system using #{dpkg-"
"buildpackage}# (provided by the /{dpkg-dev}/ package):"
msgstr ""
"Utilizar un programa creador personal como /{pbuilder}/ o /{sbuild}/ si se "
"necesita crear #{live-boot}# para una distribución de destino diferente del "
-"sistema de creación. Por ejemplo, para las imágenes en vivo de Squeeze, "
-"crear #{live-boot}# en un entorno chroot. Si la distribución de destino "
-"coincide con la distribución actual, se puede crear directamente sobre el "
-"sistema de creación con #{dpkg-buildpackage}# (proporcionada por el paquete /"
-"{dpkg-dev}/ ):"
+"sistema de creación. Por ejemplo, para las imágenes en vivo de Wheezy, crear "
+"#{live-boot}# en un entorno chroot. Si la distribución de destino coincide "
+"con la distribución actual, se puede crear directamente sobre el sistema de "
+"creación con #{dpkg-buildpackage}# (proporcionada por el paquete /{dpkg-"
+"dev}/ ):"
#. type: Plain text
#: en/user_installation.ssi:134
@@ -500,9 +501,10 @@ msgid ""
"You can let live-build automatically use the latest snapshots of live-boot "
"and live-config by configuring a third-party repository in your live-build "
"configuration directory. Assuming you have already created a configuration "
-"tree with #{lb config}#:"
+"tree in the current directory with #{lb config}#:"
msgstr ""
"Se puede dejar que live-build utilice automáticamente las últimas "
"instantáneas de live-boot y live-config mediante la configuración de "
"repósitorios de terceros en el directorio de configuración de live-build. "
-"Suponiendo que ya se haya creado un árbol de configuración con #{lb config}#:"
+"Suponiendo que ya se haya creado un árbol de configuración en el directorio "
+"actual con #{lb config}#:"
diff --git a/manual/po/es/user_managing_a_configuration.ssi.po b/manual/po/es/user_managing_a_configuration.ssi.po
index cedd5f2..1372fc8 100644
--- a/manual/po/es/user_managing_a_configuration.ssi.po
+++ b/manual/po/es/user_managing_a_configuration.ssi.po
@@ -2,15 +2,15 @@
# Copyright (C) 2011 Free Software Foundation, Inc.
# This file is distributed under the same license as the live-manual package.
# Automatically generated, 2011.
-# Translated and revised by:
+# Translated and revised by:
# José Luis Zabalza <jlz.3008 at gmail.com> and
# Carlos Zuferri «chals» <chals at altorricon.com>
#
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-12-19 20:37-0400\n"
-"PO-Revision-Date: 2011-03-12 17:52+0100\n"
+"POT-Creation-Date: 2011-11-02 12:23-0200\n"
+"PO-Revision-Date: 2011-11-13 17:28+0100\n"
"Last-Translator: José Luis Zabalza and Carlos Zuferri «chals» "
"<jlz.3008 at gmail.com> <chals at altorricon.com>\n"
"Language-Team: Debian live Spanish translation team <debian-live at lists."
@@ -24,55 +24,56 @@ msgstr ""
#. type: Plain text
#: 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/project_bugs.ssi:58
+#: en/about_manual.ssi:146 en/about_manual.ssi:157 en/about_manual.ssi:165
+#: en/about_manual.ssi:173 en/project_bugs.ssi:60
#: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
#: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
#: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/user_basics.ssi:30 en/user_basics.ssi:40
-#: en/user_basics.ssi:52 en/user_basics.ssi:64 en/user_basics.ssi:76
-#: en/user_basics.ssi:86 en/user_basics.ssi:100 en/user_basics.ssi:108
-#: en/user_basics.ssi:116 en/user_basics.ssi:126 en/user_basics.ssi:140
+#: en/project_procedures.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
+#: en/user_basics.ssi:116 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:218 en/user_basics.ssi:246 en/user_basics.ssi:262
-#: en/user_basics.ssi:270 en/user_basics.ssi:290 en/user_basics.ssi:315
+#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
+#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
+#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
+#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
-#: en/user_customization-installer.ssi:43
+#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
-#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:53
-#: en/user_customization-packages.ssi:66 en/user_customization-packages.ssi:80
-#: en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:112
-#: en/user_customization-packages.ssi:142
-#: en/user_customization-packages.ssi:155
-#: en/user_customization-packages.ssi:165
-#: en/user_customization-packages.ssi:175
-#: en/user_customization-packages.ssi:185
-#: en/user_customization-packages.ssi:199
-#: en/user_customization-packages.ssi:215
-#: en/user_customization-packages.ssi:227
-#: en/user_customization-packages.ssi:291
-#: en/user_customization-packages.ssi:303
-#: en/user_customization-packages.ssi:313
-#: en/user_customization-packages.ssi:331
-#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
-#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
-#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
-#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
-#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:106
-#: 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:178 en/user_examples.ssi:190
-#: en/user_examples.ssi:206 en/user_examples.ssi:220 en/user_examples.ssi:229
-#: en/user_examples.ssi:247 en/user_examples.ssi:255 en/user_examples.ssi:268
-#: en/user_examples.ssi:283 en/user_installation.ssi:38
+#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:54
+#: en/user_customization-packages.ssi:67 en/user_customization-packages.ssi:81
+#: en/user_customization-packages.ssi:101
+#: en/user_customization-packages.ssi:131
+#: en/user_customization-packages.ssi:144
+#: en/user_customization-packages.ssi:154
+#: en/user_customization-packages.ssi:164
+#: en/user_customization-packages.ssi:174
+#: en/user_customization-packages.ssi:188
+#: en/user_customization-packages.ssi:204
+#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:320
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:345 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:24 en/user_customization-runtime.ssi:44
+#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:63
+#: en/user_customization-runtime.ssi:71 en/user_customization-runtime.ssi:80
+#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:111
+#: en/user_customization-runtime.ssi:119 en/user_examples.ssi:14
+#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
+#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
+#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
+#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
+#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
+#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
+#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:271
+#: en/user_examples.ssi:286 en/user_installation.ssi:38
#: en/user_installation.ssi:46 en/user_installation.ssi:56
#: en/user_installation.ssi:64 en/user_installation.ssi:74
#: en/user_installation.ssi:82 en/user_installation.ssi:90
@@ -88,60 +89,61 @@ msgstr "code{"
#. type: Plain text
#: 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:174 en/project_bugs.ssi:62
+#: en/about_manual.ssi:151 en/about_manual.ssi:161 en/about_manual.ssi:169
+#: en/about_manual.ssi:177 en/project_bugs.ssi:64
#: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
#: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
#: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/user_basics.ssi:34 en/user_basics.ssi:44
-#: en/user_basics.ssi:58 en/user_basics.ssi:70 en/user_basics.ssi:80
-#: en/user_basics.ssi:92 en/user_basics.ssi:104 en/user_basics.ssi:112
-#: en/user_basics.ssi:120 en/user_basics.ssi:130 en/user_basics.ssi:146
+#: en/project_procedures.ssi:131 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:134 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:238 en/user_basics.ssi:250 en/user_basics.ssi:266
-#: en/user_basics.ssi:274 en/user_basics.ssi:301 en/user_basics.ssi:340
+#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
+#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
+#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
+#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
-#: en/user_customization-installer.ssi:37
-#: en/user_customization-installer.ssi:48
+#: en/user_customization-installer.ssi:38
+#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:70 en/user_customization-packages.ssi:84
-#: en/user_customization-packages.ssi:98
-#: en/user_customization-packages.ssi:116
-#: en/user_customization-packages.ssi:147
-#: en/user_customization-packages.ssi:161
-#: en/user_customization-packages.ssi:171
-#: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:191
-#: en/user_customization-packages.ssi:203
-#: en/user_customization-packages.ssi:219
-#: en/user_customization-packages.ssi:231
-#: en/user_customization-packages.ssi:295
-#: en/user_customization-packages.ssi:307
-#: en/user_customization-packages.ssi:317
-#: en/user_customization-packages.ssi:344
-#: en/user_customization-packages.ssi:354 en/user_customization-runtime.ssi:18
-#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
-#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
-#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
-#: en/user_customization-runtime.ssi:102 en/user_customization-runtime.ssi:111
-#: 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:186 en/user_examples.ssi:202
-#: en/user_examples.ssi:210 en/user_examples.ssi:225 en/user_examples.ssi:233
-#: en/user_examples.ssi:251 en/user_examples.ssi:264 en/user_examples.ssi:279
-#: en/user_examples.ssi:297 en/user_installation.ssi:42
+#: en/user_customization-packages.ssi:46 en/user_customization-packages.ssi:59
+#: en/user_customization-packages.ssi:71 en/user_customization-packages.ssi:85
+#: en/user_customization-packages.ssi:105
+#: en/user_customization-packages.ssi:136
+#: en/user_customization-packages.ssi:150
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:180
+#: en/user_customization-packages.ssi:192
+#: en/user_customization-packages.ssi:208
+#: en/user_customization-packages.ssi:220
+#: en/user_customization-packages.ssi:284
+#: en/user_customization-packages.ssi:296
+#: en/user_customization-packages.ssi:306
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341
+#: en/user_customization-packages.ssi:350 en/user_customization-runtime.ssi:18
+#: en/user_customization-runtime.ssi:28 en/user_customization-runtime.ssi:48
+#: en/user_customization-runtime.ssi:59 en/user_customization-runtime.ssi:67
+#: en/user_customization-runtime.ssi:76 en/user_customization-runtime.ssi:85
+#: en/user_customization-runtime.ssi:105 en/user_customization-runtime.ssi:115
+#: en/user_customization-runtime.ssi:124 en/user_examples.ssi:20
+#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
+#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
+#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
+#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
+#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
+#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
+#: en/user_examples.ssi:254 en/user_examples.ssi:267 en/user_examples.ssi:282
+#: en/user_examples.ssi:300 en/user_installation.ssi:42
#: en/user_installation.ssi:50 en/user_installation.ssi:60
#: en/user_installation.ssi:70 en/user_installation.ssi:78
#: en/user_installation.ssi:86 en/user_installation.ssi:94
#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_installation.ssi:150 en/user_managing_a_configuration.ssi:31
+#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
@@ -291,12 +293,12 @@ msgstr "#{auto/config}#"
msgid ""
" #!/bin/sh\n"
" lb config noauto \\\n"
-" --packages-lists \"standard\" \\\n"
+" --package-lists \"standard\" \\\n"
" \"${@}\"\n"
msgstr ""
-"#!/bin/sh\n"
+" #!/bin/sh\n"
" lb config noauto \\\n"
-" --packages-lists \"standard\" \\\n"
+" --package-lists \"standard\" \\\n"
" \"${@}\"\n"
#. type: Plain text
@@ -351,17 +353,17 @@ msgid " $ cp /usr/share/live/build/examples/auto/* auto/\n"
msgstr " $ cp /usr/share/live/build/examples/auto/* auto/\n"
#. type: Plain text
-#: en/user_managing_a_configuration.ssi:62
+#: en/user_managing_a_configuration.ssi:61
msgid ""
"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. "
+"example above, #{--package-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 ""
"Se puede editar el script #{auto/config}#, modificándolo o añadiendo "
"cualquier opción que se acomode a las necesidades requeridas. En el ejemplo "
-"anterior, se asignará la opción #{--packages-lists standard}# como si fuese "
+"anterior, se asignará la opción #{--package-lists standard}# como si fuese "
"asignada por defecto. Se puede cambiar este valor a uno adecuado o "
"simplemente eliminarlo si no es necesario añadiendo cualquier otra opción "
"que se adecue a las necesidades requeridas por la imagen a crear, en líneas "
diff --git a/manual/po/es/user_overview.ssi.po b/manual/po/es/user_overview.ssi.po
index c69cd97..1498a6b 100644
--- a/manual/po/es/user_overview.ssi.po
+++ b/manual/po/es/user_overview.ssi.po
@@ -9,8 +9,8 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2011-05-13 12:02-0200\n"
-"PO-Revision-Date: 2011-05-13 18:54+0100\n"
+"POT-Creation-Date: 2011-11-07 08:16-0400\n"
+"PO-Revision-Date: 2011-11-07 14:47+0100\n"
"Last-Translator: José Luis Zabalza and Carlos Zuferri «chals» "
"<jlz.3008 at gmail.com> <chals at altorricon.com>\n"
"Language-Team: Debian live Spanish translation team <debian-live at lists."
@@ -42,37 +42,38 @@ msgstr ""
#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
-#: en/user_customization-installer.ssi:43
+#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
-#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:53
-#: en/user_customization-packages.ssi:66 en/user_customization-packages.ssi:80
-#: en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:112
-#: en/user_customization-packages.ssi:142
-#: en/user_customization-packages.ssi:155
-#: en/user_customization-packages.ssi:165
-#: en/user_customization-packages.ssi:175
-#: en/user_customization-packages.ssi:185
-#: en/user_customization-packages.ssi:199
-#: en/user_customization-packages.ssi:215
-#: en/user_customization-packages.ssi:227
-#: en/user_customization-packages.ssi:291
-#: en/user_customization-packages.ssi:303
-#: en/user_customization-packages.ssi:313
-#: en/user_customization-packages.ssi:331
-#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
-#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
-#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
-#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
-#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:105
-#: 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:178 en/user_examples.ssi:190
-#: en/user_examples.ssi:206 en/user_examples.ssi:220 en/user_examples.ssi:229
-#: en/user_examples.ssi:247 en/user_examples.ssi:255 en/user_examples.ssi:268
-#: en/user_examples.ssi:283 en/user_installation.ssi:38
+#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:54
+#: en/user_customization-packages.ssi:67 en/user_customization-packages.ssi:81
+#: en/user_customization-packages.ssi:101
+#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:140
+#: en/user_customization-packages.ssi:150
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:184
+#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:276
+#: en/user_customization-packages.ssi:288
+#: en/user_customization-packages.ssi:298
+#: en/user_customization-packages.ssi:316
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:24 en/user_customization-runtime.ssi:44
+#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:63
+#: en/user_customization-runtime.ssi:71 en/user_customization-runtime.ssi:80
+#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:111
+#: en/user_customization-runtime.ssi:119 en/user_examples.ssi:14
+#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
+#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
+#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
+#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
+#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
+#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
+#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
+#: en/user_examples.ssi:277 en/user_installation.ssi:38
#: en/user_installation.ssi:46 en/user_installation.ssi:56
#: en/user_installation.ssi:64 en/user_installation.ssi:74
#: en/user_installation.ssi:82 en/user_installation.ssi:90
@@ -81,7 +82,7 @@ msgstr ""
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:80 en/user_overview.ssi:88
+#: en/user_overview.ssi:48 en/user_overview.ssi:56
msgid "code{"
msgstr "code{"
@@ -105,38 +106,39 @@ msgstr "code{"
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
-#: en/user_customization-installer.ssi:37
-#: en/user_customization-installer.ssi:48
+#: en/user_customization-installer.ssi:38
+#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:70 en/user_customization-packages.ssi:84
-#: en/user_customization-packages.ssi:98
-#: en/user_customization-packages.ssi:116
-#: en/user_customization-packages.ssi:147
-#: en/user_customization-packages.ssi:161
-#: en/user_customization-packages.ssi:171
-#: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:191
-#: en/user_customization-packages.ssi:203
-#: en/user_customization-packages.ssi:219
-#: en/user_customization-packages.ssi:231
-#: en/user_customization-packages.ssi:295
-#: en/user_customization-packages.ssi:307
-#: en/user_customization-packages.ssi:317
-#: en/user_customization-packages.ssi:344
-#: en/user_customization-packages.ssi:353 en/user_customization-runtime.ssi:18
-#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
-#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
-#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
-#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:110
-#: 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:186 en/user_examples.ssi:202
-#: en/user_examples.ssi:210 en/user_examples.ssi:225 en/user_examples.ssi:233
-#: en/user_examples.ssi:251 en/user_examples.ssi:264 en/user_examples.ssi:279
-#: en/user_examples.ssi:297 en/user_installation.ssi:42
+#: en/user_customization-packages.ssi:46 en/user_customization-packages.ssi:59
+#: en/user_customization-packages.ssi:71 en/user_customization-packages.ssi:85
+#: en/user_customization-packages.ssi:105
+#: en/user_customization-packages.ssi:132
+#: en/user_customization-packages.ssi:146
+#: en/user_customization-packages.ssi:156
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:329
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:346 en/user_customization-runtime.ssi:18
+#: en/user_customization-runtime.ssi:28 en/user_customization-runtime.ssi:48
+#: en/user_customization-runtime.ssi:59 en/user_customization-runtime.ssi:67
+#: en/user_customization-runtime.ssi:76 en/user_customization-runtime.ssi:85
+#: en/user_customization-runtime.ssi:105 en/user_customization-runtime.ssi:115
+#: en/user_customization-runtime.ssi:124 en/user_examples.ssi:20
+#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
+#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
+#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
+#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
+#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
+#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
+#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
+#: en/user_examples.ssi:291 en/user_installation.ssi:42
#: en/user_installation.ssi:50 en/user_installation.ssi:60
#: en/user_installation.ssi:70 en/user_installation.ssi:78
#: en/user_installation.ssi:86 en/user_installation.ssi:94
@@ -144,8 +146,8 @@ msgstr "code{"
#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
-#: en/user_overview.ssi:84 en/user_overview.ssi:92
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:42
+#: en/user_overview.ssi:52 en/user_overview.ssi:60
msgid "}code"
msgstr "}code"
@@ -301,110 +303,40 @@ msgstr ""
#: en/user_overview.ssi:34
msgid ""
"Issuing #{lb config}# without any arguments creates a #{config/}# "
-"subdirectory which it populates with some default settings:"
+"subdirectory which it populates with some default settings, and a skeleton #"
+"{auto/}# subdirectory tree."
msgstr ""
"Ejecutar #{lb config}# sin argumentos crea un subdirectorio #{config/}# que "
-"se completa con algunas opciones por defecto:"
+"se completa con algunas opciones por defecto y un árbol de subdirectorios en "
+"forma de esqueleto #{auto/}#:"
#. type: Plain text
-#: en/user_overview.ssi:39
+#: en/user_overview.ssi:40
#, no-wrap
msgid ""
" $ lb config\n"
+" P: Considering defaults defined in /etc/live/build.conf\n"
" P: Creating config tree\n"
msgstr ""
" $ lb config\n"
+" P: Considering defaults defined in /etc/live/build.conf\n"
" P: Creating config tree\n"
#. type: Plain text
#: en/user_overview.ssi:44
-#, no-wrap
-msgid ""
-" $ ls -l\n"
-" total 8\n"
-" drwxr-xr-x 3 user user 4096 Sep 7 13:02 auto\n"
-" drwxr-xr-x 22 user user 4096 Sep 7 13:02 config\n"
-msgstr ""
-" $ ls -l\n"
-" total 8\n"
-" drwxr-xr-x 3 user user 4096 Sep 7 13:02 auto\n"
-" drwxr-xr-x 22 user user 4096 Sep 7 13:02 config\n"
-
-#. type: Plain text
-#: en/user_overview.ssi:72
-#, no-wrap
-msgid ""
-" $ ls -l config/\n"
-" total 104\n"
-" -rw-r--r-- 1 user user 4197 Sep 7 13:02 binary\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_debian-installer\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_debian-installer-includes\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_grub\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-debs\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-hooks\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-includes\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-packageslists\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-udebs\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_rootfs\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_syslinux\n"
-" -rw-r--r-- 1 user user 2051 Sep 7 13:02 bootstrap\n"
-" -rw-r--r-- 1 user user 1647 Sep 7 13:02 chroot\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_apt\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-hooks\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-includes\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-packages\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-packageslists\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-patches\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-preseed\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_sources\n"
-" -rw-r--r-- 1 user user 2954 Sep 7 13:02 common\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 includes\n"
-" -rw-r--r-- 1 user user 205 Sep 7 13:02 source\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 templates\n"
-msgstr ""
-" $ ls -l config/\n"
-" total 104\n"
-" -rw-r--r-- 1 user user 4197 Sep 7 13:02 binary\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_debian-installer\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_debian-installer-includes\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_grub\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-debs\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-hooks\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-includes\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-packageslists\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-udebs\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_rootfs\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_syslinux\n"
-" -rw-r--r-- 1 user user 2051 Sep 7 13:02 bootstrap\n"
-" -rw-r--r-- 1 user user 1647 Sep 7 13:02 chroot\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_apt\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-hooks\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-includes\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-packages\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-packageslists\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-patches\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-preseed\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_sources\n"
-" -rw-r--r-- 1 user user 2954 Sep 7 13:02 common\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 includes\n"
-" -rw-r--r-- 1 user user 205 Sep 7 13:02 source\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 templates\n"
-
-#. type: Plain text
-#: en/user_overview.ssi:76
msgid ""
"Using #{lb config}# without any arguments would be suitable for users who "
"need a very basic image, or who intend to later provide a more complete "
-"configuration via auto/config (see {Managing a configuration}#managing-a-"
+"configuration via #{auto/config}# (see {Managing a configuration}#managing-a-"
"configuration for details)."
msgstr ""
"Usar #{lb config}# sin ningún argumento sería conveniente para los usuarios "
"que necesitan una imagen muy básica, o que tienen intención de proporcionar "
-"más tarde una configuración más completa a través de auto/config (ver "
+"más tarde una configuración más completa a través de #{auto/config}# (ver "
"{Gestionar una configuración}#managing-a-configuration para más detalles)."
#. type: Plain text
-#: en/user_overview.ssi:78
+#: en/user_overview.ssi:46
msgid ""
"Normally, you will want to specify some options. For example, to include the "
"'gnome' package list in your configuration:"
@@ -413,52 +345,52 @@ msgstr ""
"incluir la lista del paquete 'gnome' en la configuración:"
#. type: Plain text
-#: en/user_overview.ssi:82
+#: en/user_overview.ssi:50
#, no-wrap
msgid " $ lb config -p gnome\n"
msgstr " $ lb config -p gnome\n"
#. type: Plain text
-#: en/user_overview.ssi:86
+#: en/user_overview.ssi:54
msgid "It is possible to specify many options, such as:"
msgstr "Es posible especificar muchas opciones, tales como:"
#. type: Plain text
-#: en/user_overview.ssi:90
+#: en/user_overview.ssi:58
#, no-wrap
msgid " $ lb config --binary-images net --hostname live-machine --username live-user ...\n"
msgstr " $ lb config --binary-images net --hostname live-machine --username live-user ...\n"
#. type: Plain text
-#: en/user_overview.ssi:94
+#: en/user_overview.ssi:62
msgid "A full list of options is available in the #{lb_config}# man page."
msgstr ""
"Una lista completa de opciones está disponible en la página del manual #"
"{lb_config}#."
#. type: Plain text
-#: en/user_overview.ssi:96
+#: en/user_overview.ssi:64
msgid "3~lb-build The #{lb build}# command"
msgstr "3~lb-build El comando #{lb build}#"
#. type: Plain text
-#: en/user_overview.ssi:98
+#: en/user_overview.ssi:66
msgid ""
-"The #{lb build}# command reads in your configuration from the config/ "
+"The #{lb build}# command reads in your configuration from the #{config/}# "
"directory. It then runs the lower level commands needed to build your Live "
"system."
msgstr ""
-"El comando #{lb build}# lee la configuración del directorio config/ A "
+"El comando #{lb build}# lee la configuración del directorio #{config/}#. A "
"continuación, ejecuta los comandos del nivel inferior más bajo necesarios "
"para crear el sistema en vivo."
#. type: Plain text
-#: en/user_overview.ssi:100
+#: en/user_overview.ssi:68
msgid "3~lb-clean The #{lb clean}# command"
msgstr "3~lb-clean El comando #{lb clean}#"
#. type: Plain text
-#: en/user_overview.ssi:102
+#: en/user_overview.ssi:70
msgid ""
"It is the job of the #{lb clean}# command to remove various parts of a build "
"so subsequent builds can start from a clean state. By default, #{chroot}#, #"
@@ -478,12 +410,12 @@ msgstr ""
"opciones"
#. type: Plain text
-#: en/user_overview.ssi:104
+#: en/user_overview.ssi:72
msgid "2~live-boot The live-boot package"
msgstr "2~live-boot El paquete live-boot"
#. type: Plain text
-#: en/user_overview.ssi:106
+#: en/user_overview.ssi:74
msgid ""
"live-boot is a collection of scripts providing hooks for the initramfs-"
"tools, used to generate an initramfs capable of booting live systems, such "
@@ -497,21 +429,21 @@ msgstr ""
"imágenes para llaves USB."
#. type: Plain text
-#: en/user_overview.ssi:108
+#: en/user_overview.ssi:76
msgid ""
-"At boot time it will look for read-only media containing a \"/live\" "
+"At boot time it will look for read-only media containing a #{/live/}# "
"directory where a root filesystem (often a compressed filesystem image like "
"squashfs) is stored. If found, it will create a writable environment, using "
"aufs, for Debian like systems to boot from."
msgstr ""
"En el momento del arranque, buscará en los medios de almacenamiento de sólo "
-"lectura un directorio \"/ live\" donde se encuentra un sistema de ficheros "
+"lectura un directorio #{/live/}# donde se encuentra un sistema de ficheros "
"raíz (a menudo una imagen del sistema de ficheros comprimidos como "
"squashfs). Si lo encuentra, creará un entorno de escritura, utilizando aufs, "
"para que arranquen los sistemas tipo Debian."
#. type: Plain text
-#: en/user_overview.ssi:110
+#: en/user_overview.ssi:78
msgid ""
"More information on initial ramfs in Debian can be found in the Debian Linux "
"Kernel Handbook at http://kernel-handbook.alioth.debian.org/ in the chapter "
@@ -522,12 +454,12 @@ msgstr ""
"concretamente en el capítulo sobre initramfs."
#. type: Plain text
-#: en/user_overview.ssi:112
+#: en/user_overview.ssi:80
msgid "2~live-config The live-config package"
msgstr "2~live-config El paquete live-config"
#. type: Plain text
-#: en/user_overview.ssi:113
+#: en/user_overview.ssi:81
msgid ""
"live-config consists of the scripts that run at boot time after live-boot to "
"configure the live system automatically. It handles such tasks as setting "
diff --git a/manual/po/fr/about_manual.ssi.po b/manual/po/fr/about_manual.ssi.po
index 56bfe63..f28736f 100644
--- a/manual/po/fr/about_manual.ssi.po
+++ b/manual/po/fr/about_manual.ssi.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
"POT-Creation-Date: 2011-04-23 14:15+0300\n"
-"PO-Revision-Date: 2011-05-14 21:02+0200\n"
+"PO-Revision-Date: 2011-10-22 18:44+0200\n"
"Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
"Language-Team: <debian-live at lists.debian.org>\n"
"Language: fr\n"
@@ -44,7 +44,7 @@ msgstr ""
"sur vous aider à construire un système Live et non pas sur des sujets de "
"l'utilisateur final, un utilisateur final peut trouver des informations "
"utiles dans ces sections: {Les Bases}#the-basics couvrent la préparation des "
-"images pour être démarrées à partir des médias ou depuis le réseau, et "
+"images pour être démarrées à partir des supports ou depuis le réseau, et "
"{Personnalisation des comportements au moment de l'exécution}#customizing-"
"run-time-behaviours décrit certaines options qui peuvent être spécifiées à "
"l'invite de démarrage, tels que la sélection d'un clavier, des paramètres "
@@ -61,12 +61,12 @@ msgid ""
"command."
msgstr ""
"Certaines commandes mentionnées dans le texte doivent être exécutées avec "
-"les privilèges super-utilisateur, qui peuvent être obtenu en devenant root à "
-"l'aide de #{su}# ou en utilisant #{sudo}#. Afin de distinguer les commandes "
-"qui peuvent être exécutées par un utilisateur sans privilèges de celles "
-"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."
+"les privilèges de super-utilisateur, qui peuvent être obtenus en devenant "
+"super-utilisateur à l'aide de #{su}# ou en utilisant #{sudo}#. Afin de "
+"distinguer les commandes qui peuvent être exécutées par un utilisateur sans "
+"privilèges de celles 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."
#. type: Plain text
#: en/about_manual.ssi:10
@@ -95,21 +95,21 @@ msgid ""
msgstr ""
"Même si nous croyons que tout dans ce manuel est important pour au moins "
"certains de nos utilisateurs, nous nous rendons compte qu'il y a beaucoup de "
-"matière à couvrir et que vous pouvez expérimenter avant d'entrer dans les "
-"détails. Par conséquent, nous avons fourni trois tutoriels dans la section "
-"{Exemples}#examples destinée à vous apprendre la construction de l'image et "
-"les bases de la personnalisation. Lire en premier {En utilisant les exemples}"
-"#using-the-examples, suivie par {Tutoriel 1: Une image standard}#tutorial-1, "
-"{Tutoriel 2: Un logiciel de navigateur Web}#tutorial-2 et finalement "
-"{Tutoriel 3: Une image personnalisée}#tutorial-3. À la fin de ces tutoriels, "
-"vous aurez un avant-goût de ce qui peut être fait avec Debian Live. Nous "
-"vous encourageons à revenir à l'étude plus approfondie du manuel, la "
-"prochaine lecture peut-être {Les bases}#the-basics, passer pour {Construire "
-"une image netboot}#building-netboot-image, et finissant par la lecture de la"
-"{Vue d'ensemble de la personnalisation}#customization-overview et les autres "
-"sections suivantes. En ce point, nous espérons que vous êtes complètement "
-"excités par ce que on peut faire avec Debian Live et motivés pour lire le "
-"reste du manuel, du début à la fin"
+"matière à couvrir et que vous pouvez vouloir expérimenter avant d'entrer "
+"dans les détails. Par conséquent, nous avons fourni trois tutoriels dans la "
+"section {Exemples}#examples destinée à vous apprendre la construction de "
+"l'image et les bases de la personnalisation. Lire en premier {En utilisant "
+"les exemples}#using-the-examples, suivie par {Tutoriel 1: Une image standard}"
+"#tutorial-1, {Tutoriel 2: Un logiciel de navigateur Web}#tutorial-2 et "
+"finalement {Tutoriel 3: Une image personnalisée}#tutorial-3. À la fin de ces "
+"tutoriels, vous aurez un avant-goût de ce qui peut être fait avec Debian "
+"Live. Nous vous encourageons à revenir à l'étude plus approfondie du "
+"manuel, la prochaine lecture peut-être {Les bases}#the-basics, passer pour "
+"{Construire une image netboot}#building-netboot-image, et finissant par la "
+"lecture de la{Vue d'ensemble de la personnalisation}#customization-overview "
+"et les autres sections suivantes. En ce point, nous espérons que vous êtes "
+"complètement excités par ce que on peut faire avec Debian Live et motivés "
+"pour lire le reste du manuel, du début à la fin."
#. type: Plain text
#: en/about_manual.ssi:14
@@ -129,8 +129,9 @@ msgstr ""
"installation préalable sur disque dur. Les Systèmes Live ne modifient pas le "
"système d'exploitation local ou les fichiers installés sur le disque dur "
"sans qu'on leur en donne explicitement l'instruction. D'habitude, les "
-"systèmes Live sont démarrés à partir de media tels que des CD, DVD, ou des "
-"clés USB. Certains peuvent également être démarrés depuis le réseau."
+"systèmes Live sont démarrés à partir des supports tels que des CD, DVD, ou "
+"des clés USB. Certains systèmes peuvent également être démarrés depuis le "
+"réseau."
#. type: Plain text
#: en/about_manual.ssi:18
@@ -222,7 +223,7 @@ msgid ""
"prompt to influence the kernel or live-config."
msgstr ""
"_* *{Paramètres de démarrage}*: Les paramètres pouvant être entrés à "
-"l'invite de démarrage afin de modifier le kernel ou live-config."
+"l'invite de démarrage afin de modifier le noyau ou live-config."
#. type: Plain text
#: en/about_manual.ssi:38
@@ -556,8 +557,8 @@ msgid ""
"You may build the live-manual from the top level directory of your Git "
"checkout by executing:"
msgstr ""
-"Vous pouvez compiler live-manual depuis le répertoire racine de votre "
-"checkout git en exécutant:"
+"Vous pouvez compiler live-manual depuis le répertoire racine de votre Git "
+"checkout en exécutant:"
#. type: Plain text
#: en/about_manual.ssi:102
@@ -585,7 +586,7 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:114
msgid "3~ Applying patches"
-msgstr "3~ Appliquer des patches"
+msgstr "3~ Appliquer des correctifs"
#. type: Plain text
#: en/about_manual.ssi:116
@@ -595,7 +596,7 @@ msgid ""
"repository, you must follow this procedure:"
msgstr ""
"Les contributions directes au référentiel sont possibles pour tout le monde. "
-"Cependant, nous vous demandons d'envoyer les changements conséquents sur la "
+"Cependant, nous vous demandons d'envoyer les changements importants sur la "
"liste de diffusion au préalable. Afin de faire un push sur le référentiel, "
"les étapes suivantes sont nécessaires."
@@ -744,6 +745,6 @@ msgid ""
"_* Don't forget you need #{make commit}# to ensure the translated manuals "
"are updated from the po files, before #{git commit -a}# and #{git push}#."
msgstr ""
-"_* N'oubliez pas que vous devez #{make commit}# pour assurer la traduction "
-"des manuels sont mis à jour à partir des fichiers po, avant #{git commit -a}"
-"# et #{git push}#."
+"_* N'oubliez pas que vous devez faire un #{make commit}# pour assurer que la "
+"traduction des manuels sont mis à jour à partir des fichiers po, avant #{git "
+"commit -a}# et #{git push}#."
diff --git a/manual/po/fr/about_project.ssi.po b/manual/po/fr/about_project.ssi.po
index c5774d6..03cb989 100644
--- a/manual/po/fr/about_project.ssi.po
+++ b/manual/po/fr/about_project.ssi.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
"POT-Creation-Date: 2011-08-29 08:54-0200\n"
-"PO-Revision-Date: 2011-08-29 22:38+0200\n"
+"PO-Revision-Date: 2011-10-22 19:08+0200\n"
"Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
"Language-Team: <debian-live at lists.debian.org>\n"
"Language: fr\n"
@@ -90,8 +90,8 @@ msgid ""
"_* They ship custom kernels with additional patches that are not part of "
"Debian."
msgstr ""
-"_* Ils offrent kernels personnalisés avec des patches supplémentaires qui ne "
-"font pas partie de Debian."
+"_* Ils offrent noyaus personnalisés avec des correctifs supplémentaires qui "
+"ne font pas partie de Debian."
#. type: Plain text
#: en/about_project.ssi:24
@@ -156,7 +156,8 @@ msgstr ""
#. type: Plain text
#: en/about_project.ssi:42
msgid "_* It uses an unaltered Debian kernel with no additional patches."
-msgstr "_* Il utilise un kernel Debian inchangé sans patches supplémentaires."
+msgstr ""
+"_* Il utilise un noyau Debian inchangé sans correctifs supplémentaires."
#. type: Plain text
#: en/about_project.ssi:44
@@ -300,9 +301,10 @@ msgid ""
"please see {Reporting bugs}#bugs."
msgstr ""
"_* *{BTS}*: Le Debian Bug Tracking System (BTS) contient les détails des "
-"bugs rapportés par les utilisateurs et les développeurs. Chaque bug reçoit "
-"un numéro, et il est conservé jusqu'à ce qu'il soit marqué comme traité. "
-"Pour plus d'informations, s'il vous plaît voir {Rapporter des bugs}#bugs."
+"bogues rapportés par les utilisateurs et les développeurs. Chaque bogue "
+"reçoit un numéro, et il est conservé jusqu'à ce qu'il soit marqué comme "
+"traité. Pour plus d'informations, s'il vous plaît voir {Rapporter des bogues}"
+"#bugs."
#. type: Plain text
#: en/about_project.ssi:71
diff --git a/manual/po/fr/index.html.in.po b/manual/po/fr/index.html.in.po
index cb9f9d3..1402d72 100644
--- a/manual/po/fr/index.html.in.po
+++ b/manual/po/fr/index.html.in.po
@@ -2,19 +2,20 @@
# 2010 Christophe Siraut <chris at tobald.eu.org>
# This file is distributed under the same license as the live-config package.
# Carlo Stemberger <carlo.stemberger at gmail.com>, 2010.
+# Carlos Zuferri «chals» <chals at altorricon.com>, 2011.
#
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-02-03 18:22-0400\n"
-"PO-Revision-Date: 2010-12-08 16:13+0100\n"
-"Last-Translator: Carlo Stemberger <carlo.stemberger at gmail.com>\n"
-"Language-Team: Italian <tp at lists.linux.it>\n"
+"POT-Creation-Date: 2011-12-03 18:55+0100\n"
+"PO-Revision-Date: 2011-12-03 19:04+0100\n"
+"Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
+"Language-Team: <debian-live at lists.debian.org>\n"
"Language: fr\n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2: plural=(n !=1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. type: Content of: <html><head><title>
#: en/index.html.in:4
@@ -29,75 +30,86 @@ msgstr "Manuel Debian Live"
#. type: Content of: <html><body><p>
#: en/index.html.in:12
msgid ""
+"<i>live-manual</i> is available in different file formats and it is "
+"translated into several languages. Keep in mind that some translations may "
+"be incomplete or may not be up to date."
+msgstr ""
+"<i>live-manual</i> est disponible en formats de fichiers différents et il "
+"est traduit en plusieurs langues. Rappelez que certaines traductions peuvent "
+"être incomplètes ou ne pas être à jour."
+
+#. type: Content of: <html><body><p>
+#: en/index.html.in:17
+msgid ""
"Please report errors, omissions, patches and suggestions to our mailinglist "
"at <a href=\"mailto:debian-live at lists.debian.org\">debian-live at lists.debian."
-"org</a> and read about <a href=\"html/about-manual.html#how-to-contribute"
+"org</a> and read about <a href=\"html/about-manual.en.html#how-to-contribute"
"\">how to contribute</a> to the manual."
msgstr ""
"Veuillez transmettre les erreurs, omissions, patches et suggestions sur "
"notre liste de discussion <a href=\"mailto:debian-live at lists.debian.org"
-"\">debian-live at lists.debian.org</a> et lire <a href=\"html/about-manual."
+"\">debian-live at lists.debian.org</a> et lire <a href=\"html/about-manual.fr."
"html#how-to-contribute\">comment contribuer</a> au manuel."
#. type: Content of: <html><body><h3>
-#: en/index.html.in:15
+#: en/index.html.in:20
msgid "Available Formats"
msgstr "Formats disponibles"
#. type: Content of: <html><body><ul><li>
-#: en/index.html.in:18
-msgid "<a href=\"epub/live-manual.epub\">EPUB</a>"
-msgstr "<a href=\"epub/live-manual.epub\">EPUB</a>"
+#: en/index.html.in:23
+msgid "<a href=\"epub/live-manual.en.epub\">EPUB</a>"
+msgstr "<a href=\"epub/live-manual.fr.epub\">EPUB</a>"
#. type: Content of: <html><body><ul><li>
-#: en/index.html.in:19
+#: en/index.html.in:24
msgid ""
-"HTML: <a href=\"html/index.html\">multi page</a>, <a href=\"html/live-manual."
-"html\">single page</a>"
+"HTML: <a href=\"html/index.en.html\">multi page</a>, <a href=\"html/live-"
+"manual.en.html\">single page</a>"
msgstr ""
-"HTML: <a href=\"html/index.html\">multi pages</a>, <a href=\"html/live-"
-"manual.html\">page unique</a>"
+"HTML: <a href=\"html/index.fr.html\">multi pages</a>, <a href=\"html/live-"
+"manual.fr.html\">page unique</a>"
#. type: Content of: <html><body><ul><li>
-#: en/index.html.in:20
-msgid "<a href=\"odf/live-manual.odt\">ODF</a>"
-msgstr "<a href=\"odf/live-manual.odt\">ODF</a>"
+#: en/index.html.in:25
+msgid "<a href=\"odf/live-manual.en.odt\">ODF</a>"
+msgstr "<a href=\"odf/live-manual.fr.odt\">ODF</a>"
#. type: Content of: <html><body><ul><li>
-#: en/index.html.in:21
+#: en/index.html.in:26
msgid ""
-"PDF: <a href=\"pdf/live-manual.portrait-a4.pdf\">A4 portrait</a>, <a href="
-"\"pdf/live-manual.landscape-a4.pdf\">A4 landscape</a>, <a href=\"pdf/live-"
-"manual.portrait-letter.pdf\">letter portrait</a>, <a href=\"pdf/live-manual."
-"landscape-letter.pdf\">letter landscape</a>"
+"PDF: <a href=\"pdf/live-manual.portrait-a4.en.pdf\">A4 portrait</a>, <a href="
+"\"pdf/live-manual.landscape-a4.en.pdf\">A4 landscape</a>, <a href=\"pdf/live-"
+"manual.portrait-letter.en.pdf\">letter portrait</a>, <a href=\"pdf/live-"
+"manual.landscape-letter.en.pdf\">letter landscape</a>"
msgstr ""
-"PDF: <a href=\"pdf/live-manual.portrait-a4.pdf\">A4 portrait</a>, <a href="
-"\"pdf/live-manual.landscape-a4.pdf\">A4 paysage</a>, <a href=\"pdf/live-"
-"manual.portrait-letter.pdf\">US portrait</a>, <a href=\"pdf/live-manual."
-"landscape-letter.pdf\">US paysage</a>"
+"PDF: <a href=\"pdf/live-manual.portrait-a4.fr.pdf\">A4 portrait</a>, <a href="
+"\"pdf/live-manual.landscape-a4.fr.pdf\">A4 paysage</a>, <a href=\"pdf/live-"
+"manual.portrait-letter.fr.pdf\">US portrait</a>, <a href=\"pdf/live-manual."
+"landscape-letter.fr.pdf\">US paysage</a>"
#. type: Content of: <html><body><ul><li>
-#: en/index.html.in:22
-msgid "<a href=\"txt/live-manual.txt\">Plain text</a>"
-msgstr "<a href=\"txt/live-manual.txt\">Texte brut</a>"
+#: en/index.html.in:27
+msgid "<a href=\"txt/live-manual.en.txt\">Plain text</a>"
+msgstr "<a href=\"txt/live-manual.fr.txt\">Texte brut</a>"
#. type: Content of: <html><body><p>
-#: en/index.html.in:26
+#: en/index.html.in:31
msgid "Last changed: @DATE_CHANGE@"
msgstr "Dernière modification: @DATE_CHANGE@"
#. type: Content of: <html><body><p>
-#: en/index.html.in:27
+#: en/index.html.in:32
msgid "Last built: @DATE_BUILD@"
msgstr "Dernière compilation: @DATE_BUILD@"
#. type: Content of: <html><body><h3>
-#: en/index.html.in:30
+#: en/index.html.in:35
msgid "Source"
msgstr "Source"
#. type: Content of: <html><body><p>
-#: en/index.html.in:33
+#: en/index.html.in:38
msgid ""
"The sources for this manual is available in a <a href=\"http://git.or.cz/"
"\">Git</a> repository at live.debian.net."
@@ -106,7 +118,7 @@ msgstr ""
"\"http://git.or.cz/\">Git</a> sur live.debian.net."
#. type: Content of: <html><body><ul><li>
-#: en/index.html.in:37
+#: en/index.html.in:42
msgid ""
"Browse: <a href=\"http://live.debian.net/gitweb/?p=live-manual.git"
"\"><small><tt>http://live.debian.net/gitweb/?p=live-manual.git</tt></small></"
@@ -117,7 +129,7 @@ msgstr ""
"a>"
#. type: Content of: <html><body><ul><li>
-#: en/index.html.in:38
+#: en/index.html.in:43
msgid ""
"Git: <a href=\"git://live.debian.net/git/live-manual.git\"><small><tt>git://"
"live.debian.net/git/live-manual.git</tt></small></a>"
@@ -126,7 +138,7 @@ msgstr ""
"live.debian.net/git/live-manual.git</tt></small></a>"
#. type: Content of: <html><body><p>
-#: en/index.html.in:42
+#: en/index.html.in:47
msgid ""
"<a href=\"http://live.debian.net/\">Debian Live</a> <<a href=\"mailto:"
"debian-live at lists.debian.org\">debian-live at lists.debian.org</a>> - <a "
diff --git a/manual/po/fr/live-manual.ssm.po b/manual/po/fr/live-manual.ssm.po
index 248cd01..0ab6ea6 100644
--- a/manual/po/fr/live-manual.ssm.po
+++ b/manual/po/fr/live-manual.ssm.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-09-30 14:54+0300\n"
+"POT-Creation-Date: 2011-12-04 10:22+0100\n"
"PO-Revision-Date: 2011-06-19 16:32+0200\n"
"Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
"Language-Team: <debian-live at lists.debian.org>\n"
@@ -49,7 +49,7 @@ msgstr ""
#, no-wrap
msgid ""
"@date:\n"
-" :published: 2011-09-30\n"
+" :published: 2011-12-04\n"
msgstr ""
#. type: Plain text
diff --git a/manual/po/fr/user_basics.ssi.po b/manual/po/fr/user_basics.ssi.po
index ff12887..8fa18db 100644
--- a/manual/po/fr/user_basics.ssi.po
+++ b/manual/po/fr/user_basics.ssi.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-04-23 14:15+0300\n"
+"POT-Creation-Date: 2011-11-02 12:23-0200\n"
"PO-Revision-Date: 2011-06-26 20:10+0200\n"
"Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
"Language-Team: <debian-live at lists.debian.org>\n"
@@ -38,37 +38,38 @@ msgstr ""
#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
-#: en/user_customization-installer.ssi:43
+#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
-#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:53
-#: en/user_customization-packages.ssi:66 en/user_customization-packages.ssi:80
-#: en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:112
-#: en/user_customization-packages.ssi:142
-#: en/user_customization-packages.ssi:155
-#: en/user_customization-packages.ssi:165
-#: en/user_customization-packages.ssi:175
-#: en/user_customization-packages.ssi:185
-#: en/user_customization-packages.ssi:199
-#: en/user_customization-packages.ssi:215
-#: en/user_customization-packages.ssi:227
-#: en/user_customization-packages.ssi:291
-#: en/user_customization-packages.ssi:303
-#: en/user_customization-packages.ssi:313
-#: en/user_customization-packages.ssi:331
-#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
-#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
-#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
-#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
-#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:105
-#: 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:178 en/user_examples.ssi:190
-#: en/user_examples.ssi:206 en/user_examples.ssi:220 en/user_examples.ssi:229
-#: en/user_examples.ssi:247 en/user_examples.ssi:255 en/user_examples.ssi:268
-#: en/user_examples.ssi:283 en/user_installation.ssi:38
+#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:54
+#: en/user_customization-packages.ssi:67 en/user_customization-packages.ssi:81
+#: en/user_customization-packages.ssi:101
+#: en/user_customization-packages.ssi:131
+#: en/user_customization-packages.ssi:144
+#: en/user_customization-packages.ssi:154
+#: en/user_customization-packages.ssi:164
+#: en/user_customization-packages.ssi:174
+#: en/user_customization-packages.ssi:188
+#: en/user_customization-packages.ssi:204
+#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:320
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:345 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:24 en/user_customization-runtime.ssi:44
+#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:63
+#: en/user_customization-runtime.ssi:71 en/user_customization-runtime.ssi:80
+#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:111
+#: en/user_customization-runtime.ssi:119 en/user_examples.ssi:14
+#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
+#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
+#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
+#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
+#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
+#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
+#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:271
+#: en/user_examples.ssi:286 en/user_installation.ssi:38
#: en/user_installation.ssi:46 en/user_installation.ssi:56
#: en/user_installation.ssi:64 en/user_installation.ssi:74
#: en/user_installation.ssi:82 en/user_installation.ssi:90
@@ -101,38 +102,39 @@ msgstr "code{"
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
-#: en/user_customization-installer.ssi:37
-#: en/user_customization-installer.ssi:48
+#: en/user_customization-installer.ssi:38
+#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:70 en/user_customization-packages.ssi:84
-#: en/user_customization-packages.ssi:98
-#: en/user_customization-packages.ssi:116
-#: en/user_customization-packages.ssi:147
-#: en/user_customization-packages.ssi:161
-#: en/user_customization-packages.ssi:171
-#: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:191
-#: en/user_customization-packages.ssi:203
-#: en/user_customization-packages.ssi:219
-#: en/user_customization-packages.ssi:231
-#: en/user_customization-packages.ssi:295
-#: en/user_customization-packages.ssi:307
-#: en/user_customization-packages.ssi:317
-#: en/user_customization-packages.ssi:344
-#: en/user_customization-packages.ssi:353 en/user_customization-runtime.ssi:18
-#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
-#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
-#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
-#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:110
-#: 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:186 en/user_examples.ssi:202
-#: en/user_examples.ssi:210 en/user_examples.ssi:225 en/user_examples.ssi:233
-#: en/user_examples.ssi:251 en/user_examples.ssi:264 en/user_examples.ssi:279
-#: en/user_examples.ssi:297 en/user_installation.ssi:42
+#: en/user_customization-packages.ssi:46 en/user_customization-packages.ssi:59
+#: en/user_customization-packages.ssi:71 en/user_customization-packages.ssi:85
+#: en/user_customization-packages.ssi:105
+#: en/user_customization-packages.ssi:136
+#: en/user_customization-packages.ssi:150
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:180
+#: en/user_customization-packages.ssi:192
+#: en/user_customization-packages.ssi:208
+#: en/user_customization-packages.ssi:220
+#: en/user_customization-packages.ssi:284
+#: en/user_customization-packages.ssi:296
+#: en/user_customization-packages.ssi:306
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341
+#: en/user_customization-packages.ssi:350 en/user_customization-runtime.ssi:18
+#: en/user_customization-runtime.ssi:28 en/user_customization-runtime.ssi:48
+#: en/user_customization-runtime.ssi:59 en/user_customization-runtime.ssi:67
+#: en/user_customization-runtime.ssi:76 en/user_customization-runtime.ssi:85
+#: en/user_customization-runtime.ssi:105 en/user_customization-runtime.ssi:115
+#: en/user_customization-runtime.ssi:124 en/user_examples.ssi:20
+#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
+#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
+#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
+#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
+#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
+#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
+#: en/user_examples.ssi:254 en/user_examples.ssi:267 en/user_examples.ssi:282
+#: en/user_examples.ssi:300 en/user_installation.ssi:42
#: en/user_installation.ssi:50 en/user_installation.ssi:60
#: en/user_installation.ssi:70 en/user_installation.ssi:78
#: en/user_installation.ssi:86 en/user_installation.ssi:94
@@ -357,7 +359,7 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:44 en/user_basics.ssi:170 en/user_basics.ssi:238
-#: en/user_examples.ssi:109 en/user_examples.ssi:208
+#: en/user_examples.ssi:119 en/user_examples.ssi:211
#, no-wrap
msgid " # lb build\n"
msgstr ""
@@ -686,7 +688,7 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:142
#, no-wrap
-msgid " $ lb config --packages virtualbox-ose-guest-x11\n"
+msgid " $ echo virtualbox-ose-guest-x11 >> config/package-lists/my.list.chroot\n"
msgstr ""
#. type: Plain text
diff --git a/manual/po/fr/user_customization-contents.ssi.po b/manual/po/fr/user_customization-contents.ssi.po
index fbd7b15..8ad75c3 100644
--- a/manual/po/fr/user_customization-contents.ssi.po
+++ b/manual/po/fr/user_customization-contents.ssi.po
@@ -7,8 +7,8 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-08-25 15:56+0300\n"
-"PO-Revision-Date: 2011-07-30 17:55+0200\n"
+"POT-Creation-Date: 2011-11-07 21:01-0400\n"
+"PO-Revision-Date: 2011-11-08 14:51+0100\n"
"Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
"Language-Team: <debian-live at lists.debian.org>\n"
"Language: fr\n"
@@ -38,48 +38,47 @@ msgstr ""
#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
-#: en/user_customization-installer.ssi:43
+#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
-#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:53
-#: en/user_customization-packages.ssi:66 en/user_customization-packages.ssi:80
-#: en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:112
-#: en/user_customization-packages.ssi:142
-#: en/user_customization-packages.ssi:155
-#: en/user_customization-packages.ssi:165
-#: en/user_customization-packages.ssi:175
-#: en/user_customization-packages.ssi:185
-#: en/user_customization-packages.ssi:199
-#: en/user_customization-packages.ssi:215
-#: en/user_customization-packages.ssi:227
-#: en/user_customization-packages.ssi:291
-#: en/user_customization-packages.ssi:303
-#: en/user_customization-packages.ssi:313
-#: en/user_customization-packages.ssi:331
-#: en/user_customization-packages.ssi:348
-#: en/user_customization-packages.ssi:356 en/user_customization-runtime.ssi:14
-#: en/user_customization-runtime.ssi:24 en/user_customization-runtime.ssi:44
-#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:63
-#: en/user_customization-runtime.ssi:71 en/user_customization-runtime.ssi:80
-#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:111
-#: en/user_customization-runtime.ssi:119 en/user_examples.ssi:14
+#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:54
+#: en/user_customization-packages.ssi:67 en/user_customization-packages.ssi:81
+#: en/user_customization-packages.ssi:101
+#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:140
+#: en/user_customization-packages.ssi:150
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:184
+#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:276
+#: en/user_customization-packages.ssi:288
+#: en/user_customization-packages.ssi:298
+#: en/user_customization-packages.ssi:316
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
+#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
+#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
+#: en/user_customization-runtime.ssi:104 en/user_customization-runtime.ssi:114
+#: en/user_customization-runtime.ssi:122 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:178 en/user_examples.ssi:190 en/user_examples.ssi:206
-#: en/user_examples.ssi:220 en/user_examples.ssi:229 en/user_examples.ssi:247
-#: en/user_examples.ssi:255 en/user_examples.ssi:268 en/user_examples.ssi:283
-#: en/user_installation.ssi:38 en/user_installation.ssi:46
-#: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi:74 en/user_installation.ssi:82
-#: en/user_installation.ssi:90 en/user_installation.ssi:114
-#: en/user_installation.ssi:129 en/user_installation.ssi:146
-#: en/user_managing_a_configuration.ssi:24
+#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
+#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
+#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
+#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
+#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
+#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
+#: en/user_examples.ssi:277 en/user_installation.ssi:38
+#: en/user_installation.ssi:46 en/user_installation.ssi:56
+#: en/user_installation.ssi:64 en/user_installation.ssi:74
+#: en/user_installation.ssi:82 en/user_installation.ssi:90
+#: en/user_installation.ssi:114 en/user_installation.ssi:129
+#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:80 en/user_overview.ssi:88
+#: en/user_overview.ssi:48 en/user_overview.ssi:56
msgid "code{"
msgstr "code{"
@@ -103,49 +102,48 @@ msgstr "code{"
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
-#: en/user_customization-installer.ssi:37
-#: en/user_customization-installer.ssi:48
+#: en/user_customization-installer.ssi:38
+#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:70 en/user_customization-packages.ssi:84
-#: en/user_customization-packages.ssi:98
-#: en/user_customization-packages.ssi:116
-#: en/user_customization-packages.ssi:147
-#: en/user_customization-packages.ssi:161
-#: en/user_customization-packages.ssi:171
-#: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:191
-#: en/user_customization-packages.ssi:203
-#: en/user_customization-packages.ssi:219
-#: en/user_customization-packages.ssi:231
-#: en/user_customization-packages.ssi:295
-#: en/user_customization-packages.ssi:307
-#: en/user_customization-packages.ssi:317
-#: en/user_customization-packages.ssi:344
-#: en/user_customization-packages.ssi:352
-#: en/user_customization-packages.ssi:361 en/user_customization-runtime.ssi:18
-#: en/user_customization-runtime.ssi:28 en/user_customization-runtime.ssi:48
-#: en/user_customization-runtime.ssi:59 en/user_customization-runtime.ssi:67
-#: en/user_customization-runtime.ssi:76 en/user_customization-runtime.ssi:85
-#: en/user_customization-runtime.ssi:105 en/user_customization-runtime.ssi:115
-#: en/user_customization-runtime.ssi:124 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:186 en/user_examples.ssi:202 en/user_examples.ssi:210
-#: en/user_examples.ssi:225 en/user_examples.ssi:233 en/user_examples.ssi:251
-#: en/user_examples.ssi:264 en/user_examples.ssi:279 en/user_examples.ssi:297
-#: en/user_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi:70
-#: en/user_installation.ssi:78 en/user_installation.ssi:86
-#: en/user_installation.ssi:94 en/user_installation.ssi:119
-#: en/user_installation.ssi:136 en/user_installation.ssi:149
-#: en/user_managing_a_configuration.ssi:31
+#: en/user_customization-packages.ssi:46 en/user_customization-packages.ssi:59
+#: en/user_customization-packages.ssi:71 en/user_customization-packages.ssi:85
+#: en/user_customization-packages.ssi:105
+#: en/user_customization-packages.ssi:132
+#: en/user_customization-packages.ssi:146
+#: en/user_customization-packages.ssi:156
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:329
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:346 en/user_customization-runtime.ssi:21
+#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
+#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
+#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
+#: en/user_customization-runtime.ssi:108 en/user_customization-runtime.ssi:118
+#: en/user_customization-runtime.ssi:127 en/user_examples.ssi:20
+#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
+#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
+#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
+#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
+#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
+#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
+#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
+#: en/user_examples.ssi:291 en/user_installation.ssi:42
+#: en/user_installation.ssi:50 en/user_installation.ssi:60
+#: en/user_installation.ssi:70 en/user_installation.ssi:78
+#: en/user_installation.ssi:86 en/user_installation.ssi:94
+#: en/user_installation.ssi:119 en/user_installation.ssi:136
+#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
-#: en/user_overview.ssi:84 en/user_overview.ssi:92
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:42
+#: en/user_overview.ssi:52 en/user_overview.ssi:60
msgid "}code"
msgstr "}code"
@@ -269,22 +267,22 @@ msgstr ""
#. type: Plain text
#: en/user_customization-contents.ssi:24
msgid ""
-"To include files, simply add them to your #{config/chroot_local-includes}# "
+"To include files, simply add them to your #{config/includes.chroot}# "
"directory. This directory corresponds to the root directory (#{/}#) of the "
"live system. For example, to add a file #{/var/www/index.html}# in the live "
"system, use:"
msgstr ""
"Pour inclure des fichiers, il suffit de les ajouter à votre répertoire #"
-"{config/chroot_local-includes}#. Ce répertoire correspond au répertoire "
-"racine (#{/}#) du système live. Par exemple, pour ajouter un fichier #{/var/"
-"www/index.html}# dans le système live, utilisez:"
+"{config/includes.chroot}#. Ce répertoire correspond au répertoire racine (#"
+"{/}#) du système live. Par exemple, pour ajouter un fichier #{/var/www/index."
+"html}# dans le système live, utilisez:"
#. type: Plain text
#: en/user_customization-contents.ssi:29
#, no-wrap
msgid ""
-" $ mkdir -p config/chroot_local-includes/var/www\n"
-" $ cp /path/to/my/index.html config/chroot_local-includes/var/www\n"
+" $ mkdir -p config/includes.chroot/var/www\n"
+" $ cp /path/to/my/index.html config/includes.chroot/var/www\n"
msgstr ""
#. type: Plain text
@@ -298,7 +296,7 @@ msgstr "Votre configuration aura alors le schéma suivant:"
msgid ""
" -- config\n"
" [...]\n"
-" |-- chroot_local-includes\n"
+" |-- includes.chroot\n"
" | `-- var\n"
" | `-- www\n"
" | `-- index.html\n"
@@ -328,8 +326,8 @@ msgid ""
"booting the Live system, you can use binary local includes. This works in a "
"similar fashion to chroot local includes. For example, suppose the files #{~/"
"video_demo.*}# are demo videos of the live system described by and linked to "
-"by an HTML index page. Simply copy the material to #{config/binary_local-"
-"includes/}# as follows:"
+"by an HTML index page. Simply copy the material to #{config/includes.binary/}"
+"# as follows:"
msgstr ""
"Pour inclure des matériels tels que des documents ou des vidéos sur le "
"système de fichiers des supports, afin qu'il soit accessible dès l'insertion "
@@ -337,13 +335,13 @@ msgstr ""
"binary local includes. Cela fonctionne de façon similaire aux chroot local "
"includes. Par exemple, supposons que les fichiers #{~/video_demo.*}# sont "
"des vidéos de démonstration du système live décrit par et lié par une page "
-"d'index HTML. Copiez simplement le matériel à #{config/binary_local-"
-"includes/}# comme suit:"
+"d'index HTML. Copiez simplement le matériel dans #{config/includes.binary/}# "
+"comme suit:"
#. type: Plain text
#: en/user_customization-contents.ssi:56
#, no-wrap
-msgid " $ cp ~/video_demo.* config/binary_local-includes/\n"
+msgid " $ cp ~/video_demo.* config/includes.binary/\n"
msgstr ""
#. type: Plain text
@@ -407,24 +405,24 @@ msgstr "3~live-chroot-local-hooks Live/chroot local hooks"
#. type: Plain text
#: en/user_customization-contents.ssi:80
msgid ""
-"To run commands in the chroot stage, create a hook script containing the "
-"commands in the #{config/chroot_local-hooks}# directory. The hook will run "
-"in the chroot after the rest of your chroot configuration has been applied, "
-"so remember to ensure your configuration includes all packages and files "
-"your hook needs in order to run. See the example chroot hook scripts for "
-"various common chroot customization tasks provided in #{/usr/share/live/"
+"To run commands in the chroot stage, create a hook script with a #{.chroot}# "
+"suffix containing the commands in the #{config/hooks/}# directory. The hook "
+"will run in the chroot after the rest of your chroot configuration has been "
+"applied, so remember to ensure your configuration includes all packages and "
+"files your hook needs in order to run. See the example chroot hook scripts "
+"for various common chroot customization tasks provided in #{/usr/share/live/"
"build/examples/hooks}# which you can copy or symlink to use them in your own "
"configuration."
msgstr ""
-"Pour exécuter des commandes à l'étape chroot, créer un script hook contenant "
-"les commandes dans le répertoire #{config/chroot_local-hooks}#. Le hook "
-"s'exécutera dans le chroot après le reste de votre configuration chroot a "
-"été appliquée, donc n'oubliez pas de vous assurer que votre configuration "
-"inclut tous les paquets et les fichiers que votre hook a besoin pour "
-"fonctionner. Voir les exemples de scripts chroot hook pour diverses tâches "
-"courantes de personnalisation chroot fournis dans #{/usr/share/live/build/"
-"examples/hooks}# que vous pouvez copier ou symlink pour les utiliser dans "
-"votre propre configuration."
+"Pour exécuter des commandes à l'étape chroot, créer un script hook avec le "
+"suffixe #{.chroot}# contenant les commandes dans le répertoire #{config/"
+"hooks/}#. Le hook s'exécutera dans le chroot après le reste de votre "
+"configuration chroot a été appliquée, donc n'oubliez pas de vous assurer que "
+"votre configuration inclut tous les paquets et les fichiers que votre hook a "
+"besoin pour fonctionner. Voir les exemples de scripts chroot hook pour "
+"diverses tâches courantes de personnalisation chroot fournis dans #{/usr/"
+"share/live/build/examples/hooks}# que vous pouvez copier ou symlink pour les "
+"utiliser dans votre propre configuration."
#. type: Plain text
#: en/user_customization-contents.ssi:82
@@ -438,19 +436,18 @@ msgid ""
"explained in the \"Customization\" section of its man page. Examine live-"
"config's own hooks provided in #{/lib/live/config/}#, noting the sequence "
"numbers. Then provide your own hook prefixed with an appropriate sequence "
-"number, either as a chroot local include in #{config/chroot_local-includes/"
-"lib/live/config/}#, or as a custom package as discussed in {Installing "
-"modified or third-party packages}#installing-modified-or-third-party-"
-"packages."
+"number, either as a chroot local include in #{config/includes.chroot/lib/"
+"live/config/}#, or as a custom package as discussed in {Installing modified "
+"or third-party packages}#installing-modified-or-third-party-packages."
msgstr ""
"Pour exécuter des commandes au moment du démarrage, vous pouvez fournir live-"
"config hooks comme expliqué dans la section \"Personnalisation\" de sa page "
"de manuel. Examiner les hooks de live-config fournis dans #{/lib/live/"
"config/}#, en notant les numéros de séquence. Puis fournir votre propre hook "
"préfixée avec un numéro de séquence appropriée, soit comme un chroot local "
-"include dans #{config/chroot_local-includes/lib/live/config/}#, ou comme un "
-"paquet personnalisé tel que discuté dans {Installation des paquets modifiés "
-"ou de tiers}#installing-modified-or-third-party-packages."
+"include dans #{config/includes.chroot/lib/live/config/}#, ou comme un paquet "
+"personnalisé tel que discuté dans {Installation des paquets modifiés ou de "
+"tiers}#installing-modified-or-third-party-packages."
#. type: Plain text
#: en/user_customization-contents.ssi:86
@@ -460,25 +457,27 @@ msgstr "3~ Binary local hooks"
#. type: Plain text
#: en/user_customization-contents.ssi:88
msgid ""
-"To run commands in the binary stage, create a hook script containing the "
-"commands in the #{config/binary_local-hooks}#. The hook will run after all "
-"other binary commands are run, but before binary_checksums, the very last "
-"binary commands The commands in your hook do not run in the chroot, so take "
-"care to not modify any files outside of the build tree, or you may damage "
-"your build system! See the example binary hook scripts for various common "
-"binary customization tasks provided in #{/usr/share/live/build/examples/"
-"hooks}# which you can copy or symlink to use them in your own configuration."
+"To run commands in the binary stage, create a hook script with a #{.binary}# "
+"suffix containing the commands in the #{config/hooks/}# directory. The hook "
+"will run after all other binary commands are run, but before "
+"binary_checksums, the very last binary command. The commands in your hook do "
+"not run in the chroot, so take care to not modify any files outside of the "
+"build tree, or you may damage your build system! See the example binary hook "
+"scripts for various common binary customization tasks provided in #{/usr/"
+"share/live/build/examples/hooks}# which you can copy or symlink to use them "
+"in your own configuration."
msgstr ""
-"Pour exécuter des commandes à l'étape binaire, créer un script hook "
-"contenant les commandes dans #{config/binary_local-hooks}#. Le hook sera "
-"exécuté après toutes les autres commandes binaires sont exécutées, mais "
-"avant binary_checksums, les dernièrs commandes binaires. Les commandes de "
-"votre hook ne s'exécutent pas dans le chroot, afin de prendre soin de ne pas "
-"modifier les fichiers en dehors de l'arbre de construction, ou vous pourriez "
-"endommager votre système de construction! Voir les exemples de scripts hook "
-"binaires pour diverses tâches courantes de personnalisation binaires fournis "
-"dans #{/usr/share/live/build/examples/hooks}# que vous pouvez copier ou "
-"symlink pour les utiliser dans votre propre configuration."
+"Pour exécuter des commandes à l'étape binaire, créer un script hook avec le "
+"suffixe #{.binary}# contenant les commandes dans le répertoire #{config/"
+"hooks/}#. Le hook sera exécuté après toutes les autres commandes binaires "
+"sont exécutées, mais avant binary_checksums, les dernièrs commandes "
+"binaires. Les commandes de votre hook ne s'exécutent pas dans le chroot, "
+"afin de prendre soin de ne pas modifier les fichiers en dehors de l'arbre de "
+"construction, ou vous pourriez endommager votre système de construction! "
+"Voir les exemples de scripts hook binaires pour diverses tâches courantes de "
+"personnalisation binaires fournis dans #{/usr/share/live/build/examples/"
+"hooks}# que vous pouvez copier ou symlink pour les utiliser dans votre "
+"propre configuration."
#. type: Plain text
#: en/user_customization-contents.ssi:90
@@ -488,13 +487,15 @@ msgstr "2~ Préconfigurer questions de debconf"
#. type: Plain text
#: en/user_customization-contents.ssi:92
msgid ""
-"Files in the #{config/chroot_local-preseed}# directory are considered to be "
+"Files in the #{config/preseed/}# directory suffixed with #{.preseed}# "
+"followed by the stage (#{.chroot}# or #{.binary}#) are considered to be "
"debconf preseed files and are installed by live-build using #{debconf-set-"
-"selections}#."
+"selections}# during the corresponding stage."
msgstr ""
-"Les fichiers dans le répertoire #{config/chroot_local-preseed}# sont "
-"considérés comme des fichiers de préconfiguration debconf et sont installés "
-"par live-build en utilisant #{debconf-set-selections}#."
+"Les fichiers dans le répertoire #{config/preseed/}# avec le suffixe #{."
+"preseed}# suivi de l'étape (#{.chroot}# or #{.binary}#) sont considérés "
+"comme des fichiers de préconfiguration debconf et sont installés par live-"
+"build en utilisant #{debconf-set-selections}#."
#. type: Plain text
#: en/user_customization-contents.ssi:93
diff --git a/manual/po/fr/user_customization-installer.ssi.po b/manual/po/fr/user_customization-installer.ssi.po
index ec6b15d..deb3ba3 100644
--- a/manual/po/fr/user_customization-installer.ssi.po
+++ b/manual/po/fr/user_customization-installer.ssi.po
@@ -7,8 +7,8 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-04-03 07:04-0200\n"
-"PO-Revision-Date: 2011-08-26 20:07+0200\n"
+"POT-Creation-Date: 2011-11-07 21:19-0400\n"
+"PO-Revision-Date: 2011-11-08 14:55+0100\n"
"Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
"Language-Team: <debian-live at lists.debian.org>\n"
"Language: fr\n"
@@ -27,48 +27,49 @@ msgstr ""
#: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/user_basics.ssi:30 en/user_basics.ssi:40
-#: en/user_basics.ssi:56 en/user_basics.ssi:71 en/user_basics.ssi:106
-#: en/user_basics.ssi:114 en/user_basics.ssi:126 en/user_basics.ssi:138
-#: en/user_basics.ssi:150 en/user_basics.ssi:158 en/user_basics.ssi:166
-#: en/user_basics.ssi:182 en/user_basics.ssi:192 en/user_basics.ssi:200
-#: en/user_basics.ssi:216 en/user_basics.ssi:224 en/user_basics.ssi:234
-#: en/user_basics.ssi:252 en/user_basics.ssi:280 en/user_basics.ssi:296
-#: en/user_basics.ssi:304 en/user_basics.ssi:324 en/user_basics.ssi:349
+#: en/project_procedures.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
+#: en/user_basics.ssi:116 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:184 en/user_basics.ssi:194 en/user_basics.ssi:202
+#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
+#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
+#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
-#: en/user_customization-installer.ssi:43
+#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
-#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:53
-#: en/user_customization-packages.ssi:66 en/user_customization-packages.ssi:80
-#: en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:112
-#: en/user_customization-packages.ssi:142
-#: en/user_customization-packages.ssi:155
-#: en/user_customization-packages.ssi:165
-#: en/user_customization-packages.ssi:175
-#: en/user_customization-packages.ssi:185
-#: en/user_customization-packages.ssi:199
-#: en/user_customization-packages.ssi:215
-#: en/user_customization-packages.ssi:227
-#: en/user_customization-packages.ssi:291
-#: en/user_customization-packages.ssi:303
-#: en/user_customization-packages.ssi:313
-#: en/user_customization-packages.ssi:331
-#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
-#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
-#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
-#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
-#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:105
-#: 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:178 en/user_examples.ssi:190
-#: en/user_examples.ssi:206 en/user_examples.ssi:220 en/user_examples.ssi:229
-#: en/user_examples.ssi:247 en/user_examples.ssi:255 en/user_examples.ssi:268
-#: en/user_examples.ssi:283 en/user_installation.ssi:38
+#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:54
+#: en/user_customization-packages.ssi:67 en/user_customization-packages.ssi:81
+#: en/user_customization-packages.ssi:101
+#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:140
+#: en/user_customization-packages.ssi:150
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:184
+#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:276
+#: en/user_customization-packages.ssi:288
+#: en/user_customization-packages.ssi:298
+#: en/user_customization-packages.ssi:316
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
+#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
+#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
+#: en/user_customization-runtime.ssi:104 en/user_customization-runtime.ssi:114
+#: en/user_customization-runtime.ssi:122 en/user_examples.ssi:14
+#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
+#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
+#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
+#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
+#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
+#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
+#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
+#: en/user_examples.ssi:277 en/user_installation.ssi:38
#: en/user_installation.ssi:46 en/user_installation.ssi:56
#: en/user_installation.ssi:64 en/user_installation.ssi:74
#: en/user_installation.ssi:82 en/user_installation.ssi:90
@@ -77,7 +78,7 @@ msgstr ""
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:80 en/user_overview.ssi:88
+#: en/user_overview.ssi:48 en/user_overview.ssi:56
msgid "code{"
msgstr "code{"
@@ -91,48 +92,49 @@ msgstr "code{"
#: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/user_basics.ssi:34 en/user_basics.ssi:44
-#: en/user_basics.ssi:62 en/user_basics.ssi:75 en/user_basics.ssi:110
-#: en/user_basics.ssi:118 en/user_basics.ssi:132 en/user_basics.ssi:142
-#: en/user_basics.ssi:154 en/user_basics.ssi:162 en/user_basics.ssi:170
-#: en/user_basics.ssi:186 en/user_basics.ssi:196 en/user_basics.ssi:204
-#: en/user_basics.ssi:220 en/user_basics.ssi:228 en/user_basics.ssi:238
-#: en/user_basics.ssi:272 en/user_basics.ssi:284 en/user_basics.ssi:300
-#: en/user_basics.ssi:308 en/user_basics.ssi:335 en/user_basics.ssi:374
+#: en/project_procedures.ssi:131 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
+#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
+#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
+#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
+#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
-#: en/user_customization-installer.ssi:37
-#: en/user_customization-installer.ssi:48
+#: en/user_customization-installer.ssi:38
+#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:70 en/user_customization-packages.ssi:84
-#: en/user_customization-packages.ssi:98
-#: en/user_customization-packages.ssi:116
-#: en/user_customization-packages.ssi:147
-#: en/user_customization-packages.ssi:161
-#: en/user_customization-packages.ssi:171
-#: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:191
-#: en/user_customization-packages.ssi:203
-#: en/user_customization-packages.ssi:219
-#: en/user_customization-packages.ssi:231
-#: en/user_customization-packages.ssi:295
-#: en/user_customization-packages.ssi:307
-#: en/user_customization-packages.ssi:317
-#: en/user_customization-packages.ssi:344
-#: en/user_customization-packages.ssi:353 en/user_customization-runtime.ssi:18
-#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
-#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
-#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
-#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:110
-#: 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:186 en/user_examples.ssi:202
-#: en/user_examples.ssi:210 en/user_examples.ssi:225 en/user_examples.ssi:233
-#: en/user_examples.ssi:251 en/user_examples.ssi:264 en/user_examples.ssi:279
-#: en/user_examples.ssi:297 en/user_installation.ssi:42
+#: en/user_customization-packages.ssi:46 en/user_customization-packages.ssi:59
+#: en/user_customization-packages.ssi:71 en/user_customization-packages.ssi:85
+#: en/user_customization-packages.ssi:105
+#: en/user_customization-packages.ssi:132
+#: en/user_customization-packages.ssi:146
+#: en/user_customization-packages.ssi:156
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:329
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:346 en/user_customization-runtime.ssi:21
+#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
+#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
+#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
+#: en/user_customization-runtime.ssi:108 en/user_customization-runtime.ssi:118
+#: en/user_customization-runtime.ssi:127 en/user_examples.ssi:20
+#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
+#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
+#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
+#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
+#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
+#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
+#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
+#: en/user_examples.ssi:291 en/user_installation.ssi:42
#: en/user_installation.ssi:50 en/user_installation.ssi:60
#: en/user_installation.ssi:70 en/user_installation.ssi:78
#: en/user_installation.ssi:86 en/user_installation.ssi:94
@@ -140,8 +142,8 @@ msgstr "code{"
#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
-#: en/user_overview.ssi:84 en/user_overview.ssi:92
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:42
+#: en/user_overview.ssi:52 en/user_overview.ssi:60
msgid "}code"
msgstr "}code"
@@ -286,20 +288,21 @@ msgstr ""
"utilise pour l'architecture spécifiée. Par exemple:"
#. type: Plain text
-#: en/user_customization-installer.ssi:35
+#: en/user_customization-installer.ssi:36
#, no-wrap
msgid ""
" $ lb config --architecture i386 --linux-flavours 486 \\\n"
-" --debian-installer live --packages debian-installer-launcher\n"
+" --debian-installer live\n"
+" $ echo debian-installer-launcher >> config/package-lists/my.list.chroot\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-installer.ssi:39
+#: en/user_customization-installer.ssi:40
msgid "2~ Customizing Debian Installer by preseeding"
msgstr "2~ Personnalisation de l'installateur Debian par préconfiguration"
#. type: Plain text
-#: en/user_customization-installer.ssi:41
+#: en/user_customization-installer.ssi:42
msgid ""
"As described in the Debian Installer Manual, Appendix B at http://www.debian."
"org/releases/stable/i386/apb.html, \"Preseeding provides a way to set "
@@ -324,7 +327,7 @@ msgstr ""
"préconfigurer les paramètres régionaux pour #{en_US}#:"
#. type: Plain text
-#: en/user_customization-installer.ssi:46
+#: en/user_customization-installer.ssi:47
#, no-wrap
msgid ""
" $ echo \"d-i debian-installer/locale string en_US\" \\\n"
@@ -332,23 +335,23 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-installer.ssi:50
+#: en/user_customization-installer.ssi:51
msgid "2~ Customizing Debian Installer content"
msgstr "2~ Personnalisation de contenu pour l'Installateur Debian"
#. type: Plain text
-#: en/user_customization-installer.ssi:51
+#: en/user_customization-installer.ssi:52
msgid ""
"For experimental or debugging purposes, you might want to include locally "
-"built #{d-i}# component udeb packages. Place these in #{config/binary_local-"
-"udebs/}# to include them in the image. Additional or replacement files and "
+"built #{d-i}# component udeb packages. Place these in #{config/packages."
+"binary/}# to include them in the image. Additional or replacement files and "
"directories may be included in the installer initrd as well, in a similar "
"fashion to {Live/chroot local includes}#live-chroot-local-includes, by "
"placing the material in #{config/binary_debian-installer-includes/}#."
msgstr ""
"Pour des fins expérimentales ou de débogage, vous pouvez inclure paquets "
-"udeb #{d-i}# construits localement. Les placer dans #{config/binary_local-"
-"udebs/}# pour les inclure dans l'image. Fichiers supplémentaires ou de "
+"udeb #{d-i}# construits localement. Les placer dans #{config/packages."
+"binary/}# pour les inclure dans l'image. Fichiers supplémentaires ou de "
"remplacement et répertoires peuvent être inclus dans l'initrd de "
"l'installateur ainsi, d'une manière similaire à {Live/chroot local includes}"
"#live-chroot-local-includes en plaçant le matériau dans #{config/"
diff --git a/manual/po/fr/user_customization-packages.ssi.po b/manual/po/fr/user_customization-packages.ssi.po
index 244f10f..e40957c 100644
--- a/manual/po/fr/user_customization-packages.ssi.po
+++ b/manual/po/fr/user_customization-packages.ssi.po
@@ -7,8 +7,8 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-08-14 16:53+0300\n"
-"PO-Revision-Date: 2011-08-14 18:03+0200\n"
+"POT-Creation-Date: 2011-11-07 21:01-0400\n"
+"PO-Revision-Date: 2011-11-08 14:44+0100\n"
"Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
"Language-Team: <debian-live at lists.debian.org>\n"
"Language: fr\n"
@@ -38,38 +38,38 @@ msgstr ""
#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
-#: en/user_customization-installer.ssi:43
+#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
-#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:53
-#: en/user_customization-packages.ssi:66 en/user_customization-packages.ssi:80
-#: en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:112
-#: en/user_customization-packages.ssi:142
-#: en/user_customization-packages.ssi:155
-#: en/user_customization-packages.ssi:165
-#: en/user_customization-packages.ssi:175
-#: en/user_customization-packages.ssi:185
-#: en/user_customization-packages.ssi:199
-#: en/user_customization-packages.ssi:215
-#: en/user_customization-packages.ssi:227
-#: en/user_customization-packages.ssi:291
-#: en/user_customization-packages.ssi:303
-#: en/user_customization-packages.ssi:313
-#: en/user_customization-packages.ssi:331
-#: en/user_customization-packages.ssi:348
-#: en/user_customization-packages.ssi:356 en/user_customization-runtime.ssi:14
-#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
-#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
-#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
-#: en/user_customization-runtime.ssi:99 en/user_customization-runtime.ssi:107
-#: 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:178 en/user_examples.ssi:190
-#: en/user_examples.ssi:206 en/user_examples.ssi:220 en/user_examples.ssi:229
-#: en/user_examples.ssi:247 en/user_examples.ssi:255 en/user_examples.ssi:268
-#: en/user_examples.ssi:283 en/user_installation.ssi:38
+#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:54
+#: en/user_customization-packages.ssi:67 en/user_customization-packages.ssi:81
+#: en/user_customization-packages.ssi:101
+#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:140
+#: en/user_customization-packages.ssi:150
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:184
+#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:276
+#: en/user_customization-packages.ssi:288
+#: en/user_customization-packages.ssi:298
+#: en/user_customization-packages.ssi:316
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
+#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
+#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
+#: en/user_customization-runtime.ssi:104 en/user_customization-runtime.ssi:114
+#: en/user_customization-runtime.ssi:122 en/user_examples.ssi:14
+#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
+#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
+#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
+#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
+#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
+#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
+#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
+#: en/user_examples.ssi:277 en/user_installation.ssi:38
#: en/user_installation.ssi:46 en/user_installation.ssi:56
#: en/user_installation.ssi:64 en/user_installation.ssi:74
#: en/user_installation.ssi:82 en/user_installation.ssi:90
@@ -78,7 +78,7 @@ msgstr ""
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:80 en/user_overview.ssi:88
+#: en/user_overview.ssi:48 en/user_overview.ssi:56
msgid "code{"
msgstr "code{"
@@ -102,39 +102,39 @@ msgstr "code{"
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
-#: en/user_customization-installer.ssi:37
-#: en/user_customization-installer.ssi:48
+#: en/user_customization-installer.ssi:38
+#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:70 en/user_customization-packages.ssi:84
-#: en/user_customization-packages.ssi:98
-#: en/user_customization-packages.ssi:116
-#: en/user_customization-packages.ssi:147
-#: en/user_customization-packages.ssi:161
-#: en/user_customization-packages.ssi:171
-#: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:191
-#: en/user_customization-packages.ssi:203
-#: en/user_customization-packages.ssi:219
-#: en/user_customization-packages.ssi:231
-#: en/user_customization-packages.ssi:295
-#: en/user_customization-packages.ssi:307
-#: en/user_customization-packages.ssi:317
-#: en/user_customization-packages.ssi:344
-#: en/user_customization-packages.ssi:352
-#: en/user_customization-packages.ssi:361 en/user_customization-runtime.ssi:18
-#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
-#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
-#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
-#: en/user_customization-runtime.ssi:103 en/user_customization-runtime.ssi:112
-#: 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:186 en/user_examples.ssi:202
-#: en/user_examples.ssi:210 en/user_examples.ssi:225 en/user_examples.ssi:233
-#: en/user_examples.ssi:251 en/user_examples.ssi:264 en/user_examples.ssi:279
-#: en/user_examples.ssi:297 en/user_installation.ssi:42
+#: en/user_customization-packages.ssi:46 en/user_customization-packages.ssi:59
+#: en/user_customization-packages.ssi:71 en/user_customization-packages.ssi:85
+#: en/user_customization-packages.ssi:105
+#: en/user_customization-packages.ssi:132
+#: en/user_customization-packages.ssi:146
+#: en/user_customization-packages.ssi:156
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:329
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:346 en/user_customization-runtime.ssi:21
+#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
+#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
+#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
+#: en/user_customization-runtime.ssi:108 en/user_customization-runtime.ssi:118
+#: en/user_customization-runtime.ssi:127 en/user_examples.ssi:20
+#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
+#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
+#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
+#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
+#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
+#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
+#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
+#: en/user_examples.ssi:291 en/user_installation.ssi:42
#: en/user_installation.ssi:50 en/user_installation.ssi:60
#: en/user_installation.ssi:70 en/user_installation.ssi:78
#: en/user_installation.ssi:86 en/user_installation.ssi:94
@@ -142,8 +142,8 @@ msgstr "code{"
#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
-#: en/user_overview.ssi:84 en/user_overview.ssi:92
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:42
+#: en/user_overview.ssi:52 en/user_overview.ssi:60
msgid "}code"
msgstr "}code"
@@ -212,7 +212,7 @@ msgstr "3~ Distribution, archive areas et mode"
msgid ""
"The distribution you choose has the broadest impact on which packages are "
"available to include in your live image. Specify the codename, which "
-"defaults to #{squeeze}# for the Squeeze version of live-build. Any current "
+"defaults to #{wheezy}# for the Wheezy version of live-build. Any current "
"distribution carried in the Debian archive may be specified by its codename "
"here. (See {Terms}#terms for more details.) The #{--distribution}# option "
"not only influences the source of packages within the archive, but also "
@@ -222,13 +222,13 @@ msgid ""
msgstr ""
"La distribution que vous choisissez a le plus large impact sur les paquets "
"qui sont disponibles à inclure dans votre image live. Indiquez le nom de "
-"code, qui est par défaut #{squeeze}# pour la version de live-build dans "
-"Squeeze. Toute distribution actuelle dans l'archive Debian peut être "
-"spécifié par son nom de code ici. (Voir {Termes}#terms pour plus de "
-"détails.) L'option #{--distribution}# non seulement influence la source des "
-"paquets dans l'archive, mais aussi dit #{live-build}# comme it doit "
-"construire chaque distribution supportée. Par exemple, pour construire "
-"contre *unstable*, Sid, précisez: "
+"code, qui est par défaut #{wheezy}# pour la version de live-build dans "
+"Wheezy. Toute distribution actuelle dans l'archive Debian peut être spécifié "
+"par son nom de code ici. (Voir {Termes}#terms pour plus de détails.) "
+"L'option #{--distribution}# non seulement influence la source des paquets "
+"dans l'archive, mais aussi dit #{live-build}# comme it doit construire "
+"chaque distribution soutenue. Par exemple, pour construire contre "
+"*unstable*, Sid, précisez: "
#. type: Plain text
#: en/user_customization-packages.ssi:16
@@ -266,19 +266,19 @@ msgid ""
"derivative are supported instead of the ones for Debian. The mode also "
"modifies live-build behaviour to suit the derivatives."
msgstr ""
-"Support expérimental est disponible pour certains dérivés de Debian par "
+"Soutien expérimental est disponible pour certains dérivés de Debian par "
"l'option #{--mode}#. L'option #{debian}# est définie par défaut, même si "
"vous êtes en créant sur un système non-Debian. Si vous spécifiez #{--mode "
-"ubuntu}# ou #{--mode emdebian}#, les noms de distribution et des archive "
-"areas pour les dérivés spécifiés sont supportés au lieu de ceux de Debian. "
-"Le mode modifie également le comportement de live-build en fonction des "
-"dérivés."
+"ubuntu}# ou #{--mode emdebian}#, les noms de distribution et des areas des "
+"archives pour les dérivés spécifiés sont soutenues au lieu de ceux de "
+"Debian. Le mode modifie également le comportement de live-build en fonction "
+"des dérivés."
#. type: Plain text
#: en/user_customization-packages.ssi:30
#, no-wrap
msgid "*{Note:}* The projects for whom these modes were added are primarily responsible for supporting users of these options. The Debian live project, in turn, provides development support on a best-effort basis only, based on feedback from the derivative projects as we do not develop or support these derivatives ourselves.\n"
-msgstr "*{Remarque:}* Les projets pour lesquels ces modes ont été ajoutés sont principalement responsables de aider les utilisateurs de ces options. Le projet Debian Live, à son tour, fournit un support de développement sur une base des meilleurs efforts seulement, en fonction des commentaires sur les projets dérivés que nous n'avons pas développé ou supporté nous-mêmes.\n"
+msgstr "*{Remarque:}* Les projets pour lesquels ces modes ont été ajoutés sont principalement responsables de aider les utilisateurs de ces options. Le projet Debian Live, à son tour, fournit un soutien de développement sur une base des meilleurs efforts seulement, en fonction des commentaires sur les projets dérivés que nous n'avons pas développé ou soutenu nous-mêmes.\n"
#. type: Plain text
#: en/user_customization-packages.ssi:32
@@ -290,28 +290,29 @@ msgstr "3~ Miroirs de distribution"
msgid ""
"The Debian archive is replicated across a large network of mirrors around "
"the world so that people in each region can choose a nearby mirror for best "
-"download speed. Each of the #{--mirror-*}# options governs which "
+"download speed. Each of the #{--parent-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."
+"those stages, and later, in the *binary* stage, the #{--parent-mirror-binary}"
+"# and #{--parent-mirror-binary-security}# values are used, superceding any "
+"mirrors used in an earlier stage."
msgstr ""
"L'archive Debian est répliqué à travers un large réseau de miroirs autour du "
"monde pour que les gens dans chaque région peuvent choisir un miroir proche "
-"avec la meilleur vitesse de téléchargement. Chacune des options #{--mirror-*}"
-"# qui régit quel miroir de distribution est utilisée à différents stades de "
-"la construction. Rappelez-vous de {Etapes de la construction}#stages-of-the-"
-"build que l'étape *bootstrap* c'est quand le chroot est initialement peuplée "
-"par debootstrap avec un système minimal, et l'étape *chroot* c'est quand le "
-"chroot utilisé pour construire le système de fichiers du système live est "
-"construit. Ainsi, les commutateurs des miroirs correspondants sont utilisées "
-"pour ces étapes, et plus tard, dans le *binary* stade les valeurs #{--mirror-"
-"binary}# et #{--mirror-binary-security}# sont utilisées, remplaçant tout "
-"miroir utilisé dans une étape antérieure. "
+"avec la meilleur vitesse de téléchargement. Chacune des options #{--parent-"
+"mirror-*}# qui régit quel miroir de distribution est utilisée à différents "
+"stades de la construction. Rappelez-vous de {Etapes de la construction}"
+"#stages-of-the-build que l'étape *bootstrap* c'est quand le chroot est "
+"initialement peuplée par debootstrap avec un système minimal, et l'étape "
+"*chroot* c'est quand le chroot utilisé pour construire le système de "
+"fichiers du système live est construit. Ainsi, les commutateurs des miroirs "
+"correspondants sont utilisées pour ces étapes, et plus tard, dans le "
+"*binary* stade les valeurs #{--parent-mirror-binary}# et #{--parent-mirror-"
+"binary-security}# sont utilisées, remplaçant tout miroir utilisé dans une "
+"étape antérieure. "
#. type: Plain text
#: en/user_customization-packages.ssi:36
@@ -325,223 +326,179 @@ msgstr ""
#: en/user_customization-packages.ssi:38
msgid ""
"To set the distribution mirrors used at build time to point at a local "
-"mirror, it is sufficient to set #{--mirror-bootstrap}# and #{--mirror-chroot-"
-"security}# as follows."
+"mirror, it is sufficient to set #{--parent-mirror-bootstrap}#, #{--parent-"
+"mirror-chroot-security}# and #{--parent-mirror-chroot-backports}# as follows."
msgstr ""
"Pour définir les miroirs de distribution utilisés au temps de construction "
-"pour pointer vers un miroir local, il suffit de fixer #{--mirror-bootstrap}# "
-"et #{--mirror-chroot-security}# comme suit."
+"pour pointer vers un miroir local, il suffit de fixer #{--parent-mirror-"
+"bootstrap}# , #{--parent-mirror-chroot-security}# et #{--parent-mirror-"
+"chroot-backports}# comme suit."
#. type: Plain text
-#: en/user_customization-packages.ssi:43
+#: en/user_customization-packages.ssi:44
#, no-wrap
msgid ""
-" $ lb config --mirror-bootstrap http://localhost/debian/ \\\n"
-" --mirror-chroot-security http://localhost/debian-security/\n"
+" $ lb config --parent-mirror-bootstrap http://localhost/debian/ \\\n"
+" --parent-mirror-chroot-security http://localhost/debian-security/ \\\n"
+"\t --parent-mirror-chroot-backports http://localhost/debian-backports/\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:47
+#: en/user_customization-packages.ssi:48
msgid ""
-"The chroot mirror, specified by #{--mirror-chroot}#, defaults to the #{--"
-"mirror-bootstrap}# value."
+"The chroot mirror, specified by #{--parent-mirror-chroot}#, defaults to the #"
+"{--parent-mirror-bootstrap}# value."
msgstr ""
-"Le miroir chroot, spécifiée par #{--mirror-chroot}#, par défaut, c'est la "
-"valeur #{--mirror-bootstrap}#."
+"Le miroir chroot, spécifiée par #{--parent-mirror-chroot}#, par défaut, "
+"c'est la valeur #{--parent-mirror-bootstrap}#."
#. type: Plain text
-#: en/user_customization-packages.ssi:49
+#: en/user_customization-packages.ssi:50
msgid "3~ Distribution mirrors used at run time"
msgstr "3~ Miroirs de distribution utilisés au moment de l'exécution"
#. type: Plain text
-#: en/user_customization-packages.ssi:51
+#: en/user_customization-packages.ssi:52
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."
+"The #{--parent-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 ""
-"Les options #{--mirror-binary*}# régissent les miroirs de distribution "
-"placés dans l'image binaire. Ils peuvent être utilisés pour installer des "
-"paquets supplémentaires lors de l'exécution du système live. Les valeurs par "
-"défaut emploient #{cdn.debian.net}#, un service qui choisit un miroir "
-"géographiquement proche basé sur le numéro IP de l'utilisateur. C'est un "
-"choix approprié lorsque vous ne pouvez pas prédire quel miroir sera mieux "
-"pour tous vos utilisateurs. Ou vous pouvez spécifier vos propres valeurs, "
-"comme indiqué dans l'exemple ci-dessous. Une image construite avec cette "
-"configuration seulement serait approprié pour les utilisateurs sur un réseau "
-"où \"#{mirror}#\" est accessible."
+"Les options #{--parent-mirror-binary*}# régissent les miroirs de "
+"distribution placés dans l'image binaire. Ils peuvent être utilisés pour "
+"installer des paquets supplémentaires lors de l'exécution du système live. "
+"Les valeurs par défaut emploient #{cdn.debian.net}#, un service qui choisit "
+"un miroir géographiquement proche basé sur le numéro IP de l'utilisateur. "
+"C'est un choix approprié lorsque vous ne pouvez pas prédire quel miroir sera "
+"mieux pour tous vos utilisateurs. Ou vous pouvez spécifier vos propres "
+"valeurs, comme indiqué dans l'exemple ci-dessous. Une image construite avec "
+"cette configuration seulement serait approprié pour les utilisateurs sur un "
+"réseau où \"#{mirror}#\" est accessible."
#. type: Plain text
-#: en/user_customization-packages.ssi:56
+#: en/user_customization-packages.ssi:57
#, no-wrap
msgid ""
-" $ lb config --mirror-binary http://mirror/debian/ \\\n"
-" --mirror-binary-security http://mirror/debian-security/\n"
+" $ lb config --parent-mirror-binary http://mirror/debian/ \\\n"
+" --parent-mirror-binary-security http://mirror/debian-security/\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:60
+#: en/user_customization-packages.ssi:61
msgid "3~additional-repositories Additional repositories"
msgstr "3~additional-repositories Référentiels additionnels"
#. type: Plain text
-#: en/user_customization-packages.ssi:62
+#: en/user_customization-packages.ssi:63
msgid ""
"You may add more repositories, broadening your package choices beyond what "
"is available in your target distribution. These may be, for example, for "
"backports, experimental or custom packages. To configure additional "
-"repositories, create #{config/chroot_sources/your-repository.chroot}#, and/"
-"or #{config/chroot_sources/your-repository.binary}# files. As with the #{--"
-"mirror-*}# options, these govern the repositories used in the *chroot* stage "
-"when building the image, and in the *binary* stage, i.e. for use when "
-"running the live system."
+"repositories, create #{config/archives/your-repository.list.chroot}#, and/or "
+"#{config/archives/your-repository.list.binary}# files. As with the #{--"
+"parent-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 ""
"Vous pouvez ajouter plus de référentiels, élargir vos choix de paquets au-"
"delà ceux disponibles dans votre distribution objectif. Il peut être, par "
"exemple, pour backports, expérimentaux ou des paquets personnalisés. Pour "
"configurer des référentiels supplémentaires, créer les fichiers #{config/"
-"chroot_sources/your-repository.chroot}#, et/ou #{config/chroot_sources/your-"
-"repository.binary}#. Comme avec les options #{--mirror-*}#, elles gouvernent "
-"les référentiels utilisés dans l'étape *chroot* lors de la construction de "
-"l'image, et dans l'étape *binaire*, c'est à dire pour une utilisation au "
-"moment de l'exécution du système live."
+"archives/your-repository.list.chroot}#, et/ou #{config/archives/your-"
+"repository.list.binary}#. Comme avec les options #{--parent-mirror-*}#, "
+"elles gouvernent les référentiels utilisés dans l'étape *chroot* lors de la "
+"construction de l'image, et dans l'étape *binaire*, c'est à dire pour une "
+"utilisation au moment de l'exécution du système live."
#. type: Plain text
-#: en/user_customization-packages.ssi:64
+#: en/user_customization-packages.ssi:65
msgid ""
-"For example, #{config/chroot_sources/live.chroot}# allows you to install "
+"For example, #{config/archives/live.list.chroot}# allows you to install "
"packages from the debian live snapshot repository at live system build time."
msgstr ""
-"Par exemple, #{config/chroot_sources/live.chroot}# vous permet d'installer "
+"Par exemple, #{config/archives/live.list.chroot}# vous permet d'installer "
"des paquets du référentiel des instantanés debian live au moment de la "
"construction du système live."
#. type: Plain text
-#: en/user_customization-packages.ssi:68
+#: en/user_customization-packages.ssi:69
#, no-wrap
msgid " deb http://live.debian.net/ sid-snapshots main contrib non-free\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:72
+#: en/user_customization-packages.ssi:73
msgid ""
-"If you add the same line to #{config/chroot_sources/live.binary}#, the "
+"If you add the same line to #{config/archives/live.list.binary}#, the "
"repository will be added to your live system's #{/etc/apt/sources.list.d/}# "
"directory."
msgstr ""
-"Si vous ajoutez la même ligne à #{config/chroot_sources/live.binary}#, le "
-"référentiel sera ajouté à le répertoire #{/etc/apt/sources.list.d/}# de "
-"votre système live."
+"Si vous ajoutez la même ligne à #{config/archives/live.list.binary}#, le "
+"référentiel sera ajouté au répertoire #{/etc/apt/sources.list.d/}# de votre "
+"système live."
#. type: Plain text
-#: en/user_customization-packages.ssi:74
+#: en/user_customization-packages.ssi:75
msgid "If such files exist, they will be picked up automatically."
msgstr "Si ces fichiers existent, ils seront sélectionnés automatiquement."
#. type: Plain text
-#: en/user_customization-packages.ssi:76
+#: en/user_customization-packages.ssi:77
msgid ""
"You should also put the GPG key used to sign the repository into #{config/"
-"chroot_sources/your-repository.{binary,chroot}.gpg}# files."
+"archives/your-repository.gpg.{binary,chroot}}# files."
msgstr ""
"Vous devriez également mettre la clé GPG utilisée pour signer le référentiel "
-"dans fichiers #{config/chroot_sources/your-repository.{binary,chroot}.gpg}#"
+"dans fichiers #{config/archives/your-repository.gpg.{binary,chroot}}#"
#. type: Plain text
-#: en/user_customization-packages.ssi:78
+#: en/user_customization-packages.ssi:79
#, no-wrap
-msgid "*{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:\n"
-msgstr "*{Remarque:}* certains référentiels de paquets préconfigurés sont disponibles pour une sélection facile grâce à l'option #{--repository}#, par exemple pour permettre des instantanés live, une simple commande suffit pour l'activer:\n"
+msgid "*{Note:}* some preconfigured package repositories are available for easy selection through the #{--archives}# option, e.g. for enabling live snapshots, a simple command is enough to enable it:\n"
+msgstr "*{Remarque:}* certains référentiels de paquets préconfigurés sont disponibles pour une sélection facile grâce à l'option #{--archives}#, par exemple pour permettre des instantanés live, une simple commande suffit pour l'activer:\n"
#. type: Plain text
-#: en/user_customization-packages.ssi:82 en/user_installation.ssi:148
+#: en/user_customization-packages.ssi:83 en/user_installation.ssi:148
#, no-wrap
-msgid " $ lb config --repository live.debian.net\n"
+msgid " $ lb config --archives live.debian.net\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:86
+#: en/user_customization-packages.ssi:87
msgid "2~choosing-packages-to-install Choosing packages to install"
msgstr "2~choosing-packages-to-install Choisir les paquets à installer"
#. type: Plain text
-#: en/user_customization-packages.ssi:88
+#: en/user_customization-packages.ssi:89
msgid ""
"There are a number of ways to choose which packages live-build will install "
"in your image, covering a variety of different needs. You can simply name "
-"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."
+"individual packages to install in a package list. You can also choose "
+"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 ""
"Il y a un certain nombre de façons de choisir quels paquets live-build va "
"installer dans votre image, couvrant une variété de besoins différents. Vous "
-"pouvez tout simplement nommer les paquets individuels à installer, que ce "
-"soit avec l'option #{--packages}# pour quelques paquets, ou dans une liste "
-"de paquets pour un grand nombre de paquets. Vous pouvez également choisir "
-"grandes listes prédéfinies de paquets, ou utilisez des tâches APT. Et enfin, "
-"vous pouvez placer paquets dans votre arbre #{config/}# qui est bien adapté "
-"aux essais de nouveaux paquets ou expérimentaux avant qu'ils ne soient "
-"disponibles à partir d'un référentiel."
+"pouvez tout simplement nommer les paquets individuels à installer dans une "
+"liste de paquets. Vous pouvez également choisir grandes listes prédéfinies "
+"de paquets, ou utilisez des tâches APT. Et enfin, vous pouvez placer paquets "
+"dans votre arbre #{config/}# qui est bien adapté aux essais de nouveaux "
+"paquets ou expérimentaux avant qu'ils ne soient disponibles sur un "
+"référentiel."
#. type: Plain text
-#: en/user_customization-packages.ssi:90
-msgid "3~ Choosing a few packages"
-msgstr "3~ Choisir un certain nombre de paquets"
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:92
-msgid ""
-"When the number of packages added is small, simply specify #{--packages}#. "
-"For example:"
-msgstr ""
-"Si le nombre de paquets ajoutée est petit il suffit de spécifier #{--"
-"packages}#. Par exemple:"
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:96
-#, no-wrap
-msgid " $ lb config --packages \"package1 package2 package3\"\n"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:100
-msgid ""
-"The behaviour of live-build when specifying a package that does not exist is "
-"determined by your choice of APT utility. See {Choosing apt or aptitude}"
-"#choosing-apt-or-aptitude for more details."
-msgstr ""
-"Le comportement de live-build pour spécifier un paquet qui n'existe pas est "
-"déterminé par votre choix de l'utilité APT. Voir {Choisir apt ou aptitude}"
-"#choosing-apt-or-aptitude pour plus de détails."
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:102
-msgid ""
-"If you need to specify a large number of packages to be installed or you "
-"need flexibility regarding which packages to install, use package lists as "
-"discussed in the following section, {Package lists}#package-lists."
-msgstr ""
-"Si vous avez besoin de spécifier un grand nombre de paquets à installer ou "
-"vous avez besoin de flexibilité en ce qui concerne les paquets à installer, "
-"utilisez des listes de paquets tel que discuté dans la section suivante, "
-"{Listes de paquets}#package-lists."
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:104
+#: en/user_customization-packages.ssi:91
msgid "3~package-lists Package lists"
msgstr "3~package-lists Listes de paquets"
#. type: Plain text
-#: en/user_customization-packages.ssi:106
+#: en/user_customization-packages.ssi:93
msgid ""
"Package lists are a powerful way of expressing which packages should be "
"installed. The list syntax supports included files and conditional sections "
@@ -553,7 +510,7 @@ msgid ""
"combination of both."
msgstr ""
"Les listes de paquets sont un excellent moyen d'exprimer quels paquets "
-"doivent être installés. La syntaxe de la liste supporte les fichiers inclus "
+"doivent être installés. La syntaxe de la liste soutient les fichiers inclus "
"et sections conditionnelles qui les rend facile de construire à partir "
"d'autres listes et de les adapter pour une utilisation dans configurations "
"multiples. Vous pouvez utiliser des listes de paquets prédéfinies, offrant "
@@ -563,151 +520,129 @@ msgstr ""
"propre liste de paquets, ou utiliser une combinaison des deux."
#. type: Plain text
-#: en/user_customization-packages.ssi:108
+#: en/user_customization-packages.ssi:95
+#, no-wrap
+msgid "*{Note:}* 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.\n"
+msgstr "*{Remarque:}* Le comportement de live-build pour spécifier un paquet qui n'existe pas est déterminé par votre choix de l'utilité APT. Voir {Choisir apt ou aptitude}#choosing-apt-or-aptitude pour plus de détails.\n"
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:97
msgid "3~ Predefined package lists"
msgstr "3~ Listes de paquets prédéfinies"
#. type: Plain text
-#: en/user_customization-packages.ssi:110
+#: en/user_customization-packages.ssi:99
msgid ""
"The simplest way to use lists is to specify one or more predefined lists "
-"with the #{--packages-lists}# option. For example:"
+"with the #{--package-lists}# option. For example:"
msgstr ""
"La façon la plus simple d'utiliser des listes consiste à spécifier une ou "
-"plusieurs listes prédéfinies avec la option #{--packages-lists}#. Par "
-"exemple:"
+"plusieurs listes prédéfinies avec la option #{--package-lists}#. Par exemple:"
#. type: Plain text
-#: en/user_customization-packages.ssi:114
+#: en/user_customization-packages.ssi:103
#, no-wrap
-msgid " $ lb config --packages-lists \"gnome-core rescue\"\n"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:118
-msgid ""
-"In addition to these lists, live-build supports four virtual package lists: #"
-"{gnome-desktop}#, #{kde-desktop}#, #{lxde-desktop}# and #{xfce-desktop}#, "
-"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."
+msgid " $ lb config --package-lists \"gnome rescue\"\n"
msgstr ""
-"En plus de ces listes, live-build supporte quatre listes de paquets "
-"virtuels: #{gnome-desktop}#, #{kde-desktop}#, #{lxde-desktop}# et #{xfce-"
-"desktop}#, chacun d'entre eux offrent une sélection plus grande de paquets "
-"qui correspond à valeurs par défaut de l'installateur Debian pour ces "
-"environnements de bureau. Voir {Tâches de bureau et de la langue}#desktop-"
-"and-language-tasks pour plus de détails."
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:120
-#, no-wrap
-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.\n"
-msgstr "*{Remarque:}* Les images préconstruites GNOME, KDE, LXDE et XFCE disponibles pour téléchargement à http://live.debian.net sont construites en utilisant les listes virtuels correspondantes #{*-desktop}#.\n"
#. type: Plain text
-#: en/user_customization-packages.ssi:122
+#: en/user_customization-packages.ssi:107
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 "
+"build/package-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 ""
"L'emplacement par défaut pour les fichiers liste sur votre système est #{/"
-"usr/share/live/build/lists/}#. Pour déterminer les paquets dans une liste "
-"donnée, lire le fichier correspondant, en accordant une attention aux "
+"usr/share/live/build/package-lists/}#. Pour déterminer les paquets dans une "
+"liste donnée, lire le fichier correspondant, en accordant une attention aux "
"fichiers inclus et les conditionnels tels que décrits dans les sections "
"suivantes."
#. type: Plain text
-#: en/user_customization-packages.ssi:124
+#: en/user_customization-packages.ssi:109
msgid "3~ Local package lists"
msgstr "3~ Listes de paquets locaux"
#. type: Plain text
-#: en/user_customization-packages.ssi:126
+#: en/user_customization-packages.ssi:111
msgid ""
-"You may supplement or replace entirely the supplied lists using local "
-"package lists stored in #{config/chroot_local-packageslists/}#."
+"You may supplement the predefined lists using local package lists stored in #"
+"{config/package-lists/}#."
msgstr ""
"Vous pouvez compléter ou remplacer entièrement les listes fournies en "
-"utilisant listes de paquets locaux stockées dans #{config/chroot_local-"
-"packageslists/}#."
+"utilisant listes de paquets locaux stockées dans #{config/package-lists/}#."
#. type: Plain text
-#: en/user_customization-packages.ssi:128
+#: en/user_customization-packages.ssi:113
msgid ""
"Package lists that exist in this directory need to have a #{.list}# suffix "
-"in order to be processed. Local package lists always override package lists "
-"distributed with live-build. This can cause undesired effects, we therefore "
-"recommend to use unique names for local package lists."
+"in order to be processed, and then an additional stage suffix, #{.chroot}# "
+"or #{.binary}# to indicate which stage the list is for."
msgstr ""
"Les listes de paquets qui existent dans ce répertoire ont besoin d'avoir un "
-"suffixe #{.list}# pour être traitées. Les listes locaux de paquets ont "
-"toujours priorité sur les listes de paquets distribués avec live-build. Cela "
-"peut causer des effets indésirables, nous recommandons donc d'utiliser des "
-"noms uniques pour listes de paquets locaux."
+"suffixe #{.list}# pour être traitées, puis un suffixe d'étape supplémentaire#"
+"{.chroot}# ou #{.binary}# pour indiquer à quelle étape la liste est destinée."
#. type: Plain text
-#: en/user_customization-packages.ssi:130
-msgid "3~ Local binary package lists"
-msgstr "3~ Listes locaux de paquets binaires"
+#: en/user_customization-packages.ssi:115
+#, no-wrap
+msgid "*{Note:}* If you don't specify the stage suffix, the list will be used for both stages. Normally, you want to specify #{.list.chroot}# so that the packages will only be installed in the live filesystem and not have an extra copy of the #{.deb}# placed on the media.\n"
+msgstr "*{Remarque:}* Si vous ne spécifiez pas le suffixe de l'étape, la liste sera utilisée pour les deux étapes. Normalement, vous voulez spécifier #{.list.chroot}# de sorte que les paquets seront seulement installés dans le système de fichiers live et ne pas avoir une copie supplémentaire du #{.deb}# placé sur le support.\n"
#. type: Plain text
-#: en/user_customization-packages.ssi:132
-msgid ""
-"In case you want to include some required .deb packages to live media's #"
-"{pool/}# (without installing them onto the live image) you may need to use "
-"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 ""
-"Dans le cas où vous voulez inclure certains paquets .deb dans #{pool/}# de "
-"votre support live (sans les installer sur l'image live) vous pouvez avoir "
-"besoin d'utiliser des listes à l'aide de listes locaux de paquets binaires "
-"stockées dans #{config/binary_local-packageslists/}#. Ces supports peuvent "
-"être utilisés comme une image d'installation de Debian personnalisés pour "
-"les installations hors-ligne."
+#: en/user_customization-packages.ssi:117
+msgid "3~ Local binary package lists"
+msgstr "3~ Listes locaux de paquets binaires"
#. type: Plain text
-#: en/user_customization-packages.ssi:134
+#: en/user_customization-packages.ssi:119
msgid ""
-"Package lists that exist in this directory need to have a #{.list}# suffix "
-"in order to be processed."
+"To make a binary stage list, place a file suffixed with #{.list.binary}# in #"
+"{config/package-lists/}#. These packages are not installed in the live "
+"filesystem, but are included on the live media under #{pool/}#. You would "
+"typically use such a list with one of the non-live installer variants. As "
+"mentioned above, if you want this list to be the same as your chroot stage "
+"list, simply use the #{.list}# suffix by itself."
msgstr ""
-"Les listes de paquets qui existent dans ce répertoire ont besoin d'avoir un "
-"suffixe #{.list}# pour être traitées."
+"Pour faire une liste pour l'étape binary, placez un fichier avec le suffixe #"
+"{.list.binary}# dans #{config/package-lists/}#. Ces paquets ne sont pas "
+"installés dans le système de fichiers live, mais sont inclus sur les "
+"supports live sous #{pool/}#. Vous utiliserez généralement cette liste avec "
+"une des variantes d'installation non-live. Comme mentionné ci-dessus, si "
+"vous voulez que cette liste soit le même que votre liste pour l'étape "
+"chroot, utilisez simplement le suffixe #{.list}#. "
#. type: Plain text
-#: en/user_customization-packages.ssi:136
+#: en/user_customization-packages.ssi:121
msgid "3~ Extending a provided package list using includes"
msgstr "3~ Extension d'un liste de paquets fournis à l'aide de «includes»"
#. type: Plain text
-#: en/user_customization-packages.ssi:138
+#: en/user_customization-packages.ssi:123
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."
+"includes. Refer to these in the #{/usr/share/live/build/package-lists/}# "
+"directory, as they serve as good examples of how to write your own lists."
msgstr ""
"Les listes de paquets qui sont incluses avec live-build font un grand usage "
"des «includes». Reportez-vous à ceux-ci dans le répertoire #{/usr/share/live/"
-"build/lists/}#, car ils servent d'exemples pour savoir comment écrire vos "
-"propres listes."
+"build/package-lists/}#, car ils servent d'exemples pour savoir comment "
+"écrire vos propres listes."
#. type: Plain text
-#: en/user_customization-packages.ssi:140
+#: en/user_customization-packages.ssi:125
msgid ""
"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:"
+"iceweasel, create #{config/package-lists/my.list.chroot}# with the following "
+"contents:"
msgstr ""
"Par exemple, pour faire une liste qui comprend la liste prédéfinie #{gnome}"
-"#, plus iceweasel, créer #{config/chroot_local-packageslists/mygnome.list}# "
-"avec le contenu suivant:"
+"#, plus iceweasel, créer #{config/package-lists/my.list.chroot}# avec le "
+"contenu suivant:"
#. type: Plain text
-#: en/user_customization-packages.ssi:145
+#: en/user_customization-packages.ssi:130
#, no-wrap
msgid ""
" #include <gnome>\n"
@@ -715,12 +650,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:134
msgid "3~ Using conditionals inside package lists"
msgstr "3~ Utilisant des conditionnels dans les listes de paquets"
#. type: Plain text
-#: en/user_customization-packages.ssi:151
+#: en/user_customization-packages.ssi:136
msgid ""
"Any of the live-build configuration variables stored in #{config/*}# (minus "
"the #{LB_}# prefix) may be used in conditional statements in package lists. "
@@ -738,7 +673,7 @@ msgstr ""
"{ARCHITECTURE}# ou #{ARCHIVE_AREAS}#."
#. type: Plain text
-#: en/user_customization-packages.ssi:153
+#: en/user_customization-packages.ssi:138
msgid ""
"For example, to install #{ia32-libs}# if the #{--architecture amd64}# is "
"specified:"
@@ -747,7 +682,7 @@ msgstr ""
"spécifié:"
#. type: Plain text
-#: en/user_customization-packages.ssi:159
+#: en/user_customization-packages.ssi:144
#, no-wrap
msgid ""
" #if ARCHITECTURE amd64\n"
@@ -756,7 +691,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:148
msgid ""
"You may test for any one of a number of values, e.g. to install #{memtest86+}"
"# if either #{--architecture i386}# or #{--architecture amd64}# is specified:"
@@ -766,7 +701,7 @@ msgstr ""
"amd64}# est spécifié:"
#. type: Plain text
-#: en/user_customization-packages.ssi:169
+#: en/user_customization-packages.ssi:154
#, no-wrap
msgid ""
" #if ARCHITECTURE i386 amd64\n"
@@ -775,7 +710,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:173
+#: en/user_customization-packages.ssi:158
msgid ""
"You may also test against variables that may contain more than one value, e."
"g. to install #{vrms}# if either #{contrib}# or #{non-free}# is specified "
@@ -786,7 +721,7 @@ msgstr ""
"free}# est spécifié via #{--archive-areas}#:"
#. type: Plain text
-#: en/user_customization-packages.ssi:179
+#: en/user_customization-packages.ssi:164
#, no-wrap
msgid ""
" #if ARCHIVE_AREAS contrib non-free\n"
@@ -795,12 +730,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:183
+#: en/user_customization-packages.ssi:168
msgid "A conditional may surround an #{#include}# directive:"
msgstr "Un conditionnel peut entourer une directive #{#include}#:"
#. type: Plain text
-#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:174
#, no-wrap
msgid ""
" #if ARCHITECTURE amd64\n"
@@ -809,41 +744,45 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:178
msgid "The nesting of conditionals is not supported."
-msgstr "L'imbrication des conditionnels n'est pas supportée."
+msgstr "L'imbrication des conditionnels n'est pas soutenu."
#. type: Plain text
-#: en/user_customization-packages.ssi:195
+#: en/user_customization-packages.ssi:180
msgid "3~ Tasks"
msgstr "3~ Tâches"
#. type: Plain text
-#: en/user_customization-packages.ssi:197
+#: en/user_customization-packages.ssi:182
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."
+"live-build by putting them in a list in #{config/task-lists/}#, as in the "
+"example below."
msgstr ""
"L'installateur Debian offre l'utilisateur le choix d'un certain nombre de "
"listes présélectionnées de paquets, chacun centré sur un type particulier de "
"système ou d'une tâche pour laquelle un système peut être utilisé, comme "
"«environnement de bureau graphique», «serveur de messagerie» ou «portable». "
-"Ces listes sont appelés «tâches» et sont supportés par APT à travers "
-"l'option «Task:» Vous pouvez spécifier une ou plusieurs tâches en live-build "
-"via l'option #{--tasks}#, comme dans l'exemple ci-dessous."
+"Ces listes sont appelés «tâches» (Tasks) et sont soutenus par APT grâce à "
+"l'option «Task:» Vous pouvez spécifier une ou plusieurs tâches à live-build "
+"en les plaçant dans une liste dans #{config/task-lists/}#, comme dans "
+"l'exemple ci-dessous."
#. type: Plain text
-#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:187
#, no-wrap
-msgid " $ lb config --tasks \"mail-server file-server\"\n"
+msgid ""
+" $ lb config\n"
+" $ echo \"mail-server file-server\" >> config/task-lists/my.list.chroot\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:205
+#: en/user_customization-packages.ssi:191
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, "
@@ -856,126 +795,110 @@ msgstr ""
"être examinées avec #{tasksel --task-packages}#."
#. type: Plain text
-#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:193
msgid "3~desktop-and-language-tasks Desktop and language tasks"
msgstr "3~desktop-and-language-tasks Tâches de bureau et de la langue"
#. type: Plain text
-#: en/user_customization-packages.ssi:209
+#: en/user_customization-packages.ssi:195
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 #{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 ""
-"Les tâches de bureau et de la langue sont des cas particuliers. Dans "
-"l'installateur Debian, si le milieu a été préparé pour un environnement de "
-"bureau particulier, la tâche correspondante sera automatiquement installée. "
-"Ainsi, il y a tâches #{gnome-desktop}#, #{kde-desktop}#, #{lxde-desktop}# et "
-"#{xfce-desktop}#, dont aucun n'est offert dans le menu #{tasksel}#. De même, "
-"il n'y a pas entrées de menu pour les tâches de les langues, mais le choix "
-"de la langue de l'utilisateur lors de l'installation influence le choix des "
-"tâches de la langue correspondante."
+"Desktop and language tasks are special cases that need some extra planning "
+"and configuration. Live images are different from Debian Installer images in "
+"this respect. 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 internal #{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 ""
+"Les tâches de bureau et de la langue sont des cas particuliers qui ont "
+"besoin d'une certaine planification et de configuration supplémentaire . "
+"Dans l'installateur Debian, si le support a été préparé pour un "
+"environnement de bureau particulier, la tâche correspondante sera "
+"automatiquement installée. Ainsi, il y a tâches internes #{gnome-desktop}#, #"
+"{kde-desktop}#, #{lxde-desktop}# et #{xfce-desktop}#, dont aucun n'est "
+"offert dans le menu #{tasksel}#. De même, il n'y a pas entrées de menu pour "
+"les tâches de les langues, mais le choix de la langue de l'utilisateur lors "
+"de l'installation influence le choix des tâches de la langue correspondante."
#. type: Plain text
-#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:197
msgid ""
-"In live-build, therefore, these special cases are also given special "
-"consideration, but with three notable differences at the time of writing."
+"When developing a desktop live image, the image typically boots directly to "
+"a working desktop, the choices of both desktop and default language having "
+"been made at build time, not at run time as in the case of the Debian "
+"Installer. That's not to say that a live image couldn't be built to support "
+"multiple desktops or multiple languages and offer the user a choice, but "
+"that is not live-build's default behaviour."
msgstr ""
-"En live-build, par conséquent, ces cas particuliers sont également d'une "
-"attention particulière, mais avec trois différences notables au moment de "
-"l'écriture."
+"Lors du développement d'une image de bureau live, l'image généralement "
+"démarre directement à un bureau de travail, le choix des deux "
+"environnements de bureau et la langue par défaut ayant été faite au moment "
+"de la construction, non pas au moment de l'exécution comme dans le cas de "
+"l'installateur de Debian. Cela ne veut pas dire qu'une image live ne pouvait "
+"être construite pour soutenir plusieurs environnements de bureau ou de "
+"plusieurs langues et offrir à l'utilisateur un choix, mais ce n'est pas le "
+"comportement par défaut de live-build."
#. type: Plain text
-#: en/user_customization-packages.ssi:213
+#: en/user_customization-packages.ssi:199
msgid ""
-"First, there is no provision made yet automatically for language tasks, "
-"although a subset of those packages are included if you specify #{lb config "
-"--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:"
+"Because there is no provision made automatically for language tasks, which "
+"include such things as language-specific fonts and input-method packages, if "
+"you want them, you need to specify them in your configuration. For example, "
+"a GNOME desktop image containing support for Japanese might include these "
+"tasks:"
msgstr ""
-"D'abord, il n'existe aucune disposition fait encore automatiquement pour des "
-"tâches de la langue, même si un sous-ensemble de ces packages sont inclus si "
-"vous spécifiez #{lb config --language}#. Si vous avez besoin de ces tâches, "
-"qui comprennent des éléments tels que des polices spécifiques de la lange et "
-"des paquets de méthodes d'entrée, vous devez les spécifier dans votre "
-"configuration. Par exemple:"
+"Parce qu'il n'ya pas de disposition fait automatiquement pour les tâches de "
+"la langue, qui comprennent des éléments tels que des polices spécifiques de "
+"la langue et des paquets de méthodes d'entrée, si vous les voulez, vous "
+"devez les spécifier dans votre configuration. Par exemple, une image de "
+"bureau GNOME contenant de soutien pour le japonais pourrait inclure les "
+"tâches suivantes:"
#. type: Plain text
-#: en/user_customization-packages.ssi:217
+#: en/user_customization-packages.ssi:205
#, no-wrap
-msgid " $ lb config --tasks \"japanese japanese-desktop japanese-gnome-desktop\"\n"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:221
msgid ""
-"Second, live-build supports #{*-desktop}# virtual package lists for each of "
-"the desktop flavours mentioned above, which select the #{standard-x11}# "
-"predefined package list, the corresponding #{*-desktop}# task and three "
-"additional tasks: #{desktop}#, #{standard}# and #{laptop}#. So, for example, "
-"if you specify #{--packages-lists gnome-desktop}#, it is equivalent to "
-"specifying #{--packages debian-installer-launcher --packages-lists standard-"
-"x11 --tasks \"gnome-desktop desktop standard laptop\"}#."
+" $ lb config\n"
+" $ echo \"gnome-desktop desktop standard laptop\" >> config/task-lists/my.list.chroot\n"
+" $ echo \"japanese japanese-desktop japanese-gnome-desktop\" >> config/task-lists/my.list.chroot\n"
msgstr ""
-"En second lieu, live-build supporte #{*-desktop}# listes de paquets virtuels "
-"pour chacune des saveurs de bureau mentionnés ci-dessus, qui sélectionnent "
-"la liste prédéfinie de paquets #{standard-x11}#, le correspondant #{*-"
-"desktop}# et trois tâches supplémentaires: #{desktop}#, #{standard}# et #"
-"{laptop}#. Ainsi, par exemple, si vous spécifiez #{--packages-lists gnome-"
-"desktop}#, il est équivalent à spécifier #{--packages debian-installer-"
-"launcher --packages-lists standard-x11 --tasks \"gnome-desktop desktop "
-"standard laptop\"}#."
#. type: Plain text
-#: en/user_customization-packages.ssi:223
+#: en/user_customization-packages.ssi:209
msgid ""
-"Third, if any of the tasks for these desktop flavours are selected, either "
-"explicitly through #{--tasks}# or implicitly by #{--packages-lists}#, 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."
+"Since desktop tasks are \"internal\" tasks, for every desktop flavour task "
+"included in the image, the corresponding value, if it differs from the "
+"default, \"gnome\", must be preseeded in the \"tasksel/desktop\" debconf "
+"variable or else tasksel will not recognize and install it. Thus:"
msgstr ""
-"En troisième lieu, si une des tâches de bureau pour ces saveurs sont "
-"sélectionnés, soit explicitement par #{--tasks}# ou implicitement par #{--"
-"packages-lists}#, live-build préconfigurera la valeur de bureau "
-"correspondante pour l'installateur Debian (si elle est incluse) pour "
-"s'assurer qu'il suit ses propres règles pour l'installation de saveurs de "
-"bureau différents."
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:225
-#, no-wrap
-msgid "*{Note:}* There is also an experimental #{--language}# option that has an overlapping purpose with language tasks. For any language for which it is known that there are #{*-l10n}# packages, if #{--language}# is specified, those packages will be installed. Furthermore, if any #{syslinux}# templates matching the language are found, they will be used instead of the default English templates. The package selection done by #{--language}# is a poor approximation of language tasks, as it requires that the list of packages to include per language be maintained internally in live-build, and besides, language tasks are more comprehensive and flexible. However, the #{syslinux}# aspect is still useful. Thus, if you use #{--bootloader syslinux}# and templates for the specified language exist either in #{/usr/share/live/build/templates/syslinux/}# or #{config/templates/syslinux/}#, consider using this option, possibly in combination with tasks to ensure all relevant packages are in
stalled. For example:\n"
-msgstr "*{Remarque:}* Il existe également une option expérimental #{--language}# qui a un objectif qui se chevauche avec des tâches des langues. Pour toute langue pour laquelle il est connu qu'il y a des paquets #{*-l10n}#, si #{--language}# est spécifié, ces paquets seront installés. Par ailleurs, si tous les modèles #{syslinux}# correspondants à la langue sont trouvés, ils seront utilisés au lieu des modèles par défaut en anglais. La sélection des paquets fait par #{--language}# est une mauvaise approximation aux tâches de langue, car elle exige que la liste des paquets à inclure par langue sera maintenu en interne en live-build, et d'ailleurs, des langues sont plus complets et flexibles. Cependant, l'aspect #{syslinux}# est encore utile. Ainsi, si vous utilisez #{--bootloader syslinux}# et des modèles pour la langue spécifiée existe, soit dans #{/usr/share/live/build/templates/syslinux/}# ou #{config/templates/syslinux/}#, pensez à utiliser cette option
, éventuellement en combinaison avec des tâches pour s'assurer que tous les paquets concernés sont installés. Par exemple:\n"
+"Comme les tâches de bureau sont des tâches «internes», pour chaque tâche de "
+"saveur de bureau inclus dans l'image, la valeur correspondante, si elle "
+"diffère de la valeur par défaut, \"gnome\", doit être préconfiguré dans la "
+"variable debconf «tasksel/desktop\", ou bien tasksel ne la reconnaîtra pas "
+"et ne l'installera pas. Ainsi:"
#. type: Plain text
-#: en/user_customization-packages.ssi:229
+#: en/user_customization-packages.ssi:214
#, no-wrap
-msgid " $ lb config --language es\n"
+msgid ""
+" $ lb config\n"
+" $ echo 'tasksel tasksel/desktop multiselect kde' >> config/preseed/my.preseed.chroot\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:233
+#: en/user_customization-packages.ssi:218
msgid ""
-"Even so, it is limited in that it only supports a single language and a "
-"single bootloader. Therefore, for all of these reasons, the future of this "
-"option is under review, possibly to be replaced with something entirely "
-"different in the next major release of live-build."
+"This parameter can take multiple values, e.g. \"lxde xfce\" instead of \"kde"
+"\"."
msgstr ""
-"Même ainsi, elle est limitée en ce qu'elle ne supporte que d'une seule "
-"langue et un chargeur de démarrage unique. Par conséquent, pour toutes ces "
-"raisons, l'avenir de cette option est à l'étude, qui pourrait être remplacé "
-"par quelque chose d'entièrement différent dans la prochaine version majeure "
-"de live-build."
+"Ce paramètre peut prendre plusieurs valeurs, par exemple \"lxde xfce\" au "
+"lieu de \"kde\"."
#. type: Plain text
-#: en/user_customization-packages.ssi:235
+#: en/user_customization-packages.ssi:220
msgid ""
"2~installing-modified-or-third-party-packages Installing modified or third-"
"party packages"
@@ -984,7 +907,7 @@ msgstr ""
"modifiés ou de tiers"
#. type: Plain text
-#: en/user_customization-packages.ssi:237
+#: en/user_customization-packages.ssi:222
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 "
@@ -1002,7 +925,7 @@ msgstr ""
"ajouter des fonctionnalités sur mesure et/ou propriétaires."
#. type: Plain text
-#: en/user_customization-packages.ssi:239
+#: en/user_customization-packages.ssi:224
msgid ""
"This section does not cover advice regarding building or maintaining "
"modified packages. Joachim Breitner's 'How to fork privately' method from "
@@ -1019,53 +942,52 @@ msgstr ""
"debian.org/doc/maint-guide/ et ailleurs"
#. type: Plain text
-#: en/user_customization-packages.ssi:241
+#: en/user_customization-packages.ssi:226
msgid "There are two ways of installing modified custom packages:"
msgstr "Il y a deux façons d'installer des paquets personnalisés modifiés:"
#. type: Plain text
-#: en/user_customization-packages.ssi:243
-msgid "_* #{chroot_local-packages}#"
-msgstr "_* #{chroot_local-packages}#"
+#: en/user_customization-packages.ssi:228
+msgid "_* #{packages.chroot}#"
+msgstr "_* #{packages.chroot}#"
#. type: Plain text
-#: en/user_customization-packages.ssi:245
+#: en/user_customization-packages.ssi:230
msgid "_* Using a custom APT repository"
msgstr "_* En utilisant un référentiel APT personnalisé"
#. type: Plain text
-#: en/user_customization-packages.ssi:247
+#: en/user_customization-packages.ssi:232
msgid ""
-"Using #{chroot_local-packages}# is simpler to achieve and useful for \"one-"
-"off\" customizations but has a number of drawbacks, whilst using a custom "
-"APT repository is more time-consuming to set up."
+"Using #{packages.chroot}# 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 ""
-"Utilisant #{chroot_local-packages}# est plus simple à réaliser et utile pour "
-"les personnalisations ponctuels mais a un certain nombre d'inconvénients, "
-"tout en utilisant un réferéntiel personnalisé APT est plus fastidieux à "
-"mettre en place."
+"Utilisant #{packages.chroot}# est plus simple à réaliser et utile pour les "
+"personnalisations ponctuels mais a un certain nombre d'inconvénients, tout "
+"en utilisant un réferéntiel personnalisé APT est plus fastidieux à mettre en "
+"place."
#. type: Plain text
-#: en/user_customization-packages.ssi:249
-msgid "3~ Using #{chroot_local-packages}# to install custom packages"
-msgstr ""
-"3~ Utilisant #{chroot_local-packages}# pour installer paquets personnalisés"
+#: en/user_customization-packages.ssi:234
+msgid "3~ Using #{packages.chroot}# to install custom packages"
+msgstr "3~ Utilisant #{packages.chroot}# pour installer paquets personnalisés"
#. type: Plain text
-#: en/user_customization-packages.ssi:251
+#: en/user_customization-packages.ssi:236
msgid ""
-"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/packages.chroot/}"
+"# 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 ""
"Pour installer un paquet personnalisé, il suffit de le copier dans le "
-"répertoire #{config/chroot_local-packages/}#. Les paquets qui sont dans ce "
+"répertoire #{config/packages.chroot/}#. Les paquets qui sont dans ce "
"répertoire seront automatiquement installés dans le système live pendant la "
"construction du systéme - vous n'avez pas besoin de les spécifier ailleurs."
#. type: Plain text
-#: en/user_customization-packages.ssi:253
+#: en/user_customization-packages.ssi:238
msgid ""
"Packages *{must}* be named in the prescribed way. One simple way to do this "
"is to use #{dpkg-name}#."
@@ -1074,30 +996,30 @@ msgstr ""
"simple de le faire consiste à utiliser #{dpkg-name}#."
#. type: Plain text
-#: en/user_customization-packages.ssi:255
+#: en/user_customization-packages.ssi:240
msgid ""
-"Using #{chroot_local-packages}# for installation of custom packages has "
+"Using #{packages.chroot}# for installation of custom packages has "
"disadvantages:"
msgstr ""
-"L'utilisation de #{chroot_local-packages}# pour l'installation de paquets "
+"L'utilisation de #{packages.chroot}# pour l'installation de paquets "
"personnalisés a des inconvénients:"
#. type: Plain text
-#: en/user_customization-packages.ssi:257
+#: en/user_customization-packages.ssi:242
msgid "_* It is not possible to use secure APT."
msgstr "_* Il n'est pas possible d'utiliser secure APT."
#. type: Plain text
-#: en/user_customization-packages.ssi:259
+#: en/user_customization-packages.ssi:244
msgid ""
-"_* You must install all appropriate packages in the #{config/chroot_local-"
-"packages/}# directory."
+"_* You must install all appropriate packages in the #{config/packages."
+"chroot/}# directory."
msgstr ""
"_* Vous devez installer tous les paquets appropriés dans le répertoire #"
-"{config/chroot_local-packages/}#."
+"{config/packages.chroot/}#."
#. type: Plain text
-#: en/user_customization-packages.ssi:261
+#: en/user_customization-packages.ssi:246
msgid ""
"_* It does not lend itself to storing Debian Live configurations in revision "
"control."
@@ -1106,25 +1028,25 @@ msgstr ""
"contrôle de révision."
#. type: Plain text
-#: en/user_customization-packages.ssi:263
+#: en/user_customization-packages.ssi:248
msgid "3~ Using an APT repository to install custom packages"
msgstr ""
"3~ Utilisant un référentiel APT pour installer des paquets personnalisés."
#. type: Plain text
-#: en/user_customization-packages.ssi:265
+#: en/user_customization-packages.ssi:250
msgid ""
-"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."
+"Unlike using #{packages.chroot}#, 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."
msgstr ""
-"Contrairement à l'utilisation de #{chroot_local-packages}#, lorsque vous "
-"utilisez un réferéntiel personnalisé APT vous devez vous assurer que vous "
-"spécifiez les paquets ailleurs. Voir {Choisir les paquets à installer}"
-"#choosing-packages-to-install pour plus de détails."
+"Contrairement à l'utilisation de #{packages.chroot}#, lorsque vous utilisez "
+"un réferéntiel personnalisé APT vous devez vous assurer que vous spécifiez "
+"les paquets ailleurs. Voir {Choisir les paquets à installer}#choosing-"
+"packages-to-install pour plus de détails."
#. type: Plain text
-#: en/user_customization-packages.ssi:267
+#: en/user_customization-packages.ssi:252
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 "
@@ -1135,12 +1057,12 @@ msgstr ""
"à une date ultérieure pour offrir les mises à jour des paquets modifiés."
#. type: Plain text
-#: en/user_customization-packages.ssi:269
+#: en/user_customization-packages.ssi:254
msgid "3~ Custom packages and APT"
msgstr "3~ Les paquets personnalisés et APT"
#. type: Plain text
-#: en/user_customization-packages.ssi:271
+#: en/user_customization-packages.ssi:256
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 "
@@ -1156,7 +1078,7 @@ msgstr ""
"supérieur."
#. type: Plain text
-#: en/user_customization-packages.ssi:273
+#: en/user_customization-packages.ssi:258
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 "
@@ -1172,34 +1094,34 @@ msgstr ""
"plus d'informations."
#. type: Plain text
-#: en/user_customization-packages.ssi:275
+#: en/user_customization-packages.ssi:260
msgid "2~ Configuring APT at build time"
msgstr "2~ Configuration d'APT au moment de la construction"
#. type: Plain text
-#: en/user_customization-packages.ssi:277
+#: en/user_customization-packages.ssi:262
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 "
+"appropriate configurations through #{config/includes.chroot/}#.) For a "
"complete list, look for options starting with #{apt}# in the #{lb_config}# "
"man page."
msgstr ""
"Vous pouvez configurer APT par un certain nombre d'options appliquées "
"uniquement au moment de la construction. (La configuration d'APT utilisé "
"dans le système live en fonctionnement peut être configurée de façon normale "
-"pour un système live, qui est, en incluant les configurations appropriées à #"
-"{config/chroot_local_includes/}#.) Pour une liste complète, regardez les "
+"pour un système live, qui est, en incluant les configurations appropriées "
+"dans #{config/includes.chroot/}#.) Pour une liste complète, regardez les "
"options commençant par #{apt}# dans la page de manuel de #{lb_config}#."
#. type: Plain text
-#: en/user_customization-packages.ssi:279
+#: en/user_customization-packages.ssi:264
msgid "3~choosing-apt-or-aptitude Choosing apt or aptitude"
msgstr "3~choosing-apt-or-aptitude Choisir apt ou aptitude"
#. type: Plain text
-#: en/user_customization-packages.ssi:281
+#: en/user_customization-packages.ssi:266
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 "
@@ -1213,7 +1135,7 @@ msgstr ""
"différence notable étant la manière dont les paquets manquants sont traitées."
#. type: Plain text
-#: en/user_customization-packages.ssi:283
+#: en/user_customization-packages.ssi:268
msgid ""
"_* #{apt}#: With this method, if a missing package is specified, the package "
"installation will fail. This is the default setting."
@@ -1222,7 +1144,7 @@ msgstr ""
"l'installation va échouer. C'est le paramètre par défaut."
#. type: Plain text
-#: en/user_customization-packages.ssi:285
+#: en/user_customization-packages.ssi:270
msgid ""
"_* #{aptitude}#: With this method, if a missing package is specified, the "
"package installation will succeed."
@@ -1231,12 +1153,12 @@ msgstr ""
"l'installation va réussir."
#. type: Plain text
-#: en/user_customization-packages.ssi:287
+#: en/user_customization-packages.ssi:272
msgid "3~ Using a proxy with APT"
msgstr "3~ Utilisation d'un proxy avec APT"
#. type: Plain text
-#: en/user_customization-packages.ssi:289
+#: en/user_customization-packages.ssi:274
msgid ""
"One commonly required APT configuration is to deal with building an image "
"behind a proxy. You may specify your APT proxy with the #{--apt-ftp-proxy}# "
@@ -1248,18 +1170,18 @@ msgstr ""
"nécessaire, par exemple"
#. type: Plain text
-#: en/user_customization-packages.ssi:293
+#: en/user_customization-packages.ssi:278
#, no-wrap
msgid " $ lb config --apt-http-proxy http://proxy/\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:297
+#: en/user_customization-packages.ssi:282
msgid "3~ Tweaking APT to save space"
msgstr "3~ Régler APT pour économiser de l'espace"
#. type: Plain text
-#: en/user_customization-packages.ssi:299
+#: en/user_customization-packages.ssi:284
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 "
@@ -1270,7 +1192,7 @@ msgstr ""
"d'intérêt."
#. type: Plain text
-#: en/user_customization-packages.ssi:301
+#: en/user_customization-packages.ssi:286
msgid ""
"If you don't want to include APT indices in the image, you can omit those "
"with:"
@@ -1279,13 +1201,13 @@ msgstr ""
"pouvez omettre avec:"
#. type: Plain text
-#: en/user_customization-packages.ssi:305
+#: en/user_customization-packages.ssi:290
#, no-wrap
-msgid " $ lb config --binary-indices false\n"
+msgid " $ lb config --apt-indices false\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:309
+#: en/user_customization-packages.ssi:294
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 "
@@ -1301,7 +1223,7 @@ msgstr ""
"créer ces indices."
#. type: Plain text
-#: en/user_customization-packages.ssi:311
+#: en/user_customization-packages.ssi:296
msgid ""
"If you find the installation of recommended packages bloats your image too "
"much, you may disable that default option of APT with:"
@@ -1310,13 +1232,13 @@ msgstr ""
"image trop, vous pouvez désactiver l'option par défaut d'APT avec:"
#. type: Plain text
-#: en/user_customization-packages.ssi:315
+#: en/user_customization-packages.ssi:300
#, no-wrap
msgid " $ lb config --apt-recommends false\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:319
+#: en/user_customization-packages.ssi:304
msgid ""
"The tradeoff here is that if you don't install recommended packages for a "
"given package, that is, \"packages that would be found together with this "
@@ -1344,12 +1266,12 @@ msgstr ""
"#apt-pinning."
#. type: Plain text
-#: en/user_customization-packages.ssi:321
+#: en/user_customization-packages.ssi:306
msgid "3~ Passing options to apt or aptitude"
msgstr "3~ Passer des options à apt ou aptitude"
#. type: Plain text
-#: en/user_customization-packages.ssi:323
+#: en/user_customization-packages.ssi:308
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 "
@@ -1363,54 +1285,54 @@ msgstr ""
"détails"
#. type: Plain text
-#: en/user_customization-packages.ssi:325
+#: en/user_customization-packages.ssi:310
msgid "3~apt-pinning APT pinning"
msgstr "3~apt-pinning APT pinning"
#. type: Plain text
-#: en/user_customization-packages.ssi:327
+#: en/user_customization-packages.ssi:312
msgid ""
"For background, please first read the #{apt_preferences(5)}# man page. APT "
"pinning can be configured either for build time, or else for run time. For "
"the former, create #{config/chroot_apt/preferences}#. For the latter, create "
-"#{config/chroot_local-includes/etc/apt/preferences}#."
+"#{config/includes.chroot/etc/apt/preferences}#."
msgstr ""
"Pour le contexte, s'il vous plaît lire d'abord la page de manuel #"
"{apt_preferences(5)}#. APT pinning peut être configuré soit pour le temps de "
"construction, ou encore pendant l'exécution. Pour le premier, créez #{config/"
-"chroot_apt/preferences}#. Pour ce dernier, créez #{config/chroot_local-"
-"includes/etc/apt/preferences}#."
+"chroot_apt/preferences}#. Pour ce dernier, créez #{config/includes.chroot/"
+"etc/apt/preferences}#."
#. type: Plain text
-#: en/user_customization-packages.ssi:329
+#: en/user_customization-packages.ssi:314
msgid ""
-"Let's say you are building a Squeeze live system but need all the live "
+"Let's say you are building a Wheezy live system but need all the live "
"packages that end up in the binary image to be installed from Sid at build "
"time. You need to add Sid to your APT sources and pin it so that only the "
"packages you want are installed from it at build time and all others are "
-"taken from the target system distribution, Squeeze. The following will "
+"taken from the target system distribution, Wheezy. The following will "
"accomplish this:"
msgstr ""
-"Imaginons que vous voulez construire un système live Squeeze mais il faut "
+"Imaginons que vous voulez construire un système live Wheezy mais il faut "
"installer tous les paquets live qui finissent dans l'image binaire depuis "
"Sid au moment de la construction. Vous devez ajouter Sid à votre APT sources "
"et le fixer de sorte que seulement les paquets que vous voulez sont "
"installés au temps de construction et tous les autres sont de la "
-"distribution du système cible, Squeeze. Ce qui suit devrait accomplir ça:"
+"distribution du système cible, Wheezy. Ce qui suit devrait accomplir ça:"
#. type: Plain text
-#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:322
#, no-wrap
msgid ""
-" $ echo \"deb http://mirror/debian sid main\" > config/chroot_sources/sid.chroot\n"
-" $ cat >>config/chroot_apt/preferences <<END\n"
+" $ echo \"deb http://mirror/debian sid main\" > config/archives/sid.list.chroot\n"
+" $ cat >> config/chroot_apt/preferences <<END\n"
" Package: live-boot live-boot-initramfs-tools live-config live-config-sysvinit\n"
" Pin: release n=sid\n"
" Pin-Priority: 600\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:342
+#: en/user_customization-packages.ssi:327
#, no-wrap
msgid ""
" Package: *\n"
@@ -1420,24 +1342,24 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:346
+#: en/user_customization-packages.ssi:331
#, no-wrap
msgid "*{Note:}* Wildcards can be used in package names (e.g. *{Package: live-*}*) with Apt version 0.8.14 or higher. This means that it works with Wheezy using:\n"
msgstr "*{Remarque:}* Caractères génériques peuvent être utilisés dans les noms des paquets (par exemple *{Package: live-*}*) avec la version 0.8.14 ou supérieure d'Apt. Cela signifie qu'il fonctionne avec Wheezy en utilisant:\n"
#. type: Plain text
-#: en/user_customization-packages.ssi:350
+#: en/user_customization-packages.ssi:335
msgid "$ lb config --distribution wheezy"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:354
+#: en/user_customization-packages.ssi:339
msgid ""
"Negative pin priorities will prevent a package from being installed, as in "
"the case where you do not want a package that is recommended by another "
-"package. Suppose you are building an LXDE image using #{--packages-lists "
-"lxde}# option, but don't want the user prompted to store wifi passwords in "
-"the keyring. This list includes #{gdm}#, which depends on #{gksu}#, which in "
+"package. Suppose you are building an LXDE image using #{--package-lists lxde}"
+"# option, but don't want the user prompted to store wifi passwords in the "
+"keyring. This list includes #{gdm}#, which depends on #{gksu}#, which in "
"turn recommends #{gnome-keyring}#. So you want to omit the recommended #"
"{gnome-keyring}# package. This can be done by adding the following stanza to "
"#{config/chroot_apt/preferences}#:"
@@ -1445,7 +1367,7 @@ msgstr ""
"Une priorité pin négative évitera installér un paquet, comme dans le cas où "
"vous ne voulez pas un paquet qui est recommandé par un autre paquet. "
"Supposons que vous construisez une image LXDE en utilisant l'option #{--"
-"packages-lists lxde}# mais ne veulez pas que l'utilisateur soit invité à "
+"package-lists lxde}# mais ne veulez pas que l'utilisateur soit invité à "
"stocker les mots de passe wifi dans le trousseau de clés. Cette liste "
"comprend #{gdm}#, que dépend de #{gksu}#, que à son tour recommends #{gnome-"
"keyring}#. Donc, vous voulez omettre le paquet recommandé #{gnome-keyring}#. "
@@ -1453,7 +1375,7 @@ msgstr ""
"preferences}#:"
#. type: Plain text
-#: en/user_customization-packages.ssi:360
+#: en/user_customization-packages.ssi:345
#, no-wrap
msgid ""
" Package: gnome-keyring\n"
diff --git a/manual/po/fr/user_customization-runtime.ssi.po b/manual/po/fr/user_customization-runtime.ssi.po
index 9e515a8..5e17692 100644
--- a/manual/po/fr/user_customization-runtime.ssi.po
+++ b/manual/po/fr/user_customization-runtime.ssi.po
@@ -7,8 +7,8 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-08-25 17:01+0300\n"
-"PO-Revision-Date: 2011-08-25 16:47+0200\n"
+"POT-Creation-Date: 2011-11-07 21:01-0400\n"
+"PO-Revision-Date: 2011-11-08 14:53+0100\n"
"Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
"Language-Team: <debian-live at lists.debian.org>\n"
"Language: fr\n"
@@ -38,48 +38,47 @@ msgstr ""
#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
-#: en/user_customization-installer.ssi:43
+#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
-#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:53
-#: en/user_customization-packages.ssi:66 en/user_customization-packages.ssi:80
-#: en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:112
-#: en/user_customization-packages.ssi:142
-#: en/user_customization-packages.ssi:155
-#: en/user_customization-packages.ssi:165
-#: en/user_customization-packages.ssi:175
-#: en/user_customization-packages.ssi:185
-#: en/user_customization-packages.ssi:199
-#: en/user_customization-packages.ssi:215
-#: en/user_customization-packages.ssi:227
-#: en/user_customization-packages.ssi:291
-#: en/user_customization-packages.ssi:303
-#: en/user_customization-packages.ssi:313
-#: en/user_customization-packages.ssi:331
-#: en/user_customization-packages.ssi:348
-#: en/user_customization-packages.ssi:356 en/user_customization-runtime.ssi:14
-#: en/user_customization-runtime.ssi:24 en/user_customization-runtime.ssi:44
-#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:63
-#: en/user_customization-runtime.ssi:71 en/user_customization-runtime.ssi:80
-#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:111
-#: en/user_customization-runtime.ssi:119 en/user_examples.ssi:14
+#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:54
+#: en/user_customization-packages.ssi:67 en/user_customization-packages.ssi:81
+#: en/user_customization-packages.ssi:101
+#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:140
+#: en/user_customization-packages.ssi:150
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:184
+#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:276
+#: en/user_customization-packages.ssi:288
+#: en/user_customization-packages.ssi:298
+#: en/user_customization-packages.ssi:316
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
+#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
+#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
+#: en/user_customization-runtime.ssi:104 en/user_customization-runtime.ssi:114
+#: en/user_customization-runtime.ssi:122 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:178 en/user_examples.ssi:190 en/user_examples.ssi:206
-#: en/user_examples.ssi:220 en/user_examples.ssi:229 en/user_examples.ssi:247
-#: en/user_examples.ssi:255 en/user_examples.ssi:268 en/user_examples.ssi:283
-#: en/user_installation.ssi:38 en/user_installation.ssi:46
-#: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi:74 en/user_installation.ssi:82
-#: en/user_installation.ssi:90 en/user_installation.ssi:114
-#: en/user_installation.ssi:129 en/user_installation.ssi:146
-#: en/user_managing_a_configuration.ssi:24
+#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
+#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
+#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
+#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
+#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
+#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
+#: en/user_examples.ssi:277 en/user_installation.ssi:38
+#: en/user_installation.ssi:46 en/user_installation.ssi:56
+#: en/user_installation.ssi:64 en/user_installation.ssi:74
+#: en/user_installation.ssi:82 en/user_installation.ssi:90
+#: en/user_installation.ssi:114 en/user_installation.ssi:129
+#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:80 en/user_overview.ssi:88
+#: en/user_overview.ssi:48 en/user_overview.ssi:56
msgid "code{"
msgstr "code{"
@@ -103,49 +102,48 @@ msgstr "code{"
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
-#: en/user_customization-installer.ssi:37
-#: en/user_customization-installer.ssi:48
+#: en/user_customization-installer.ssi:38
+#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:70 en/user_customization-packages.ssi:84
-#: en/user_customization-packages.ssi:98
-#: en/user_customization-packages.ssi:116
-#: en/user_customization-packages.ssi:147
-#: en/user_customization-packages.ssi:161
-#: en/user_customization-packages.ssi:171
-#: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:191
-#: en/user_customization-packages.ssi:203
-#: en/user_customization-packages.ssi:219
-#: en/user_customization-packages.ssi:231
-#: en/user_customization-packages.ssi:295
-#: en/user_customization-packages.ssi:307
-#: en/user_customization-packages.ssi:317
-#: en/user_customization-packages.ssi:344
-#: en/user_customization-packages.ssi:352
-#: en/user_customization-packages.ssi:361 en/user_customization-runtime.ssi:18
-#: en/user_customization-runtime.ssi:28 en/user_customization-runtime.ssi:48
-#: en/user_customization-runtime.ssi:59 en/user_customization-runtime.ssi:67
-#: en/user_customization-runtime.ssi:76 en/user_customization-runtime.ssi:85
-#: en/user_customization-runtime.ssi:105 en/user_customization-runtime.ssi:115
-#: en/user_customization-runtime.ssi:124 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:186 en/user_examples.ssi:202 en/user_examples.ssi:210
-#: en/user_examples.ssi:225 en/user_examples.ssi:233 en/user_examples.ssi:251
-#: en/user_examples.ssi:264 en/user_examples.ssi:279 en/user_examples.ssi:297
-#: en/user_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi:70
-#: en/user_installation.ssi:78 en/user_installation.ssi:86
-#: en/user_installation.ssi:94 en/user_installation.ssi:119
-#: en/user_installation.ssi:136 en/user_installation.ssi:149
-#: en/user_managing_a_configuration.ssi:31
+#: en/user_customization-packages.ssi:46 en/user_customization-packages.ssi:59
+#: en/user_customization-packages.ssi:71 en/user_customization-packages.ssi:85
+#: en/user_customization-packages.ssi:105
+#: en/user_customization-packages.ssi:132
+#: en/user_customization-packages.ssi:146
+#: en/user_customization-packages.ssi:156
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:329
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:346 en/user_customization-runtime.ssi:21
+#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
+#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
+#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
+#: en/user_customization-runtime.ssi:108 en/user_customization-runtime.ssi:118
+#: en/user_customization-runtime.ssi:127 en/user_examples.ssi:20
+#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
+#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
+#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
+#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
+#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
+#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
+#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
+#: en/user_examples.ssi:291 en/user_installation.ssi:42
+#: en/user_installation.ssi:50 en/user_installation.ssi:60
+#: en/user_installation.ssi:70 en/user_installation.ssi:78
+#: en/user_installation.ssi:86 en/user_installation.ssi:94
+#: en/user_installation.ssi:119 en/user_installation.ssi:136
+#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
-#: en/user_overview.ssi:84 en/user_overview.ssi:92
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:42
+#: en/user_overview.ssi:52 en/user_overview.ssi:60
msgid "}code"
msgstr "}code"
@@ -200,22 +198,27 @@ msgstr ""
msgid ""
"You can specify additional groups that the live user will belong to by "
"preseeding the #{passwd/user-default-groups}# debconf value. For example, to "
-"add the live user to the #{fuse}# group, add the following to a file in the #"
-"{config/chroot_local-preseed}# directory:"
+"add the live user to the #{fuse}# group, add the following preseed under #"
+"{config/preseed/}# for the chroot stage:"
msgstr ""
"Vous pouvez spécifier d'autres groupes pour l'utilisateur live en "
"préconfigurant la valeur debconf #{passwd/user-default-groups}#. Par "
-"exemple, pour ajouter l'utilisateur live au groupe #{fuse}# ajoutez la ligne "
-"suivante à un fichier dans le répertoire #{config/chroot_local-preseed}#:"
+"exemple, pour ajouter l'utilisateur live au groupe #{fuse}# pendant l'étape "
+"chroot, ajoutez la ligne suivante à un fichier dans le répertoire #{config/"
+"chroot_local-preseed}#:"
#. type: Plain text
-#: en/user_customization-runtime.ssi:16
+#: en/user_customization-runtime.ssi:19
#, no-wrap
-msgid " user-setup passwd/user-default-groups string audio cdrom dip floppy video plugdev netdev powerdev scanner bluetooth fuse\n"
+msgid ""
+" $ lb config\n"
+" $ echo user-setup passwd/user-default-groups string audio cdrom \\\n"
+" dip floppy video plugdev netdev powerdev scanner bluetooth fuse \\\n"
+" >> config/preseed/my.preseed.chroot\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:20
+#: en/user_customization-runtime.ssi:23
msgid ""
"It is also possible to change the default username \"user\" and the default "
"password \"live\". If you want to do that for any reason, you can easily "
@@ -226,7 +229,7 @@ msgstr ""
"vous pouvez facilement faire ça comme suit:"
#. type: Plain text
-#: en/user_customization-runtime.ssi:22
+#: en/user_customization-runtime.ssi:25
msgid ""
"To change the default username you can simply specify it in your config:"
msgstr ""
@@ -234,55 +237,55 @@ msgstr ""
"spécifier dans votre config:"
#. type: Plain text
-#: en/user_customization-runtime.ssi:26
+#: en/user_customization-runtime.ssi:29
msgid "$ lb config --bootappend-live \"username=live-user\""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:30
+#: en/user_customization-runtime.ssi:33
msgid ""
"One possible way of changing the default password is by means of a hook as "
"described in {Boot-time hooks}#boot-time-hooks. In order to do that you can "
"use the \"passwd\" hook from #{/usr/share/doc/live-config/examples/hooks}#, "
-"prefix it accordingly (e.g. 200-passwd) and add it to #{config/chroot_local-"
-"includes/lib/live/config/}#"
+"prefix it accordingly (e.g. 200-passwd) and add it to #{config/includes."
+"chroot/lib/live/config/}#"
msgstr ""
"Une façon possible de changer le mot de passe par défaut est au moyen d'un "
"hook comme décrit dans {Hooks au moment du démarrage}#boot-time-hooks. Pour "
"ce faire vous pouvez utiliser le hook \"passwd\" de #{/usr/share/doc/live-"
"config/examples/hooks}#, ajouter un préfixe correct (par exemple 200-passwd) "
-"et l'ajouter à #{config/chroot_local-includes/lib/live/config/}#"
+"et l'ajouter à #{config/includes.chroot/lib/live/config/}#"
#. type: Plain text
-#: en/user_customization-runtime.ssi:32
+#: en/user_customization-runtime.ssi:35
msgid "2~customizing-locale-and-language Customizing locale and language"
msgstr ""
"2~customizing-locale-and-language Personnalisation des paramètres régionaux "
"et la langue"
#. type: Plain text
-#: en/user_customization-runtime.ssi:34
+#: en/user_customization-runtime.ssi:37
msgid "When the live system boots, language is involved in three steps:"
msgstr ""
"Au démarrage du système live, la langue est impliqué dans trois étapes:"
#. type: Plain text
-#: en/user_customization-runtime.ssi:36
+#: en/user_customization-runtime.ssi:39
msgid "_* the locale generation"
msgstr "_* la génération des paramètres régionaux"
#. type: Plain text
-#: en/user_customization-runtime.ssi:38
+#: en/user_customization-runtime.ssi:41
msgid "_* setting the keyboard layout for the console"
msgstr "_* réglage de la disposition du clavier pour la console"
#. type: Plain text
-#: en/user_customization-runtime.ssi:40
+#: en/user_customization-runtime.ssi:43
msgid "_* setting the keyboard layout for X"
msgstr "_* réglage de la disposition du clavier pour X"
#. type: Plain text
-#: en/user_customization-runtime.ssi:42
+#: en/user_customization-runtime.ssi:45
msgid ""
"The default locale when building a Live system is \"locales=en_US.UTF-8\". "
"To define the locale that should be generated, use the #{locales}# parameter "
@@ -294,13 +297,13 @@ msgstr ""
"bootappend-live}# de #{lb config}#, par exemple"
#. type: Plain text
-#: en/user_customization-runtime.ssi:46
+#: en/user_customization-runtime.ssi:49
#, no-wrap
msgid " $ lb config --bootappend-live \"locales=de_CH.UTF-8\"\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:50
+#: en/user_customization-runtime.ssi:53
msgid ""
"This parameter can also be used at the kernel command line. You can specify "
"a locale by a full #{language_country.encoding}# word."
@@ -310,7 +313,7 @@ msgstr ""
"encoding}#."
#. type: Plain text
-#: en/user_customization-runtime.ssi:52
+#: en/user_customization-runtime.ssi:55
msgid ""
"Both the console and X keyboard configuration depend on the #{keyboard-"
"layouts}# parameter of the #{--bootappend-live}# option. Valid options for X "
@@ -328,7 +331,7 @@ msgstr ""
"par exemple:"
#. type: Plain text
-#: en/user_customization-runtime.ssi:57
+#: en/user_customization-runtime.ssi:60
#, no-wrap
msgid ""
" $ grep -i sweden -C3 /usr/share/X11/xkb/rules/base.xml | grep name\n"
@@ -336,7 +339,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:61
+#: en/user_customization-runtime.ssi:64
msgid ""
"To get the locale files for German and Swiss German keyboard layout in X use:"
msgstr ""
@@ -344,13 +347,13 @@ msgstr ""
"allemand et suisse allemand dans X utiliser:"
#. type: Plain text
-#: en/user_customization-runtime.ssi:65
+#: en/user_customization-runtime.ssi:68
#, no-wrap
msgid " $ lb config --bootappend-live \"locales=de_CH.UTF-8 keyboard-layouts=ch\"\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:69
+#: en/user_customization-runtime.ssi:72
msgid ""
"A list of the valid values of the keyboards for the console can be figured "
"with the following command:"
@@ -359,7 +362,7 @@ msgstr ""
"avec la commande suivante:"
#. type: Plain text
-#: en/user_customization-runtime.ssi:74
+#: en/user_customization-runtime.ssi:77
#, no-wrap
msgid ""
" $ for i in $(find /usr/share/keymaps/ -iname \"*kmap.gz\"); \\\n"
@@ -367,7 +370,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:78
+#: en/user_customization-runtime.ssi:81
msgid ""
"Alternatively, you can use the #{console-setup}# package, a tool to let you "
"configure console layout using X (XKB) definitions; you can then set your "
@@ -387,7 +390,7 @@ msgstr ""
"Bepo) sur un clavier TypeMatrix, à la fois dans la console et X11, utilisez:"
#. type: Plain text
-#: en/user_customization-runtime.ssi:83
+#: en/user_customization-runtime.ssi:86
#, no-wrap
msgid ""
" $ lb config --bootappend-live \\\n"
@@ -395,12 +398,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:87
+#: en/user_customization-runtime.ssi:90
msgid "2~persistence Persistence"
msgstr "2~persistence Persistance"
#. type: Plain text
-#: en/user_customization-runtime.ssi:89
+#: en/user_customization-runtime.ssi:92
msgid ""
"A live cd paradigm is a pre-installed system which runs from read-only "
"media, like a cdrom, where writes and modifications do not survive reboots "
@@ -412,7 +415,7 @@ msgstr ""
"l'exécute."
#. type: Plain text
-#: en/user_customization-runtime.ssi:91
+#: en/user_customization-runtime.ssi:94
msgid ""
"A Debian Live system is a generalization of this paradigm and thus supports "
"other media in addition to CDs; but still, in its default behaviour, it "
@@ -425,7 +428,7 @@ msgstr ""
"d'exécution du système sont perdus à l'arrêt."
#. type: Plain text
-#: en/user_customization-runtime.ssi:93
+#: en/user_customization-runtime.ssi:96
msgid ""
"Persistence is a common name for different kinds of solutions for saving "
"across reboots some, or all, of this run-time evolution of the system. To "
@@ -444,7 +447,7 @@ msgstr ""
"données ne survivent pas à un redémarrage."
#. type: Plain text
-#: en/user_customization-runtime.ssi:95
+#: en/user_customization-runtime.ssi:98
msgid ""
"The data stored on this ramdisk should be saved on a writable persistent "
"medium like a Hard Disk, a USB key, a network share or even a session of a "
@@ -460,12 +463,12 @@ msgstr ""
"préciser au moment du démarrage: #{persistent}#."
#. type: Plain text
-#: en/user_customization-runtime.ssi:97
+#: en/user_customization-runtime.ssi:100
msgid "3~ Full persistence"
msgstr "3~ Persistance pleine"
#. type: Plain text
-#: en/user_customization-runtime.ssi:99
+#: en/user_customization-runtime.ssi:102
msgid ""
"By 'full persistence' it is meant that instead of using a tmpfs for storing "
"modifications to the read-only media (with the copy-on-write, COW, system) a "
@@ -485,20 +488,20 @@ msgstr ""
"disque dur ou sur une clé USB créé avec, par exemple:"
#. type: Plain text
-#: en/user_customization-runtime.ssi:103
+#: en/user_customization-runtime.ssi:106
#, no-wrap
msgid " # mkfs.ext2 -L live-rw /dev/sdb1\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:107
+#: en/user_customization-runtime.ssi:110
msgid "See also {Using the space left on a USB stick}#using-usb-extra-space."
msgstr ""
"Voir aussi {Utilisation de l'espace disponible sur une clé USB}#using-usb-"
"extra-space."
#. type: Plain text
-#: en/user_customization-runtime.ssi:109
+#: en/user_customization-runtime.ssi:112
msgid ""
"If you already have a partition on your device, you could just change the "
"label with one of the following:"
@@ -507,13 +510,13 @@ msgstr ""
"modifier l'étiquette avec l'un des suivants:"
#. type: Plain text
-#: en/user_customization-runtime.ssi:113
+#: en/user_customization-runtime.ssi:116
#, no-wrap
msgid " # tune2fs -L live-rw /dev/sdb1 # for ext2,3,4 filesystems\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:117
+#: en/user_customization-runtime.ssi:120
msgid ""
"But since live system users cannot always use a hard drive partition, and "
"considering that most USB keys have poor write speeds, 'full' persistence "
@@ -530,7 +533,7 @@ msgstr ""
"comme:"
#. type: Plain text
-#: en/user_customization-runtime.ssi:122
+#: en/user_customization-runtime.ssi:125
#, no-wrap
msgid ""
" $ dd if=/dev/null of=live-rw bs=1G seek=1 # for a 1GB sized image file\n"
@@ -538,7 +541,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:126
+#: en/user_customization-runtime.ssi:129
msgid ""
"Then copy the #{live-rw}# file to a writable partition and reboot with the "
"boot parameter 'persistent'."
@@ -547,12 +550,12 @@ msgstr ""
"écriture et redémarrer avec le paramètre de démarrage \"persistent\"."
#. type: Plain text
-#: en/user_customization-runtime.ssi:128
+#: en/user_customization-runtime.ssi:131
msgid "3~ Home automounting"
msgstr "3~ Montage automatique de Home"
#. type: Plain text
-#: en/user_customization-runtime.ssi:130
+#: en/user_customization-runtime.ssi:133
msgid ""
"If during the boot a partition (filesystem) image file or a partition "
"labeled #{home-rw}# is discovered, this filesystem will be directly mounted "
@@ -566,12 +569,12 @@ msgstr ""
"peut être combinée avec la persistance complète."
#. type: Plain text
-#: en/user_customization-runtime.ssi:132
+#: en/user_customization-runtime.ssi:135
msgid "3~ Snapshots"
msgstr "3~ Instantanés"
#. type: Plain text
-#: en/user_customization-runtime.ssi:134
+#: en/user_customization-runtime.ssi:137
msgid ""
"Snapshots are collections of files and directories which are not mounted "
"while running but which are copied from a persistent device to the system "
@@ -603,7 +606,7 @@ msgstr ""
"systèmes de persistance."
#. type: Plain text
-#: en/user_customization-runtime.ssi:136
+#: en/user_customization-runtime.ssi:139
msgid ""
"A /home version of snapshot exists too and its label is #{home-sn.*}#; it "
"works the same as the main snapshot but it is only applied to /home."
@@ -613,7 +616,7 @@ msgstr ""
"seulement appliquée à /home."
#. type: Plain text
-#: en/user_customization-runtime.ssi:138
+#: en/user_customization-runtime.ssi:141
msgid ""
"Snapshots cannot currently handle file deletion but full persistence and "
"home automounting can."
@@ -623,12 +626,12 @@ msgstr ""
"peuvent le faire."
#. type: Plain text
-#: en/user_customization-runtime.ssi:140
+#: en/user_customization-runtime.ssi:143
msgid "3~ Persistent SubText"
msgstr "3~ SubText persistant"
#. type: Plain text
-#: en/user_customization-runtime.ssi:142
+#: en/user_customization-runtime.ssi:145
msgid ""
"If a user would need multiple persistent storage of the same type for "
"different locations or testing, such as #{live-rw-nonwork}# and #{live-rw-"
@@ -648,12 +651,12 @@ msgstr ""
"{persistent-subtext=subText}#."
#. type: Plain text
-#: en/user_customization-runtime.ssi:144
+#: en/user_customization-runtime.ssi:147
msgid "3~ Partial remastering"
msgstr "3~ Remasterisation partielle"
#. type: Plain text
-#: en/user_customization-runtime.ssi:145
+#: en/user_customization-runtime.ssi:148
msgid ""
"The run-time modification of the tmpfs could be collected using live-"
"snapshot in a squashfs and added to the cd by remastering the iso in the "
diff --git a/manual/po/fr/user_examples.ssi.po b/manual/po/fr/user_examples.ssi.po
index 5c93dc0..4f34494 100644
--- a/manual/po/fr/user_examples.ssi.po
+++ b/manual/po/fr/user_examples.ssi.po
@@ -2,19 +2,20 @@
# Copyright (C) 2010 Free Software Foundation, Inc.
# This file is distributed under the same license as the live-manual package.
# Automatically generated, 2010.
+# Carlos Zuferri «chals» <chals at altorricon.com>, 2011.
#
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-04-23 14:15+0300\n"
-"PO-Revision-Date: 2010-11-04 16:34-0400\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
+"POT-Creation-Date: 2011-11-13 17:12+0100\n"
+"PO-Revision-Date: 2011-11-13 17:42+0100\n"
+"Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
+"Language-Team: <debian-live at lists.debian.org>\n"
"Language: fr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. type: Plain text
#: en/live-manual.ssm:61 en/user_examples.ssi:2
@@ -42,37 +43,38 @@ msgstr ":B~ Exemples"
#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
-#: en/user_customization-installer.ssi:43
+#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
-#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:53
-#: en/user_customization-packages.ssi:66 en/user_customization-packages.ssi:80
-#: en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:112
-#: en/user_customization-packages.ssi:142
-#: en/user_customization-packages.ssi:155
-#: en/user_customization-packages.ssi:165
-#: en/user_customization-packages.ssi:175
-#: en/user_customization-packages.ssi:185
-#: en/user_customization-packages.ssi:199
-#: en/user_customization-packages.ssi:215
-#: en/user_customization-packages.ssi:227
-#: en/user_customization-packages.ssi:291
-#: en/user_customization-packages.ssi:303
-#: en/user_customization-packages.ssi:313
-#: en/user_customization-packages.ssi:331
-#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
-#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
-#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
-#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
-#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:105
-#: 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:178 en/user_examples.ssi:190
-#: en/user_examples.ssi:206 en/user_examples.ssi:220 en/user_examples.ssi:229
-#: en/user_examples.ssi:247 en/user_examples.ssi:255 en/user_examples.ssi:268
-#: en/user_examples.ssi:283 en/user_installation.ssi:38
+#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:54
+#: en/user_customization-packages.ssi:67 en/user_customization-packages.ssi:81
+#: en/user_customization-packages.ssi:101
+#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:140
+#: en/user_customization-packages.ssi:150
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:184
+#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:276
+#: en/user_customization-packages.ssi:288
+#: en/user_customization-packages.ssi:298
+#: en/user_customization-packages.ssi:316
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
+#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
+#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
+#: en/user_customization-runtime.ssi:104 en/user_customization-runtime.ssi:114
+#: en/user_customization-runtime.ssi:122 en/user_examples.ssi:14
+#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
+#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
+#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
+#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
+#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
+#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
+#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
+#: en/user_examples.ssi:277 en/user_installation.ssi:38
#: en/user_installation.ssi:46 en/user_installation.ssi:56
#: en/user_installation.ssi:64 en/user_installation.ssi:74
#: en/user_installation.ssi:82 en/user_installation.ssi:90
@@ -81,7 +83,7 @@ msgstr ":B~ Exemples"
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:80 en/user_overview.ssi:88
+#: en/user_overview.ssi:48 en/user_overview.ssi:56
msgid "code{"
msgstr "code{"
@@ -105,38 +107,39 @@ msgstr "code{"
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
-#: en/user_customization-installer.ssi:37
-#: en/user_customization-installer.ssi:48
+#: en/user_customization-installer.ssi:38
+#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:70 en/user_customization-packages.ssi:84
-#: en/user_customization-packages.ssi:98
-#: en/user_customization-packages.ssi:116
-#: en/user_customization-packages.ssi:147
-#: en/user_customization-packages.ssi:161
-#: en/user_customization-packages.ssi:171
-#: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:191
-#: en/user_customization-packages.ssi:203
-#: en/user_customization-packages.ssi:219
-#: en/user_customization-packages.ssi:231
-#: en/user_customization-packages.ssi:295
-#: en/user_customization-packages.ssi:307
-#: en/user_customization-packages.ssi:317
-#: en/user_customization-packages.ssi:344
-#: en/user_customization-packages.ssi:353 en/user_customization-runtime.ssi:18
-#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
-#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
-#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
-#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:110
-#: 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:186 en/user_examples.ssi:202
-#: en/user_examples.ssi:210 en/user_examples.ssi:225 en/user_examples.ssi:233
-#: en/user_examples.ssi:251 en/user_examples.ssi:264 en/user_examples.ssi:279
-#: en/user_examples.ssi:297 en/user_installation.ssi:42
+#: en/user_customization-packages.ssi:46 en/user_customization-packages.ssi:59
+#: en/user_customization-packages.ssi:71 en/user_customization-packages.ssi:85
+#: en/user_customization-packages.ssi:105
+#: en/user_customization-packages.ssi:132
+#: en/user_customization-packages.ssi:146
+#: en/user_customization-packages.ssi:156
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:329
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:346 en/user_customization-runtime.ssi:21
+#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
+#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
+#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
+#: en/user_customization-runtime.ssi:108 en/user_customization-runtime.ssi:118
+#: en/user_customization-runtime.ssi:127 en/user_examples.ssi:20
+#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
+#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
+#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
+#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
+#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
+#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
+#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
+#: en/user_examples.ssi:291 en/user_installation.ssi:42
#: en/user_installation.ssi:50 en/user_installation.ssi:60
#: en/user_installation.ssi:70 en/user_installation.ssi:78
#: en/user_installation.ssi:86 en/user_installation.ssi:94
@@ -144,14 +147,14 @@ msgstr "code{"
#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
-#: en/user_overview.ssi:84 en/user_overview.ssi:92
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:42
+#: en/user_overview.ssi:52 en/user_overview.ssi:60
msgid "}code"
msgstr "}code"
#. type: Plain text
#: en/user_basics.ssi:44 en/user_basics.ssi:170 en/user_basics.ssi:238
-#: en/user_examples.ssi:109 en/user_examples.ssi:208
+#: en/user_examples.ssi:119 en/user_examples.ssi:211
#, no-wrap
msgid " # lb build\n"
msgstr ""
@@ -159,7 +162,7 @@ msgstr ""
#. type: Plain text
#: en/user_examples.ssi:4
msgid "1~examples Examples"
-msgstr ""
+msgstr "1~examples Exemples"
#. type: Plain text
#: en/user_examples.ssi:6
@@ -169,11 +172,16 @@ msgid ""
"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 ""
+"Ce chapitre s'occupe d'exemples de constructions pour les cas d'utilisation "
+"spécifiques avec Debian Live. Si vous êtes nouveau avec la construction de "
+"vos propres images Debian Live, nous vous recommandons d'abord regarder les "
+"trois tutoriels en séquence, comme chacun apprend nouvelles techniques qui "
+"vous aideront à utiliser et à comprendre les exemples restants."
#. type: Plain text
#: en/user_examples.ssi:8
msgid "2~using-the-examples Using the examples"
-msgstr ""
+msgstr "2~using-the-examples En utilisant les exemples"
#. type: Plain text
#: en/user_examples.ssi:10
@@ -182,6 +190,10 @@ msgid ""
"requirements listed in {Requirements}#requirements and has live-build "
"installed as described in {Installing live-build}#installing-live-build."
msgstr ""
+"Pour utiliser ces exemples vous avez besoin d'un système pour les "
+"construire, lequel répond aux exigences énumérées dans {Exigences}"
+"#requirements et vous avez live-build installe comme décrit à {Installation "
+"de live-build}#installing-live-build."
#. type: Plain text
#: en/user_examples.ssi:12
@@ -192,29 +204,41 @@ msgid ""
"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 ""
+"and in it, set the corresponding #{LB_PARENT_MIRROR_*}# variables to your "
+"preferred mirror. All other mirrors used in the build will be defaulted from "
+"these values. For example:"
+msgstr ""
+"Notez que, pour des raisons de concision, dans ces exemples, nous ne "
+"spécifions pas un miroir local à utiliser pour la construction. Vous pouvez "
+"accélérer considérablement les téléchargements si vous utilisez un miroir "
+"local. Vous pouvez spécifier les options lorsque vous utilisez #{lb config}"
+"#, tel que décrit dans {Miroirs de distribution utilisés au temps de "
+"construction}#distribution-mirrors-build-time, ou pour plus de commodité, "
+"fixez par défaut votre système de construction dans #{/etc/live/build.conf}"
+"#. Il suffit de créer ce fichier et de définir les variables #"
+"{LB_PARENT_MIRROR_*}# correspondantes à votre miroir préféré. Tous les "
+"autres miroirs utilisés dans la construction seront par défaut à partir de "
+"ces valeurs. Par exemple:"
#. type: Plain text
#: en/user_examples.ssi:18
#, no-wrap
msgid ""
-" LB_MIRROR_BOOTSTRAP=\"http://mirror/debian\"\n"
-" LB_MIRROR_CHROOT=\"http://mirror/debian\"\n"
-" LB_MIRROR_CHROOT_SECURITY=\"http://mirror/debian-security\"\n"
+" LB_PARENT_MIRROR_BOOTSTRAP=\"http://mirror/debian\"\n"
+" LB_PARENT_MIRROR_CHROOT_SECURITY=\"http://mirror/debian-security\"\n"
+" LB_PARENT_MIRROR_CHROOT_BACKPORTS=\"http://mirror/debian-updates\"\n"
msgstr ""
#. type: Plain text
#: en/user_examples.ssi:22
msgid "2~tutorial-1 Tutorial 1: A standard image"
-msgstr ""
+msgstr "2~tutorial-1 Tutorial 1: Une image standard"
#. 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 ""
+msgstr "*{Cas d'utilisation:}* Créer une image simple d'abord, apprenant les bases de live-build.\n"
#. type: Plain text
#: en/user_examples.ssi:26
@@ -223,11 +247,15 @@ msgid ""
"containing only base packages (no Xorg) and some Debian Live support "
"packages, as a first exercise in using live-build."
msgstr ""
+"Dans ce tutoriel, nous construirons une image Debian Live ISO hybride par "
+"défaut contenant uniquement paquets de base (pas de Xorg) et quelques "
+"paquets Debian de soutien live, comme un premier exercice en utilisant live-"
+"build."
#. type: Plain text
#: en/user_examples.ssi:28
msgid "You can't get much simpler than this:"
-msgstr ""
+msgstr "Vous ne pouvez pas obtenir beaucoup plus simple que cela:"
#. type: Plain text
#: en/user_examples.ssi:32
@@ -242,15 +270,20 @@ msgid ""
"stored here a skeletal configuration, ready to customize or, in this case, "
"use immediately to build a default image."
msgstr ""
+"Examinez le contenu du répertoire #{config/}# si vous le souhaitez. Vous "
+"verrez stockés ici une configuration du squelette, pour être personnalise "
+"ou, dans ce cas, utiliser immédiatement pour construire une image par défaut."
#. type: Plain text
#: en/user_examples.ssi:38
msgid ""
"Now, as superuser, build the image, saving a log as you build with #{tee}#."
msgstr ""
+"Maintenant, en tant que superutilisateur, construire l'image en enregistrant "
+"un journal avec #{tee}#."
#. type: Plain text
-#: en/user_examples.ssi:42 en/user_examples.ssi:66 en/user_examples.ssi:231
+#: en/user_examples.ssi:42 en/user_examples.ssi:69 en/user_examples.ssi:234
#, no-wrap
msgid " # lb build 2>&1 | tee binary.log\n"
msgstr ""
@@ -267,17 +300,25 @@ msgid ""
"and {Copying an ISO hybrid image to a USB stick}#copying-iso-hybrid-to-usb, "
"respectively."
msgstr ""
+"En supposant que tout se passe bien, après un certain temps, le répertoire "
+"courant contient #{binary-hybrid.iso}#. Cette image ISO hybride peut être "
+"démarré directement dans une machine virtuelle comme décrit dans {Test d'une "
+"image ISO avec QEMU}#testing-iso-with-qemu et {Test d'une image ISO avec "
+"virtualbox-ose}#testing-iso-with-virtualbox, ou bien copiés sur un support "
+"optique ou un périphérique USB comme décrit dans {Graver une image ISO sur "
+"un support physique}#burning-iso-image et {Copie d'un image ISO hybride sur "
+"une clé USB}#copying-iso-hybrid-to-usb, respectivement."
#. type: Plain text
#: en/user_examples.ssi:48
msgid "2~tutorial-2 Tutorial 2: A web browser utility"
-msgstr ""
+msgstr "2~tutorial-2 Tutoriel 2: Un utilitaire de navigateur Web"
#. 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 ""
+msgstr "*{Cas d'utilisation:}* Créer une image d'un utilitaire de navigateur Web, en apprenant à appliquer des personnalisations. \n"
#. type: Plain text
#: en/user_examples.ssi:52
@@ -285,49 +326,67 @@ 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 ""
+"Dans ce tutoriel, nous allons créer une image utilisable comme un utilitaire "
+"de navigateur Web, en servant d'introduction à la personnalisation d'images "
+"Debian Live."
#. type: Plain text
-#: en/user_examples.ssi:56
+#: en/user_examples.ssi:59
#, no-wrap
-msgid " $ mkdir tutorial2 ; cd tutorial2 ; lb config -p lxde --packages iceweasel\n"
+msgid ""
+" $ mkdir tutorial2\n"
+" $ cd tutorial2\n"
+" $ lb config -p lxde\n"
+" $ echo iceweasel >> config/package-lists/my.list.chroot\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:60
+#: en/user_examples.ssi:63
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."
+"configuration for the web browser in #{config/includes.chroot/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 ""
+"Notre choix de LXDE pour cet exemple reflète notre volonté de fournir un "
+"environnement de bureau minime, puisque le point de l'image est "
+"l'utilisation unique, nous avons à l'esprit, le navigateur web. On pourrait "
+"aller encore plus loin et offrir une configuration par défaut pour le "
+"navigateur web dans #{config/includes.chroot/etc/iceweasel/profile/}#, ou "
+"des paquets de soutien supplémentaires pour visualiser différents types de "
+"contenu web, mais nous laissons cela comme une exercice pour le lecteur."
#. type: Plain text
-#: en/user_examples.ssi:62
+#: en/user_examples.ssi:65
msgid ""
"Build the image, again as superuser, keeping a log as in {Tutorial 1}"
"#tutorial-1:"
msgstr ""
+"Construire l'image, encore une fois en tant que superutilisateur, tenir un "
+"journal comme dans {Tutoriel 1}#tutorial-1:"
#. type: Plain text
-#: en/user_examples.ssi:70
+#: en/user_examples.ssi:73
msgid "Again, verify the image is OK and test, as in {Tutorial 1}#tutorial-1."
msgstr ""
+"Encore une fois, vérifiez que l'image est OK et faire un test, comme dans "
+"{Tutoriel 1}#tutorial-1:"
#. type: Plain text
-#: en/user_examples.ssi:72
+#: en/user_examples.ssi:75
msgid "2~tutorial-3 Tutorial 3: A personalized image"
-msgstr ""
+msgstr "2~tutorial-3 Tutoriel 3: Une image personnalisée"
#. type: Plain text
-#: en/user_examples.ssi:74
+#: en/user_examples.ssi:77
#, 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 ""
+msgstr "*{Cas d'utilisation:}* Créer un projet pour construire une image personnalisée, contenant vos logiciels préférés à emporter avec vous sur une clé USB où que vous alliez, et évoluant dans des révisions successives selon vos besoins et vos préférences changent.\n"
#. type: Plain text
-#: en/user_examples.ssi:76
+#: en/user_examples.ssi:79
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 "
@@ -336,14 +395,21 @@ msgid ""
"use the best practice of autoconfiguration via #{auto}# scripts as described "
"in {Managing a configuration}#managing-a-configuration."
msgstr ""
+"Puisque nous allons changer notre image personnalisée pendant un certain "
+"nombre de révisions, et nous voulons suivre ces changements, d'essayer des "
+"choses expérimentalement et éventuellement de les revenir si les choses ne "
+"fonctionnent pas, nous garderons notre configuration dans le populaire "
+"système de contrôle de version #{git}#. Nous allons également utiliser les "
+"meilleures pratiques d'autoconfiguration via #{auto}# scripts tel que décrit "
+"dans {Gestion d'une configuration}#managing-a-configuration."
#. type: Plain text
-#: en/user_examples.ssi:78
+#: en/user_examples.ssi:81
msgid "3~ First revision"
-msgstr ""
+msgstr "3~ Première révision"
#. type: Plain text
-#: en/user_examples.ssi:84
+#: en/user_examples.ssi:87
#, no-wrap
msgid ""
" $ mkdir -p tutorial3/auto\n"
@@ -352,61 +418,85 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:88
+#: en/user_examples.ssi:91
msgid "Edit #{auto/config}# to read as follows:"
-msgstr ""
+msgstr "Éditer #{auto/config}# pour lire comme suit: "
#. type: Plain text
-#: en/user_examples.ssi:92 en/user_examples.ssi:141
+#: en/user_examples.ssi:95
#, no-wrap
msgid " #!/bin/sh\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:99
+#: en/user_examples.ssi:101
#, no-wrap
msgid ""
" lb config noauto \\\n"
" --architecture i386 \\\n"
-" --linux-flavours 686 \\\n"
-" --packages-lists lxde \\\n"
-" --packages \"iceweasel xchat\" \\\n"
+" --linux-flavours 686-pae \\\n"
+" --package-lists lxde \\\n"
" \"${@}\"\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:103
+#: en/user_examples.ssi:105
+msgid "Now populate your local package list:"
+msgstr "Maintenant remplir votre liste de paquets locaux:"
+
+#. type: Plain text
+#: en/user_examples.ssi:109
+#, no-wrap
+msgid " $ echo \"iceweasel xchat\" >> config/package-lists/my.list.chroot\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:113
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}#."
+"{--linux-flavours 686-pae}# 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 ""
+"Tout d'abord, #{--architecture i386}# assure que sur notre système de "
+"construction #{amd64}#, nous construisons une version 32 bits qui peut être "
+"utilisé sur la plupart des machines. Deuxièmement, nous utilisons #{--linux-"
+"flavours 686-pae}# parce que nous ne prévoyons pas utiliser cette image sur "
+"des systèmes beaucoup plus anciens. Troisièmement, nous avons choisi la "
+"liste des paquets #{lxde}# pour nous donner un bureau minimal. Et enfin, "
+"nous avons ajouté deux premiers paquets préférés: #{iceweasel}# et #{xchat}#."
#. type: Plain text
-#: en/user_examples.ssi:105
+#: en/user_examples.ssi:115
msgid "Now, build the image:"
-msgstr ""
+msgstr "Maintenant, construire l'image:"
#. type: Plain text
-#: en/user_examples.ssi:113
+#: en/user_examples.ssi:123
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 ""
+"Notez que contrairement aux deux premiers tutoriels, nous n'avons plus "
+"besoin de taper #{2>&1 | tee binary.log}# parce que cela est maintenant "
+"inclus dans #{auto/build}#."
#. type: Plain text
-#: en/user_examples.ssi:115
+#: en/user_examples.ssi:125
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 ""
+"Une fois que vous avez testé l'image (comme dans {Tutoriel 1}#tutorial-1) et "
+"êtes satisfait avec son fonctionnement, il est temps pour initialiser notre "
+"référentiel #{git}#, ajoutant que les scripts d'auto que nous avons juste "
+"créé, et ensuite faire le premier commit: "
#. type: Plain text
-#: en/user_examples.ssi:121
+#: en/user_examples.ssi:131
#, no-wrap
msgid ""
" $ git init\n"
@@ -415,72 +505,78 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:125
+#: en/user_examples.ssi:135
msgid "3~ Second revision"
-msgstr ""
+msgstr "3~ Deuxième révision"
#. type: Plain text
-#: en/user_examples.ssi:127
+#: en/user_examples.ssi:137
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 ""
+"Dans cette révision, nous allons nettoyer à partir de la première "
+"construction, ajouter le paquet #{vlc}# à notre configuration, reconstruire, "
+"tester et faire le commit."
#. type: Plain text
-#: en/user_examples.ssi:129
+#: en/user_examples.ssi:139
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 ""
+"La commande #{lb clean}# va nettoyer tous les fichiers générés par la "
+"construction précédente à l'exception du cache, ça évite d'avoir à re-"
+"télécharger les paquets. Cela garantit que le #{lb build}# postérieure ré-"
+"exécutera toutes les étapes pour régénérer les fichiers de notre nouvelle "
+"configuration."
#. type: Plain text
-#: en/user_examples.ssi:133
+#: en/user_examples.ssi:143
#, no-wrap
msgid " # lb clean\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:137
-msgid "Now edit #{auto/config}# to add the #{vlc}# package:"
+#: en/user_examples.ssi:147
+msgid ""
+"Now append the #{vlc}# package to our local package list in #{config/package-"
+"lists/my.list.chroot}#:"
msgstr ""
+"Maintenant ajouter le paquet #{vlc}# à votre liste de paquets local dans #"
+"{config/package-lists/my.list.chroot}#:"
#. type: Plain text
-#: en/user_examples.ssi:148
+#: en/user_examples.ssi:151
#, no-wrap
-msgid ""
-" lb config noauto \\\n"
-" --architecture i386 \\\n"
-" --linux-flavours 686 \\\n"
-" --packages-lists lxde \\\n"
-" --packages \"iceweasel xchat vlc\" \\\n"
-" \"${@}\"\n"
+msgid " $ echo vlc >> config/package-lists/my.list.chroot\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:152
+#: en/user_examples.ssi:155
msgid "Build again:"
-msgstr ""
+msgstr "Construire à nouveau:"
#. type: Plain text
-#: en/user_examples.ssi:156
+#: en/user_examples.ssi:159
msgid "# lb build"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:160
+#: en/user_examples.ssi:163
msgid "Test, and when you're satisfied, commit the next revision:"
-msgstr ""
+msgstr "Tester, et quand vous êtes satisfaits, commit la prochaine révision:"
#. type: Plain text
-#: en/user_examples.ssi:164
+#: en/user_examples.ssi:167
#, no-wrap
msgid " $ git commit -a -m \"Adding vlc media player.\"\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:168
+#: en/user_examples.ssi:171
msgid ""
"Of course, more complicated changes to the configuration are possible, "
"perhaps adding files in subdirectories of #{config/}#. When you commit new "
@@ -489,9 +585,16 @@ msgid ""
"and are always cleaned up by #{lb clean}# and re-created with #{lb config}# "
"via their respective #{auto}# scripts."
msgstr ""
+"Bien sûr, des changements plus compliqués à la configuration sont possibles, "
+"peut-être l'ajout de fichiers dans les sous-répertoires de #{config/}#. "
+"Quand vous livrez des nouvelles révisions, il suffit de prendre soin de ne "
+"pas modifier à la main ou commit les fichiers de niveau supérieur dans #"
+"{config}# contenant variables #{LB_*}#, car ce sont des produits de "
+"creation, aussi, et sont toujours nettoyés par #{lb clean}# et re-créés avec "
+"#{lb config}# via leur respectives #{auto}# scripts."
#. type: Plain text
-#: en/user_examples.ssi:170
+#: en/user_examples.ssi:173
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 "
@@ -499,56 +602,68 @@ msgid ""
"created. The remaining examples in this section cover several other use "
"cases drawn from the collected experiences of users of Debian Live."
msgstr ""
+"Nous sommes arrivés à la fin de notre série de tutoriels. Alors que de "
+"nombreux types de personnalisations sont possibles, même juste en utilisant "
+"les fonctionnalités explorées dans ces exemples simples, une variété presque "
+"infinie d'images différentes peuvent être crées. Les autres exemples de "
+"cette section couvrent plusieurs autres cas d'utilisation tirés des "
+"expériences recueillies des utilisateurs de Debian Live."
#. type: Plain text
-#: en/user_examples.ssi:172
+#: en/user_examples.ssi:175
msgid "2~ A VNC Kiosk Client"
-msgstr ""
+msgstr "2~ Un client Kiosk VNC "
#. type: Plain text
-#: en/user_examples.ssi:174
+#: en/user_examples.ssi:177
#, no-wrap
msgid "*{Use case:}* Create an image with live-build to boot directly to a VNC server.\n"
-msgstr ""
+msgstr "*{Cas d'utilisation:}* Créer une image avec live-build pour démarrer directement à un serveur VNC.\n"
#. type: Plain text
-#: en/user_examples.ssi:176
+#: en/user_examples.ssi:179
msgid ""
"Make a build directory and create a skeletal configuration in it built "
"around the standard-x11 list, including #{gdm3}#, #{metacity}# and #"
-"{xtightvncviewer}#, disabling recommends to make a minimal system:"
+"{xvnc4viewer}#, disabling recommends to make a minimal system:"
msgstr ""
+"Faire un répertoire de construction et créer une configuration du squelette "
+"construit autour de la liste standard x11, avec #{gdm3}#, #{metacity}# et #"
+"{xvnc4viewer}#, désactivant «recommends» pour faire un système minimal:"
#. type: Plain text
-#: en/user_examples.ssi:184
+#: en/user_examples.ssi:187
#, no-wrap
msgid ""
" $ mkdir vnc_kiosk_client\n"
" $ cd vnc_kiosk_client\n"
-" $ lb config -a i386 -k 686 -p standard-x11 \\\n"
-" --packages \"gdm3 metacity xvnc4viewer\" \\\n"
+" $ lb config -a i386 -k 686-pae -p standard-x11 \\\n"
" --apt-recommends false\n"
+" $ echo \"gdm3 metacity xvnc4viewer\" >> config/package-lists/my.list.chroot\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:188
+#: en/user_examples.ssi:191
msgid ""
"Create the directory #{/etc/skel}# and put a custom #{.xsession}# in it for "
"the default user that will launch metacity and start xvncviewer, connecting "
"to port #{5901}# on a server at #{192.168.1.2}#:"
msgstr ""
+"Créez le répertoire #{/etc/skel}# avec une #{.xsession}# personnalisée pour "
+"l'utilisateur par défaut qui va lancer metacity et commencer xvncviewer, en "
+"reliant le port #{5901}# sur un serveur à #{192.168.1.2}#:"
#. type: Plain text
-#: en/user_examples.ssi:194
+#: en/user_examples.ssi:197
#, no-wrap
msgid ""
-" $ mkdir -p config/chroot_local-includes/etc/skel\n"
-" $ cat >config/chroot_local-includes/etc/skel/.xsession <<END\n"
+" $ mkdir -p config/includes.chroot/etc/skel\n"
+" $ cat > config/includes.chroot/etc/skel/.xsession <<END\n"
" #!/bin/sh\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:197
+#: en/user_examples.ssi:200
#, no-wrap
msgid ""
" /usr/bin/metacity &\n"
@@ -556,7 +671,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:200
+#: en/user_examples.ssi:203
#, no-wrap
msgid ""
" exit\n"
@@ -564,28 +679,28 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:204
+#: en/user_examples.ssi:207
msgid "Build the image:"
-msgstr ""
+msgstr "Construire l'image:"
#. type: Plain text
-#: en/user_examples.ssi:212
+#: en/user_examples.ssi:215
msgid "Enjoy."
-msgstr ""
+msgstr "Amusez-vous bien!"
#. type: Plain text
-#: en/user_examples.ssi:214
+#: en/user_examples.ssi:217
msgid "2~ A base image for a 128M USB key"
-msgstr ""
+msgstr "2~ Une image de base pour une clé USB de 128M"
#. type: Plain text
-#: en/user_examples.ssi:216
+#: en/user_examples.ssi:219
#, 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 ""
+msgstr "*{Cas d'utilisation:}* Créer une image standard avec certains composants éliminés afin de s'adapter sur une clé USB avec 128M avec espace laissé pour l'utiliser à votre convenance.\n"
#. type: Plain text
-#: en/user_examples.ssi:218
+#: en/user_examples.ssi:221
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 "
@@ -597,35 +712,49 @@ msgid ""
"you really know what you're doing, as omitting priority #{important}# "
"packages will most likely produce a broken live system."
msgstr ""
+"Lorsque l'optimisation d'une image adaptée à une dimension des certains "
+"supports, vous avez besoin de comprendre le compromis que vous faites entre "
+"la taille et la fonctionnalité. Dans cet exemple, nous réduisons uniquement "
+"que pour faire place à du matériel supplémentaire au sein d'une taille de "
+"128M, mais sans rien faire pour détruire l'intégrité des paquets contenus, "
+"telles que la purge des données de localisation via le paquet #{localepurge}"
+"#, ou d'autres tels optimisations \"intrusives\". On notera en particulier, "
+"vous ne devriez pas utiliser #{--bootstrap-flavour minimal}# sauf si vous "
+"savez vraiment ce que vous faites, que l'omission de paquets de priorité #"
+"{importants}# produira probablement un système live cassé."
#. type: Plain text
-#: en/user_examples.ssi:223
+#: en/user_examples.ssi:226
#, no-wrap
msgid ""
-" $ lb config -k 486 -p minimal --binary-indices false \\\n"
+" $ lb config -k 486 -p minimal --apt-indices false \\\n"
" --memtest none --apt-recommends false --includes none\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:227
+#: en/user_examples.ssi:230
msgid "Now, build the image in the usual way:"
-msgstr ""
+msgstr "Maintenant, construire l'image de la manière habituelle:"
#. type: Plain text
-#: en/user_examples.ssi:235
+#: en/user_examples.ssi:238
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 ""
+"Sur le système de l'auteur au moment de l'écriture, la configuration ci-"
+"dessus produit une image de 78Mbyte. Cela se compare favorablement avec "
+"l'image de 166Mbyte produite par la configuration par défaut dans {Tutoriel "
+"1}#tutorial-1."
#. type: Plain text
-#: en/user_examples.ssi:237
+#: en/user_examples.ssi:240
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 "
+"instead of the default #{-k \"486 686-pae\"}#. Leaving off APT's indices "
+"with #{--apt-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 #{--"
@@ -636,97 +765,116 @@ msgid ""
"you to decide if the functionality that is sacrificed with each optimization "
"is worth the loss in functionality."
msgstr ""
-
-#. type: Plain text
-#: en/user_examples.ssi:239
+"Le plus grand espace-économiseur ici, par rapport à la construction d'une "
+"image standard sur une architecture #{i386}#, est de sélectionner uniquement "
+"le saveur du noyau #{486}# au lieu de la valeur par défaut #{-k \"486 686-pae"
+"\"}#. Laissant hors indices APT avec #{--apt-indices false}# permet aussi "
+"d'économiser une bonne quantité d'espace, le compromis étant que vous devez "
+"faire #{apt-get update}# avant d'utiliser apt dans le système live. Le "
+"choix de la liste #{minimal}# laisse de côté les grands paquets de #{locales}"
+"# et les services associés. Laissant hors les paquets recommandés avec #{--"
+"apt-recommends false}# économise de l'espace supplémentaire, au détriment "
+"d'omettre certains paquets vous pourriez autrement s'attendre à être là, tel "
+"que #{firmware-linux-free}# qui peuvent être nécessaires pour prise en "
+"charge matérielle de certains supports matériels. Les options restantes "
+"économisent petites quantités d'espace supplémentaires. C'est à vous de "
+"décider si la fonctionnalité qui est sacrifié avec chaque optimisation est "
+"en vaut la perte de fonctionnalité."
+
+#. type: Plain text
+#: en/user_examples.ssi:242
msgid "2~ A localized KDE desktop and installer"
-msgstr ""
+msgstr "2~ Un bureau KDE localisé et installateur "
#. type: Plain text
-#: en/user_examples.ssi:241
+#: en/user_examples.ssi:244
#, no-wrap
msgid "*{Use case:}* Create a KDE desktop image, localized for Brazilian Portuguese and including an installer.\n"
-msgstr ""
+msgstr "*{Cas d'utilisation:}* Créer une image de bureau KDE, localisé pour le portugais brésilien et incluant un installateur.\n"
#. type: Plain text
-#: en/user_examples.ssi:243
+#: en/user_examples.ssi:246
msgid ""
"We want to make an iso-hybrid image for i386 architecture using our "
"preferred desktop, in this case KDE, containing all of the same packages "
"that would be installed by the standard Debian installer for KDE."
msgstr ""
+"Nous voulons faire une image iso-hybride pour l'architecture i386 en "
+"utilisant notre bureau préféré, dans ce cas, KDE, contenant tous les paquets "
+"mêmes qui seraient installés par l'installateur Debian standard pour KDE."
#. type: Plain text
-#: en/user_examples.ssi:245
+#: en/user_examples.ssi:248
msgid ""
-"Our initial problem is the discovery of the names of the appropriate tasks. "
-"Currently, live-build cannot help with this. While we might get lucky and "
-"find this by trial-and-error, there is a tool, #{grep-dctrl}#, which can be "
-"used to dig it out of the task descriptions in tasksel-data, so to prepare, "
-"make sure you have both of those things:"
+"Our initial problem is the discovery of the names of the appropriate "
+"language tasks. Currently, live-build cannot help with this. While we might "
+"get lucky and find this by trial-and-error, there is a tool, #{grep-dctrl}#, "
+"which can be used to dig it out of the task descriptions in tasksel-data, so "
+"to prepare, make sure you have both of those things:"
msgstr ""
+"Notre premier problème est la découverte des noms des tâches appropriées. "
+"Actuellement, live-build ne peut pas aider. Alors que nous pourrions être "
+"chanceux et trouver ce par essais et erreurs, il y a un outil, #{grep-dctrl}"
+"#, qui peut être utilisé pour découvrir des descriptions de tâches dans "
+"tasksel-data, de sorte à préparer, assurez-vous que vous avez ces deux "
+"choses:"
#. type: Plain text
-#: en/user_examples.ssi:249
+#: en/user_examples.ssi:252
#, no-wrap
msgid " # apt-get install dctrl-tools tasksel-data\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:253
+#: en/user_examples.ssi:256
msgid "Now we can search for the appropriate tasks, first with:"
msgstr ""
+"Maintenant, nous pouvons rechercher les tâches appropriées, d'abord avec:"
#. type: Plain text
-#: en/user_examples.ssi:262
+#: en/user_examples.ssi:261
#, no-wrap
msgid ""
-" $ grep-dctrl -FTest-lang pt_BR /usr/share/tasksel/debian-tasks.desc -sTask,Description\n"
+" $ grep-dctrl -FTest-lang pt_BR /usr/share/tasksel/descs/debian-tasks.desc -sTask\n"
" Task: brazilian-portuguese\n"
-" Description: Brazilian Portuguese environment\n"
-" This task installs programs, data files, and\n"
-" documentation that make it easier for Brazilian Portuguese speakers\n"
-" to use Debian.\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:266
+#: en/user_examples.ssi:265
msgid ""
"By this command, we discover the task is called, plainly enough, brazilian-"
"portuguese. Now to find the related tasks:"
msgstr ""
+"Par cette commande, nous découvrons la tâche est appelée, assez clairement, "
+"brazilian-portuguese. Maintenant, pour trouver les tâches liées:"
#. type: Plain text
-#: en/user_examples.ssi:273
+#: en/user_examples.ssi:271
#, no-wrap
msgid ""
-" $ grep-dctrl -FEnhances brazilian-portuguese /usr/share/tasksel/debian-tasks.desc -sTask,Description\n"
+" $ grep-dctrl -FEnhances brazilian-portuguese /usr/share/tasksel/descs/debian-tasks.desc -sTask\n"
" Task: brazilian-portuguese-desktop\n"
-" Description: Brazilian Portuguese desktop\n"
-" This task localises the desktop in Brasilian Portuguese.\n"
-msgstr ""
-
-#. type: Plain text
-#: en/user_examples.ssi:277
-#, no-wrap
-msgid ""
" Task: brazilian-portuguese-kde-desktop\n"
-" Description: Brazilian Portuguese KDE desktop\n"
-" This task localises the KDE desktop in Brazilian Portuguese.\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:281
+#: en/user_examples.ssi:275
msgid ""
-"We will use the experimental #{--language}# option, as live-build happens to "
-"include #{syslinux}# templates for pt_BR (see {Desktop and language tasks}"
-"#desktop-and-language-tasks for details). And at boot time we will generate "
-"the pt_BR.UTF-8 locale and select the pt-latin1 keyboard layout. Now let's "
-"put the pieces together:"
+"At boot time we will generate the pt_BR.UTF-8 locale and select the pt-"
+"latin1 keyboard layout. We will also need to preseed our desktop choice, "
+"\"kde\" so that tasksel will install the correct desktop task, as it differs "
+"from the default (see {Desktop and languages tasks}#desktop-and-language-"
+"tasks). Now let's put the pieces together:"
msgstr ""
+"Au démarrage nous allons générer les paramètres régionaux pt_BR.UTF-8 et "
+"sélectionner la configuration du clavier pt-latin1. Nous aurons aussi besoin "
+"de préconfigurer notre choix de bureau, \"kde\" de sorte que tasksel "
+"installera la tâche de bureau correcte, car elle diffère de la valeur par "
+"défaut (Voir {Tâches de bureau et de la langue}#desktop-and-language-tasks). "
+"Maintenant, nous allons assembler les pièces:"
#. type: Plain text
-#: en/user_examples.ssi:295
+#: en/user_examples.ssi:289
#, no-wrap
msgid ""
" $ mkdir live-pt_BR-kde\n"
@@ -734,19 +882,24 @@ msgid ""
" $ lb config \\\n"
" -a i386 \\\n"
" -k 486 \\\n"
-" -p kde-desktop \\\n"
-" --language pt_BR \\\n"
-" --tasks \"brazilian-portuguese brazilian-portuguese-desktop brazilian-portuguese-kde-desktop\" \\\n"
" --bootappend-live \"locales=pt_BR.UTF-8 keyboard-layouts=pt-latin1\" \\\n"
-" --debian-installer live \\\n"
-" --packages debian-installer-launcher\n"
+" --debian-installer live\n"
+" $ echo kde-desktop brazilian-portuguese brazilian-portuguese-desktop \\\n"
+" brazilian-portuguese-kde-desktop >> config/task-lists/my.list.chroot\n"
+" $ echo debian-installer-launcher >> config/package-lists/my.list.chroot\n"
+" $ echo tasksel tasksel/desktop multiselect kde >> config/preseed/my.preseed.chroot\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:298
+#: en/user_examples.ssi:292
msgid ""
"Note that we have included the #{debian-installer-launcher}# package to "
"launch the installer from the live desktop, and have also specified the 486 "
"flavour kernel, as it is currently necessary to make the installer and live "
"system kernels match for the launcher to work properly."
msgstr ""
+"Notez que nous avons inclus le paquet #{debian-installer-launcher}# pour "
+"lancer l'installateur depuis le bureau live, et ont également précisé que le "
+"noyau 486, tel qu'il est actuellement nécessaire pour faire que "
+"l'installateur et le noyau du systéme live matchent pour que le lanceur "
+"fonctionne correctement."
diff --git a/manual/po/fr/user_installation.ssi.po b/manual/po/fr/user_installation.ssi.po
index 9864831..99a517d 100644
--- a/manual/po/fr/user_installation.ssi.po
+++ b/manual/po/fr/user_installation.ssi.po
@@ -7,8 +7,8 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-06-21 09:17+0300\n"
-"PO-Revision-Date: 2011-06-04 20:13+0200\n"
+"POT-Creation-Date: 2011-11-07 17:40-0400\n"
+"PO-Revision-Date: 2011-10-04 14:42+0200\n"
"Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
"Language-Team: <debian-live at lists.debian.org>\n"
"Language: fr\n"
@@ -38,37 +38,38 @@ msgstr ""
#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
-#: en/user_customization-installer.ssi:43
+#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
-#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:53
-#: en/user_customization-packages.ssi:66 en/user_customization-packages.ssi:80
-#: en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:112
-#: en/user_customization-packages.ssi:142
-#: en/user_customization-packages.ssi:155
-#: en/user_customization-packages.ssi:165
-#: en/user_customization-packages.ssi:175
-#: en/user_customization-packages.ssi:185
-#: en/user_customization-packages.ssi:199
-#: en/user_customization-packages.ssi:215
-#: en/user_customization-packages.ssi:227
-#: en/user_customization-packages.ssi:291
-#: en/user_customization-packages.ssi:303
-#: en/user_customization-packages.ssi:313
-#: en/user_customization-packages.ssi:331
-#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
-#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
-#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
-#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
-#: en/user_customization-runtime.ssi:99 en/user_customization-runtime.ssi:107
-#: 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:178 en/user_examples.ssi:190
-#: en/user_examples.ssi:206 en/user_examples.ssi:220 en/user_examples.ssi:229
-#: en/user_examples.ssi:247 en/user_examples.ssi:255 en/user_examples.ssi:268
-#: en/user_examples.ssi:283 en/user_installation.ssi:38
+#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:54
+#: en/user_customization-packages.ssi:67 en/user_customization-packages.ssi:81
+#: en/user_customization-packages.ssi:101
+#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:140
+#: en/user_customization-packages.ssi:150
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:184
+#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:276
+#: en/user_customization-packages.ssi:288
+#: en/user_customization-packages.ssi:298
+#: en/user_customization-packages.ssi:316
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:24 en/user_customization-runtime.ssi:44
+#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:63
+#: en/user_customization-runtime.ssi:71 en/user_customization-runtime.ssi:80
+#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:111
+#: en/user_customization-runtime.ssi:119 en/user_examples.ssi:14
+#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
+#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
+#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
+#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
+#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
+#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
+#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
+#: en/user_examples.ssi:277 en/user_installation.ssi:38
#: en/user_installation.ssi:46 en/user_installation.ssi:56
#: en/user_installation.ssi:64 en/user_installation.ssi:74
#: en/user_installation.ssi:82 en/user_installation.ssi:90
@@ -77,7 +78,7 @@ msgstr ""
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:80 en/user_overview.ssi:88
+#: en/user_overview.ssi:48 en/user_overview.ssi:56
msgid "code{"
msgstr "code{"
@@ -101,38 +102,39 @@ msgstr "code{"
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
-#: en/user_customization-installer.ssi:37
-#: en/user_customization-installer.ssi:48
+#: en/user_customization-installer.ssi:38
+#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:70 en/user_customization-packages.ssi:84
-#: en/user_customization-packages.ssi:98
-#: en/user_customization-packages.ssi:116
-#: en/user_customization-packages.ssi:147
-#: en/user_customization-packages.ssi:161
-#: en/user_customization-packages.ssi:171
-#: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:191
-#: en/user_customization-packages.ssi:203
-#: en/user_customization-packages.ssi:219
-#: en/user_customization-packages.ssi:231
-#: en/user_customization-packages.ssi:295
-#: en/user_customization-packages.ssi:307
-#: en/user_customization-packages.ssi:317
-#: en/user_customization-packages.ssi:344
-#: en/user_customization-packages.ssi:353 en/user_customization-runtime.ssi:18
-#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
-#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
-#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
-#: en/user_customization-runtime.ssi:103 en/user_customization-runtime.ssi:112
-#: 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:186 en/user_examples.ssi:202
-#: en/user_examples.ssi:210 en/user_examples.ssi:225 en/user_examples.ssi:233
-#: en/user_examples.ssi:251 en/user_examples.ssi:264 en/user_examples.ssi:279
-#: en/user_examples.ssi:297 en/user_installation.ssi:42
+#: en/user_customization-packages.ssi:46 en/user_customization-packages.ssi:59
+#: en/user_customization-packages.ssi:71 en/user_customization-packages.ssi:85
+#: en/user_customization-packages.ssi:105
+#: en/user_customization-packages.ssi:132
+#: en/user_customization-packages.ssi:146
+#: en/user_customization-packages.ssi:156
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:329
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:346 en/user_customization-runtime.ssi:18
+#: en/user_customization-runtime.ssi:28 en/user_customization-runtime.ssi:48
+#: en/user_customization-runtime.ssi:59 en/user_customization-runtime.ssi:67
+#: en/user_customization-runtime.ssi:76 en/user_customization-runtime.ssi:85
+#: en/user_customization-runtime.ssi:105 en/user_customization-runtime.ssi:115
+#: en/user_customization-runtime.ssi:124 en/user_examples.ssi:20
+#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
+#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
+#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
+#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
+#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
+#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
+#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
+#: en/user_examples.ssi:291 en/user_installation.ssi:42
#: en/user_installation.ssi:50 en/user_installation.ssi:60
#: en/user_installation.ssi:70 en/user_installation.ssi:78
#: en/user_installation.ssi:86 en/user_installation.ssi:94
@@ -140,15 +142,15 @@ msgstr "code{"
#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
-#: en/user_overview.ssi:84 en/user_overview.ssi:92
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:42
+#: en/user_overview.ssi:52 en/user_overview.ssi:60
msgid "}code"
msgstr "}code"
#. type: Plain text
-#: en/user_customization-packages.ssi:82 en/user_installation.ssi:148
+#: en/user_customization-packages.ssi:83 en/user_installation.ssi:148
#, no-wrap
-msgid " $ lb config --repository live.debian.net\n"
+msgid " $ lb config --archives live.debian.net\n"
msgstr ""
#. type: Plain text
@@ -215,7 +217,8 @@ msgstr "2~installing-live-build Installation de live-build"
#: en/user_installation.ssi:24
msgid "You can install live-build in a number of different ways:"
msgstr ""
-"Vous pouvez installer live-build en un certain nombre de façons différentes:"
+"Vous pouvez installer live-build dans un certain nombre de façons "
+"différentes:"
#. type: Plain text
#: en/user_installation.ssi:26
@@ -281,7 +284,7 @@ msgid ""
"latest code, execute:"
msgstr ""
"live-build est développé en utilisant le système de contrôle de version Git. "
-"Dans les systèmes basés sur Debian, cela est fourni par le paquet /{git}/ "
+"Dans les systèmes basés sur Debian, cela est fourni par le paquet /{git}/. "
"Pour examiner le dernier code, exécutez:"
#. type: Plain text
@@ -369,8 +372,8 @@ msgstr "2~ live-boot et live-config"
#. type: Plain text
#: en/user_installation.ssi:102
#, no-wrap
-msgid "*{Note:}* You do not need to install live-boot or live-config on your system to create customized Debian Live systems. However, doing so will do no harm and is useful for reference purposes.\n"
-msgstr "*{Remarque:}* Vous n'avez pas besoin d'installer live-boot ou live-config sur votre système afin de créer des systèmes Debian Live. Cependant, cela ne fera aucun mal et est utile à des fins de référence.\n"
+msgid "*{Note:}* You do not need to install live-boot or live-config on your system to create customized Debian Live systems. However, doing so will do no harm and is useful for reference purposes. If you only want the documentation, you may now install the live-boot-doc and live-config-doc packages separately.\n"
+msgstr "*{Remarque:}* Vous n'avez pas besoin d'installer live-boot ou live-config sur votre système afin de créer des systèmes Debian Live. Cependant, cela ne fera aucun mal et est utile à des fins de référence. Si vous voulez seulement la documentation, vous pouvez maintenant installer les paquets live-boot-doc et live-config-doc séparément.\n"
#. type: Plain text
#: en/user_installation.ssi:106
@@ -423,28 +426,28 @@ msgstr "_* Créer les fichiers .deb de live-boot et live-config"
#: en/user_installation.ssi:125
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 "
-"build against Squeeze."
+"your target platform: this means if your target is Wheezy then you should "
+"build against Wheezy."
msgstr ""
"Vous devez créer sur votre distribution objectif ou en chroot contenant "
-"votre plateforme objectif: cela signifie que si votre objectif est Squeeze "
-"alors vous devez créer sur Squeeze."
+"votre plateforme objectif: cela signifie que si votre objectif est Wheezy "
+"alors vous devez créer sur Wheezy."
#. type: Plain text
#: en/user_installation.ssi:127
msgid ""
"Use a personal builder such as /{pbuilder}/ or /{sbuild}/ if you need to "
"build #{live-boot}# for a target distribution that differs from your build "
-"system. For example, for Squeeze live images, build #{live-boot}# in a "
-"Squeeze chroot. If your target distribution happens to match your build "
-"system distribution, you may build directly on the build system using #{dpkg-"
+"system. For example, for Wheezy live images, build #{live-boot}# in a Wheezy "
+"chroot. If your target distribution happens to match your build system "
+"distribution, you may build directly on the build system using #{dpkg-"
"buildpackage}# (provided by the /{dpkg-dev}/ package):"
msgstr ""
"Utilisez un système de construction automatique personnel tels que /"
"{pbuilder}/ ou /{sbuild}/ si vous avez besoin pour créer #{live-boot}# pour "
"une distribution objectif qui diffère de votre système de construction. Par "
-"exemple, pour les images live de Squeeze, créez #{live-boot}# dans un chroot "
-"Squeeze. Si votre distribution objectif correspond à votre distribution vous "
+"exemple, pour les images live de Wheezy, créez #{live-boot}# dans un chroot "
+"Wheezy. Si votre distribution objectif correspond à votre distribution vous "
"pouvez créer directement sur le système de construction en utilisant #{dpkg-"
"buildpackage}# (fournis par le paquet /{dpkg-dev}/):"
@@ -487,9 +490,10 @@ msgid ""
"You can let live-build automatically use the latest snapshots of live-boot "
"and live-config by configuring a third-party repository in your live-build "
"configuration directory. Assuming you have already created a configuration "
-"tree with #{lb config}#:"
+"tree in the current directory with #{lb config}#:"
msgstr ""
"Vous pouvez laisser live-build utiliser automatiquement les derniers "
"instantanés de live-boot et live-config configurant un référentiel de tierce "
"partie dans votre répertoire de configuration de live-build. En supposant "
-"que vous avez déjà créé un arbre de configuration avec #{lb config}#:"
+"que vous avez déjà créé un arbre de configuration dans le répertoire courant "
+"avec #{lb config}#:"
diff --git a/manual/po/fr/user_managing_a_configuration.ssi.po b/manual/po/fr/user_managing_a_configuration.ssi.po
index 3d83f83..f63675d 100644
--- a/manual/po/fr/user_managing_a_configuration.ssi.po
+++ b/manual/po/fr/user_managing_a_configuration.ssi.po
@@ -7,8 +7,8 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2010-12-19 20:37-0400\n"
-"PO-Revision-Date: 2011-07-09 19:30+0200\n"
+"POT-Creation-Date: 2011-11-02 12:23-0200\n"
+"PO-Revision-Date: 2011-11-02 22:27+0100\n"
"Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
"Language-Team: <debian-live at lists.debian.org>\n"
"Language: fr\n"
@@ -20,55 +20,56 @@ msgstr ""
#. type: Plain text
#: 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/project_bugs.ssi:58
+#: en/about_manual.ssi:146 en/about_manual.ssi:157 en/about_manual.ssi:165
+#: en/about_manual.ssi:173 en/project_bugs.ssi:60
#: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
#: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
#: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/user_basics.ssi:30 en/user_basics.ssi:40
-#: en/user_basics.ssi:52 en/user_basics.ssi:64 en/user_basics.ssi:76
-#: en/user_basics.ssi:86 en/user_basics.ssi:100 en/user_basics.ssi:108
-#: en/user_basics.ssi:116 en/user_basics.ssi:126 en/user_basics.ssi:140
+#: en/project_procedures.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
+#: en/user_basics.ssi:116 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:218 en/user_basics.ssi:246 en/user_basics.ssi:262
-#: en/user_basics.ssi:270 en/user_basics.ssi:290 en/user_basics.ssi:315
+#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
+#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
+#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
+#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
-#: en/user_customization-installer.ssi:43
+#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
-#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:53
-#: en/user_customization-packages.ssi:66 en/user_customization-packages.ssi:80
-#: en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:112
-#: en/user_customization-packages.ssi:142
-#: en/user_customization-packages.ssi:155
-#: en/user_customization-packages.ssi:165
-#: en/user_customization-packages.ssi:175
-#: en/user_customization-packages.ssi:185
-#: en/user_customization-packages.ssi:199
-#: en/user_customization-packages.ssi:215
-#: en/user_customization-packages.ssi:227
-#: en/user_customization-packages.ssi:291
-#: en/user_customization-packages.ssi:303
-#: en/user_customization-packages.ssi:313
-#: en/user_customization-packages.ssi:331
-#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
-#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
-#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
-#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
-#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:106
-#: 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:178 en/user_examples.ssi:190
-#: en/user_examples.ssi:206 en/user_examples.ssi:220 en/user_examples.ssi:229
-#: en/user_examples.ssi:247 en/user_examples.ssi:255 en/user_examples.ssi:268
-#: en/user_examples.ssi:283 en/user_installation.ssi:38
+#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:54
+#: en/user_customization-packages.ssi:67 en/user_customization-packages.ssi:81
+#: en/user_customization-packages.ssi:101
+#: en/user_customization-packages.ssi:131
+#: en/user_customization-packages.ssi:144
+#: en/user_customization-packages.ssi:154
+#: en/user_customization-packages.ssi:164
+#: en/user_customization-packages.ssi:174
+#: en/user_customization-packages.ssi:188
+#: en/user_customization-packages.ssi:204
+#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:320
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:345 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:24 en/user_customization-runtime.ssi:44
+#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:63
+#: en/user_customization-runtime.ssi:71 en/user_customization-runtime.ssi:80
+#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:111
+#: en/user_customization-runtime.ssi:119 en/user_examples.ssi:14
+#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
+#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
+#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
+#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
+#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
+#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
+#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:271
+#: en/user_examples.ssi:286 en/user_installation.ssi:38
#: en/user_installation.ssi:46 en/user_installation.ssi:56
#: en/user_installation.ssi:64 en/user_installation.ssi:74
#: en/user_installation.ssi:82 en/user_installation.ssi:90
@@ -84,60 +85,61 @@ msgstr "code{"
#. type: Plain text
#: 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:174 en/project_bugs.ssi:62
+#: en/about_manual.ssi:151 en/about_manual.ssi:161 en/about_manual.ssi:169
+#: en/about_manual.ssi:177 en/project_bugs.ssi:64
#: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
#: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
#: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/user_basics.ssi:34 en/user_basics.ssi:44
-#: en/user_basics.ssi:58 en/user_basics.ssi:70 en/user_basics.ssi:80
-#: en/user_basics.ssi:92 en/user_basics.ssi:104 en/user_basics.ssi:112
-#: en/user_basics.ssi:120 en/user_basics.ssi:130 en/user_basics.ssi:146
+#: en/project_procedures.ssi:131 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:134 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:238 en/user_basics.ssi:250 en/user_basics.ssi:266
-#: en/user_basics.ssi:274 en/user_basics.ssi:301 en/user_basics.ssi:340
+#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
+#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
+#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
+#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
-#: en/user_customization-installer.ssi:37
-#: en/user_customization-installer.ssi:48
+#: en/user_customization-installer.ssi:38
+#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:70 en/user_customization-packages.ssi:84
-#: en/user_customization-packages.ssi:98
-#: en/user_customization-packages.ssi:116
-#: en/user_customization-packages.ssi:147
-#: en/user_customization-packages.ssi:161
-#: en/user_customization-packages.ssi:171
-#: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:191
-#: en/user_customization-packages.ssi:203
-#: en/user_customization-packages.ssi:219
-#: en/user_customization-packages.ssi:231
-#: en/user_customization-packages.ssi:295
-#: en/user_customization-packages.ssi:307
-#: en/user_customization-packages.ssi:317
-#: en/user_customization-packages.ssi:344
-#: en/user_customization-packages.ssi:354 en/user_customization-runtime.ssi:18
-#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
-#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
-#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
-#: en/user_customization-runtime.ssi:102 en/user_customization-runtime.ssi:111
-#: 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:186 en/user_examples.ssi:202
-#: en/user_examples.ssi:210 en/user_examples.ssi:225 en/user_examples.ssi:233
-#: en/user_examples.ssi:251 en/user_examples.ssi:264 en/user_examples.ssi:279
-#: en/user_examples.ssi:297 en/user_installation.ssi:42
+#: en/user_customization-packages.ssi:46 en/user_customization-packages.ssi:59
+#: en/user_customization-packages.ssi:71 en/user_customization-packages.ssi:85
+#: en/user_customization-packages.ssi:105
+#: en/user_customization-packages.ssi:136
+#: en/user_customization-packages.ssi:150
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:180
+#: en/user_customization-packages.ssi:192
+#: en/user_customization-packages.ssi:208
+#: en/user_customization-packages.ssi:220
+#: en/user_customization-packages.ssi:284
+#: en/user_customization-packages.ssi:296
+#: en/user_customization-packages.ssi:306
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341
+#: en/user_customization-packages.ssi:350 en/user_customization-runtime.ssi:18
+#: en/user_customization-runtime.ssi:28 en/user_customization-runtime.ssi:48
+#: en/user_customization-runtime.ssi:59 en/user_customization-runtime.ssi:67
+#: en/user_customization-runtime.ssi:76 en/user_customization-runtime.ssi:85
+#: en/user_customization-runtime.ssi:105 en/user_customization-runtime.ssi:115
+#: en/user_customization-runtime.ssi:124 en/user_examples.ssi:20
+#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
+#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
+#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
+#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
+#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
+#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
+#: en/user_examples.ssi:254 en/user_examples.ssi:267 en/user_examples.ssi:282
+#: en/user_examples.ssi:300 en/user_installation.ssi:42
#: en/user_installation.ssi:50 en/user_installation.ssi:60
#: en/user_installation.ssi:70 en/user_installation.ssi:78
#: en/user_installation.ssi:86 en/user_installation.ssi:94
#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_installation.ssi:150 en/user_managing_a_configuration.ssi:31
+#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
@@ -278,7 +280,7 @@ msgstr ""
msgid ""
" #!/bin/sh\n"
" lb config noauto \\\n"
-" --packages-lists \"standard\" \\\n"
+" --package-lists \"standard\" \\\n"
" \"${@}\"\n"
msgstr ""
@@ -327,16 +329,16 @@ msgid " $ cp /usr/share/live/build/examples/auto/* auto/\n"
msgstr ""
#. type: Plain text
-#: en/user_managing_a_configuration.ssi:62
+#: en/user_managing_a_configuration.ssi:61
msgid ""
"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. "
+"example above, #{--package-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 ""
"Editer #{auto/config}#, en changeant ou en ajoutant des options comme bon "
-"vous semble. Dans l'exemple ci-dessus, #{--packages-lists standard}# est "
-"fixé à la valeur par défaut. Changez ce à une valeur appropriée pour votre "
-"image (ou le supprimer si vous voulez utiliser par défaut) et ajouter des "
-"options supplémentaires dans les lignes de continuation qui suivent."
+"vous semble. Dans l'exemple ci-dessus, #{--package-lists standard}# est fixé "
+"à la valeur par défaut. Changez ce à une valeur appropriée pour votre image "
+"(ou le supprimer si vous voulez utiliser par défaut) et ajouter des options "
+"supplémentaires dans les lignes de continuation qui suivent."
diff --git a/manual/po/fr/user_overview.ssi.po b/manual/po/fr/user_overview.ssi.po
index 9d78e15..06fa3c4 100644
--- a/manual/po/fr/user_overview.ssi.po
+++ b/manual/po/fr/user_overview.ssi.po
@@ -7,8 +7,8 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-05-13 12:02-0200\n"
-"PO-Revision-Date: 2011-07-02 19:38+0200\n"
+"POT-Creation-Date: 2011-11-07 08:16-0400\n"
+"PO-Revision-Date: 2011-11-07 23:15+0100\n"
"Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
"Language-Team: <debian-live at lists.debian.org>\n"
"Language: fr\n"
@@ -38,37 +38,38 @@ msgstr ""
#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
-#: en/user_customization-installer.ssi:43
+#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
-#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:53
-#: en/user_customization-packages.ssi:66 en/user_customization-packages.ssi:80
-#: en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:112
-#: en/user_customization-packages.ssi:142
-#: en/user_customization-packages.ssi:155
-#: en/user_customization-packages.ssi:165
-#: en/user_customization-packages.ssi:175
-#: en/user_customization-packages.ssi:185
-#: en/user_customization-packages.ssi:199
-#: en/user_customization-packages.ssi:215
-#: en/user_customization-packages.ssi:227
-#: en/user_customization-packages.ssi:291
-#: en/user_customization-packages.ssi:303
-#: en/user_customization-packages.ssi:313
-#: en/user_customization-packages.ssi:331
-#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
-#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
-#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
-#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
-#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:105
-#: 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:178 en/user_examples.ssi:190
-#: en/user_examples.ssi:206 en/user_examples.ssi:220 en/user_examples.ssi:229
-#: en/user_examples.ssi:247 en/user_examples.ssi:255 en/user_examples.ssi:268
-#: en/user_examples.ssi:283 en/user_installation.ssi:38
+#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:54
+#: en/user_customization-packages.ssi:67 en/user_customization-packages.ssi:81
+#: en/user_customization-packages.ssi:101
+#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:140
+#: en/user_customization-packages.ssi:150
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:184
+#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:276
+#: en/user_customization-packages.ssi:288
+#: en/user_customization-packages.ssi:298
+#: en/user_customization-packages.ssi:316
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:24 en/user_customization-runtime.ssi:44
+#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:63
+#: en/user_customization-runtime.ssi:71 en/user_customization-runtime.ssi:80
+#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:111
+#: en/user_customization-runtime.ssi:119 en/user_examples.ssi:14
+#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
+#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
+#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
+#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
+#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
+#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
+#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
+#: en/user_examples.ssi:277 en/user_installation.ssi:38
#: en/user_installation.ssi:46 en/user_installation.ssi:56
#: en/user_installation.ssi:64 en/user_installation.ssi:74
#: en/user_installation.ssi:82 en/user_installation.ssi:90
@@ -77,7 +78,7 @@ msgstr ""
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:80 en/user_overview.ssi:88
+#: en/user_overview.ssi:48 en/user_overview.ssi:56
msgid "code{"
msgstr "code{"
@@ -101,38 +102,39 @@ msgstr "code{"
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
-#: en/user_customization-installer.ssi:37
-#: en/user_customization-installer.ssi:48
+#: en/user_customization-installer.ssi:38
+#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:70 en/user_customization-packages.ssi:84
-#: en/user_customization-packages.ssi:98
-#: en/user_customization-packages.ssi:116
-#: en/user_customization-packages.ssi:147
-#: en/user_customization-packages.ssi:161
-#: en/user_customization-packages.ssi:171
-#: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:191
-#: en/user_customization-packages.ssi:203
-#: en/user_customization-packages.ssi:219
-#: en/user_customization-packages.ssi:231
-#: en/user_customization-packages.ssi:295
-#: en/user_customization-packages.ssi:307
-#: en/user_customization-packages.ssi:317
-#: en/user_customization-packages.ssi:344
-#: en/user_customization-packages.ssi:353 en/user_customization-runtime.ssi:18
-#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
-#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
-#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
-#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:110
-#: 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:186 en/user_examples.ssi:202
-#: en/user_examples.ssi:210 en/user_examples.ssi:225 en/user_examples.ssi:233
-#: en/user_examples.ssi:251 en/user_examples.ssi:264 en/user_examples.ssi:279
-#: en/user_examples.ssi:297 en/user_installation.ssi:42
+#: en/user_customization-packages.ssi:46 en/user_customization-packages.ssi:59
+#: en/user_customization-packages.ssi:71 en/user_customization-packages.ssi:85
+#: en/user_customization-packages.ssi:105
+#: en/user_customization-packages.ssi:132
+#: en/user_customization-packages.ssi:146
+#: en/user_customization-packages.ssi:156
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:329
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:346 en/user_customization-runtime.ssi:18
+#: en/user_customization-runtime.ssi:28 en/user_customization-runtime.ssi:48
+#: en/user_customization-runtime.ssi:59 en/user_customization-runtime.ssi:67
+#: en/user_customization-runtime.ssi:76 en/user_customization-runtime.ssi:85
+#: en/user_customization-runtime.ssi:105 en/user_customization-runtime.ssi:115
+#: en/user_customization-runtime.ssi:124 en/user_examples.ssi:20
+#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
+#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
+#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
+#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
+#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
+#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
+#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
+#: en/user_examples.ssi:291 en/user_installation.ssi:42
#: en/user_installation.ssi:50 en/user_installation.ssi:60
#: en/user_installation.ssi:70 en/user_installation.ssi:78
#: en/user_installation.ssi:86 en/user_installation.ssi:94
@@ -140,8 +142,8 @@ msgstr "code{"
#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
-#: en/user_overview.ssi:84 en/user_overview.ssi:92
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:42
+#: en/user_overview.ssi:52 en/user_overview.ssi:60
msgid "}code"
msgstr "}code"
@@ -298,77 +300,38 @@ msgstr ""
#: en/user_overview.ssi:34
msgid ""
"Issuing #{lb config}# without any arguments creates a #{config/}# "
-"subdirectory which it populates with some default settings:"
+"subdirectory which it populates with some default settings, and a skeleton #"
+"{auto/}# subdirectory tree."
msgstr ""
"Exécuter #{lb config}# sans aucun argument crée un sous-répertoire #{config/}"
-"# dont il remplit avec certains paramètres par défaut:"
+"# dont il remplit avec certains paramètres, et un sous-répertoire en "
+"squelette #{auto/}#."
#. type: Plain text
-#: en/user_overview.ssi:39
+#: en/user_overview.ssi:40
#, no-wrap
msgid ""
" $ lb config\n"
+" P: Considering defaults defined in /etc/live/build.conf\n"
" P: Creating config tree\n"
msgstr ""
#. type: Plain text
#: en/user_overview.ssi:44
-#, no-wrap
-msgid ""
-" $ ls -l\n"
-" total 8\n"
-" drwxr-xr-x 3 user user 4096 Sep 7 13:02 auto\n"
-" drwxr-xr-x 22 user user 4096 Sep 7 13:02 config\n"
-msgstr ""
-
-#. type: Plain text
-#: en/user_overview.ssi:72
-#, no-wrap
-msgid ""
-" $ ls -l config/\n"
-" total 104\n"
-" -rw-r--r-- 1 user user 4197 Sep 7 13:02 binary\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_debian-installer\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_debian-installer-includes\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_grub\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-debs\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-hooks\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-includes\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-packageslists\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-udebs\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_rootfs\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_syslinux\n"
-" -rw-r--r-- 1 user user 2051 Sep 7 13:02 bootstrap\n"
-" -rw-r--r-- 1 user user 1647 Sep 7 13:02 chroot\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_apt\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-hooks\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-includes\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-packages\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-packageslists\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-patches\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-preseed\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_sources\n"
-" -rw-r--r-- 1 user user 2954 Sep 7 13:02 common\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 includes\n"
-" -rw-r--r-- 1 user user 205 Sep 7 13:02 source\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 templates\n"
-msgstr ""
-
-#. type: Plain text
-#: en/user_overview.ssi:76
msgid ""
"Using #{lb config}# without any arguments would be suitable for users who "
"need a very basic image, or who intend to later provide a more complete "
-"configuration via auto/config (see {Managing a configuration}#managing-a-"
+"configuration via #{auto/config}# (see {Managing a configuration}#managing-a-"
"configuration for details)."
msgstr ""
"L'utilisation de #{lb config}# sans aucun argument serait approprié pour les "
"utilisateurs qui ont besoin d'une image de base, ou qui ont l'intention "
-"d'offrir plus tard, une configuration plus complète via auto/config (voir "
-"{Gestion d'une configuration}#managing-a-configuration pour plus de détails)."
+"d'offrir plus tard, une configuration plus complète via #{auto/config}# "
+"(voir {Gestion d'une configuration}#managing-a-configuration pour plus de "
+"détails)."
#. type: Plain text
-#: en/user_overview.ssi:78
+#: en/user_overview.ssi:46
msgid ""
"Normally, you will want to specify some options. For example, to include the "
"'gnome' package list in your configuration:"
@@ -377,52 +340,52 @@ msgstr ""
"inclure la liste du paquet «gnome» dans votre configuration:"
#. type: Plain text
-#: en/user_overview.ssi:82
+#: en/user_overview.ssi:50
#, no-wrap
msgid " $ lb config -p gnome\n"
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:86
+#: en/user_overview.ssi:54
msgid "It is possible to specify many options, such as:"
msgstr "Il est possible de spécifier plusieurs options, telles que:"
#. type: Plain text
-#: en/user_overview.ssi:90
+#: en/user_overview.ssi:58
#, no-wrap
msgid " $ lb config --binary-images net --hostname live-machine --username live-user ...\n"
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:94
+#: en/user_overview.ssi:62
msgid "A full list of options is available in the #{lb_config}# man page."
msgstr ""
"Une liste complète des options est disponible dans la page de manuel de #"
"{lb_config}#."
#. type: Plain text
-#: en/user_overview.ssi:96
+#: en/user_overview.ssi:64
msgid "3~lb-build The #{lb build}# command"
msgstr "3~lb-build La commande #{lb build}#"
#. type: Plain text
-#: en/user_overview.ssi:98
+#: en/user_overview.ssi:66
msgid ""
-"The #{lb build}# command reads in your configuration from the config/ "
+"The #{lb build}# command reads in your configuration from the #{config/}# "
"directory. It then runs the lower level commands needed to build your Live "
"system."
msgstr ""
"La commande #{lb build}# lit dans votre configuration à partir du répertoire "
-"config/. Il exécute alors les commandes de niveau inférieur nécessaires pour "
-"construire votre système Live."
+"#{config/}#. Il exécute alors les commandes de niveau inférieur nécessaires "
+"pour construire votre système Live."
#. type: Plain text
-#: en/user_overview.ssi:100
+#: en/user_overview.ssi:68
msgid "3~lb-clean The #{lb clean}# command"
msgstr "3~lb-clean La commande #{lb clean}#"
#. type: Plain text
-#: en/user_overview.ssi:102
+#: en/user_overview.ssi:70
msgid ""
"It is the job of the #{lb clean}# command to remove various parts of a build "
"so subsequent builds can start from a clean state. By default, #{chroot}#, #"
@@ -442,12 +405,12 @@ msgstr ""
"la page de manuel de #{lb_clean}# pour une liste complète des options."
#. type: Plain text
-#: en/user_overview.ssi:104
+#: en/user_overview.ssi:72
msgid "2~live-boot The live-boot package"
msgstr "2~live-boot Le paquet live-boot"
#. type: Plain text
-#: en/user_overview.ssi:106
+#: en/user_overview.ssi:74
msgid ""
"live-boot is a collection of scripts providing hooks for the initramfs-"
"tools, used to generate an initramfs capable of booting live systems, such "
@@ -460,21 +423,21 @@ msgstr ""
"netboot tarballs, et les images clé USB."
#. type: Plain text
-#: en/user_overview.ssi:108
+#: en/user_overview.ssi:76
msgid ""
-"At boot time it will look for read-only media containing a \"/live\" "
+"At boot time it will look for read-only media containing a #{/live/}# "
"directory where a root filesystem (often a compressed filesystem image like "
"squashfs) is stored. If found, it will create a writable environment, using "
"aufs, for Debian like systems to boot from."
msgstr ""
"Au démarrage il va chercher un support en lecture seule qui contient un "
-"répertoire «/live» où un système de fichiers racine (souvent une image de "
+"répertoire #{/live/}# où un système de fichiers racine (souvent une image de "
"système de fichiers compressé comme squashfs) est stocké. S'il est trouvé, "
"il va créer un environnement accessible en écriture, en utilisant aufs, afin "
"que systémes similaires à Debian puissent démarrer à partir de ça."
#. type: Plain text
-#: en/user_overview.ssi:110
+#: en/user_overview.ssi:78
msgid ""
"More information on initial ramfs in Debian can be found in the Debian Linux "
"Kernel Handbook at http://kernel-handbook.alioth.debian.org/ in the chapter "
@@ -485,12 +448,12 @@ msgstr ""
"dans le chapitre sur initramfs."
#. type: Plain text
-#: en/user_overview.ssi:112
+#: en/user_overview.ssi:80
msgid "2~live-config The live-config package"
msgstr "2~live-config Le paquet live-config"
#. type: Plain text
-#: en/user_overview.ssi:113
+#: en/user_overview.ssi:81
msgid ""
"live-config consists of the scripts that run at boot time after live-boot to "
"configure the live system automatically. It handles such tasks as setting "
diff --git a/manual/po/it/index.html.in.po b/manual/po/it/index.html.in.po
index f427b3c..0b9875d 100644
--- a/manual/po/it/index.html.in.po
+++ b/manual/po/it/index.html.in.po
@@ -3,14 +3,15 @@
# This file is distributed under the same license as the live-manual package.
# Automatically generated, 2010.
# Carlo Stemberger <carlo.stemberger at gmail.com>, 2010.
+# Carlos Zuferri «chals» <chals at altorricon.com>, 2011.
#
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-02-03 18:22-0400\n"
-"PO-Revision-Date: 2010-12-08 17:00+0100\n"
-"Last-Translator: Carlo Stemberger <carlo.stemberger at gmail.com>\n"
-"Language-Team: Italian <tp at lists.linux.it>\n"
+"POT-Creation-Date: 2011-12-03 18:55+0100\n"
+"PO-Revision-Date: 2011-11-25 22:22+0100\n"
+"Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
+"Language-Team: <debian-live at lists.debian.org>\n"
"Language: it\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -30,75 +31,83 @@ msgstr "Manuale Debian Live"
#. type: Content of: <html><body><p>
#: en/index.html.in:12
msgid ""
+"<i>live-manual</i> is available in different file formats and it is "
+"translated into several languages. Keep in mind that some translations may "
+"be incomplete or may not be up to date."
+msgstr ""
+
+#. type: Content of: <html><body><p>
+#: en/index.html.in:17
+msgid ""
"Please report errors, omissions, patches and suggestions to our mailinglist "
"at <a href=\"mailto:debian-live at lists.debian.org\">debian-live at lists.debian."
-"org</a> and read about <a href=\"html/about-manual.html#how-to-contribute"
+"org</a> and read about <a href=\"html/about-manual.en.html#how-to-contribute"
"\">how to contribute</a> to the manual."
msgstr ""
"Si prega di segnalare errori, omissioni, patch e suggerimenti sulla nostra "
"mailing list <a href=\"mailto:debian-live at lists.debian.org\">debian-"
-"live at lists.debian.org</a> e leggere <a href=\"html/about-manual.html#how-to-"
-"contribute\">come contribuire</a> al manuale."
+"live at lists.debian.org</a> e leggere <a href=\"html/about-manual.it.html#how-"
+"to-contribute\">come contribuire</a> al manuale."
#. type: Content of: <html><body><h3>
-#: en/index.html.in:15
+#: en/index.html.in:20
msgid "Available Formats"
msgstr "Formati disponibili"
#. type: Content of: <html><body><ul><li>
-#: en/index.html.in:18
-msgid "<a href=\"epub/live-manual.epub\">EPUB</a>"
-msgstr "<a href=\"epub/live-manual.epub\">EPUB</a>"
+#: en/index.html.in:23
+msgid "<a href=\"epub/live-manual.en.epub\">EPUB</a>"
+msgstr "<a href=\"epub/live-manual.it.epub\">EPUB</a>"
#. type: Content of: <html><body><ul><li>
-#: en/index.html.in:19
+#: en/index.html.in:24
msgid ""
-"HTML: <a href=\"html/index.html\">multi page</a>, <a href=\"html/live-manual."
-"html\">single page</a>"
+"HTML: <a href=\"html/index.en.html\">multi page</a>, <a href=\"html/live-"
+"manual.en.html\">single page</a>"
msgstr ""
-"HTML: <a href=\"html/index.html\">multi-pagina</a>, <a href=\"html/live-"
-"manual.html\">pagina unica</a>"
+"HTML: <a href=\"html/index.it.html\">multi-pagina</a>, <a href=\"html/live-"
+"manual.it.html\">pagina unica</a>"
#. type: Content of: <html><body><ul><li>
-#: en/index.html.in:20
-msgid "<a href=\"odf/live-manual.odt\">ODF</a>"
-msgstr "<a href=\"odf/live-manual.odt\">ODF</a>"
+#: en/index.html.in:25
+msgid "<a href=\"odf/live-manual.en.odt\">ODF</a>"
+msgstr "<a href=\"odf/live-manual.it.odt\">ODF</a>"
#. type: Content of: <html><body><ul><li>
-#: en/index.html.in:21
+#: en/index.html.in:26
msgid ""
-"PDF: <a href=\"pdf/live-manual.portrait-a4.pdf\">A4 portrait</a>, <a href="
-"\"pdf/live-manual.landscape-a4.pdf\">A4 landscape</a>, <a href=\"pdf/live-"
-"manual.portrait-letter.pdf\">letter portrait</a>, <a href=\"pdf/live-manual."
-"landscape-letter.pdf\">letter landscape</a>"
+"PDF: <a href=\"pdf/live-manual.portrait-a4.en.pdf\">A4 portrait</a>, <a href="
+"\"pdf/live-manual.landscape-a4.en.pdf\">A4 landscape</a>, <a href=\"pdf/live-"
+"manual.portrait-letter.en.pdf\">letter portrait</a>, <a href=\"pdf/live-"
+"manual.landscape-letter.en.pdf\">letter landscape</a>"
msgstr ""
-"PDF: <a href=\"pdf/live-manual.portrait-a4.pdf\">A4 verticale</a>, <a href="
-"\"pdf/live-manual.landscape-a4.pdf\">A4 orizzontale</a>, <a href=\"pdf/live-"
-"manual.portrait-letter.pdf\">lettera verticale</a>, <a href=\"pdf/live-"
-"manual.landscape-letter.pdf\">lettera orizzontale</a>"
+"PDF: <a href=\"pdf/live-manual.portrait-a4.it.pdf\">A4 verticale</a>, <a "
+"href=\"pdf/live-manual.landscape-a4.it.pdf\">A4 orizzontale</a>, <a href="
+"\"pdf/live-manual.portrait-letter.it.pdf\">lettera verticale</a>, <a href="
+"\"pdf/live-manual.landscape-letter.it.pdf\">lettera orizzontale</a>"
#. type: Content of: <html><body><ul><li>
-#: en/index.html.in:22
-msgid "<a href=\"txt/live-manual.txt\">Plain text</a>"
-msgstr "<a href=\"txt/live-manual.txt\">Testo semplice</a>"
+#: en/index.html.in:27
+msgid "<a href=\"txt/live-manual.en.txt\">Plain text</a>"
+msgstr "<a href=\"txt/live-manual.it.txt\">Testo semplice</a>"
#. type: Content of: <html><body><p>
-#: en/index.html.in:26
+#: en/index.html.in:31
msgid "Last changed: @DATE_CHANGE@"
msgstr "Ultima modifica: @DATE_CHANGE@"
#. type: Content of: <html><body><p>
-#: en/index.html.in:27
+#: en/index.html.in:32
msgid "Last built: @DATE_BUILD@"
msgstr "Ultima compilazione: @DATE_BUILD@"
#. type: Content of: <html><body><h3>
-#: en/index.html.in:30
+#: en/index.html.in:35
msgid "Source"
msgstr "Sorgente"
#. type: Content of: <html><body><p>
-#: en/index.html.in:33
+#: en/index.html.in:38
msgid ""
"The sources for this manual is available in a <a href=\"http://git.or.cz/"
"\">Git</a> repository at live.debian.net."
@@ -107,7 +116,7 @@ msgstr ""
"\"http://git.or.cz/\">Git</a> su live.debian.net."
#. type: Content of: <html><body><ul><li>
-#: en/index.html.in:37
+#: en/index.html.in:42
msgid ""
"Browse: <a href=\"http://live.debian.net/gitweb/?p=live-manual.git"
"\"><small><tt>http://live.debian.net/gitweb/?p=live-manual.git</tt></small></"
@@ -118,7 +127,7 @@ msgstr ""
"a>"
#. type: Content of: <html><body><ul><li>
-#: en/index.html.in:38
+#: en/index.html.in:43
msgid ""
"Git: <a href=\"git://live.debian.net/git/live-manual.git\"><small><tt>git://"
"live.debian.net/git/live-manual.git</tt></small></a>"
@@ -127,7 +136,7 @@ msgstr ""
"live.debian.net/git/live-manual.git</tt></small></a>"
#. type: Content of: <html><body><p>
-#: en/index.html.in:42
+#: en/index.html.in:47
msgid ""
"<a href=\"http://live.debian.net/\">Debian Live</a> <<a href=\"mailto:"
"debian-live at lists.debian.org\">debian-live at lists.debian.org</a>> - <a "
diff --git a/manual/po/it/live-manual.ssm.po b/manual/po/it/live-manual.ssm.po
index 149ba62..5e1c823 100644
--- a/manual/po/it/live-manual.ssm.po
+++ b/manual/po/it/live-manual.ssm.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-09-30 14:54+0300\n"
+"POT-Creation-Date: 2011-12-04 10:22+0100\n"
"PO-Revision-Date: 2011-03-11 10:33+0100\n"
"Last-Translator: skizzhg <skizzhg at gmx.com>\n"
"Language-Team: Italian <tp at lists.linux.it>\n"
@@ -49,7 +49,7 @@ msgstr ""
#, no-wrap
msgid ""
"@date:\n"
-" :published: 2011-09-30\n"
+" :published: 2011-12-04\n"
msgstr ""
#. type: Plain text
diff --git a/manual/po/it/user_basics.ssi.po b/manual/po/it/user_basics.ssi.po
index 2975803..ffbd9bd 100644
--- a/manual/po/it/user_basics.ssi.po
+++ b/manual/po/it/user_basics.ssi.po
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-04-23 14:15+0300\n"
+"POT-Creation-Date: 2011-11-02 12:23-0200\n"
"PO-Revision-Date: 2011-04-16 03:29+0200\n"
"Last-Translator: skizzhg <skizzhg at gmx.com>\n"
"Language-Team: Italian <tp at lists.linux.it>\n"
@@ -39,37 +39,38 @@ msgstr ""
#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
-#: en/user_customization-installer.ssi:43
+#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
-#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:53
-#: en/user_customization-packages.ssi:66 en/user_customization-packages.ssi:80
-#: en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:112
-#: en/user_customization-packages.ssi:142
-#: en/user_customization-packages.ssi:155
-#: en/user_customization-packages.ssi:165
-#: en/user_customization-packages.ssi:175
-#: en/user_customization-packages.ssi:185
-#: en/user_customization-packages.ssi:199
-#: en/user_customization-packages.ssi:215
-#: en/user_customization-packages.ssi:227
-#: en/user_customization-packages.ssi:291
-#: en/user_customization-packages.ssi:303
-#: en/user_customization-packages.ssi:313
-#: en/user_customization-packages.ssi:331
-#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
-#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
-#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
-#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
-#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:105
-#: 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:178 en/user_examples.ssi:190
-#: en/user_examples.ssi:206 en/user_examples.ssi:220 en/user_examples.ssi:229
-#: en/user_examples.ssi:247 en/user_examples.ssi:255 en/user_examples.ssi:268
-#: en/user_examples.ssi:283 en/user_installation.ssi:38
+#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:54
+#: en/user_customization-packages.ssi:67 en/user_customization-packages.ssi:81
+#: en/user_customization-packages.ssi:101
+#: en/user_customization-packages.ssi:131
+#: en/user_customization-packages.ssi:144
+#: en/user_customization-packages.ssi:154
+#: en/user_customization-packages.ssi:164
+#: en/user_customization-packages.ssi:174
+#: en/user_customization-packages.ssi:188
+#: en/user_customization-packages.ssi:204
+#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:320
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:345 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:24 en/user_customization-runtime.ssi:44
+#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:63
+#: en/user_customization-runtime.ssi:71 en/user_customization-runtime.ssi:80
+#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:111
+#: en/user_customization-runtime.ssi:119 en/user_examples.ssi:14
+#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
+#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
+#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
+#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
+#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
+#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
+#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:271
+#: en/user_examples.ssi:286 en/user_installation.ssi:38
#: en/user_installation.ssi:46 en/user_installation.ssi:56
#: en/user_installation.ssi:64 en/user_installation.ssi:74
#: en/user_installation.ssi:82 en/user_installation.ssi:90
@@ -102,38 +103,39 @@ msgstr "code{"
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
-#: en/user_customization-installer.ssi:37
-#: en/user_customization-installer.ssi:48
+#: en/user_customization-installer.ssi:38
+#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:70 en/user_customization-packages.ssi:84
-#: en/user_customization-packages.ssi:98
-#: en/user_customization-packages.ssi:116
-#: en/user_customization-packages.ssi:147
-#: en/user_customization-packages.ssi:161
-#: en/user_customization-packages.ssi:171
-#: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:191
-#: en/user_customization-packages.ssi:203
-#: en/user_customization-packages.ssi:219
-#: en/user_customization-packages.ssi:231
-#: en/user_customization-packages.ssi:295
-#: en/user_customization-packages.ssi:307
-#: en/user_customization-packages.ssi:317
-#: en/user_customization-packages.ssi:344
-#: en/user_customization-packages.ssi:353 en/user_customization-runtime.ssi:18
-#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
-#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
-#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
-#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:110
-#: 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:186 en/user_examples.ssi:202
-#: en/user_examples.ssi:210 en/user_examples.ssi:225 en/user_examples.ssi:233
-#: en/user_examples.ssi:251 en/user_examples.ssi:264 en/user_examples.ssi:279
-#: en/user_examples.ssi:297 en/user_installation.ssi:42
+#: en/user_customization-packages.ssi:46 en/user_customization-packages.ssi:59
+#: en/user_customization-packages.ssi:71 en/user_customization-packages.ssi:85
+#: en/user_customization-packages.ssi:105
+#: en/user_customization-packages.ssi:136
+#: en/user_customization-packages.ssi:150
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:180
+#: en/user_customization-packages.ssi:192
+#: en/user_customization-packages.ssi:208
+#: en/user_customization-packages.ssi:220
+#: en/user_customization-packages.ssi:284
+#: en/user_customization-packages.ssi:296
+#: en/user_customization-packages.ssi:306
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341
+#: en/user_customization-packages.ssi:350 en/user_customization-runtime.ssi:18
+#: en/user_customization-runtime.ssi:28 en/user_customization-runtime.ssi:48
+#: en/user_customization-runtime.ssi:59 en/user_customization-runtime.ssi:67
+#: en/user_customization-runtime.ssi:76 en/user_customization-runtime.ssi:85
+#: en/user_customization-runtime.ssi:105 en/user_customization-runtime.ssi:115
+#: en/user_customization-runtime.ssi:124 en/user_examples.ssi:20
+#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
+#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
+#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
+#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
+#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
+#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
+#: en/user_examples.ssi:254 en/user_examples.ssi:267 en/user_examples.ssi:282
+#: en/user_examples.ssi:300 en/user_installation.ssi:42
#: en/user_installation.ssi:50 en/user_installation.ssi:60
#: en/user_installation.ssi:70 en/user_installation.ssi:78
#: en/user_installation.ssi:86 en/user_installation.ssi:94
@@ -352,7 +354,7 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:44 en/user_basics.ssi:170 en/user_basics.ssi:238
-#: en/user_examples.ssi:109 en/user_examples.ssi:208
+#: en/user_examples.ssi:119 en/user_examples.ssi:211
#, no-wrap
msgid " # lb build\n"
msgstr ""
@@ -674,7 +676,7 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:142
#, no-wrap
-msgid " $ lb config --packages virtualbox-ose-guest-x11\n"
+msgid " $ echo virtualbox-ose-guest-x11 >> config/package-lists/my.list.chroot\n"
msgstr ""
#. type: Plain text
diff --git a/manual/po/it/user_customization-contents.ssi.po b/manual/po/it/user_customization-contents.ssi.po
index eb02561..3684803 100644
--- a/manual/po/it/user_customization-contents.ssi.po
+++ b/manual/po/it/user_customization-contents.ssi.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-08-25 15:56+0300\n"
+"POT-Creation-Date: 2011-11-07 21:01-0400\n"
"PO-Revision-Date: 2011-09-10 23:07+0200\n"
"Last-Translator: skizzhg <skizzhg at gmx.com>\n"
"Language-Team: Italian <tp at lists.linux.it>\n"
@@ -38,48 +38,47 @@ msgstr ""
#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
-#: en/user_customization-installer.ssi:43
+#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
-#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:53
-#: en/user_customization-packages.ssi:66 en/user_customization-packages.ssi:80
-#: en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:112
-#: en/user_customization-packages.ssi:142
-#: en/user_customization-packages.ssi:155
-#: en/user_customization-packages.ssi:165
-#: en/user_customization-packages.ssi:175
-#: en/user_customization-packages.ssi:185
-#: en/user_customization-packages.ssi:199
-#: en/user_customization-packages.ssi:215
-#: en/user_customization-packages.ssi:227
-#: en/user_customization-packages.ssi:291
-#: en/user_customization-packages.ssi:303
-#: en/user_customization-packages.ssi:313
-#: en/user_customization-packages.ssi:331
-#: en/user_customization-packages.ssi:348
-#: en/user_customization-packages.ssi:356 en/user_customization-runtime.ssi:14
-#: en/user_customization-runtime.ssi:24 en/user_customization-runtime.ssi:44
-#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:63
-#: en/user_customization-runtime.ssi:71 en/user_customization-runtime.ssi:80
-#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:111
-#: en/user_customization-runtime.ssi:119 en/user_examples.ssi:14
+#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:54
+#: en/user_customization-packages.ssi:67 en/user_customization-packages.ssi:81
+#: en/user_customization-packages.ssi:101
+#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:140
+#: en/user_customization-packages.ssi:150
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:184
+#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:276
+#: en/user_customization-packages.ssi:288
+#: en/user_customization-packages.ssi:298
+#: en/user_customization-packages.ssi:316
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
+#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
+#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
+#: en/user_customization-runtime.ssi:104 en/user_customization-runtime.ssi:114
+#: en/user_customization-runtime.ssi:122 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:178 en/user_examples.ssi:190 en/user_examples.ssi:206
-#: en/user_examples.ssi:220 en/user_examples.ssi:229 en/user_examples.ssi:247
-#: en/user_examples.ssi:255 en/user_examples.ssi:268 en/user_examples.ssi:283
-#: en/user_installation.ssi:38 en/user_installation.ssi:46
-#: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi:74 en/user_installation.ssi:82
-#: en/user_installation.ssi:90 en/user_installation.ssi:114
-#: en/user_installation.ssi:129 en/user_installation.ssi:146
-#: en/user_managing_a_configuration.ssi:24
+#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
+#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
+#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
+#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
+#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
+#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
+#: en/user_examples.ssi:277 en/user_installation.ssi:38
+#: en/user_installation.ssi:46 en/user_installation.ssi:56
+#: en/user_installation.ssi:64 en/user_installation.ssi:74
+#: en/user_installation.ssi:82 en/user_installation.ssi:90
+#: en/user_installation.ssi:114 en/user_installation.ssi:129
+#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:80 en/user_overview.ssi:88
+#: en/user_overview.ssi:48 en/user_overview.ssi:56
msgid "code{"
msgstr "code{"
@@ -103,49 +102,48 @@ msgstr "code{"
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
-#: en/user_customization-installer.ssi:37
-#: en/user_customization-installer.ssi:48
+#: en/user_customization-installer.ssi:38
+#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:70 en/user_customization-packages.ssi:84
-#: en/user_customization-packages.ssi:98
-#: en/user_customization-packages.ssi:116
-#: en/user_customization-packages.ssi:147
-#: en/user_customization-packages.ssi:161
-#: en/user_customization-packages.ssi:171
-#: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:191
-#: en/user_customization-packages.ssi:203
-#: en/user_customization-packages.ssi:219
-#: en/user_customization-packages.ssi:231
-#: en/user_customization-packages.ssi:295
-#: en/user_customization-packages.ssi:307
-#: en/user_customization-packages.ssi:317
-#: en/user_customization-packages.ssi:344
-#: en/user_customization-packages.ssi:352
-#: en/user_customization-packages.ssi:361 en/user_customization-runtime.ssi:18
-#: en/user_customization-runtime.ssi:28 en/user_customization-runtime.ssi:48
-#: en/user_customization-runtime.ssi:59 en/user_customization-runtime.ssi:67
-#: en/user_customization-runtime.ssi:76 en/user_customization-runtime.ssi:85
-#: en/user_customization-runtime.ssi:105 en/user_customization-runtime.ssi:115
-#: en/user_customization-runtime.ssi:124 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:186 en/user_examples.ssi:202 en/user_examples.ssi:210
-#: en/user_examples.ssi:225 en/user_examples.ssi:233 en/user_examples.ssi:251
-#: en/user_examples.ssi:264 en/user_examples.ssi:279 en/user_examples.ssi:297
-#: en/user_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi:70
-#: en/user_installation.ssi:78 en/user_installation.ssi:86
-#: en/user_installation.ssi:94 en/user_installation.ssi:119
-#: en/user_installation.ssi:136 en/user_installation.ssi:149
-#: en/user_managing_a_configuration.ssi:31
+#: en/user_customization-packages.ssi:46 en/user_customization-packages.ssi:59
+#: en/user_customization-packages.ssi:71 en/user_customization-packages.ssi:85
+#: en/user_customization-packages.ssi:105
+#: en/user_customization-packages.ssi:132
+#: en/user_customization-packages.ssi:146
+#: en/user_customization-packages.ssi:156
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:329
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:346 en/user_customization-runtime.ssi:21
+#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
+#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
+#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
+#: en/user_customization-runtime.ssi:108 en/user_customization-runtime.ssi:118
+#: en/user_customization-runtime.ssi:127 en/user_examples.ssi:20
+#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
+#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
+#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
+#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
+#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
+#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
+#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
+#: en/user_examples.ssi:291 en/user_installation.ssi:42
+#: en/user_installation.ssi:50 en/user_installation.ssi:60
+#: en/user_installation.ssi:70 en/user_installation.ssi:78
+#: en/user_installation.ssi:86 en/user_installation.ssi:94
+#: en/user_installation.ssi:119 en/user_installation.ssi:136
+#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
-#: en/user_overview.ssi:84 en/user_overview.ssi:92
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:42
+#: en/user_overview.ssi:52 en/user_overview.ssi:60
msgid "}code"
msgstr "}code"
@@ -265,8 +263,14 @@ msgstr ""
#. type: Plain text
#: en/user_customization-contents.ssi:24
+#, fuzzy
+#| msgid ""
+#| "To include files, simply add them to your #{config/chroot_local-includes}"
+#| "# directory. This directory corresponds to the root directory (#{/}#) of "
+#| "the live system. For example, to add a file #{/var/www/index.html}# in "
+#| "the live system, use:"
msgid ""
-"To include files, simply add them to your #{config/chroot_local-includes}# "
+"To include files, simply add them to your #{config/includes.chroot}# "
"directory. This directory corresponds to the root directory (#{/}#) of the "
"live system. For example, to add a file #{/var/www/index.html}# in the live "
"system, use:"
@@ -280,8 +284,8 @@ msgstr ""
#: en/user_customization-contents.ssi:29
#, no-wrap
msgid ""
-" $ mkdir -p config/chroot_local-includes/var/www\n"
-" $ cp /path/to/my/index.html config/chroot_local-includes/var/www\n"
+" $ mkdir -p config/includes.chroot/var/www\n"
+" $ cp /path/to/my/index.html config/includes.chroot/var/www\n"
msgstr ""
#. type: Plain text
@@ -295,7 +299,7 @@ msgstr "La configurazione avrà quindi il seguente schema:"
msgid ""
" -- config\n"
" [...]\n"
-" |-- chroot_local-includes\n"
+" |-- includes.chroot\n"
" | `-- var\n"
" | `-- www\n"
" | `-- index.html\n"
@@ -319,14 +323,23 @@ msgstr "3~binary-local-includes Include locali binari"
#. type: Plain text
#: en/user_customization-contents.ssi:52
+#, fuzzy
+#| msgid ""
+#| "To include material such as documentation or videos on the media "
+#| "filesystem so that it is accessible immediately upon insertion of the "
+#| "media without booting the Live system, you can use binary local includes. "
+#| "This works in a similar fashion to chroot local includes. For example, "
+#| "suppose the files #{~/video_demo.*}# are demo videos of the live system "
+#| "described by and linked to by an HTML index page. Simply copy the "
+#| "material to #{config/binary_local-includes/}# as follows:"
msgid ""
"To include material such as documentation or videos on the media filesystem "
"so that it is accessible immediately upon insertion of the media without "
"booting the Live system, you can use binary local includes. This works in a "
"similar fashion to chroot local includes. For example, suppose the files #{~/"
"video_demo.*}# are demo videos of the live system described by and linked to "
-"by an HTML index page. Simply copy the material to #{config/binary_local-"
-"includes/}# as follows:"
+"by an HTML index page. Simply copy the material to #{config/includes.binary/}"
+"# as follows:"
msgstr ""
"Si possono utilizzare include locali binari per inserire sul filesystem del "
"supporto materiale come documentazione o video affinché sia immediatamente "
@@ -339,7 +352,7 @@ msgstr ""
#. type: Plain text
#: en/user_customization-contents.ssi:56
#, no-wrap
-msgid " $ cp ~/video_demo.* config/binary_local-includes/\n"
+msgid " $ cp ~/video_demo.* config/includes.binary/\n"
msgstr ""
#. type: Plain text
@@ -400,13 +413,23 @@ msgstr "3~live-chroot-local-hooks Live/chroot hook locali"
#. type: Plain text
#: en/user_customization-contents.ssi:80
+#, fuzzy
+#| msgid ""
+#| "To run commands in the chroot stage, create a hook script containing the "
+#| "commands in the #{config/chroot_local-hooks}# directory. The hook will "
+#| "run in the chroot after the rest of your chroot configuration has been "
+#| "applied, so remember to ensure your configuration includes all packages "
+#| "and files your hook needs in order to run. See the example chroot hook "
+#| "scripts for various common chroot customization tasks provided in #{/usr/"
+#| "share/live/build/examples/hooks}# which you can copy or symlink to use "
+#| "them in your own configuration."
msgid ""
-"To run commands in the chroot stage, create a hook script containing the "
-"commands in the #{config/chroot_local-hooks}# directory. The hook will run "
-"in the chroot after the rest of your chroot configuration has been applied, "
-"so remember to ensure your configuration includes all packages and files "
-"your hook needs in order to run. See the example chroot hook scripts for "
-"various common chroot customization tasks provided in #{/usr/share/live/"
+"To run commands in the chroot stage, create a hook script with a #{.chroot}# "
+"suffix containing the commands in the #{config/hooks/}# directory. The hook "
+"will run in the chroot after the rest of your chroot configuration has been "
+"applied, so remember to ensure your configuration includes all packages and "
+"files your hook needs in order to run. See the example chroot hook scripts "
+"for various common chroot customization tasks provided in #{/usr/share/live/"
"build/examples/hooks}# which you can copy or symlink to use them in your own "
"configuration."
msgstr ""
@@ -426,15 +449,24 @@ msgstr "3~boot-time-hooks Hook in fase di avvio"
#. type: Plain text
#: en/user_customization-contents.ssi:84
+#, fuzzy
+#| msgid ""
+#| "To execute commands at boot time, you can supply live-config hooks as "
+#| "explained in the \"Customization\" section of its man page. Examine live-"
+#| "config's own hooks provided in #{/lib/live/config/}#, noting the sequence "
+#| "numbers. Then provide your own hook prefixed with an appropriate sequence "
+#| "number, either as a chroot local include in #{config/chroot_local-"
+#| "includes/lib/live/config/}#, or as a custom package as discussed in "
+#| "{Installing modified or third-party packages}#installing-modified-or-"
+#| "third-party-packages."
msgid ""
"To execute commands at boot time, you can supply live-config hooks as "
"explained in the \"Customization\" section of its man page. Examine live-"
"config's own hooks provided in #{/lib/live/config/}#, noting the sequence "
"numbers. Then provide your own hook prefixed with an appropriate sequence "
-"number, either as a chroot local include in #{config/chroot_local-includes/"
-"lib/live/config/}#, or as a custom package as discussed in {Installing "
-"modified or third-party packages}#installing-modified-or-third-party-"
-"packages."
+"number, either as a chroot local include in #{config/includes.chroot/lib/"
+"live/config/}#, or as a custom package as discussed in {Installing modified "
+"or third-party packages}#installing-modified-or-third-party-packages."
msgstr ""
"Per eseguire comandi all'avvio, è possibile fornire degli hook a live-config "
"come spiegato nella sezione \"Customization\" del suo manuale. Controllare "
@@ -452,15 +484,27 @@ msgstr "3~ Hook binari locali"
#. type: Plain text
#: en/user_customization-contents.ssi:88
+#, fuzzy
+#| msgid ""
+#| "To run commands in the binary stage, create a hook script containing the "
+#| "commands in the #{config/binary_local-hooks}#. The hook will run after "
+#| "all other binary commands are run, but before binary_checksums, the very "
+#| "last binary commands The commands in your hook do not run in the chroot, "
+#| "so take care to not modify any files outside of the build tree, or you "
+#| "may damage your build system! See the example binary hook scripts for "
+#| "various common binary customization tasks provided in #{/usr/share/live/"
+#| "build/examples/hooks}# which you can copy or symlink to use them in your "
+#| "own configuration."
msgid ""
-"To run commands in the binary stage, create a hook script containing the "
-"commands in the #{config/binary_local-hooks}#. The hook will run after all "
-"other binary commands are run, but before binary_checksums, the very last "
-"binary commands The commands in your hook do not run in the chroot, so take "
-"care to not modify any files outside of the build tree, or you may damage "
-"your build system! See the example binary hook scripts for various common "
-"binary customization tasks provided in #{/usr/share/live/build/examples/"
-"hooks}# which you can copy or symlink to use them in your own configuration."
+"To run commands in the binary stage, create a hook script with a #{.binary}# "
+"suffix containing the commands in the #{config/hooks/}# directory. The hook "
+"will run after all other binary commands are run, but before "
+"binary_checksums, the very last binary command. The commands in your hook do "
+"not run in the chroot, so take care to not modify any files outside of the "
+"build tree, or you may damage your build system! See the example binary hook "
+"scripts for various common binary customization tasks provided in #{/usr/"
+"share/live/build/examples/hooks}# which you can copy or symlink to use them "
+"in your own configuration."
msgstr ""
"Per eseguire comandi nella fase binaria, creare uno script hook che contenga "
"i comandi in #{config/binary_local-hooks}#. L'hook verrà eseguito dopo tutti "
@@ -479,10 +523,16 @@ msgstr "2~ Preconfigurare le domande di Debconf"
#. type: Plain text
#: en/user_customization-contents.ssi:92
+#, fuzzy
+#| msgid ""
+#| "Files in the #{config/chroot_local-preseed}# directory are considered to "
+#| "be debconf preseed files and are installed by live-build using #{debconf-"
+#| "set-selections}#."
msgid ""
-"Files in the #{config/chroot_local-preseed}# directory are considered to be "
+"Files in the #{config/preseed/}# directory suffixed with #{.preseed}# "
+"followed by the stage (#{.chroot}# or #{.binary}#) are considered to be "
"debconf preseed files and are installed by live-build using #{debconf-set-"
-"selections}#."
+"selections}# during the corresponding stage."
msgstr ""
"I file nella directory #{config/chroot_local-preseed}# sono considerati file "
"di preconfigurazione di debconf e sono installati da live-build usando #"
diff --git a/manual/po/it/user_customization-installer.ssi.po b/manual/po/it/user_customization-installer.ssi.po
index 31cd74a..6822433 100644
--- a/manual/po/it/user_customization-installer.ssi.po
+++ b/manual/po/it/user_customization-installer.ssi.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-04-03 07:04-0200\n"
+"POT-Creation-Date: 2011-11-07 21:19-0400\n"
"PO-Revision-Date: 2010-12-16 18:31+0100\n"
"Last-Translator: lillo sciascia <lillosciascia at gmail.com>\n"
"Language-Team: Italian <tp at lists.linux.it>\n"
@@ -27,48 +27,49 @@ msgstr ""
#: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/user_basics.ssi:30 en/user_basics.ssi:40
-#: en/user_basics.ssi:56 en/user_basics.ssi:71 en/user_basics.ssi:106
-#: en/user_basics.ssi:114 en/user_basics.ssi:126 en/user_basics.ssi:138
-#: en/user_basics.ssi:150 en/user_basics.ssi:158 en/user_basics.ssi:166
-#: en/user_basics.ssi:182 en/user_basics.ssi:192 en/user_basics.ssi:200
-#: en/user_basics.ssi:216 en/user_basics.ssi:224 en/user_basics.ssi:234
-#: en/user_basics.ssi:252 en/user_basics.ssi:280 en/user_basics.ssi:296
-#: en/user_basics.ssi:304 en/user_basics.ssi:324 en/user_basics.ssi:349
+#: en/project_procedures.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
+#: en/user_basics.ssi:116 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:184 en/user_basics.ssi:194 en/user_basics.ssi:202
+#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
+#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
+#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
-#: en/user_customization-installer.ssi:43
+#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
-#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:53
-#: en/user_customization-packages.ssi:66 en/user_customization-packages.ssi:80
-#: en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:112
-#: en/user_customization-packages.ssi:142
-#: en/user_customization-packages.ssi:155
-#: en/user_customization-packages.ssi:165
-#: en/user_customization-packages.ssi:175
-#: en/user_customization-packages.ssi:185
-#: en/user_customization-packages.ssi:199
-#: en/user_customization-packages.ssi:215
-#: en/user_customization-packages.ssi:227
-#: en/user_customization-packages.ssi:291
-#: en/user_customization-packages.ssi:303
-#: en/user_customization-packages.ssi:313
-#: en/user_customization-packages.ssi:331
-#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
-#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
-#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
-#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
-#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:105
-#: 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:178 en/user_examples.ssi:190
-#: en/user_examples.ssi:206 en/user_examples.ssi:220 en/user_examples.ssi:229
-#: en/user_examples.ssi:247 en/user_examples.ssi:255 en/user_examples.ssi:268
-#: en/user_examples.ssi:283 en/user_installation.ssi:38
+#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:54
+#: en/user_customization-packages.ssi:67 en/user_customization-packages.ssi:81
+#: en/user_customization-packages.ssi:101
+#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:140
+#: en/user_customization-packages.ssi:150
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:184
+#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:276
+#: en/user_customization-packages.ssi:288
+#: en/user_customization-packages.ssi:298
+#: en/user_customization-packages.ssi:316
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
+#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
+#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
+#: en/user_customization-runtime.ssi:104 en/user_customization-runtime.ssi:114
+#: en/user_customization-runtime.ssi:122 en/user_examples.ssi:14
+#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
+#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
+#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
+#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
+#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
+#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
+#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
+#: en/user_examples.ssi:277 en/user_installation.ssi:38
#: en/user_installation.ssi:46 en/user_installation.ssi:56
#: en/user_installation.ssi:64 en/user_installation.ssi:74
#: en/user_installation.ssi:82 en/user_installation.ssi:90
@@ -77,7 +78,7 @@ msgstr ""
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:80 en/user_overview.ssi:88
+#: en/user_overview.ssi:48 en/user_overview.ssi:56
msgid "code{"
msgstr "code{"
@@ -91,48 +92,49 @@ msgstr "code{"
#: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/user_basics.ssi:34 en/user_basics.ssi:44
-#: en/user_basics.ssi:62 en/user_basics.ssi:75 en/user_basics.ssi:110
-#: en/user_basics.ssi:118 en/user_basics.ssi:132 en/user_basics.ssi:142
-#: en/user_basics.ssi:154 en/user_basics.ssi:162 en/user_basics.ssi:170
-#: en/user_basics.ssi:186 en/user_basics.ssi:196 en/user_basics.ssi:204
-#: en/user_basics.ssi:220 en/user_basics.ssi:228 en/user_basics.ssi:238
-#: en/user_basics.ssi:272 en/user_basics.ssi:284 en/user_basics.ssi:300
-#: en/user_basics.ssi:308 en/user_basics.ssi:335 en/user_basics.ssi:374
+#: en/project_procedures.ssi:131 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
+#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
+#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
+#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
+#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
-#: en/user_customization-installer.ssi:37
-#: en/user_customization-installer.ssi:48
+#: en/user_customization-installer.ssi:38
+#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:70 en/user_customization-packages.ssi:84
-#: en/user_customization-packages.ssi:98
-#: en/user_customization-packages.ssi:116
-#: en/user_customization-packages.ssi:147
-#: en/user_customization-packages.ssi:161
-#: en/user_customization-packages.ssi:171
-#: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:191
-#: en/user_customization-packages.ssi:203
-#: en/user_customization-packages.ssi:219
-#: en/user_customization-packages.ssi:231
-#: en/user_customization-packages.ssi:295
-#: en/user_customization-packages.ssi:307
-#: en/user_customization-packages.ssi:317
-#: en/user_customization-packages.ssi:344
-#: en/user_customization-packages.ssi:353 en/user_customization-runtime.ssi:18
-#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
-#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
-#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
-#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:110
-#: 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:186 en/user_examples.ssi:202
-#: en/user_examples.ssi:210 en/user_examples.ssi:225 en/user_examples.ssi:233
-#: en/user_examples.ssi:251 en/user_examples.ssi:264 en/user_examples.ssi:279
-#: en/user_examples.ssi:297 en/user_installation.ssi:42
+#: en/user_customization-packages.ssi:46 en/user_customization-packages.ssi:59
+#: en/user_customization-packages.ssi:71 en/user_customization-packages.ssi:85
+#: en/user_customization-packages.ssi:105
+#: en/user_customization-packages.ssi:132
+#: en/user_customization-packages.ssi:146
+#: en/user_customization-packages.ssi:156
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:329
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:346 en/user_customization-runtime.ssi:21
+#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
+#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
+#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
+#: en/user_customization-runtime.ssi:108 en/user_customization-runtime.ssi:118
+#: en/user_customization-runtime.ssi:127 en/user_examples.ssi:20
+#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
+#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
+#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
+#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
+#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
+#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
+#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
+#: en/user_examples.ssi:291 en/user_installation.ssi:42
#: en/user_installation.ssi:50 en/user_installation.ssi:60
#: en/user_installation.ssi:70 en/user_installation.ssi:78
#: en/user_installation.ssi:86 en/user_installation.ssi:94
@@ -140,8 +142,8 @@ msgstr "code{"
#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
-#: en/user_overview.ssi:84 en/user_overview.ssi:92
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:42
+#: en/user_overview.ssi:52 en/user_overview.ssi:60
msgid "}code"
msgstr "}code"
@@ -284,20 +286,21 @@ msgstr ""
"specificata. Per esempio:"
#. type: Plain text
-#: en/user_customization-installer.ssi:35
+#: en/user_customization-installer.ssi:36
#, no-wrap
msgid ""
" $ lb config --architecture i386 --linux-flavours 486 \\\n"
-" --debian-installer live --packages debian-installer-launcher\n"
+" --debian-installer live\n"
+" $ echo debian-installer-launcher >> config/package-lists/my.list.chroot\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-installer.ssi:39
+#: en/user_customization-installer.ssi:40
msgid "2~ Customizing Debian Installer by preseeding"
msgstr "2~ Personalizzare il Debian Installer con la preconfigurazione"
#. type: Plain text
-#: en/user_customization-installer.ssi:41
+#: en/user_customization-installer.ssi:42
msgid ""
"As described in the Debian Installer Manual, Appendix B at http://www.debian."
"org/releases/stable/i386/apb.html, \"Preseeding provides a way to set "
@@ -321,7 +324,7 @@ msgstr ""
"l'impostazione della localizzazione su #{en_US}#:"
#. type: Plain text
-#: en/user_customization-installer.ssi:46
+#: en/user_customization-installer.ssi:47
#, no-wrap
msgid ""
" $ echo \"d-i debian-installer/locale string en_US\" \\\n"
@@ -329,16 +332,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-installer.ssi:50
+#: en/user_customization-installer.ssi:51
msgid "2~ Customizing Debian Installer content"
msgstr "2~ Personalizzare il contenuto del Debian Installer"
#. type: Plain text
-#: en/user_customization-installer.ssi:51
+#: en/user_customization-installer.ssi:52
+#, fuzzy
+#| msgid ""
+#| "For experimental or debugging purposes, you might want to include locally "
+#| "built #{d-i}# component udeb packages. Place these in #{config/"
+#| "binary_local-udebs/}# to include them in the image. Additional or "
+#| "replacement files and directories may be included in the installer initrd "
+#| "as well, in a similar fashion to {Live/chroot local includes}#live-chroot-"
+#| "local-includes, by placing the material in #{config/binary_debian-"
+#| "installer-includes/}#."
msgid ""
"For experimental or debugging purposes, you might want to include locally "
-"built #{d-i}# component udeb packages. Place these in #{config/binary_local-"
-"udebs/}# to include them in the image. Additional or replacement files and "
+"built #{d-i}# component udeb packages. Place these in #{config/packages."
+"binary/}# to include them in the image. Additional or replacement files and "
"directories may be included in the installer initrd as well, in a similar "
"fashion to {Live/chroot local includes}#live-chroot-local-includes, by "
"placing the material in #{config/binary_debian-installer-includes/}#."
diff --git a/manual/po/it/user_customization-packages.ssi.po b/manual/po/it/user_customization-packages.ssi.po
index a304bd0..c7a42a7 100644
--- a/manual/po/it/user_customization-packages.ssi.po
+++ b/manual/po/it/user_customization-packages.ssi.po
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0~a12\n"
-"POT-Creation-Date: 2011-08-14 16:53+0300\n"
+"POT-Creation-Date: 2011-11-07 21:01-0400\n"
"PO-Revision-Date: 2011-08-02 00:53+0200\n"
"Last-Translator: skizzhg <skizzhg at gmx.com>\n"
"Language-Team: Italian <tp at lists.linux.it>\n"
@@ -39,38 +39,38 @@ msgstr ""
#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
-#: en/user_customization-installer.ssi:43
+#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
-#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:53
-#: en/user_customization-packages.ssi:66 en/user_customization-packages.ssi:80
-#: en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:112
-#: en/user_customization-packages.ssi:142
-#: en/user_customization-packages.ssi:155
-#: en/user_customization-packages.ssi:165
-#: en/user_customization-packages.ssi:175
-#: en/user_customization-packages.ssi:185
-#: en/user_customization-packages.ssi:199
-#: en/user_customization-packages.ssi:215
-#: en/user_customization-packages.ssi:227
-#: en/user_customization-packages.ssi:291
-#: en/user_customization-packages.ssi:303
-#: en/user_customization-packages.ssi:313
-#: en/user_customization-packages.ssi:331
-#: en/user_customization-packages.ssi:348
-#: en/user_customization-packages.ssi:356 en/user_customization-runtime.ssi:14
-#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
-#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
-#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
-#: en/user_customization-runtime.ssi:99 en/user_customization-runtime.ssi:107
-#: 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:178 en/user_examples.ssi:190
-#: en/user_examples.ssi:206 en/user_examples.ssi:220 en/user_examples.ssi:229
-#: en/user_examples.ssi:247 en/user_examples.ssi:255 en/user_examples.ssi:268
-#: en/user_examples.ssi:283 en/user_installation.ssi:38
+#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:54
+#: en/user_customization-packages.ssi:67 en/user_customization-packages.ssi:81
+#: en/user_customization-packages.ssi:101
+#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:140
+#: en/user_customization-packages.ssi:150
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:184
+#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:276
+#: en/user_customization-packages.ssi:288
+#: en/user_customization-packages.ssi:298
+#: en/user_customization-packages.ssi:316
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
+#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
+#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
+#: en/user_customization-runtime.ssi:104 en/user_customization-runtime.ssi:114
+#: en/user_customization-runtime.ssi:122 en/user_examples.ssi:14
+#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
+#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
+#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
+#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
+#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
+#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
+#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
+#: en/user_examples.ssi:277 en/user_installation.ssi:38
#: en/user_installation.ssi:46 en/user_installation.ssi:56
#: en/user_installation.ssi:64 en/user_installation.ssi:74
#: en/user_installation.ssi:82 en/user_installation.ssi:90
@@ -79,7 +79,7 @@ msgstr ""
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:80 en/user_overview.ssi:88
+#: en/user_overview.ssi:48 en/user_overview.ssi:56
msgid "code{"
msgstr "code{"
@@ -103,39 +103,39 @@ msgstr "code{"
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
-#: en/user_customization-installer.ssi:37
-#: en/user_customization-installer.ssi:48
+#: en/user_customization-installer.ssi:38
+#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:70 en/user_customization-packages.ssi:84
-#: en/user_customization-packages.ssi:98
-#: en/user_customization-packages.ssi:116
-#: en/user_customization-packages.ssi:147
-#: en/user_customization-packages.ssi:161
-#: en/user_customization-packages.ssi:171
-#: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:191
-#: en/user_customization-packages.ssi:203
-#: en/user_customization-packages.ssi:219
-#: en/user_customization-packages.ssi:231
-#: en/user_customization-packages.ssi:295
-#: en/user_customization-packages.ssi:307
-#: en/user_customization-packages.ssi:317
-#: en/user_customization-packages.ssi:344
-#: en/user_customization-packages.ssi:352
-#: en/user_customization-packages.ssi:361 en/user_customization-runtime.ssi:18
-#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
-#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
-#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
-#: en/user_customization-runtime.ssi:103 en/user_customization-runtime.ssi:112
-#: 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:186 en/user_examples.ssi:202
-#: en/user_examples.ssi:210 en/user_examples.ssi:225 en/user_examples.ssi:233
-#: en/user_examples.ssi:251 en/user_examples.ssi:264 en/user_examples.ssi:279
-#: en/user_examples.ssi:297 en/user_installation.ssi:42
+#: en/user_customization-packages.ssi:46 en/user_customization-packages.ssi:59
+#: en/user_customization-packages.ssi:71 en/user_customization-packages.ssi:85
+#: en/user_customization-packages.ssi:105
+#: en/user_customization-packages.ssi:132
+#: en/user_customization-packages.ssi:146
+#: en/user_customization-packages.ssi:156
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:329
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:346 en/user_customization-runtime.ssi:21
+#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
+#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
+#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
+#: en/user_customization-runtime.ssi:108 en/user_customization-runtime.ssi:118
+#: en/user_customization-runtime.ssi:127 en/user_examples.ssi:20
+#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
+#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
+#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
+#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
+#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
+#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
+#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
+#: en/user_examples.ssi:291 en/user_installation.ssi:42
#: en/user_installation.ssi:50 en/user_installation.ssi:60
#: en/user_installation.ssi:70 en/user_installation.ssi:78
#: en/user_installation.ssi:86 en/user_installation.ssi:94
@@ -143,8 +143,8 @@ msgstr "code{"
#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
-#: en/user_overview.ssi:84 en/user_overview.ssi:92
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:42
+#: en/user_overview.ssi:52 en/user_overview.ssi:60
msgid "}code"
msgstr "}code"
@@ -212,7 +212,7 @@ msgstr "3~ Distribuzione, le aree di archivio e le modalità"
msgid ""
"The distribution you choose has the broadest impact on which packages are "
"available to include in your live image. Specify the codename, which "
-"defaults to #{squeeze}# for the Squeeze version of live-build. Any current "
+"defaults to #{wheezy}# for the Wheezy version of live-build. Any current "
"distribution carried in the Debian archive may be specified by its codename "
"here. (See {Terms}#terms for more details.) The #{--distribution}# option "
"not only influences the source of packages within the archive, but also "
@@ -222,8 +222,8 @@ msgid ""
msgstr ""
"La distribuzione che viene scelta ha un ampio impatto su quali pacchetti "
"siano disponibili per essere inclusi nell'immagine live. Specificare il nome "
-"in codice, il predefinito per la versione Squeeze di live-build è #{squeeze}"
-"#; qualsiasi attuale distribuzione mantenuta negli archivi Debian può essere "
+"in codice, il predefinito per la versione Wheezy di live-build è #{wheezy}#; "
+"qualsiasi attuale distribuzione mantenuta negli archivi Debian può essere "
"qui specificata con il suo nome in codice. (Per ulteriori dettagli "
"consultare il {Glossario}#terms). L'opzione #{--distribution}# non solo "
"influenza la sorgente dei pacchetti nell'archivio, ma indica a #{live-build}"
@@ -287,18 +287,31 @@ msgstr "3~ Mirror delle distribuzioni"
#. type: Plain text
#: en/user_customization-packages.ssi:34
+#, fuzzy
+#| msgid ""
+#| "The Debian archive is replicated across a large network of mirrors around "
+#| "the world so that people in each region can choose a nearby mirror for "
+#| "best download speed. Each of the #{--mirror-*}# options governs which "
+#| "distribution mirror is used at various stages of the build. Recall from "
+#| "{Stages of the build}#stages-of-the-build that the *bootstrap* stage is "
+#| "when the chroot is initially populated by debootstrap with a minimal "
+#| "system, and the *chroot* stage is when the chroot used to construct the "
+#| "live system's filesystem is built. Thus, the corresponding mirror "
+#| "switches are used for those stages, and later, in the *binary* stage, the "
+#| "#{--mirror-binary}# and #{--mirror-binary-security}# values are used, "
+#| "superceding any mirrors used in an earlier stage."
msgid ""
"The Debian archive is replicated across a large network of mirrors around "
"the world so that people in each region can choose a nearby mirror for best "
-"download speed. Each of the #{--mirror-*}# options governs which "
+"download speed. Each of the #{--parent-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."
+"those stages, and later, in the *binary* stage, the #{--parent-mirror-binary}"
+"# and #{--parent-mirror-binary-security}# values are used, superceding any "
+"mirrors used in an earlier stage."
msgstr ""
"L'archivio Debian è replicato attraverso una vasta rete di mirror in tutto "
"il mondo cosicché chiunque in ogni nazione può selezionare il mirror più "
@@ -323,48 +336,68 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:38
+#, fuzzy
+#| msgid ""
+#| "To set the distribution mirrors used at build time to point at a local "
+#| "mirror, it is sufficient to set #{--mirror-bootstrap}# and #{--mirror-"
+#| "chroot-security}# as follows."
msgid ""
"To set the distribution mirrors used at build time to point at a local "
-"mirror, it is sufficient to set #{--mirror-bootstrap}# and #{--mirror-chroot-"
-"security}# as follows."
+"mirror, it is sufficient to set #{--parent-mirror-bootstrap}#, #{--parent-"
+"mirror-chroot-security}# and #{--parent-mirror-chroot-backports}# as follows."
msgstr ""
"Per impostare i mirror delle distribuzioni usati in fase di compilazione ad "
"uno locale, è sufficiente impostare #{--mirror-bootstrap}# e #{--mirror-"
"chroot-security}# come segue."
#. type: Plain text
-#: en/user_customization-packages.ssi:43
+#: en/user_customization-packages.ssi:44
#, no-wrap
msgid ""
-" $ lb config --mirror-bootstrap http://localhost/debian/ \\\n"
-" --mirror-chroot-security http://localhost/debian-security/\n"
+" $ lb config --parent-mirror-bootstrap http://localhost/debian/ \\\n"
+" --parent-mirror-chroot-security http://localhost/debian-security/ \\\n"
+"\t --parent-mirror-chroot-backports http://localhost/debian-backports/\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:47
+#: en/user_customization-packages.ssi:48
+#, fuzzy
+#| msgid ""
+#| "The chroot mirror, specified by #{--mirror-chroot}#, defaults to the #{--"
+#| "mirror-bootstrap}# value."
msgid ""
-"The chroot mirror, specified by #{--mirror-chroot}#, defaults to the #{--"
-"mirror-bootstrap}# value."
+"The chroot mirror, specified by #{--parent-mirror-chroot}#, defaults to the #"
+"{--parent-mirror-bootstrap}# value."
msgstr ""
"Il mirror chroot, specificato da #{--mirror-chroot}#, è impostato al valore "
"di #{--mirror-bootstrap}#."
#. type: Plain text
-#: en/user_customization-packages.ssi:49
+#: en/user_customization-packages.ssi:50
msgid "3~ Distribution mirrors used at run time"
msgstr "3~ Mirror delle distribuzioni usate durante l'esecuzione"
#. type: Plain text
-#: en/user_customization-packages.ssi:51
-msgid ""
-"The #{--mirror-binary*}# options govern the distribution mirrors placed in "
-"the binary image. These may be used to install additional packages while "
-"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."
+#: en/user_customization-packages.ssi:52
+#, fuzzy
+#| 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."
+msgid ""
+"The #{--parent-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 ""
"Le opzioni #{--mirror-binary*}# determinano i mirror delle distribuzioni "
"inseriti nell'immagine binaria. Questi possono essere usati per installare "
@@ -378,29 +411,39 @@ msgstr ""
"raggiungibile il \"#{mirror}#\"."
#. type: Plain text
-#: en/user_customization-packages.ssi:56
+#: en/user_customization-packages.ssi:57
#, no-wrap
msgid ""
-" $ lb config --mirror-binary http://mirror/debian/ \\\n"
-" --mirror-binary-security http://mirror/debian-security/\n"
+" $ lb config --parent-mirror-binary http://mirror/debian/ \\\n"
+" --parent-mirror-binary-security http://mirror/debian-security/\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:60
+#: en/user_customization-packages.ssi:61
msgid "3~additional-repositories Additional repositories"
msgstr "3~additional-repositories Repository addizionali"
#. type: Plain text
-#: en/user_customization-packages.ssi:62
+#: en/user_customization-packages.ssi:63
+#, fuzzy
+#| msgid ""
+#| "You may add more repositories, broadening your package choices beyond "
+#| "what is available in your target distribution. These may be, for example, "
+#| "for backports, experimental or custom packages. To configure additional "
+#| "repositories, create #{config/chroot_sources/your-repository.chroot}#, "
+#| "and/or #{config/chroot_sources/your-repository.binary}# files. As with "
+#| "the #{--mirror-*}# options, these govern the repositories used in the "
+#| "*chroot* stage when building the image, and in the *binary* stage, i.e. "
+#| "for use when running the live system."
msgid ""
"You may add more repositories, broadening your package choices beyond what "
"is available in your target distribution. These may be, for example, for "
"backports, experimental or custom packages. To configure additional "
-"repositories, create #{config/chroot_sources/your-repository.chroot}#, and/"
-"or #{config/chroot_sources/your-repository.binary}# files. As with the #{--"
-"mirror-*}# options, these govern the repositories used in the *chroot* stage "
-"when building the image, and in the *binary* stage, i.e. for use when "
-"running the live system."
+"repositories, create #{config/archives/your-repository.list.chroot}#, and/or "
+"#{config/archives/your-repository.list.binary}# files. As with the #{--"
+"parent-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 ""
"Si possono aggiungere altri repository, ampliando così la scelta dei "
"pacchetti al di là di quelli disponibili nella distribuzione di "
@@ -413,9 +456,14 @@ msgstr ""
"sistema live è avviato."
#. type: Plain text
-#: en/user_customization-packages.ssi:64
+#: en/user_customization-packages.ssi:65
+#, fuzzy
+#| msgid ""
+#| "For example, #{config/chroot_sources/live.chroot}# allows you to install "
+#| "packages from the debian live snapshot repository at live system build "
+#| "time."
msgid ""
-"For example, #{config/chroot_sources/live.chroot}# allows you to install "
+"For example, #{config/archives/live.list.chroot}# allows you to install "
"packages from the debian live snapshot repository at live system build time."
msgstr ""
"Per esempio, #{config/chroot_sources/live.chroot}# permette di installare "
@@ -423,15 +471,20 @@ msgstr ""
"del sistema live."
#. type: Plain text
-#: en/user_customization-packages.ssi:68
+#: en/user_customization-packages.ssi:69
#, no-wrap
msgid " deb http://live.debian.net/ sid-snapshots main contrib non-free\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:72
+#: en/user_customization-packages.ssi:73
+#, fuzzy
+#| msgid ""
+#| "If you add the same line to #{config/chroot_sources/live.binary}#, the "
+#| "repository will be added to your live system's #{/etc/apt/sources.list.d/}"
+#| "# directory."
msgid ""
-"If you add the same line to #{config/chroot_sources/live.binary}#, the "
+"If you add the same line to #{config/archives/live.list.binary}#, the "
"repository will be added to your live system's #{/etc/apt/sources.list.d/}# "
"directory."
msgstr ""
@@ -440,47 +493,60 @@ msgstr ""
"sistema live."
#. type: Plain text
-#: en/user_customization-packages.ssi:74
+#: en/user_customization-packages.ssi:75
msgid "If such files exist, they will be picked up automatically."
msgstr "Se il file esiste, saranno prelevati automaticamente."
#. type: Plain text
-#: en/user_customization-packages.ssi:76
+#: en/user_customization-packages.ssi:77
+#, fuzzy
+#| msgid ""
+#| "You should also put the GPG key used to sign the repository into #{config/"
+#| "chroot_sources/your-repository.{binary,chroot}.gpg}# files."
msgid ""
"You should also put the GPG key used to sign the repository into #{config/"
-"chroot_sources/your-repository.{binary,chroot}.gpg}# files."
+"archives/your-repository.gpg.{binary,chroot}}# files."
msgstr ""
"Bisogna inoltre inserire la chiave GPG usata per firmare il repository nei "
"file #{config/chroot_sources/vostro-repository.{binary,chroot}.gpg}#."
#. type: Plain text
-#: en/user_customization-packages.ssi:78
-#, no-wrap
-msgid "*{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:\n"
+#: en/user_customization-packages.ssi:79
+#, fuzzy, no-wrap
+#| msgid "*{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:\n"
+msgid "*{Note:}* some preconfigured package repositories are available for easy selection through the #{--archives}# option, e.g. for enabling live snapshots, a simple command is enough to enable it:\n"
msgstr "*{Nota:}* alcuni repository di pacchetti preconfigurati sono disponibili per una facile selezione attraverso l'opzione #{--repository}#, per abilitare gli snapshot live è sufficiente un semplice comando:\n"
#. type: Plain text
-#: en/user_customization-packages.ssi:82 en/user_installation.ssi:148
+#: en/user_customization-packages.ssi:83 en/user_installation.ssi:148
#, no-wrap
-msgid " $ lb config --repository live.debian.net\n"
+msgid " $ lb config --archives live.debian.net\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:86
+#: en/user_customization-packages.ssi:87
msgid "2~choosing-packages-to-install Choosing packages to install"
msgstr "2~choosing-packages-to-install Scegliere i pacchetti da installare"
#. type: Plain text
-#: en/user_customization-packages.ssi:88
+#: en/user_customization-packages.ssi:89
+#, fuzzy
+#| msgid ""
+#| "There are a number of ways to choose which packages live-build will "
+#| "install in your image, covering a variety of different needs. You can "
+#| "simply name 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."
msgid ""
"There are a number of ways to choose which packages live-build will install "
"in your image, covering a variety of different needs. You can simply name "
-"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."
+"individual packages to install in a package list. You can also choose "
+"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 ""
"Ci sono diversi modi per scegliere quali pacchetti live-build installerà "
"nell'immagine, coprendo una gamma di esigenze diverse. Si possono scegliere "
@@ -492,54 +558,12 @@ msgstr ""
"disponibili in un repository."
#. type: Plain text
-#: en/user_customization-packages.ssi:90
-msgid "3~ Choosing a few packages"
-msgstr "3~ Scegliere pochi pacchetti"
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:92
-msgid ""
-"When the number of packages added is small, simply specify #{--packages}#. "
-"For example:"
-msgstr ""
-"Quando il numero dei pacchetti da aggiungere è esiguo è sufficiente "
-"specificare #{--packages}#. Per esempio:"
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:96
-#, no-wrap
-msgid " $ lb config --packages \"package1 package2 package3\"\n"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:100
-msgid ""
-"The behaviour of live-build when specifying a package that does not exist is "
-"determined by your choice of APT utility. See {Choosing apt or aptitude}"
-"#choosing-apt-or-aptitude for more details."
-msgstr ""
-"Quando si specifica un pacchetto che non esiste, il comportamento di live-"
-"build è determinato dalla scelta delle utilità di APT. Per ulteriori "
-"dettagli si veda {Scegliere apt o aptitude}#choosing-apt-or-aptitude."
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:102
-msgid ""
-"If you need to specify a large number of packages to be installed or you "
-"need flexibility regarding which packages to install, use package lists as "
-"discussed in the following section, {Package lists}#package-lists."
-msgstr ""
-"Se si necessita di specificare un gran numero di pacchetti o si desidera "
-"flessibilità su quali installare, usare gli elenchi dei pacchetti come "
-"discusso nella prossima sezione, {Elenchi di pacchetti}#package-lists."
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:104
+#: en/user_customization-packages.ssi:91
msgid "3~package-lists Package lists"
msgstr "3~package-lists Elenchi di pacchetti"
#. type: Plain text
-#: en/user_customization-packages.ssi:106
+#: en/user_customization-packages.ssi:93
msgid ""
"Package lists are a powerful way of expressing which packages should be "
"installed. The list syntax supports included files and conditional sections "
@@ -560,52 +584,47 @@ msgstr ""
"propri elenchi o usare una combinazione di entrambi."
#. type: Plain text
-#: en/user_customization-packages.ssi:108
+#: en/user_customization-packages.ssi:95
+#, fuzzy, no-wrap
+#| msgid "The behaviour of live-build when specifying a package that does not exist is determined by your choice of APT utility. See {Choosing apt or aptitude}#choosing-apt-or-aptitude for more details."
+msgid "*{Note:}* 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.\n"
+msgstr "Quando si specifica un pacchetto che non esiste, il comportamento di live-build è determinato dalla scelta delle utilità di APT. Per ulteriori dettagli si veda {Scegliere apt o aptitude}#choosing-apt-or-aptitude."
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:97
msgid "3~ Predefined package lists"
msgstr "3~ Elenchi predefiniti di pacchetti"
#. type: Plain text
-#: en/user_customization-packages.ssi:110
+#: en/user_customization-packages.ssi:99
+#, fuzzy
+#| msgid ""
+#| "The simplest way to use lists is to specify one or more predefined lists "
+#| "with the #{--packages-lists}# option. For example:"
msgid ""
"The simplest way to use lists is to specify one or more predefined lists "
-"with the #{--packages-lists}# option. For example:"
+"with the #{--package-lists}# option. For example:"
msgstr ""
"Il modo più semplice per usare gli elenchi è di specificarne uno o più con "
"l'opzione #{--packages-lists}#. Per esempio:"
#. type: Plain text
-#: en/user_customization-packages.ssi:114
+#: en/user_customization-packages.ssi:103
#, no-wrap
-msgid " $ lb config --packages-lists \"gnome-core rescue\"\n"
+msgid " $ lb config --package-lists \"gnome rescue\"\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:118
-msgid ""
-"In addition to these lists, live-build supports four virtual package lists: #"
-"{gnome-desktop}#, #{kde-desktop}#, #{lxde-desktop}# and #{xfce-desktop}#, "
-"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 ""
-"In aggiunta a questi elenchi, live-build ne gestisce quattro virtuali: #"
-"{gnome-desktop}#, #{kde-desktop}#, #{lxde-desktop}# and #{xfce-desktop}#, "
-"ciascuno dei quali fornisce una selezione più estesa di pacchetti che "
-"corrisponde ai predefiniti dell'installatore Debian per ciascun ambiente "
-"desktop. Per ulteriori dettagli si veda {Task per desktop e lingua}#desktop-"
-"and-language-tasks."
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:120
-#, no-wrap
-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.\n"
-msgstr "*{Nota:}* le immagini pre-costruite di GNOME, KDE, LXDE e XFCE disponibili per essere scaricate da http://live.debian.net sono costruite usando i corrispondenti elenchi #{*-desktop}# virtuali.\n"
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:122
+#: en/user_customization-packages.ssi:107
+#, fuzzy
+#| 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."
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 "
+"build/package-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 ""
@@ -615,89 +634,98 @@ msgstr ""
"come descritto nella sezioni seguenti."
#. type: Plain text
-#: en/user_customization-packages.ssi:124
+#: en/user_customization-packages.ssi:109
msgid "3~ Local package lists"
msgstr "3~ Elenchi locali dei pacchetti"
#. type: Plain text
-#: en/user_customization-packages.ssi:126
+#: en/user_customization-packages.ssi:111
+#, fuzzy
+#| msgid ""
+#| "You may supplement or replace entirely the supplied lists using local "
+#| "package lists stored in #{config/chroot_local-packageslists/}#."
msgid ""
-"You may supplement or replace entirely the supplied lists using local "
-"package lists stored in #{config/chroot_local-packageslists/}#."
+"You may supplement the predefined lists using local package lists stored in #"
+"{config/package-lists/}#."
msgstr ""
"Gli elenchi si possono integrare o sostituire interamente usando quelli "
"locali dei pacchetti in #{config/chroot_local-packageslists/}#."
#. type: Plain text
-#: en/user_customization-packages.ssi:128
+#: en/user_customization-packages.ssi:113
+#, fuzzy
+#| msgid ""
+#| "Package lists that exist in this directory need to have a #{.list}# "
+#| "suffix in order to be processed."
msgid ""
"Package lists that exist in this directory need to have a #{.list}# suffix "
-"in order to be processed. Local package lists always override package lists "
-"distributed with live-build. This can cause undesired effects, we therefore "
-"recommend to use unique names for local package lists."
+"in order to be processed, and then an additional stage suffix, #{.chroot}# "
+"or #{.binary}# to indicate which stage the list is for."
msgstr ""
-"Per essere processati, questi elenchi devono avere il suffisso #{.list}#. I "
-"locali sovrascrivono sempre quelli forniti con live-build, questo può "
-"causare effetti indesiderati perciò si raccomanda di usare nomi univoci."
+"Per essere processate le liste dei pacchetti che si trovano nella directory "
+"deve avere un suffisso #{.list}#."
#. type: Plain text
-#: en/user_customization-packages.ssi:130
-msgid "3~ Local binary package lists"
-msgstr "3~ Elenchi locali di pacchetti binari"
+#: en/user_customization-packages.ssi:115
+#, no-wrap
+msgid "*{Note:}* If you don't specify the stage suffix, the list will be used for both stages. Normally, you want to specify #{.list.chroot}# so that the packages will only be installed in the live filesystem and not have an extra copy of the #{.deb}# placed on the media.\n"
+msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:132
-msgid ""
-"In case you want to include some required .deb packages to live media's #"
-"{pool/}# (without installing them onto the live image) you may need to use "
-"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 ""
-"Nel caso in cui si desideri includere dei pacchetti .deb alla directory #"
-"{pool/}# della live (senza installarli sull'immagine) bisogna usare gli "
-"elenchi utilizzando quelli locali dei pacchetti binari situati in #{config/"
-"binary_local-packageslists/}#. Tale supporto può essere utilizzato come "
-"immagine personalizzata di Debian per installazioni non in linea."
+#: en/user_customization-packages.ssi:117
+msgid "3~ Local binary package lists"
+msgstr "3~ Elenchi locali di pacchetti binari"
#. type: Plain text
-#: en/user_customization-packages.ssi:134
+#: en/user_customization-packages.ssi:119
msgid ""
-"Package lists that exist in this directory need to have a #{.list}# suffix "
-"in order to be processed."
+"To make a binary stage list, place a file suffixed with #{.list.binary}# in #"
+"{config/package-lists/}#. These packages are not installed in the live "
+"filesystem, but are included on the live media under #{pool/}#. You would "
+"typically use such a list with one of the non-live installer variants. As "
+"mentioned above, if you want this list to be the same as your chroot stage "
+"list, simply use the #{.list}# suffix by itself."
msgstr ""
-"Per essere processate le liste dei pacchetti che si trovano nella directory "
-"deve avere un suffisso #{.list}#."
#. type: Plain text
-#: en/user_customization-packages.ssi:136
+#: en/user_customization-packages.ssi:121
msgid "3~ Extending a provided package list using includes"
msgstr "3~ Estendere un'elenco di pacchetti usando gli include"
#. type: Plain text
-#: en/user_customization-packages.ssi:138
+#: en/user_customization-packages.ssi:123
+#, fuzzy
+#| 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."
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."
+"includes. Refer to these in the #{/usr/share/live/build/package-lists/}# "
+"directory, as they serve as good examples of how to write your own lists."
msgstr ""
"Gli elenchi di pacchetti inclusi in live-build fanno un notevole uso di "
"include. Far riferimento a questi nella directory #{/usr/share/live/build/"
"lists/}#, in quanto portano ottimi esempi su come scrivere i propri."
#. type: Plain text
-#: en/user_customization-packages.ssi:140
+#: en/user_customization-packages.ssi:125
+#, fuzzy
+#| msgid ""
+#| "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:"
msgid ""
"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:"
+"iceweasel, create #{config/package-lists/my.list.chroot}# with the following "
+"contents:"
msgstr ""
"Per esempio, per creare un elenco che includa quello predefinito di #{gnome}"
"# più iceweasel, creare #{config/chroot_local-packageslists/mygnome.list}# "
"con i seguenti contenuti:"
#. type: Plain text
-#: en/user_customization-packages.ssi:145
+#: en/user_customization-packages.ssi:130
#, no-wrap
msgid ""
" #include <gnome>\n"
@@ -705,12 +733,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:134
msgid "3~ Using conditionals inside package lists"
msgstr "3~ Usare condizioni all'interno degli elenchi di pacchetti"
#. type: Plain text
-#: en/user_customization-packages.ssi:151
+#: en/user_customization-packages.ssi:136
msgid ""
"Any of the live-build configuration variables stored in #{config/*}# (minus "
"the #{LB_}# prefix) may be used in conditional statements in package lists. "
@@ -727,7 +755,7 @@ msgstr ""
"abbia senso, come #{DISTRIBUTION}#, #{ARCHITECTURE}# o #{ARCHIVE_AREAS}#."
#. type: Plain text
-#: en/user_customization-packages.ssi:153
+#: en/user_customization-packages.ssi:138
msgid ""
"For example, to install #{ia32-libs}# if the #{--architecture amd64}# is "
"specified:"
@@ -736,7 +764,7 @@ msgstr ""
"amd64}#:"
#. type: Plain text
-#: en/user_customization-packages.ssi:159
+#: en/user_customization-packages.ssi:144
#, no-wrap
msgid ""
" #if ARCHITECTURE amd64\n"
@@ -745,7 +773,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:148
msgid ""
"You may test for any one of a number of values, e.g. to install #{memtest86+}"
"# if either #{--architecture i386}# or #{--architecture amd64}# is specified:"
@@ -755,7 +783,7 @@ msgstr ""
"architecture amd64}#:"
#. type: Plain text
-#: en/user_customization-packages.ssi:169
+#: en/user_customization-packages.ssi:154
#, no-wrap
msgid ""
" #if ARCHITECTURE i386 amd64\n"
@@ -764,7 +792,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:173
+#: en/user_customization-packages.ssi:158
msgid ""
"You may also test against variables that may contain more than one value, e."
"g. to install #{vrms}# if either #{contrib}# or #{non-free}# is specified "
@@ -775,7 +803,7 @@ msgstr ""
"free}# tramite #{--archive-areas}#:"
#. type: Plain text
-#: en/user_customization-packages.ssi:179
+#: en/user_customization-packages.ssi:164
#, no-wrap
msgid ""
" #if ARCHIVE_AREAS contrib non-free\n"
@@ -784,12 +812,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:183
+#: en/user_customization-packages.ssi:168
msgid "A conditional may surround an #{#include}# directive:"
msgstr "Una condizione può coinvolegere una direttiva #{#include}#:"
#. type: Plain text
-#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:174
#, no-wrap
msgid ""
" #if ARCHITECTURE amd64\n"
@@ -798,24 +826,33 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:178
msgid "The nesting of conditionals is not supported."
msgstr "Le condizioni nidificate non sono supportate."
#. type: Plain text
-#: en/user_customization-packages.ssi:195
+#: en/user_customization-packages.ssi:180
msgid "3~ Tasks"
msgstr "3~ Task"
#. type: Plain text
-#: en/user_customization-packages.ssi:197
+#: en/user_customization-packages.ssi:182
+#, fuzzy
+#| 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."
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."
+"live-build by putting them in a list in #{config/task-lists/}#, as in the "
+"example below."
msgstr ""
"L'installatore Debian offre all'utente la scelta di vari elenchi di "
"pacchetti pre-selezionati, ognuno dei quali focalizzato su un particolare "
@@ -826,13 +863,15 @@ msgstr ""
"#, come nell'esempio seguente."
#. type: Plain text
-#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:187
#, no-wrap
-msgid " $ lb config --tasks \"mail-server file-server\"\n"
+msgid ""
+" $ lb config\n"
+" $ echo \"mail-server file-server\" >> config/task-lists/my.list.chroot\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:205
+#: en/user_customization-packages.ssi:191
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, "
@@ -845,20 +884,32 @@ msgstr ""
"con #{tasksel --task-packages}#."
#. type: Plain text
-#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:193
msgid "3~desktop-and-language-tasks Desktop and language tasks"
msgstr "3~desktop-and-language-tasks Task per desktop e lingua"
#. type: Plain text
-#: en/user_customization-packages.ssi:209
-msgid ""
-"Desktop and language tasks are special cases. In the Debian Installer, if "
-"the medium was prepared for a particular desktop environment flavour, the "
-"corresponding task will be automatically installed. Thus, 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."
+#: en/user_customization-packages.ssi:195
+#, fuzzy
+#| 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 #"
+#| "{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."
+msgid ""
+"Desktop and language tasks are special cases that need some extra planning "
+"and configuration. Live images are different from Debian Installer images in "
+"this respect. 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 internal #{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 ""
"I task per i desktop e la lingua sono un caso speciale. Nell'installatore "
"Debian, se il supporto è stato preparato per un particolare ambiente "
@@ -870,22 +921,31 @@ msgstr ""
"corrispondenti task della lingua."
#. type: Plain text
-#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:197
msgid ""
-"In live-build, therefore, these special cases are also given special "
-"consideration, but with three notable differences at the time of writing."
+"When developing a desktop live image, the image typically boots directly to "
+"a working desktop, the choices of both desktop and default language having "
+"been made at build time, not at run time as in the case of the Debian "
+"Installer. That's not to say that a live image couldn't be built to support "
+"multiple desktops or multiple languages and offer the user a choice, but "
+"that is not live-build's default behaviour."
msgstr ""
-"Perciò in live-build a questi casi particolari è anche data particolare "
-"considerazione, ma con tre differenze notevoli al momento in cui si scrive."
#. type: Plain text
-#: en/user_customization-packages.ssi:213
-msgid ""
-"First, there is no provision made yet automatically for language tasks, "
-"although a subset of those packages are included if you specify #{lb config "
-"--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:"
+#: en/user_customization-packages.ssi:199
+#, fuzzy
+#| msgid ""
+#| "First, there is no provision made yet automatically for language tasks, "
+#| "although a subset of those packages are included if you specify #{lb "
+#| "config --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:"
+msgid ""
+"Because there is no provision made automatically for language tasks, which "
+"include such things as language-specific fonts and input-method packages, if "
+"you want them, you need to specify them in your configuration. For example, "
+"a GNOME desktop image containing support for Japanese might include these "
+"tasks:"
msgstr ""
"Primo, non è stata fatta ancora alcuna previsione sui task della lingua, "
"sebbene sia incluso un sottoinsieme di questi pacchetti specificando #{lb "
@@ -894,72 +954,40 @@ msgstr ""
"specificati nella configurazione. Per esempio:"
#. type: Plain text
-#: en/user_customization-packages.ssi:217
+#: en/user_customization-packages.ssi:205
#, no-wrap
-msgid " $ lb config --tasks \"japanese japanese-desktop japanese-gnome-desktop\"\n"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:221
msgid ""
-"Second, live-build supports #{*-desktop}# virtual package lists for each of "
-"the desktop flavours mentioned above, which select the #{standard-x11}# "
-"predefined package list, the corresponding #{*-desktop}# task and three "
-"additional tasks: #{desktop}#, #{standard}# and #{laptop}#. So, for example, "
-"if you specify #{--packages-lists gnome-desktop}#, it is equivalent to "
-"specifying #{--packages debian-installer-launcher --packages-lists standard-"
-"x11 --tasks \"gnome-desktop desktop standard laptop\"}#."
+" $ lb config\n"
+" $ echo \"gnome-desktop desktop standard laptop\" >> config/task-lists/my.list.chroot\n"
+" $ echo \"japanese japanese-desktop japanese-gnome-desktop\" >> config/task-lists/my.list.chroot\n"
msgstr ""
-"Secondo, live-build gestisce gli elenchi #{*-desktop}# virtuali dei "
-"pacchetti per ogni tipo di desktop menzionato sopra, il quale seleziona "
-"l'elenco predefinito #{standard-x11}#, il corrispondente task #{*-desktop}# "
-"e tre task addizionali: #{desktop}#, #{standard}# e #{laptop}#. Così per "
-"esempio, se si specifica #{--packages-lists gnome-desktop}#, è l'equivalente "
-"di #{--packages debian-installer-launcher --packages-lists standard-x11 --"
-"tasks \"gnome-desktop desktop standard laptop\"}#."
#. type: Plain text
-#: en/user_customization-packages.ssi:223
+#: en/user_customization-packages.ssi:209
msgid ""
-"Third, if any of the tasks for these desktop flavours are selected, either "
-"explicitly through #{--tasks}# or implicitly by #{--packages-lists}#, 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."
+"Since desktop tasks are \"internal\" tasks, for every desktop flavour task "
+"included in the image, the corresponding value, if it differs from the "
+"default, \"gnome\", must be preseeded in the \"tasksel/desktop\" debconf "
+"variable or else tasksel will not recognize and install it. Thus:"
msgstr ""
-"Terzo, se viene selezionato uno qualsiasi dei task per i vari desktop, sia "
-"esplicitamente con #{--tasks}# o implicitamente con #{--packages-lists}#, "
-"live-build pre-imposterà il corrispondente valore desktop per l'installatore "
-"Debian (se incluso) per garantire che segua le proprie regole per installare "
-"i vari tipi di desktop."
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:225
-#, no-wrap
-msgid "*{Note:}* There is also an experimental #{--language}# option that has an overlapping purpose with language tasks. For any language for which it is known that there are #{*-l10n}# packages, if #{--language}# is specified, those packages will be installed. Furthermore, if any #{syslinux}# templates matching the language are found, they will be used instead of the default English templates. The package selection done by #{--language}# is a poor approximation of language tasks, as it requires that the list of packages to include per language be maintained internally in live-build, and besides, language tasks are more comprehensive and flexible. However, the #{syslinux}# aspect is still useful. Thus, if you use #{--bootloader syslinux}# and templates for the specified language exist either in #{/usr/share/live/build/templates/syslinux/}# or #{config/templates/syslinux/}#, consider using this option, possibly in combination with tasks to ensure all relevant packages are in
stalled. For example:\n"
-msgstr "*{Nota:}* esiste anche l'opzione sperimentale #{--language}# con lo scopo di sovrapporsi ai task della lingua. Se #{--language}# è specificato, per ogni lingua per la quale sia nota la presenza di pacchetti #{*-l10n}# questi verranno installati. Inoltre se uno dei modelli #{syslinux}# corrisponde alla lingua trovata, questi saranno usati al posto di quello inglese predefinito. La selezione dei pacchetti fatta con #{--language}# è un'approssimazione dei task della lingua, in quanto richiede che l'elenco dei pacchetti da includere per ogni lingua sia mantenuta all'interno di live-build, oltretutto i task della lingua sono più completi e flessibili; per quanto l'aspetto di #{syslinux}# sia comunque utile. Quindi utilizzando #{--bootloader syslinux}#, e se i modelli per la lingua specificata esistono in #{/usr/share/live/build/templates/syslinux/}# o in #{config/templates/syslinux/}#, si può considerare questa opzione, eventualmente in combinazione con i task per gar
antire che vengano installati tutti i pacchetti interessati. Esempio:\n"
#. type: Plain text
-#: en/user_customization-packages.ssi:229
+#: en/user_customization-packages.ssi:214
#, no-wrap
-msgid " $ lb config --language es\n"
+msgid ""
+" $ lb config\n"
+" $ echo 'tasksel tasksel/desktop multiselect kde' >> config/preseed/my.preseed.chroot\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:233
+#: en/user_customization-packages.ssi:218
msgid ""
-"Even so, it is limited in that it only supports a single language and a "
-"single bootloader. Therefore, for all of these reasons, the future of this "
-"option is under review, possibly to be replaced with something entirely "
-"different in the next major release of live-build."
+"This parameter can take multiple values, e.g. \"lxde xfce\" instead of \"kde"
+"\"."
msgstr ""
-"Anche così è limitato dal fatto che gestisce una sola lingua e un solo "
-"bootloader. Pertanto, per tutte queste ragioni, il futuro di questa opzione "
-"è in revisione, potrebbe essere sostituito con qualcosa di totalmente "
-"diverso nel prossimo rilascio di live-build."
#. type: Plain text
-#: en/user_customization-packages.ssi:235
+#: en/user_customization-packages.ssi:220
msgid ""
"2~installing-modified-or-third-party-packages Installing modified or third-"
"party packages"
@@ -968,7 +996,7 @@ msgstr ""
"modificati o di terze parti"
#. type: Plain text
-#: en/user_customization-packages.ssi:237
+#: en/user_customization-packages.ssi:222
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 "
@@ -985,7 +1013,7 @@ msgstr ""
"utilizzati per aggiungere funzionalità proprietarie o su misura."
#. type: Plain text
-#: en/user_customization-packages.ssi:239
+#: en/user_customization-packages.ssi:224
msgid ""
"This section does not cover advice regarding building or maintaining "
"modified packages. Joachim Breitner's 'How to fork privately' method from "
@@ -1002,45 +1030,58 @@ msgstr ""
"maint-guide/ e altrove."
#. type: Plain text
-#: en/user_customization-packages.ssi:241
+#: en/user_customization-packages.ssi:226
msgid "There are two ways of installing modified custom packages:"
msgstr "Ci sono due modi per installare pacchetti personalizzati:"
#. type: Plain text
-#: en/user_customization-packages.ssi:243
-msgid "_* #{chroot_local-packages}#"
+#: en/user_customization-packages.ssi:228
+msgid "_* #{packages.chroot}#"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:245
+#: en/user_customization-packages.ssi:230
msgid "_* Using a custom APT repository"
msgstr "_* Utilizzare repository APT personalizzati"
#. type: Plain text
-#: en/user_customization-packages.ssi:247
+#: en/user_customization-packages.ssi:232
+#, fuzzy
+#| msgid ""
+#| "Using #{chroot_local-packages}# is simpler to achieve and useful for "
+#| "\"one-off\" customizations but has a number of drawbacks, whilst using a "
+#| "custom APT repository is more time-consuming to set up."
msgid ""
-"Using #{chroot_local-packages}# is simpler to achieve and useful for \"one-"
-"off\" customizations but has a number of drawbacks, whilst using a custom "
-"APT repository is more time-consuming to set up."
+"Using #{packages.chroot}# 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 ""
"Usando #{chroot_local-packages}# è più semplice da ottenere e utile per una "
"personalizzazione \"una tantum\" ma ha una serie di svantaggi, mentre un "
"repository APT personalizzato è più laborioso da configurare."
#. type: Plain text
-#: en/user_customization-packages.ssi:249
-msgid "3~ Using #{chroot_local-packages}# to install custom packages"
+#: en/user_customization-packages.ssi:234
+#, fuzzy
+#| msgid "3~ Using #{chroot_local-packages}# to install custom packages"
+msgid "3~ Using #{packages.chroot}# to install custom packages"
msgstr ""
"3~ Utilizzare #{chroot_local-packages}# per installare pacchetti "
"personalizzati"
#. type: Plain text
-#: en/user_customization-packages.ssi:251
+#: en/user_customization-packages.ssi:236
+#, fuzzy
+#| msgid ""
+#| "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."
msgid ""
-"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/packages.chroot/}"
+"# 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 ""
"Per installare un pacchetto personalizzato copiarlo nella directory #{config/"
"chroot_local-packages/}#; i pacchetti al suo interno verranno installati "
@@ -1048,7 +1089,7 @@ msgstr ""
"specificarli altrove."
#. type: Plain text
-#: en/user_customization-packages.ssi:253
+#: en/user_customization-packages.ssi:238
msgid ""
"Packages *{must}* be named in the prescribed way. One simple way to do this "
"is to use #{dpkg-name}#."
@@ -1057,30 +1098,38 @@ msgstr ""
"semplice per farlo è usare #{dpkg-name}#."
#. type: Plain text
-#: en/user_customization-packages.ssi:255
+#: en/user_customization-packages.ssi:240
+#, fuzzy
+#| msgid ""
+#| "Using #{chroot_local-packages}# for installation of custom packages has "
+#| "disadvantages:"
msgid ""
-"Using #{chroot_local-packages}# for installation of custom packages has "
+"Using #{packages.chroot}# for installation of custom packages has "
"disadvantages:"
msgstr ""
"L'utilizzo di #{chroot_local-packages}# per l'installazione di pacchetti "
"personalizzati presenta degli svantaggi:"
#. type: Plain text
-#: en/user_customization-packages.ssi:257
+#: en/user_customization-packages.ssi:242
msgid "_* It is not possible to use secure APT."
msgstr "_* non è possibile usare secure APT"
#. type: Plain text
-#: en/user_customization-packages.ssi:259
+#: en/user_customization-packages.ssi:244
+#, fuzzy
+#| msgid ""
+#| "_* You must install all appropriate packages in the #{config/chroot_local-"
+#| "packages/}# directory."
msgid ""
-"_* You must install all appropriate packages in the #{config/chroot_local-"
-"packages/}# directory."
+"_* You must install all appropriate packages in the #{config/packages."
+"chroot/}# directory."
msgstr ""
"_* è necessario installare i pacchetti adeguati nella directory #{config/"
"chroot_local-packages/}#."
#. type: Plain text
-#: en/user_customization-packages.ssi:261
+#: en/user_customization-packages.ssi:246
msgid ""
"_* It does not lend itself to storing Debian Live configurations in revision "
"control."
@@ -1089,17 +1138,22 @@ msgstr ""
"versione."
#. type: Plain text
-#: en/user_customization-packages.ssi:263
+#: en/user_customization-packages.ssi:248
msgid "3~ Using an APT repository to install custom packages"
msgstr ""
"3~ Utilizzare un repository APT per installare pacchetti personalizzati"
#. type: Plain text
-#: en/user_customization-packages.ssi:265
+#: en/user_customization-packages.ssi:250
+#, fuzzy
+#| msgid ""
+#| "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."
msgid ""
-"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."
+"Unlike using #{packages.chroot}#, 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."
msgstr ""
"A differenza di #{chroot_local-packages}#, quando si usa un repository APT "
"personalizzato è necessario assicurarsi di specificare altrove i pacchetti. "
@@ -1107,7 +1161,7 @@ msgstr ""
"packages-to-install."
#. type: Plain text
-#: en/user_customization-packages.ssi:267
+#: en/user_customization-packages.ssi:252
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 "
@@ -1118,12 +1172,12 @@ msgstr ""
"per offrire aggiornamenti dei pacchetti modificati."
#. type: Plain text
-#: en/user_customization-packages.ssi:269
+#: en/user_customization-packages.ssi:254
msgid "3~ Custom packages and APT"
msgstr "3~ Pacchetti personalizzati e APT"
#. type: Plain text
-#: en/user_customization-packages.ssi:271
+#: en/user_customization-packages.ssi:256
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 "
@@ -1138,7 +1192,7 @@ msgstr ""
"sceglie di installare quello con il numero di versione più alto."
#. type: Plain text
-#: en/user_customization-packages.ssi:273
+#: en/user_customization-packages.ssi:258
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 "
@@ -1153,17 +1207,25 @@ msgstr ""
"veda {APT pinning}#apt-pinning per maggiori informazioni."
#. type: Plain text
-#: en/user_customization-packages.ssi:275
+#: en/user_customization-packages.ssi:260
msgid "2~ Configuring APT at build time"
msgstr "2~ Configurare APT in fase di costruzione"
#. type: Plain text
-#: en/user_customization-packages.ssi:277
+#: en/user_customization-packages.ssi:262
+#, fuzzy
+#| 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."
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 "
+"appropriate configurations through #{config/includes.chroot/}#.) For a "
"complete list, look for options starting with #{apt}# in the #{lb_config}# "
"man page."
msgstr ""
@@ -1175,12 +1237,12 @@ msgstr ""
"iniziano con #{apt}#."
#. type: Plain text
-#: en/user_customization-packages.ssi:279
+#: en/user_customization-packages.ssi:264
msgid "3~choosing-apt-or-aptitude Choosing apt or aptitude"
msgstr "3~choosing-apt-or-aptitude Scegliere apt o aptitude"
#. type: Plain text
-#: en/user_customization-packages.ssi:281
+#: en/user_customization-packages.ssi:266
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 "
@@ -1195,7 +1257,7 @@ msgstr ""
"quelli mancanti."
#. type: Plain text
-#: en/user_customization-packages.ssi:283
+#: en/user_customization-packages.ssi:268
msgid ""
"_* #{apt}#: With this method, if a missing package is specified, the package "
"installation will fail. This is the default setting."
@@ -1204,7 +1266,7 @@ msgstr ""
"esito negativo; questo è l'impostazine predefinita."
#. type: Plain text
-#: en/user_customization-packages.ssi:285
+#: en/user_customization-packages.ssi:270
msgid ""
"_* #{aptitude}#: With this method, if a missing package is specified, the "
"package installation will succeed."
@@ -1213,12 +1275,12 @@ msgstr ""
"avrà successo."
#. type: Plain text
-#: en/user_customization-packages.ssi:287
+#: en/user_customization-packages.ssi:272
msgid "3~ Using a proxy with APT"
msgstr "3~ Utilizzare un proxy con APT"
#. type: Plain text
-#: en/user_customization-packages.ssi:289
+#: en/user_customization-packages.ssi:274
msgid ""
"One commonly required APT configuration is to deal with building an image "
"behind a proxy. You may specify your APT proxy with the #{--apt-ftp-proxy}# "
@@ -1229,18 +1291,18 @@ msgstr ""
"ftp-proxy}# o #{--apt-http-proxy}# secondo necessità:"
#. type: Plain text
-#: en/user_customization-packages.ssi:293
+#: en/user_customization-packages.ssi:278
#, no-wrap
msgid " $ lb config --apt-http-proxy http://proxy/\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:297
+#: en/user_customization-packages.ssi:282
msgid "3~ Tweaking APT to save space"
msgstr "3~ Modificare APT per risparmiare spazio"
#. type: Plain text
-#: en/user_customization-packages.ssi:299
+#: en/user_customization-packages.ssi:284
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 "
@@ -1250,20 +1312,20 @@ msgstr ""
"in tal caso una o entrambe delle seguenti opzioni possono essere d'interesse."
#. type: Plain text
-#: en/user_customization-packages.ssi:301
+#: en/user_customization-packages.ssi:286
msgid ""
"If you don't want to include APT indices in the image, you can omit those "
"with:"
msgstr "È possibile non includere gli indici di APT con:"
#. type: Plain text
-#: en/user_customization-packages.ssi:305
+#: en/user_customization-packages.ssi:290
#, no-wrap
-msgid " $ lb config --binary-indices false\n"
+msgid " $ lb config --apt-indices false\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:309
+#: en/user_customization-packages.ssi:294
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 "
@@ -1278,7 +1340,7 @@ msgstr ""
"deve usare prima #{apt-get update}# per crearli."
#. type: Plain text
-#: en/user_customization-packages.ssi:311
+#: en/user_customization-packages.ssi:296
msgid ""
"If you find the installation of recommended packages bloats your image too "
"much, you may disable that default option of APT with:"
@@ -1287,13 +1349,13 @@ msgstr ""
"troppo l'immagine, si può disabilitare l'opzione predefinita di APT con:"
#. type: Plain text
-#: en/user_customization-packages.ssi:315
+#: en/user_customization-packages.ssi:300
#, no-wrap
msgid " $ lb config --apt-recommends false\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:319
+#: en/user_customization-packages.ssi:304
msgid ""
"The tradeoff here is that if you don't install recommended packages for a "
"given package, that is, \"packages that would be found together with this "
@@ -1320,12 +1382,12 @@ msgstr ""
"spiegato in {APT pinning}#apt-pinning."
#. type: Plain text
-#: en/user_customization-packages.ssi:321
+#: en/user_customization-packages.ssi:306
msgid "3~ Passing options to apt or aptitude"
msgstr "3~ Passare opzioni ad apt o aptitude"
#. type: Plain text
-#: en/user_customization-packages.ssi:323
+#: en/user_customization-packages.ssi:308
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 "
@@ -1338,17 +1400,23 @@ msgstr ""
"di #{apt}# e #{aptitude}# per i dettagli."
#. type: Plain text
-#: en/user_customization-packages.ssi:325
+#: en/user_customization-packages.ssi:310
msgid "3~apt-pinning APT pinning"
msgstr "3~apt-pinning APT pinning"
#. type: Plain text
-#: en/user_customization-packages.ssi:327
+#: en/user_customization-packages.ssi:312
+#, fuzzy
+#| msgid ""
+#| "For background, please first read the #{apt_preferences(5)}# man page. "
+#| "APT pinning can be configured either for build time, or else for run "
+#| "time. For the former, create #{config/chroot_apt/preferences}#. For the "
+#| "latter, create #{config/chroot_local-includes/etc/apt/preferences}#."
msgid ""
"For background, please first read the #{apt_preferences(5)}# man page. APT "
"pinning can be configured either for build time, or else for run time. For "
"the former, create #{config/chroot_apt/preferences}#. For the latter, create "
-"#{config/chroot_local-includes/etc/apt/preferences}#."
+"#{config/includes.chroot/etc/apt/preferences}#."
msgstr ""
"Si prega di leggere prima il manuale di #{apt_preferences(5)}#. Il pinning "
"può essere configurato sia in fase di costruzione sia di esecuzione; per la "
@@ -1356,35 +1424,35 @@ msgstr ""
"{config/chroot_local-includes/etc/apt/preferences}#."
#. type: Plain text
-#: en/user_customization-packages.ssi:329
+#: en/user_customization-packages.ssi:314
msgid ""
-"Let's say you are building a Squeeze live system but need all the live "
+"Let's say you are building a Wheezy live system but need all the live "
"packages that end up in the binary image to be installed from Sid at build "
"time. You need to add Sid to your APT sources and pin it so that only the "
"packages you want are installed from it at build time and all others are "
-"taken from the target system distribution, Squeeze. The following will "
+"taken from the target system distribution, Wheezy. The following will "
"accomplish this:"
msgstr ""
-"Nell'ipotesi di creare un sistema live Squeeze e avendo la necessità di "
+"Nell'ipotesi di creare un sistema live Wheezy e avendo la necessità di "
"installare da Sid tutti i pacchetti live destinati all'immagine binaria "
"questa fase, bisogna aggiungere Sid alle fonti di APT e farne il pinning "
"affinché verranno installati da lì solo i pacchetti voluti, mentre per tutti "
-"gli altri si attingerà dalla distribuzione principale, Squeeze. Quanto segue "
+"gli altri si attingerà dalla distribuzione principale, Wheezy. Quanto segue "
"servirà allo scopo:"
#. type: Plain text
-#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:322
#, no-wrap
msgid ""
-" $ echo \"deb http://mirror/debian sid main\" > config/chroot_sources/sid.chroot\n"
-" $ cat >>config/chroot_apt/preferences <<END\n"
+" $ echo \"deb http://mirror/debian sid main\" > config/archives/sid.list.chroot\n"
+" $ cat >> config/chroot_apt/preferences <<END\n"
" Package: live-boot live-boot-initramfs-tools live-config live-config-sysvinit\n"
" Pin: release n=sid\n"
" Pin-Priority: 600\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:342
+#: en/user_customization-packages.ssi:327
#, no-wrap
msgid ""
" Package: *\n"
@@ -1394,24 +1462,34 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:346
+#: en/user_customization-packages.ssi:331
#, no-wrap
msgid "*{Note:}* Wildcards can be used in package names (e.g. *{Package: live-*}*) with Apt version 0.8.14 or higher. This means that it works with Wheezy using:\n"
msgstr "*{Nota:}* con la versione 0.8.14 o superiore di Apt si possono utilizzare wildcard nei nomi dei pacchetti (*{Package: live-*}*). Ciò significa che funziona con Wheezy usando:\n"
#. type: Plain text
-#: en/user_customization-packages.ssi:350
+#: en/user_customization-packages.ssi:335
msgid "$ lb config --distribution wheezy"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:354
+#: en/user_customization-packages.ssi:339
+#, fuzzy
+#| msgid ""
+#| "Negative pin priorities will prevent a package from being installed, as "
+#| "in the case where you do not want a package that is recommended by "
+#| "another package. Suppose you are building an LXDE image using #{--"
+#| "packages-lists lxde}# option, but don't want the user prompted to store "
+#| "wifi passwords in the keyring. This list includes #{gdm}#, which depends "
+#| "on #{gksu}#, which in turn recommends #{gnome-keyring}#. So you want to "
+#| "omit the recommended #{gnome-keyring}# package. This can be done by "
+#| "adding the following stanza to #{config/chroot_apt/preferences}#:"
msgid ""
"Negative pin priorities will prevent a package from being installed, as in "
"the case where you do not want a package that is recommended by another "
-"package. Suppose you are building an LXDE image using #{--packages-lists "
-"lxde}# option, but don't want the user prompted to store wifi passwords in "
-"the keyring. This list includes #{gdm}#, which depends on #{gksu}#, which in "
+"package. Suppose you are building an LXDE image using #{--package-lists lxde}"
+"# option, but don't want the user prompted to store wifi passwords in the "
+"keyring. This list includes #{gdm}#, which depends on #{gksu}#, which in "
"turn recommends #{gnome-keyring}#. So you want to omit the recommended #"
"{gnome-keyring}# package. This can be done by adding the following stanza to "
"#{config/chroot_apt/preferences}#:"
@@ -1426,7 +1504,7 @@ msgstr ""
"chroot_apt/preferences}# la seguente definizione:"
#. type: Plain text
-#: en/user_customization-packages.ssi:360
+#: en/user_customization-packages.ssi:345
#, no-wrap
msgid ""
" Package: gnome-keyring\n"
diff --git a/manual/po/it/user_customization-runtime.ssi.po b/manual/po/it/user_customization-runtime.ssi.po
index de6fd16..487c6e1 100644
--- a/manual/po/it/user_customization-runtime.ssi.po
+++ b/manual/po/it/user_customization-runtime.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-08-25 17:01+0300\n"
+"POT-Creation-Date: 2011-11-07 21:01-0400\n"
"PO-Revision-Date: 2011-09-10 23:11+0200\n"
"Last-Translator: skizzhg <skizzhg at gmx.com>\n"
"Language-Team: Italian <tp at lists.linux.it>\n"
@@ -37,48 +37,47 @@ msgstr ""
#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
-#: en/user_customization-installer.ssi:43
+#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
-#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:53
-#: en/user_customization-packages.ssi:66 en/user_customization-packages.ssi:80
-#: en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:112
-#: en/user_customization-packages.ssi:142
-#: en/user_customization-packages.ssi:155
-#: en/user_customization-packages.ssi:165
-#: en/user_customization-packages.ssi:175
-#: en/user_customization-packages.ssi:185
-#: en/user_customization-packages.ssi:199
-#: en/user_customization-packages.ssi:215
-#: en/user_customization-packages.ssi:227
-#: en/user_customization-packages.ssi:291
-#: en/user_customization-packages.ssi:303
-#: en/user_customization-packages.ssi:313
-#: en/user_customization-packages.ssi:331
-#: en/user_customization-packages.ssi:348
-#: en/user_customization-packages.ssi:356 en/user_customization-runtime.ssi:14
-#: en/user_customization-runtime.ssi:24 en/user_customization-runtime.ssi:44
-#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:63
-#: en/user_customization-runtime.ssi:71 en/user_customization-runtime.ssi:80
-#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:111
-#: en/user_customization-runtime.ssi:119 en/user_examples.ssi:14
+#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:54
+#: en/user_customization-packages.ssi:67 en/user_customization-packages.ssi:81
+#: en/user_customization-packages.ssi:101
+#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:140
+#: en/user_customization-packages.ssi:150
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:184
+#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:276
+#: en/user_customization-packages.ssi:288
+#: en/user_customization-packages.ssi:298
+#: en/user_customization-packages.ssi:316
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
+#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
+#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
+#: en/user_customization-runtime.ssi:104 en/user_customization-runtime.ssi:114
+#: en/user_customization-runtime.ssi:122 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:178 en/user_examples.ssi:190 en/user_examples.ssi:206
-#: en/user_examples.ssi:220 en/user_examples.ssi:229 en/user_examples.ssi:247
-#: en/user_examples.ssi:255 en/user_examples.ssi:268 en/user_examples.ssi:283
-#: en/user_installation.ssi:38 en/user_installation.ssi:46
-#: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi:74 en/user_installation.ssi:82
-#: en/user_installation.ssi:90 en/user_installation.ssi:114
-#: en/user_installation.ssi:129 en/user_installation.ssi:146
-#: en/user_managing_a_configuration.ssi:24
+#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
+#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
+#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
+#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
+#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
+#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
+#: en/user_examples.ssi:277 en/user_installation.ssi:38
+#: en/user_installation.ssi:46 en/user_installation.ssi:56
+#: en/user_installation.ssi:64 en/user_installation.ssi:74
+#: en/user_installation.ssi:82 en/user_installation.ssi:90
+#: en/user_installation.ssi:114 en/user_installation.ssi:129
+#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:80 en/user_overview.ssi:88
+#: en/user_overview.ssi:48 en/user_overview.ssi:56
msgid "code{"
msgstr "code{"
@@ -102,49 +101,48 @@ msgstr "code{"
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
-#: en/user_customization-installer.ssi:37
-#: en/user_customization-installer.ssi:48
+#: en/user_customization-installer.ssi:38
+#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:70 en/user_customization-packages.ssi:84
-#: en/user_customization-packages.ssi:98
-#: en/user_customization-packages.ssi:116
-#: en/user_customization-packages.ssi:147
-#: en/user_customization-packages.ssi:161
-#: en/user_customization-packages.ssi:171
-#: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:191
-#: en/user_customization-packages.ssi:203
-#: en/user_customization-packages.ssi:219
-#: en/user_customization-packages.ssi:231
-#: en/user_customization-packages.ssi:295
-#: en/user_customization-packages.ssi:307
-#: en/user_customization-packages.ssi:317
-#: en/user_customization-packages.ssi:344
-#: en/user_customization-packages.ssi:352
-#: en/user_customization-packages.ssi:361 en/user_customization-runtime.ssi:18
-#: en/user_customization-runtime.ssi:28 en/user_customization-runtime.ssi:48
-#: en/user_customization-runtime.ssi:59 en/user_customization-runtime.ssi:67
-#: en/user_customization-runtime.ssi:76 en/user_customization-runtime.ssi:85
-#: en/user_customization-runtime.ssi:105 en/user_customization-runtime.ssi:115
-#: en/user_customization-runtime.ssi:124 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:186 en/user_examples.ssi:202 en/user_examples.ssi:210
-#: en/user_examples.ssi:225 en/user_examples.ssi:233 en/user_examples.ssi:251
-#: en/user_examples.ssi:264 en/user_examples.ssi:279 en/user_examples.ssi:297
-#: en/user_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi:70
-#: en/user_installation.ssi:78 en/user_installation.ssi:86
-#: en/user_installation.ssi:94 en/user_installation.ssi:119
-#: en/user_installation.ssi:136 en/user_installation.ssi:149
-#: en/user_managing_a_configuration.ssi:31
+#: en/user_customization-packages.ssi:46 en/user_customization-packages.ssi:59
+#: en/user_customization-packages.ssi:71 en/user_customization-packages.ssi:85
+#: en/user_customization-packages.ssi:105
+#: en/user_customization-packages.ssi:132
+#: en/user_customization-packages.ssi:146
+#: en/user_customization-packages.ssi:156
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:329
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:346 en/user_customization-runtime.ssi:21
+#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
+#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
+#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
+#: en/user_customization-runtime.ssi:108 en/user_customization-runtime.ssi:118
+#: en/user_customization-runtime.ssi:127 en/user_examples.ssi:20
+#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
+#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
+#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
+#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
+#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
+#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
+#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
+#: en/user_examples.ssi:291 en/user_installation.ssi:42
+#: en/user_installation.ssi:50 en/user_installation.ssi:60
+#: en/user_installation.ssi:70 en/user_installation.ssi:78
+#: en/user_installation.ssi:86 en/user_installation.ssi:94
+#: en/user_installation.ssi:119 en/user_installation.ssi:136
+#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
-#: en/user_overview.ssi:84 en/user_overview.ssi:92
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:42
+#: en/user_overview.ssi:52 en/user_overview.ssi:60
msgid "}code"
msgstr "}code"
@@ -195,11 +193,17 @@ msgstr ""
#. type: Plain text
#: en/user_customization-runtime.ssi:12
+#, fuzzy
+#| msgid ""
+#| "You can specify additional groups that the live user will belong to by "
+#| "preseeding the #{passwd/user-default-groups}# debconf value. For example, "
+#| "to add the live user to the #{fuse}# group, add the following to a file "
+#| "in the #{config/chroot_local-preseed}# directory:"
msgid ""
"You can specify additional groups that the live user will belong to by "
"preseeding the #{passwd/user-default-groups}# debconf value. For example, to "
-"add the live user to the #{fuse}# group, add the following to a file in the #"
-"{config/chroot_local-preseed}# directory:"
+"add the live user to the #{fuse}# group, add the following preseed under #"
+"{config/preseed/}# for the chroot stage:"
msgstr ""
"È possibile specificare gruppi aggiuntivi ai quali l'utente live apparterrà "
"preconfigurando il valore #{passwd/user-default-groups}# di debconf. Ad "
@@ -207,13 +211,17 @@ msgstr ""
"ad un file nella directory #{config/chroot_local-preseed}#:"
#. type: Plain text
-#: en/user_customization-runtime.ssi:16
+#: en/user_customization-runtime.ssi:19
#, no-wrap
-msgid " user-setup passwd/user-default-groups string audio cdrom dip floppy video plugdev netdev powerdev scanner bluetooth fuse\n"
+msgid ""
+" $ lb config\n"
+" $ echo user-setup passwd/user-default-groups string audio cdrom \\\n"
+" dip floppy video plugdev netdev powerdev scanner bluetooth fuse \\\n"
+" >> config/preseed/my.preseed.chroot\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:20
+#: en/user_customization-runtime.ssi:23
msgid ""
"It is also possible to change the default username \"user\" and the default "
"password \"live\". If you want to do that for any reason, you can easily "
@@ -221,55 +229,55 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:22
+#: en/user_customization-runtime.ssi:25
msgid ""
"To change the default username you can simply specify it in your config:"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:26
+#: en/user_customization-runtime.ssi:29
msgid "$ lb config --bootappend-live \"username=live-user\""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:30
+#: en/user_customization-runtime.ssi:33
msgid ""
"One possible way of changing the default password is by means of a hook as "
"described in {Boot-time hooks}#boot-time-hooks. In order to do that you can "
"use the \"passwd\" hook from #{/usr/share/doc/live-config/examples/hooks}#, "
-"prefix it accordingly (e.g. 200-passwd) and add it to #{config/chroot_local-"
-"includes/lib/live/config/}#"
+"prefix it accordingly (e.g. 200-passwd) and add it to #{config/includes."
+"chroot/lib/live/config/}#"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:32
+#: en/user_customization-runtime.ssi:35
msgid "2~customizing-locale-and-language Customizing locale and language"
msgstr ""
"2~customizing-locale-and-language Personalizzare la localizzazione e la "
"lingua"
#. type: Plain text
-#: en/user_customization-runtime.ssi:34
+#: en/user_customization-runtime.ssi:37
msgid "When the live system boots, language is involved in three steps:"
msgstr "Quando il sistema live si avvia, la lingua è inserita in tre fasi:"
#. type: Plain text
-#: en/user_customization-runtime.ssi:36
+#: en/user_customization-runtime.ssi:39
msgid "_* the locale generation"
msgstr "_* generazione della localizzazione"
#. type: Plain text
-#: en/user_customization-runtime.ssi:38
+#: en/user_customization-runtime.ssi:41
msgid "_* setting the keyboard layout for the console"
msgstr "_* impostazione del layout di tastiera per la console"
#. type: Plain text
-#: en/user_customization-runtime.ssi:40
+#: en/user_customization-runtime.ssi:43
msgid "_* setting the keyboard layout for X"
msgstr "impostazione del layout di tastiera per X"
#. type: Plain text
-#: en/user_customization-runtime.ssi:42
+#: en/user_customization-runtime.ssi:45
msgid ""
"The default locale when building a Live system is \"locales=en_US.UTF-8\". "
"To define the locale that should be generated, use the #{locales}# parameter "
@@ -280,13 +288,13 @@ msgstr ""
"{locales}# nell'opzione #{--bootappend-live}# di #{lb config}#:"
#. type: Plain text
-#: en/user_customization-runtime.ssi:46
+#: en/user_customization-runtime.ssi:49
#, no-wrap
msgid " $ lb config --bootappend-live \"locales=de_CH.UTF-8\"\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:50
+#: en/user_customization-runtime.ssi:53
msgid ""
"This parameter can also be used at the kernel command line. You can specify "
"a locale by a full #{language_country.encoding}# word."
@@ -295,7 +303,7 @@ msgstr ""
"specificando una localizzazione nella forma #{lingua_nazione.codifica}#."
#. type: Plain text
-#: en/user_customization-runtime.ssi:52
+#: en/user_customization-runtime.ssi:55
msgid ""
"Both the console and X keyboard configuration depend on the #{keyboard-"
"layouts}# parameter of the #{--bootappend-live}# option. Valid options for X "
@@ -313,7 +321,7 @@ msgstr ""
"lingua:"
#. type: Plain text
-#: en/user_customization-runtime.ssi:57
+#: en/user_customization-runtime.ssi:60
#, no-wrap
msgid ""
" $ grep -i sweden -C3 /usr/share/X11/xkb/rules/base.xml | grep name\n"
@@ -321,7 +329,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:61
+#: en/user_customization-runtime.ssi:64
msgid ""
"To get the locale files for German and Swiss German keyboard layout in X use:"
msgstr ""
@@ -329,13 +337,13 @@ msgstr ""
"svizzero-tedesco in X:"
#. type: Plain text
-#: en/user_customization-runtime.ssi:65
+#: en/user_customization-runtime.ssi:68
#, no-wrap
msgid " $ lb config --bootappend-live \"locales=de_CH.UTF-8 keyboard-layouts=ch\"\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:69
+#: en/user_customization-runtime.ssi:72
msgid ""
"A list of the valid values of the keyboards for the console can be figured "
"with the following command:"
@@ -344,7 +352,7 @@ msgstr ""
"il seguente comando:"
#. type: Plain text
-#: en/user_customization-runtime.ssi:74
+#: en/user_customization-runtime.ssi:77
#, no-wrap
msgid ""
" $ for i in $(find /usr/share/keymaps/ -iname \"*kmap.gz\"); \\\n"
@@ -352,7 +360,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:78
+#: en/user_customization-runtime.ssi:81
msgid ""
"Alternatively, you can use the #{console-setup}# package, a tool to let you "
"configure console layout using X (XKB) definitions; you can then set your "
@@ -371,7 +379,7 @@ msgstr ""
"francese con una tastiera TypeMatrix, sia in console sia in X11:"
#. type: Plain text
-#: en/user_customization-runtime.ssi:83
+#: en/user_customization-runtime.ssi:86
#, no-wrap
msgid ""
" $ lb config --bootappend-live \\\n"
@@ -379,12 +387,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:87
+#: en/user_customization-runtime.ssi:90
msgid "2~persistence Persistence"
msgstr "2~persistence Persistenza"
#. type: Plain text
-#: en/user_customization-runtime.ssi:89
+#: en/user_customization-runtime.ssi:92
msgid ""
"A live cd paradigm is a pre-installed system which runs from read-only "
"media, like a cdrom, where writes and modifications do not survive reboots "
@@ -395,7 +403,7 @@ msgstr ""
"ai riavvii dell'hardware della macchina ospitante."
#. type: Plain text
-#: en/user_customization-runtime.ssi:91
+#: en/user_customization-runtime.ssi:94
msgid ""
"A Debian Live system is a generalization of this paradigm and thus supports "
"other media in addition to CDs; but still, in its default behaviour, it "
@@ -409,7 +417,7 @@ msgstr ""
"spegnimento."
#. type: Plain text
-#: en/user_customization-runtime.ssi:93
+#: en/user_customization-runtime.ssi:96
msgid ""
"Persistence is a common name for different kinds of solutions for saving "
"across reboots some, or all, of this run-time evolution of the system. To "
@@ -426,7 +434,7 @@ msgstr ""
"sui ram disk non sopravvivono ai riavvii."
#. type: Plain text
-#: en/user_customization-runtime.ssi:95
+#: en/user_customization-runtime.ssi:98
msgid ""
"The data stored on this ramdisk should be saved on a writable persistent "
"medium like a Hard Disk, a USB key, a network share or even a session of a "
@@ -442,12 +450,12 @@ msgstr ""
"all'avvio: #{persistent}#."
#. type: Plain text
-#: en/user_customization-runtime.ssi:97
+#: en/user_customization-runtime.ssi:100
msgid "3~ Full persistence"
msgstr "3~ Persistenza completa"
#. type: Plain text
-#: en/user_customization-runtime.ssi:99
+#: en/user_customization-runtime.ssi:102
msgid ""
"By 'full persistence' it is meant that instead of using a tmpfs for storing "
"modifications to the read-only media (with the copy-on-write, COW, system) a "
@@ -467,20 +475,20 @@ msgstr ""
"penna usb creata ad esempio con:"
#. type: Plain text
-#: en/user_customization-runtime.ssi:103
+#: en/user_customization-runtime.ssi:106
#, no-wrap
msgid " # mkfs.ext2 -L live-rw /dev/sdb1\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:107
+#: en/user_customization-runtime.ssi:110
msgid "See also {Using the space left on a USB stick}#using-usb-extra-space."
msgstr ""
"Si veda anche {Usare lo spazio rimanente su una penna USB}#using-usb-extra-"
"space."
#. type: Plain text
-#: en/user_customization-runtime.ssi:109
+#: en/user_customization-runtime.ssi:112
msgid ""
"If you already have a partition on your device, you could just change the "
"label with one of the following:"
@@ -489,13 +497,13 @@ msgstr ""
"l'etichetta con una delle seguenti:"
#. type: Plain text
-#: en/user_customization-runtime.ssi:113
+#: en/user_customization-runtime.ssi:116
#, no-wrap
msgid " # tune2fs -L live-rw /dev/sdb1 # for ext2,3,4 filesystems\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:117
+#: en/user_customization-runtime.ssi:120
msgid ""
"But since live system users cannot always use a hard drive partition, and "
"considering that most USB keys have poor write speeds, 'full' persistence "
@@ -512,7 +520,7 @@ msgstr ""
"qualcosa come:"
#. type: Plain text
-#: en/user_customization-runtime.ssi:122
+#: en/user_customization-runtime.ssi:125
#, no-wrap
msgid ""
" $ dd if=/dev/null of=live-rw bs=1G seek=1 # for a 1GB sized image file\n"
@@ -520,7 +528,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:126
+#: en/user_customization-runtime.ssi:129
msgid ""
"Then copy the #{live-rw}# file to a writable partition and reboot with the "
"boot parameter 'persistent'."
@@ -529,12 +537,12 @@ msgstr ""
"con il parametro d'avvio \"persistent\"."
#. type: Plain text
-#: en/user_customization-runtime.ssi:128
+#: en/user_customization-runtime.ssi:131
msgid "3~ Home automounting"
msgstr "3~ Mount automatico della home"
#. type: Plain text
-#: en/user_customization-runtime.ssi:130
+#: en/user_customization-runtime.ssi:133
msgid ""
"If during the boot a partition (filesystem) image file or a partition "
"labeled #{home-rw}# is discovered, this filesystem will be directly mounted "
@@ -548,12 +556,12 @@ msgstr ""
"persistenza completa."
#. type: Plain text
-#: en/user_customization-runtime.ssi:132
+#: en/user_customization-runtime.ssi:135
msgid "3~ Snapshots"
msgstr "3~ Istantanee"
#. type: Plain text
-#: en/user_customization-runtime.ssi:134
+#: en/user_customization-runtime.ssi:137
msgid ""
"Snapshots are collections of files and directories which are not mounted "
"while running but which are copied from a persistent device to the system "
@@ -583,7 +591,7 @@ msgstr ""
"basati su memoria flash."
#. type: Plain text
-#: en/user_customization-runtime.ssi:136
+#: en/user_customization-runtime.ssi:139
msgid ""
"A /home version of snapshot exists too and its label is #{home-sn.*}#; it "
"works the same as the main snapshot but it is only applied to /home."
@@ -592,7 +600,7 @@ msgstr ""
"come la principale ma viene applicata solo ad /home."
#. type: Plain text
-#: en/user_customization-runtime.ssi:138
+#: en/user_customization-runtime.ssi:141
msgid ""
"Snapshots cannot currently handle file deletion but full persistence and "
"home automounting can."
@@ -601,12 +609,12 @@ msgstr ""
"contrario della persistenza completa e il mount automatico della home. "
#. type: Plain text
-#: en/user_customization-runtime.ssi:140
+#: en/user_customization-runtime.ssi:143
msgid "3~ Persistent SubText"
msgstr "3~ Sottotesto persistente"
#. type: Plain text
-#: en/user_customization-runtime.ssi:142
+#: en/user_customization-runtime.ssi:145
msgid ""
"If a user would need multiple persistent storage of the same type for "
"different locations or testing, such as #{live-rw-nonwork}# and #{live-rw-"
@@ -625,12 +633,12 @@ msgstr ""
"subtext=sottotesto}#."
#. type: Plain text
-#: en/user_customization-runtime.ssi:144
+#: en/user_customization-runtime.ssi:147
msgid "3~ Partial remastering"
msgstr "3~ Rimasterizzazione parziale"
#. type: Plain text
-#: en/user_customization-runtime.ssi:145
+#: en/user_customization-runtime.ssi:148
msgid ""
"The run-time modification of the tmpfs could be collected using live-"
"snapshot in a squashfs and added to the cd by remastering the iso in the "
diff --git a/manual/po/it/user_examples.ssi.po b/manual/po/it/user_examples.ssi.po
index cbfcc9a..f06cc86 100644
--- a/manual/po/it/user_examples.ssi.po
+++ b/manual/po/it/user_examples.ssi.po
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-03-18 07:39-0200\n"
+"POT-Creation-Date: 2011-11-13 17:12+0100\n"
"PO-Revision-Date: 2011-04-16 03:33+0200\n"
"Last-Translator: skizzhg <skizzhg at gmx.com>\n"
"Language-Team: Italian <tp at lists.linux.it>\n"
@@ -33,48 +33,49 @@ msgstr ":B~ Esempi"
#: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/user_basics.ssi:30 en/user_basics.ssi:40
-#: en/user_basics.ssi:56 en/user_basics.ssi:71 en/user_basics.ssi:106
-#: en/user_basics.ssi:114 en/user_basics.ssi:126 en/user_basics.ssi:138
-#: en/user_basics.ssi:150 en/user_basics.ssi:158 en/user_basics.ssi:166
-#: en/user_basics.ssi:182 en/user_basics.ssi:192 en/user_basics.ssi:200
-#: en/user_basics.ssi:216 en/user_basics.ssi:224 en/user_basics.ssi:234
-#: en/user_basics.ssi:252 en/user_basics.ssi:280 en/user_basics.ssi:296
-#: en/user_basics.ssi:304 en/user_basics.ssi:324 en/user_basics.ssi:349
+#: en/project_procedures.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
+#: en/user_basics.ssi:116 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:184 en/user_basics.ssi:194 en/user_basics.ssi:202
+#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
+#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
+#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
-#: en/user_customization-installer.ssi:43
+#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
-#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:53
-#: en/user_customization-packages.ssi:66 en/user_customization-packages.ssi:80
-#: en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:112
-#: en/user_customization-packages.ssi:142
-#: en/user_customization-packages.ssi:155
-#: en/user_customization-packages.ssi:165
-#: en/user_customization-packages.ssi:175
-#: en/user_customization-packages.ssi:185
-#: en/user_customization-packages.ssi:199
-#: en/user_customization-packages.ssi:215
-#: en/user_customization-packages.ssi:227
-#: en/user_customization-packages.ssi:291
-#: en/user_customization-packages.ssi:303
-#: en/user_customization-packages.ssi:313
-#: en/user_customization-packages.ssi:331
-#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
-#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
-#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
-#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
-#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:105
-#: 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:178 en/user_examples.ssi:190
-#: en/user_examples.ssi:206 en/user_examples.ssi:220 en/user_examples.ssi:229
-#: en/user_examples.ssi:247 en/user_examples.ssi:255 en/user_examples.ssi:268
-#: en/user_examples.ssi:283 en/user_installation.ssi:38
+#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:54
+#: en/user_customization-packages.ssi:67 en/user_customization-packages.ssi:81
+#: en/user_customization-packages.ssi:101
+#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:140
+#: en/user_customization-packages.ssi:150
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:184
+#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:276
+#: en/user_customization-packages.ssi:288
+#: en/user_customization-packages.ssi:298
+#: en/user_customization-packages.ssi:316
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
+#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
+#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
+#: en/user_customization-runtime.ssi:104 en/user_customization-runtime.ssi:114
+#: en/user_customization-runtime.ssi:122 en/user_examples.ssi:14
+#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
+#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
+#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
+#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
+#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
+#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
+#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
+#: en/user_examples.ssi:277 en/user_installation.ssi:38
#: en/user_installation.ssi:46 en/user_installation.ssi:56
#: en/user_installation.ssi:64 en/user_installation.ssi:74
#: en/user_installation.ssi:82 en/user_installation.ssi:90
@@ -83,7 +84,7 @@ msgstr ":B~ Esempi"
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:80 en/user_overview.ssi:88
+#: en/user_overview.ssi:48 en/user_overview.ssi:56
msgid "code{"
msgstr "code{"
@@ -97,48 +98,49 @@ msgstr "code{"
#: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/user_basics.ssi:34 en/user_basics.ssi:44
-#: en/user_basics.ssi:62 en/user_basics.ssi:75 en/user_basics.ssi:110
-#: en/user_basics.ssi:118 en/user_basics.ssi:132 en/user_basics.ssi:142
-#: en/user_basics.ssi:154 en/user_basics.ssi:162 en/user_basics.ssi:170
-#: en/user_basics.ssi:186 en/user_basics.ssi:196 en/user_basics.ssi:204
-#: en/user_basics.ssi:220 en/user_basics.ssi:228 en/user_basics.ssi:238
-#: en/user_basics.ssi:272 en/user_basics.ssi:284 en/user_basics.ssi:300
-#: en/user_basics.ssi:308 en/user_basics.ssi:335 en/user_basics.ssi:374
+#: en/project_procedures.ssi:131 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
+#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
+#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
+#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
+#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
-#: en/user_customization-installer.ssi:37
-#: en/user_customization-installer.ssi:48
+#: en/user_customization-installer.ssi:38
+#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:70 en/user_customization-packages.ssi:84
-#: en/user_customization-packages.ssi:98
-#: en/user_customization-packages.ssi:116
-#: en/user_customization-packages.ssi:147
-#: en/user_customization-packages.ssi:161
-#: en/user_customization-packages.ssi:171
-#: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:191
-#: en/user_customization-packages.ssi:203
-#: en/user_customization-packages.ssi:219
-#: en/user_customization-packages.ssi:231
-#: en/user_customization-packages.ssi:295
-#: en/user_customization-packages.ssi:307
-#: en/user_customization-packages.ssi:317
-#: en/user_customization-packages.ssi:344
-#: en/user_customization-packages.ssi:353 en/user_customization-runtime.ssi:18
-#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
-#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
-#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
-#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:110
-#: 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:186 en/user_examples.ssi:202
-#: en/user_examples.ssi:210 en/user_examples.ssi:225 en/user_examples.ssi:233
-#: en/user_examples.ssi:251 en/user_examples.ssi:264 en/user_examples.ssi:279
-#: en/user_examples.ssi:297 en/user_installation.ssi:42
+#: en/user_customization-packages.ssi:46 en/user_customization-packages.ssi:59
+#: en/user_customization-packages.ssi:71 en/user_customization-packages.ssi:85
+#: en/user_customization-packages.ssi:105
+#: en/user_customization-packages.ssi:132
+#: en/user_customization-packages.ssi:146
+#: en/user_customization-packages.ssi:156
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:329
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:346 en/user_customization-runtime.ssi:21
+#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
+#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
+#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
+#: en/user_customization-runtime.ssi:108 en/user_customization-runtime.ssi:118
+#: en/user_customization-runtime.ssi:127 en/user_examples.ssi:20
+#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
+#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
+#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
+#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
+#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
+#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
+#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
+#: en/user_examples.ssi:291 en/user_installation.ssi:42
#: en/user_installation.ssi:50 en/user_installation.ssi:60
#: en/user_installation.ssi:70 en/user_installation.ssi:78
#: en/user_installation.ssi:86 en/user_installation.ssi:94
@@ -146,14 +148,14 @@ msgstr "code{"
#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
-#: en/user_overview.ssi:84 en/user_overview.ssi:92
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:42
+#: en/user_overview.ssi:52 en/user_overview.ssi:60
msgid "}code"
msgstr "}code"
#. type: Plain text
-#: en/user_basics.ssi:42 en/user_basics.ssi:168 en/user_basics.ssi:236
-#: en/user_examples.ssi:109 en/user_examples.ssi:208
+#: en/user_basics.ssi:44 en/user_basics.ssi:170 en/user_basics.ssi:238
+#: en/user_examples.ssi:119 en/user_examples.ssi:211
#, no-wrap
msgid " # lb build\n"
msgstr ""
@@ -195,6 +197,16 @@ msgstr ""
#. type: Plain text
#: en/user_examples.ssi:12
+#, fuzzy
+#| 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:"
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 "
@@ -202,8 +214,9 @@ msgid ""
"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:"
+"and in it, set the corresponding #{LB_PARENT_MIRROR_*}# variables to your "
+"preferred mirror. All other mirrors used in the build will be defaulted from "
+"these values. For example:"
msgstr ""
"Si noti che, per brevità, in questi esempi non specifichiamo un mirror "
"locale da usare per la costruzione. Usando un mirror locale, si possono "
@@ -219,9 +232,9 @@ msgstr ""
#: en/user_examples.ssi:18
#, no-wrap
msgid ""
-" LB_MIRROR_BOOTSTRAP=\"http://mirror/debian\"\n"
-" LB_MIRROR_CHROOT=\"http://mirror/debian\"\n"
-" LB_MIRROR_CHROOT_SECURITY=\"http://mirror/debian-security\"\n"
+" LB_PARENT_MIRROR_BOOTSTRAP=\"http://mirror/debian\"\n"
+" LB_PARENT_MIRROR_CHROOT_SECURITY=\"http://mirror/debian-security\"\n"
+" LB_PARENT_MIRROR_CHROOT_BACKPORTS=\"http://mirror/debian-updates\"\n"
msgstr ""
#. type: Plain text
@@ -276,7 +289,7 @@ msgstr ""
"Ora, come super-utente, si generi l'immagine, salvando un log con #{tee}#."
#. type: Plain text
-#: en/user_examples.ssi:42 en/user_examples.ssi:66 en/user_examples.ssi:231
+#: en/user_examples.ssi:42 en/user_examples.ssi:69 en/user_examples.ssi:234
#, no-wrap
msgid " # lb build 2>&1 | tee binary.log\n"
msgstr ""
@@ -325,20 +338,33 @@ msgstr ""
"Live."
#. type: Plain text
-#: en/user_examples.ssi:56
+#: en/user_examples.ssi:59
#, no-wrap
-msgid " $ mkdir tutorial2 ; cd tutorial2 ; lb config -p lxde --packages iceweasel\n"
+msgid ""
+" $ mkdir tutorial2\n"
+" $ cd tutorial2\n"
+" $ lb config -p lxde\n"
+" $ echo iceweasel >> config/package-lists/my.list.chroot\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:60
+#: en/user_examples.ssi:63
+#, fuzzy
+#| 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."
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."
+"configuration for the web browser in #{config/includes.chroot/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 ""
"La scelta di LXDE per questo esempio riflette il desiderio di fornire un "
"ambiente desktop minimale, dato che il punto focale dell'immagine è il "
@@ -349,7 +375,7 @@ msgstr ""
"lasciamo questo come esercizio per il lettore."
#. type: Plain text
-#: en/user_examples.ssi:62
+#: en/user_examples.ssi:65
msgid ""
"Build the image, again as superuser, keeping a log as in {Tutorial 1}"
"#tutorial-1:"
@@ -358,25 +384,25 @@ msgstr ""
"{Tutorial 1}#tutorial-1:"
#. type: Plain text
-#: en/user_examples.ssi:70
+#: en/user_examples.ssi:73
msgid "Again, verify the image is OK and test, as in {Tutorial 1}#tutorial-1."
msgstr ""
"Di nuovo, si verifichi che l'immagine sia a posto e la si collaudi, come in "
"{Tutorial 1}#tutorial-1."
#. type: Plain text
-#: en/user_examples.ssi:72
+#: en/user_examples.ssi:75
msgid "2~tutorial-3 Tutorial 3: A personalized image"
msgstr "2~tutorial-3 Tutorial 3: un'immagine personalizzata"
#. type: Plain text
-#: en/user_examples.ssi:74
+#: en/user_examples.ssi:77
#, 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 "*{Caso d'uso:}* creazione di un progetto per costruire un'immagine personalizzata che contiene i pacchetti preferiti da portare con sé in una chiavetta USB ovunque si vada, e che evolve in revisioni successive allorché i bisogni o le preferenze cambino.\n"
#. type: Plain text
-#: en/user_examples.ssi:76
+#: en/user_examples.ssi:79
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 "
@@ -394,12 +420,12 @@ msgstr ""
"#managing-a-configuration."
#. type: Plain text
-#: en/user_examples.ssi:78
+#: en/user_examples.ssi:81
msgid "3~ First revision"
msgstr "3~ Prima revisione"
#. type: Plain text
-#: en/user_examples.ssi:84
+#: en/user_examples.ssi:87
#, no-wrap
msgid ""
" $ mkdir -p tutorial3/auto\n"
@@ -408,37 +434,57 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:88
+#: en/user_examples.ssi:91
msgid "Edit #{auto/config}# to read as follows:"
msgstr "Modificare #{auto/config}# come segue:"
#. type: Plain text
-#: en/user_examples.ssi:92 en/user_examples.ssi:141
+#: en/user_examples.ssi:95
#, no-wrap
msgid " #!/bin/sh\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:99
+#: en/user_examples.ssi:101
#, no-wrap
msgid ""
" lb config noauto \\\n"
" --architecture i386 \\\n"
-" --linux-flavours 686 \\\n"
-" --packages-lists lxde \\\n"
-" --packages \"iceweasel xchat\" \\\n"
+" --linux-flavours 686-pae \\\n"
+" --package-lists lxde \\\n"
" \"${@}\"\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:103
+#: en/user_examples.ssi:105
+#, fuzzy
+#| msgid "3~ Local package lists"
+msgid "Now populate your local package list:"
+msgstr "3~ Elenchi locali dei pacchetti"
+
+#. type: Plain text
+#: en/user_examples.ssi:109
+#, no-wrap
+msgid " $ echo \"iceweasel xchat\" >> config/package-lists/my.list.chroot\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:113
+#, fuzzy
+#| 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}#."
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}#."
+"{--linux-flavours 686-pae}# 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 ""
"Per prima cosa, #{--architecture i386}# assicura che sul nostro sistema #"
"{amd64}# costruiamo una versione a 32-bit utilizzabile sulla maggior parte "
@@ -449,12 +495,12 @@ msgstr ""
"# e #{xchat}#."
#. type: Plain text
-#: en/user_examples.ssi:105
+#: en/user_examples.ssi:115
msgid "Now, build the image:"
msgstr "Costruire quindi l'immagine:"
#. type: Plain text
-#: en/user_examples.ssi:113
+#: en/user_examples.ssi:123
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}#."
@@ -463,7 +509,7 @@ msgstr ""
"{2>&1 | tee binary.log}# dato che questo è ora incluso in #{auto/build}#."
#. type: Plain text
-#: en/user_examples.ssi:115
+#: en/user_examples.ssi:125
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 "
@@ -475,7 +521,7 @@ msgstr ""
"creati, e di fare poi il primo commit:"
#. type: Plain text
-#: en/user_examples.ssi:121
+#: en/user_examples.ssi:131
#, no-wrap
msgid ""
" $ git init\n"
@@ -484,12 +530,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:125
+#: en/user_examples.ssi:135
msgid "3~ Second revision"
msgstr "3~ Seconda revisione"
#. type: Plain text
-#: en/user_examples.ssi:127
+#: en/user_examples.ssi:137
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."
@@ -499,7 +545,7 @@ msgstr ""
"verifica e commit."
#. type: Plain text
-#: en/user_examples.ssi:129
+#: en/user_examples.ssi:139
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 "
@@ -512,53 +558,49 @@ msgstr ""
"passaggi per rigenerare i file dalla nuova configurazione."
#. type: Plain text
-#: en/user_examples.ssi:133
+#: en/user_examples.ssi:143
#, no-wrap
msgid " # lb clean\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:137
-msgid "Now edit #{auto/config}# to add the #{vlc}# package:"
-msgstr "Si modifichi ora #{auto/config}# per aggiungere il pacchetto #{vlc}#:"
+#: en/user_examples.ssi:147
+msgid ""
+"Now append the #{vlc}# package to our local package list in #{config/package-"
+"lists/my.list.chroot}#:"
+msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:148
+#: en/user_examples.ssi:151
#, no-wrap
-msgid ""
-" lb config noauto \\\n"
-" --architecture i386 \\\n"
-" --linux-flavours 686 \\\n"
-" --packages-lists lxde \\\n"
-" --packages \"iceweasel xchat vlc\" \\\n"
-" \"${@}\"\n"
+msgid " $ echo vlc >> config/package-lists/my.list.chroot\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:152
+#: en/user_examples.ssi:155
msgid "Build again:"
msgstr "Rigenerare nuovamente:"
#. type: Plain text
-#: en/user_examples.ssi:156
+#: en/user_examples.ssi:159
msgid "# lb build"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:160
+#: en/user_examples.ssi:163
msgid "Test, and when you're satisfied, commit the next revision:"
msgstr ""
"Verificare, e quando soddisfatti, eseguire il commit della revisione "
"successiva:"
#. type: Plain text
-#: en/user_examples.ssi:164
+#: en/user_examples.ssi:167
#, no-wrap
msgid " $ git commit -a -m \"Adding vlc media player.\"\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:168
+#: en/user_examples.ssi:171
msgid ""
"Of course, more complicated changes to the configuration are possible, "
"perhaps adding files in subdirectories of #{config/}#. When you commit new "
@@ -576,7 +618,7 @@ msgstr ""
"#{lb config}# attraverso i loro rispettivi script #{auto}#."
#. type: Plain text
-#: en/user_examples.ssi:170
+#: en/user_examples.ssi:173
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 "
@@ -592,22 +634,27 @@ msgstr ""
"utenti Debian Live."
#. type: Plain text
-#: en/user_examples.ssi:172
+#: en/user_examples.ssi:175
msgid "2~ A VNC Kiosk Client"
msgstr "2~ Un client Kiosk VNC"
#. type: Plain text
-#: en/user_examples.ssi:174
+#: en/user_examples.ssi:177
#, no-wrap
msgid "*{Use case:}* Create an image with live-build to boot directly to a VNC server.\n"
msgstr "*{Caso d'uso:}* creazione di un'immagine con live-build per avviare direttamente un server VNC.\n"
#. type: Plain text
-#: en/user_examples.ssi:176
+#: en/user_examples.ssi:179
+#, fuzzy
+#| msgid ""
+#| "Make a build directory and create a skeletal configuration in it built "
+#| "around the standard-x11 list, including #{gdm3}#, #{metacity}# and #"
+#| "{xtightvncviewer}#, disabling recommends to make a minimal system:"
msgid ""
"Make a build directory and create a skeletal configuration in it built "
"around the standard-x11 list, including #{gdm3}#, #{metacity}# and #"
-"{xtightvncviewer}#, disabling recommends to make a minimal system:"
+"{xvnc4viewer}#, disabling recommends to make a minimal system:"
msgstr ""
"Creare una directory con al suo interno una configurazione scheletrica "
"costruita sulla base dell'elenco di standard-x11, tra cui #{gdm3}#, #"
@@ -615,18 +662,18 @@ msgstr ""
"un sistema minimale:"
#. type: Plain text
-#: en/user_examples.ssi:184
+#: en/user_examples.ssi:187
#, no-wrap
msgid ""
" $ mkdir vnc_kiosk_client\n"
" $ cd vnc_kiosk_client\n"
-" $ lb config -a i386 -k 686 -p standard-x11 \\\n"
-" --packages \"gdm3 metacity xvnc4viewer\" \\\n"
+" $ lb config -a i386 -k 686-pae -p standard-x11 \\\n"
" --apt-recommends false\n"
+" $ echo \"gdm3 metacity xvnc4viewer\" >> config/package-lists/my.list.chroot\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:188
+#: en/user_examples.ssi:191
msgid ""
"Create the directory #{/etc/skel}# and put a custom #{.xsession}# in it for "
"the default user that will launch metacity and start xvncviewer, connecting "
@@ -638,16 +685,16 @@ msgstr ""
"{192.168.1.2}#:"
#. type: Plain text
-#: en/user_examples.ssi:194
+#: en/user_examples.ssi:197
#, no-wrap
msgid ""
-" $ mkdir -p config/chroot_local-includes/etc/skel\n"
-" $ cat >config/chroot_local-includes/etc/skel/.xsession <<END\n"
+" $ mkdir -p config/includes.chroot/etc/skel\n"
+" $ cat > config/includes.chroot/etc/skel/.xsession <<END\n"
" #!/bin/sh\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:197
+#: en/user_examples.ssi:200
#, no-wrap
msgid ""
" /usr/bin/metacity &\n"
@@ -655,7 +702,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:200
+#: en/user_examples.ssi:203
#, no-wrap
msgid ""
" exit\n"
@@ -663,28 +710,28 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:204
+#: en/user_examples.ssi:207
msgid "Build the image:"
msgstr "Costruire l'immagine:"
#. type: Plain text
-#: en/user_examples.ssi:212
+#: en/user_examples.ssi:215
msgid "Enjoy."
msgstr "Buon divertimento."
#. type: Plain text
-#: en/user_examples.ssi:214
+#: en/user_examples.ssi:217
msgid "2~ A base image for a 128M USB key"
msgstr "2~ Un'immagine base per una chiavetta USB da 128M"
#. type: Plain text
-#: en/user_examples.ssi:216
+#: en/user_examples.ssi:219
#, 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 "*{Caso d'uso:}* creazione di un'immagine standard con alcuni componenti rimossi affinché possa stare su una chiavetta USB da 128M, con lo spazio che rimane da usarsi come meglio si crede.\n"
#. type: Plain text
-#: en/user_examples.ssi:218
+#: en/user_examples.ssi:221
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 "
@@ -707,20 +754,20 @@ msgstr ""
"{important}# che molto probabilmente produrrà un sistema live danneggiato."
#. type: Plain text
-#: en/user_examples.ssi:223
+#: en/user_examples.ssi:226
#, no-wrap
msgid ""
-" $ lb config -k 486 -p minimal --binary-indices false \\\n"
+" $ lb config -k 486 -p minimal --apt-indices false \\\n"
" --memtest none --apt-recommends false --includes none\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:227
+#: en/user_examples.ssi:230
msgid "Now, build the image in the usual way:"
msgstr "Costruire quindi l'immagine nel modo consueto:"
#. type: Plain text
-#: en/user_examples.ssi:235
+#: en/user_examples.ssi:238
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 "
@@ -731,12 +778,28 @@ msgstr ""
"prodotta dalla configurazione predefinita nel {Tutorial 1}#tutorial-1."
#. type: Plain text
-#: en/user_examples.ssi:237
+#: en/user_examples.ssi:240
+#, fuzzy
+#| 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."
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 "
+"instead of the default #{-k \"486 686-pae\"}#. Leaving off APT's indices "
+"with #{--apt-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 #{--"
@@ -761,18 +824,18 @@ msgstr ""
"se le funzionalità sacrificate con ciascuna ottimizzazione valgono la pena."
#. type: Plain text
-#: en/user_examples.ssi:239
+#: en/user_examples.ssi:242
msgid "2~ A localized KDE desktop and installer"
msgstr "2~ Un desktop KDE localizzato e l'installer"
#. type: Plain text
-#: en/user_examples.ssi:241
+#: en/user_examples.ssi:244
#, no-wrap
msgid "*{Use case:}* Create a KDE desktop image, localized for Brazilian Portuguese and including an installer.\n"
msgstr "*{Caso d'uso:}* creazione di un'immagine con il desktop KDE, localizzato per il portoghese brasiliano e che includa l'installatore.\n"
#. type: Plain text
-#: en/user_examples.ssi:243
+#: en/user_examples.ssi:246
msgid ""
"We want to make an iso-hybrid image for i386 architecture using our "
"preferred desktop, in this case KDE, containing all of the same packages "
@@ -784,13 +847,20 @@ msgstr ""
"KDE."
#. type: Plain text
-#: en/user_examples.ssi:245
+#: en/user_examples.ssi:248
+#, fuzzy
+#| msgid ""
+#| "Our initial problem is the discovery of the names of the appropriate "
+#| "tasks. Currently, live-build cannot help with this. While we might get "
+#| "lucky and find this by trial-and-error, there is a tool, #{grep-dctrl}#, "
+#| "which can be used to dig it out of the task descriptions in tasksel-data, "
+#| "so to prepare, make sure you have both of those things:"
msgid ""
-"Our initial problem is the discovery of the names of the appropriate tasks. "
-"Currently, live-build cannot help with this. While we might get lucky and "
-"find this by trial-and-error, there is a tool, #{grep-dctrl}#, which can be "
-"used to dig it out of the task descriptions in tasksel-data, so to prepare, "
-"make sure you have both of those things:"
+"Our initial problem is the discovery of the names of the appropriate "
+"language tasks. Currently, live-build cannot help with this. While we might "
+"get lucky and find this by trial-and-error, there is a tool, #{grep-dctrl}#, "
+"which can be used to dig it out of the task descriptions in tasksel-data, so "
+"to prepare, make sure you have both of those things:"
msgstr ""
"Il problema iniziale è di scoprire i nomi dei task appropriati, attualmente, "
"live-build non aiuta in questo. Si può essere fortunati o arrivarci con vari "
@@ -799,30 +869,26 @@ msgstr ""
"di avere entrambi questi pacchetti:"
#. type: Plain text
-#: en/user_examples.ssi:249
+#: en/user_examples.ssi:252
#, no-wrap
msgid " # apt-get install dctrl-tools tasksel-data\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:253
+#: en/user_examples.ssi:256
msgid "Now we can search for the appropriate tasks, first with:"
msgstr "Ora si possono cercare i task appropriati:"
#. type: Plain text
-#: en/user_examples.ssi:262
+#: en/user_examples.ssi:261
#, no-wrap
msgid ""
-" $ grep-dctrl -FTest-lang pt_BR /usr/share/tasksel/debian-tasks.desc -sTask,Description\n"
+" $ grep-dctrl -FTest-lang pt_BR /usr/share/tasksel/descs/debian-tasks.desc -sTask\n"
" Task: brazilian-portuguese\n"
-" Description: Brazilian Portuguese environment\n"
-" This task installs programs, data files, and\n"
-" documentation that make it easier for Brazilian Portuguese speakers\n"
-" to use Debian.\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:266
+#: en/user_examples.ssi:265
msgid ""
"By this command, we discover the task is called, plainly enough, brazilian-"
"portuguese. Now to find the related tasks:"
@@ -831,41 +897,26 @@ msgstr ""
"chiaramente, brazilian-portuguese. Ora per trovare i task correlati:"
#. type: Plain text
-#: en/user_examples.ssi:273
+#: en/user_examples.ssi:271
#, no-wrap
msgid ""
-" $ grep-dctrl -FEnhances brazilian-portuguese /usr/share/tasksel/debian-tasks.desc -sTask,Description\n"
+" $ grep-dctrl -FEnhances brazilian-portuguese /usr/share/tasksel/descs/debian-tasks.desc -sTask\n"
" Task: brazilian-portuguese-desktop\n"
-" Description: Brazilian Portuguese desktop\n"
-" This task localises the desktop in Brasilian Portuguese.\n"
-msgstr ""
-
-#. type: Plain text
-#: en/user_examples.ssi:277
-#, no-wrap
-msgid ""
" Task: brazilian-portuguese-kde-desktop\n"
-" Description: Brazilian Portuguese KDE desktop\n"
-" This task localises the KDE desktop in Brazilian Portuguese.\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:281
+#: en/user_examples.ssi:275
msgid ""
-"We will use the experimental #{--language}# option, as live-build happens to "
-"include #{syslinux}# templates for pt_BR (see {Desktop and language tasks}"
-"#desktop-and-language-tasks for details). And at boot time we will generate "
-"the pt_BR.UTF-8 locale and select the pt-latin1 keyboard layout. Now let's "
-"put the pieces together:"
+"At boot time we will generate the pt_BR.UTF-8 locale and select the pt-"
+"latin1 keyboard layout. We will also need to preseed our desktop choice, "
+"\"kde\" so that tasksel will install the correct desktop task, as it differs "
+"from the default (see {Desktop and languages tasks}#desktop-and-language-"
+"tasks). Now let's put the pieces together:"
msgstr ""
-"Si userà l'opzione sperimentale #{--language}#, poiché live-build contempla "
-"i template #{syslinux}# per pt_BR (vedere {Task per desktop e lingua}"
-"#desktop-and-language-tasks per i dettagli). All'avvio verrà generata la "
-"lingua pt_BR.UTF-8 e selezionato pt-latin1 come layout della tastiera. Ora "
-"mettiamo insieme i pezzi:"
#. type: Plain text
-#: en/user_examples.ssi:295
+#: en/user_examples.ssi:289
#, no-wrap
msgid ""
" $ mkdir live-pt_BR-kde\n"
@@ -873,16 +924,16 @@ msgid ""
" $ lb config \\\n"
" -a i386 \\\n"
" -k 486 \\\n"
-" -p kde-desktop \\\n"
-" --language pt_BR \\\n"
-" --tasks \"brazilian-portuguese brazilian-portuguese-desktop brazilian-portuguese-kde-desktop\" \\\n"
" --bootappend-live \"locales=pt_BR.UTF-8 keyboard-layouts=pt-latin1\" \\\n"
-" --debian-installer live \\\n"
-" --packages debian-installer-launcher\n"
+" --debian-installer live\n"
+" $ echo kde-desktop brazilian-portuguese brazilian-portuguese-desktop \\\n"
+" brazilian-portuguese-kde-desktop >> config/task-lists/my.list.chroot\n"
+" $ echo debian-installer-launcher >> config/package-lists/my.list.chroot\n"
+" $ echo tasksel tasksel/desktop multiselect kde >> config/preseed/my.preseed.chroot\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:298
+#: en/user_examples.ssi:292
msgid ""
"Note that we have included the #{debian-installer-launcher}# package to "
"launch the installer from the live desktop, and have also specified the 486 "
diff --git a/manual/po/it/user_installation.ssi.po b/manual/po/it/user_installation.ssi.po
index 1355ddd..086a478 100644
--- a/manual/po/it/user_installation.ssi.po
+++ b/manual/po/it/user_installation.ssi.po
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-06-21 09:17+0300\n"
+"POT-Creation-Date: 2011-11-07 17:40-0400\n"
"PO-Revision-Date: 2011-06-21 13:11+0200\n"
"Last-Translator: skizzhg <skizzhg at gmx.com>\n"
"Language-Team: Italian <tp at lists.linux.it>\n"
@@ -39,37 +39,38 @@ msgstr ""
#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
-#: en/user_customization-installer.ssi:43
+#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
-#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:53
-#: en/user_customization-packages.ssi:66 en/user_customization-packages.ssi:80
-#: en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:112
-#: en/user_customization-packages.ssi:142
-#: en/user_customization-packages.ssi:155
-#: en/user_customization-packages.ssi:165
-#: en/user_customization-packages.ssi:175
-#: en/user_customization-packages.ssi:185
-#: en/user_customization-packages.ssi:199
-#: en/user_customization-packages.ssi:215
-#: en/user_customization-packages.ssi:227
-#: en/user_customization-packages.ssi:291
-#: en/user_customization-packages.ssi:303
-#: en/user_customization-packages.ssi:313
-#: en/user_customization-packages.ssi:331
-#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
-#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
-#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
-#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
-#: en/user_customization-runtime.ssi:99 en/user_customization-runtime.ssi:107
-#: 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:178 en/user_examples.ssi:190
-#: en/user_examples.ssi:206 en/user_examples.ssi:220 en/user_examples.ssi:229
-#: en/user_examples.ssi:247 en/user_examples.ssi:255 en/user_examples.ssi:268
-#: en/user_examples.ssi:283 en/user_installation.ssi:38
+#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:54
+#: en/user_customization-packages.ssi:67 en/user_customization-packages.ssi:81
+#: en/user_customization-packages.ssi:101
+#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:140
+#: en/user_customization-packages.ssi:150
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:184
+#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:276
+#: en/user_customization-packages.ssi:288
+#: en/user_customization-packages.ssi:298
+#: en/user_customization-packages.ssi:316
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:24 en/user_customization-runtime.ssi:44
+#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:63
+#: en/user_customization-runtime.ssi:71 en/user_customization-runtime.ssi:80
+#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:111
+#: en/user_customization-runtime.ssi:119 en/user_examples.ssi:14
+#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
+#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
+#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
+#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
+#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
+#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
+#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
+#: en/user_examples.ssi:277 en/user_installation.ssi:38
#: en/user_installation.ssi:46 en/user_installation.ssi:56
#: en/user_installation.ssi:64 en/user_installation.ssi:74
#: en/user_installation.ssi:82 en/user_installation.ssi:90
@@ -78,7 +79,7 @@ msgstr ""
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:80 en/user_overview.ssi:88
+#: en/user_overview.ssi:48 en/user_overview.ssi:56
msgid "code{"
msgstr "code{"
@@ -102,38 +103,39 @@ msgstr "code{"
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
-#: en/user_customization-installer.ssi:37
-#: en/user_customization-installer.ssi:48
+#: en/user_customization-installer.ssi:38
+#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:70 en/user_customization-packages.ssi:84
-#: en/user_customization-packages.ssi:98
-#: en/user_customization-packages.ssi:116
-#: en/user_customization-packages.ssi:147
-#: en/user_customization-packages.ssi:161
-#: en/user_customization-packages.ssi:171
-#: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:191
-#: en/user_customization-packages.ssi:203
-#: en/user_customization-packages.ssi:219
-#: en/user_customization-packages.ssi:231
-#: en/user_customization-packages.ssi:295
-#: en/user_customization-packages.ssi:307
-#: en/user_customization-packages.ssi:317
-#: en/user_customization-packages.ssi:344
-#: en/user_customization-packages.ssi:353 en/user_customization-runtime.ssi:18
-#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
-#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
-#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
-#: en/user_customization-runtime.ssi:103 en/user_customization-runtime.ssi:112
-#: 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:186 en/user_examples.ssi:202
-#: en/user_examples.ssi:210 en/user_examples.ssi:225 en/user_examples.ssi:233
-#: en/user_examples.ssi:251 en/user_examples.ssi:264 en/user_examples.ssi:279
-#: en/user_examples.ssi:297 en/user_installation.ssi:42
+#: en/user_customization-packages.ssi:46 en/user_customization-packages.ssi:59
+#: en/user_customization-packages.ssi:71 en/user_customization-packages.ssi:85
+#: en/user_customization-packages.ssi:105
+#: en/user_customization-packages.ssi:132
+#: en/user_customization-packages.ssi:146
+#: en/user_customization-packages.ssi:156
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:329
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:346 en/user_customization-runtime.ssi:18
+#: en/user_customization-runtime.ssi:28 en/user_customization-runtime.ssi:48
+#: en/user_customization-runtime.ssi:59 en/user_customization-runtime.ssi:67
+#: en/user_customization-runtime.ssi:76 en/user_customization-runtime.ssi:85
+#: en/user_customization-runtime.ssi:105 en/user_customization-runtime.ssi:115
+#: en/user_customization-runtime.ssi:124 en/user_examples.ssi:20
+#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
+#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
+#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
+#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
+#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
+#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
+#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
+#: en/user_examples.ssi:291 en/user_installation.ssi:42
#: en/user_installation.ssi:50 en/user_installation.ssi:60
#: en/user_installation.ssi:70 en/user_installation.ssi:78
#: en/user_installation.ssi:86 en/user_installation.ssi:94
@@ -141,15 +143,15 @@ msgstr "code{"
#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
-#: en/user_overview.ssi:84 en/user_overview.ssi:92
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:42
+#: en/user_overview.ssi:52 en/user_overview.ssi:60
msgid "}code"
msgstr "}code"
#. type: Plain text
-#: en/user_customization-packages.ssi:82 en/user_installation.ssi:148
+#: en/user_customization-packages.ssi:83 en/user_installation.ssi:148
#, no-wrap
-msgid " $ lb config --repository live.debian.net\n"
+msgid " $ lb config --archives live.debian.net\n"
msgstr ""
#. type: Plain text
@@ -369,8 +371,8 @@ msgstr "2~ live-boot e live-config"
#. type: Plain text
#: en/user_installation.ssi:102
#, no-wrap
-msgid "*{Note:}* You do not need to install live-boot or live-config on your system to create customized Debian Live systems. However, doing so will do no harm and is useful for reference purposes.\n"
-msgstr "*{Nota:}* non è necessario installare live-boot o live-config sul proprio sistema per creare sistemi Debian Live personalizzati. Tuttavia, farlo non nuoce.\n"
+msgid "*{Note:}* You do not need to install live-boot or live-config on your system to create customized Debian Live systems. However, doing so will do no harm and is useful for reference purposes. If you only want the documentation, you may now install the live-boot-doc and live-config-doc packages separately.\n"
+msgstr "*{Nota:}* non è necessario installare live-boot o live-config sul proprio sistema per creare sistemi Debian Live personalizzati. Tuttavia, farlo non nuoce. Se si vuole la documentazione è possibile installare i pacchetti live-boot-doc e live-config-doc separatamente.\n"
#. type: Plain text
#: en/user_installation.ssi:106
@@ -423,27 +425,27 @@ msgstr "_* Costruire un .deb di live-boot e live-config"
#: en/user_installation.ssi:125
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 "
-"build against Squeeze."
+"your target platform: this means if your target is Wheezy then you should "
+"build against Wheezy."
msgstr ""
"È necessario compilare sulla distribuzione di destinazione, oppure in un "
"chroot contenente la piattaforma di destinazione: significa che se "
-"l'obiettivo è Squeeze allora bisogna compilare su Squeeze."
+"l'obiettivo è Wheezy allora bisogna compilare su Wheezy."
#. type: Plain text
#: en/user_installation.ssi:127
msgid ""
"Use a personal builder such as /{pbuilder}/ or /{sbuild}/ if you need to "
"build #{live-boot}# for a target distribution that differs from your build "
-"system. For example, for Squeeze live images, build #{live-boot}# in a "
-"Squeeze chroot. If your target distribution happens to match your build "
-"system distribution, you may build directly on the build system using #{dpkg-"
+"system. For example, for Wheezy live images, build #{live-boot}# in a Wheezy "
+"chroot. If your target distribution happens to match your build system "
+"distribution, you may build directly on the build system using #{dpkg-"
"buildpackage}# (provided by the /{dpkg-dev}/ package):"
msgstr ""
"Se si deve compilare #{live-boot}# per una distribuzione di destinazione "
"diversa dal proprio sistema, utilizzare un compilatore tipo /{pbuilder}/ o /"
-"{sbuild}/. Ad esempio, per immagini live Squeeze, si generi #{live-boot}# in "
-"un chroot Squeeze. Se la distribuzione di destinazione corrisponde con la "
+"{sbuild}/. Ad esempio, per immagini live Wheezy, si generi #{live-boot}# in "
+"un chroot Wheezy. Se la distribuzione di destinazione corrisponde con la "
"distribuzione del proprio sistema, si può costruire direttamente sul sistema "
"usando #{dpkg-buildpackage}# (fornito dal pacchetto /{dpkg-dev}/):"
@@ -485,9 +487,9 @@ msgid ""
"You can let live-build automatically use the latest snapshots of live-boot "
"and live-config by configuring a third-party repository in your live-build "
"configuration directory. Assuming you have already created a configuration "
-"tree with #{lb config}#:"
+"tree in the current directory with #{lb config}#:"
msgstr ""
"Si può lasciare che live-build usi automaticamente l'ultima istantanea di "
"live-boot e live-config configurando un repository esterno nella directory "
"di configurazione di live-build. Assumendo che si sia già creato un albero "
-"di configurazione con #{lb config}#:"
+"di configurazione nell'attuale directory con #{lb config}#:"
diff --git a/manual/po/it/user_managing_a_configuration.ssi.po b/manual/po/it/user_managing_a_configuration.ssi.po
index ce50b86..8d64d82 100644
--- a/manual/po/it/user_managing_a_configuration.ssi.po
+++ b/manual/po/it/user_managing_a_configuration.ssi.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2010-12-19 20:37-0400\n"
+"POT-Creation-Date: 2011-11-02 12:23-0200\n"
"PO-Revision-Date: 2011-03-11 11:21+0100\n"
"Last-Translator: skizzhg <skizzhg at gmx.com>\n"
"Language-Team: Italian <tp at lists.linux.it>\n"
@@ -20,55 +20,56 @@ msgstr ""
#. type: Plain text
#: 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/project_bugs.ssi:58
+#: en/about_manual.ssi:146 en/about_manual.ssi:157 en/about_manual.ssi:165
+#: en/about_manual.ssi:173 en/project_bugs.ssi:60
#: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
#: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
#: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/user_basics.ssi:30 en/user_basics.ssi:40
-#: en/user_basics.ssi:52 en/user_basics.ssi:64 en/user_basics.ssi:76
-#: en/user_basics.ssi:86 en/user_basics.ssi:100 en/user_basics.ssi:108
-#: en/user_basics.ssi:116 en/user_basics.ssi:126 en/user_basics.ssi:140
+#: en/project_procedures.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
+#: en/user_basics.ssi:116 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:218 en/user_basics.ssi:246 en/user_basics.ssi:262
-#: en/user_basics.ssi:270 en/user_basics.ssi:290 en/user_basics.ssi:315
+#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
+#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
+#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
+#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
-#: en/user_customization-installer.ssi:43
+#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
-#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:53
-#: en/user_customization-packages.ssi:66 en/user_customization-packages.ssi:80
-#: en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:112
-#: en/user_customization-packages.ssi:142
-#: en/user_customization-packages.ssi:155
-#: en/user_customization-packages.ssi:165
-#: en/user_customization-packages.ssi:175
-#: en/user_customization-packages.ssi:185
-#: en/user_customization-packages.ssi:199
-#: en/user_customization-packages.ssi:215
-#: en/user_customization-packages.ssi:227
-#: en/user_customization-packages.ssi:291
-#: en/user_customization-packages.ssi:303
-#: en/user_customization-packages.ssi:313
-#: en/user_customization-packages.ssi:331
-#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
-#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
-#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
-#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
-#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:106
-#: 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:178 en/user_examples.ssi:190
-#: en/user_examples.ssi:206 en/user_examples.ssi:220 en/user_examples.ssi:229
-#: en/user_examples.ssi:247 en/user_examples.ssi:255 en/user_examples.ssi:268
-#: en/user_examples.ssi:283 en/user_installation.ssi:38
+#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:54
+#: en/user_customization-packages.ssi:67 en/user_customization-packages.ssi:81
+#: en/user_customization-packages.ssi:101
+#: en/user_customization-packages.ssi:131
+#: en/user_customization-packages.ssi:144
+#: en/user_customization-packages.ssi:154
+#: en/user_customization-packages.ssi:164
+#: en/user_customization-packages.ssi:174
+#: en/user_customization-packages.ssi:188
+#: en/user_customization-packages.ssi:204
+#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:320
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:345 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:24 en/user_customization-runtime.ssi:44
+#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:63
+#: en/user_customization-runtime.ssi:71 en/user_customization-runtime.ssi:80
+#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:111
+#: en/user_customization-runtime.ssi:119 en/user_examples.ssi:14
+#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
+#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
+#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
+#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
+#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
+#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
+#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:271
+#: en/user_examples.ssi:286 en/user_installation.ssi:38
#: en/user_installation.ssi:46 en/user_installation.ssi:56
#: en/user_installation.ssi:64 en/user_installation.ssi:74
#: en/user_installation.ssi:82 en/user_installation.ssi:90
@@ -84,60 +85,61 @@ msgstr "code{"
#. type: Plain text
#: 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:174 en/project_bugs.ssi:62
+#: en/about_manual.ssi:151 en/about_manual.ssi:161 en/about_manual.ssi:169
+#: en/about_manual.ssi:177 en/project_bugs.ssi:64
#: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
#: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
#: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/user_basics.ssi:34 en/user_basics.ssi:44
-#: en/user_basics.ssi:58 en/user_basics.ssi:70 en/user_basics.ssi:80
-#: en/user_basics.ssi:92 en/user_basics.ssi:104 en/user_basics.ssi:112
-#: en/user_basics.ssi:120 en/user_basics.ssi:130 en/user_basics.ssi:146
+#: en/project_procedures.ssi:131 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:134 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:238 en/user_basics.ssi:250 en/user_basics.ssi:266
-#: en/user_basics.ssi:274 en/user_basics.ssi:301 en/user_basics.ssi:340
+#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
+#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
+#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
+#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
-#: en/user_customization-installer.ssi:37
-#: en/user_customization-installer.ssi:48
+#: en/user_customization-installer.ssi:38
+#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:70 en/user_customization-packages.ssi:84
-#: en/user_customization-packages.ssi:98
-#: en/user_customization-packages.ssi:116
-#: en/user_customization-packages.ssi:147
-#: en/user_customization-packages.ssi:161
-#: en/user_customization-packages.ssi:171
-#: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:191
-#: en/user_customization-packages.ssi:203
-#: en/user_customization-packages.ssi:219
-#: en/user_customization-packages.ssi:231
-#: en/user_customization-packages.ssi:295
-#: en/user_customization-packages.ssi:307
-#: en/user_customization-packages.ssi:317
-#: en/user_customization-packages.ssi:344
-#: en/user_customization-packages.ssi:354 en/user_customization-runtime.ssi:18
-#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
-#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
-#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
-#: en/user_customization-runtime.ssi:102 en/user_customization-runtime.ssi:111
-#: 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:186 en/user_examples.ssi:202
-#: en/user_examples.ssi:210 en/user_examples.ssi:225 en/user_examples.ssi:233
-#: en/user_examples.ssi:251 en/user_examples.ssi:264 en/user_examples.ssi:279
-#: en/user_examples.ssi:297 en/user_installation.ssi:42
+#: en/user_customization-packages.ssi:46 en/user_customization-packages.ssi:59
+#: en/user_customization-packages.ssi:71 en/user_customization-packages.ssi:85
+#: en/user_customization-packages.ssi:105
+#: en/user_customization-packages.ssi:136
+#: en/user_customization-packages.ssi:150
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:180
+#: en/user_customization-packages.ssi:192
+#: en/user_customization-packages.ssi:208
+#: en/user_customization-packages.ssi:220
+#: en/user_customization-packages.ssi:284
+#: en/user_customization-packages.ssi:296
+#: en/user_customization-packages.ssi:306
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341
+#: en/user_customization-packages.ssi:350 en/user_customization-runtime.ssi:18
+#: en/user_customization-runtime.ssi:28 en/user_customization-runtime.ssi:48
+#: en/user_customization-runtime.ssi:59 en/user_customization-runtime.ssi:67
+#: en/user_customization-runtime.ssi:76 en/user_customization-runtime.ssi:85
+#: en/user_customization-runtime.ssi:105 en/user_customization-runtime.ssi:115
+#: en/user_customization-runtime.ssi:124 en/user_examples.ssi:20
+#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
+#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
+#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
+#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
+#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
+#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
+#: en/user_examples.ssi:254 en/user_examples.ssi:267 en/user_examples.ssi:282
+#: en/user_examples.ssi:300 en/user_installation.ssi:42
#: en/user_installation.ssi:50 en/user_installation.ssi:60
#: en/user_installation.ssi:70 en/user_installation.ssi:78
#: en/user_installation.ssi:86 en/user_installation.ssi:94
#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_installation.ssi:150 en/user_managing_a_configuration.ssi:31
+#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
@@ -274,7 +276,7 @@ msgstr ""
msgid ""
" #!/bin/sh\n"
" lb config noauto \\\n"
-" --packages-lists \"standard\" \\\n"
+" --package-lists \"standard\" \\\n"
" \"${@}\"\n"
msgstr ""
@@ -323,10 +325,17 @@ msgid " $ cp /usr/share/live/build/examples/auto/* auto/\n"
msgstr ""
#. type: Plain text
-#: en/user_managing_a_configuration.ssi:62
+#: en/user_managing_a_configuration.ssi:61
+#, fuzzy
+#| msgid ""
+#| "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."
msgid ""
"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. "
+"example above, #{--package-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/it/user_overview.ssi.po b/manual/po/it/user_overview.ssi.po
index b908d90..3c24d5a 100644
--- a/manual/po/it/user_overview.ssi.po
+++ b/manual/po/it/user_overview.ssi.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-05-13 12:02-0200\n"
+"POT-Creation-Date: 2011-11-07 08:16-0400\n"
"PO-Revision-Date: 2011-03-11 11:27+0100\n"
"Last-Translator: skizzhg <skizzhg at gmx.com>\n"
"Language-Team: Italian <tp at lists.linux.it>\n"
@@ -38,37 +38,38 @@ msgstr ""
#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
-#: en/user_customization-installer.ssi:43
+#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
-#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:53
-#: en/user_customization-packages.ssi:66 en/user_customization-packages.ssi:80
-#: en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:112
-#: en/user_customization-packages.ssi:142
-#: en/user_customization-packages.ssi:155
-#: en/user_customization-packages.ssi:165
-#: en/user_customization-packages.ssi:175
-#: en/user_customization-packages.ssi:185
-#: en/user_customization-packages.ssi:199
-#: en/user_customization-packages.ssi:215
-#: en/user_customization-packages.ssi:227
-#: en/user_customization-packages.ssi:291
-#: en/user_customization-packages.ssi:303
-#: en/user_customization-packages.ssi:313
-#: en/user_customization-packages.ssi:331
-#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
-#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
-#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
-#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
-#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:105
-#: 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:178 en/user_examples.ssi:190
-#: en/user_examples.ssi:206 en/user_examples.ssi:220 en/user_examples.ssi:229
-#: en/user_examples.ssi:247 en/user_examples.ssi:255 en/user_examples.ssi:268
-#: en/user_examples.ssi:283 en/user_installation.ssi:38
+#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:54
+#: en/user_customization-packages.ssi:67 en/user_customization-packages.ssi:81
+#: en/user_customization-packages.ssi:101
+#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:140
+#: en/user_customization-packages.ssi:150
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:184
+#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:276
+#: en/user_customization-packages.ssi:288
+#: en/user_customization-packages.ssi:298
+#: en/user_customization-packages.ssi:316
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:24 en/user_customization-runtime.ssi:44
+#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:63
+#: en/user_customization-runtime.ssi:71 en/user_customization-runtime.ssi:80
+#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:111
+#: en/user_customization-runtime.ssi:119 en/user_examples.ssi:14
+#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
+#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
+#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
+#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
+#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
+#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
+#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
+#: en/user_examples.ssi:277 en/user_installation.ssi:38
#: en/user_installation.ssi:46 en/user_installation.ssi:56
#: en/user_installation.ssi:64 en/user_installation.ssi:74
#: en/user_installation.ssi:82 en/user_installation.ssi:90
@@ -77,7 +78,7 @@ msgstr ""
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:80 en/user_overview.ssi:88
+#: en/user_overview.ssi:48 en/user_overview.ssi:56
msgid "code{"
msgstr "code{"
@@ -101,38 +102,39 @@ msgstr "code{"
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
-#: en/user_customization-installer.ssi:37
-#: en/user_customization-installer.ssi:48
+#: en/user_customization-installer.ssi:38
+#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:70 en/user_customization-packages.ssi:84
-#: en/user_customization-packages.ssi:98
-#: en/user_customization-packages.ssi:116
-#: en/user_customization-packages.ssi:147
-#: en/user_customization-packages.ssi:161
-#: en/user_customization-packages.ssi:171
-#: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:191
-#: en/user_customization-packages.ssi:203
-#: en/user_customization-packages.ssi:219
-#: en/user_customization-packages.ssi:231
-#: en/user_customization-packages.ssi:295
-#: en/user_customization-packages.ssi:307
-#: en/user_customization-packages.ssi:317
-#: en/user_customization-packages.ssi:344
-#: en/user_customization-packages.ssi:353 en/user_customization-runtime.ssi:18
-#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
-#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
-#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
-#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:110
-#: 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:186 en/user_examples.ssi:202
-#: en/user_examples.ssi:210 en/user_examples.ssi:225 en/user_examples.ssi:233
-#: en/user_examples.ssi:251 en/user_examples.ssi:264 en/user_examples.ssi:279
-#: en/user_examples.ssi:297 en/user_installation.ssi:42
+#: en/user_customization-packages.ssi:46 en/user_customization-packages.ssi:59
+#: en/user_customization-packages.ssi:71 en/user_customization-packages.ssi:85
+#: en/user_customization-packages.ssi:105
+#: en/user_customization-packages.ssi:132
+#: en/user_customization-packages.ssi:146
+#: en/user_customization-packages.ssi:156
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:329
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:346 en/user_customization-runtime.ssi:18
+#: en/user_customization-runtime.ssi:28 en/user_customization-runtime.ssi:48
+#: en/user_customization-runtime.ssi:59 en/user_customization-runtime.ssi:67
+#: en/user_customization-runtime.ssi:76 en/user_customization-runtime.ssi:85
+#: en/user_customization-runtime.ssi:105 en/user_customization-runtime.ssi:115
+#: en/user_customization-runtime.ssi:124 en/user_examples.ssi:20
+#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
+#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
+#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
+#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
+#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
+#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
+#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
+#: en/user_examples.ssi:291 en/user_installation.ssi:42
#: en/user_installation.ssi:50 en/user_installation.ssi:60
#: en/user_installation.ssi:70 en/user_installation.ssi:78
#: en/user_installation.ssi:86 en/user_installation.ssi:94
@@ -140,8 +142,8 @@ msgstr "code{"
#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
-#: en/user_overview.ssi:84 en/user_overview.ssi:92
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:42
+#: en/user_overview.ssi:52 en/user_overview.ssi:60
msgid "}code"
msgstr "}code"
@@ -295,70 +297,39 @@ msgstr ""
#. type: Plain text
#: en/user_overview.ssi:34
+#, fuzzy
+#| msgid ""
+#| "Issuing #{lb config}# without any arguments creates a #{config/}# "
+#| "subdirectory which it populates with some default settings:"
msgid ""
"Issuing #{lb config}# without any arguments creates a #{config/}# "
-"subdirectory which it populates with some default settings:"
+"subdirectory which it populates with some default settings, and a skeleton #"
+"{auto/}# subdirectory tree."
msgstr ""
"L'esecuzione di #{lb config}# senza argomenti crea una sottodirectory di #"
"{config/}# popolata con alcune impostazioni predefinite:"
#. type: Plain text
-#: en/user_overview.ssi:39
+#: en/user_overview.ssi:40
#, no-wrap
msgid ""
" $ lb config\n"
+" P: Considering defaults defined in /etc/live/build.conf\n"
" P: Creating config tree\n"
msgstr ""
#. type: Plain text
#: en/user_overview.ssi:44
-#, no-wrap
-msgid ""
-" $ ls -l\n"
-" total 8\n"
-" drwxr-xr-x 3 user user 4096 Sep 7 13:02 auto\n"
-" drwxr-xr-x 22 user user 4096 Sep 7 13:02 config\n"
-msgstr ""
-
-#. type: Plain text
-#: en/user_overview.ssi:72
-#, no-wrap
-msgid ""
-" $ ls -l config/\n"
-" total 104\n"
-" -rw-r--r-- 1 user user 4197 Sep 7 13:02 binary\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_debian-installer\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_debian-installer-includes\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_grub\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-debs\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-hooks\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-includes\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-packageslists\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-udebs\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_rootfs\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_syslinux\n"
-" -rw-r--r-- 1 user user 2051 Sep 7 13:02 bootstrap\n"
-" -rw-r--r-- 1 user user 1647 Sep 7 13:02 chroot\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_apt\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-hooks\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-includes\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-packages\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-packageslists\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-patches\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-preseed\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_sources\n"
-" -rw-r--r-- 1 user user 2954 Sep 7 13:02 common\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 includes\n"
-" -rw-r--r-- 1 user user 205 Sep 7 13:02 source\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 templates\n"
-msgstr ""
-
-#. type: Plain text
-#: en/user_overview.ssi:76
+#, fuzzy
+#| msgid ""
+#| "Using #{lb config}# without any arguments would be suitable for users who "
+#| "need a very basic image, or who intend to later provide a more complete "
+#| "configuration via auto/config (see {Managing a configuration}#managing-a-"
+#| "configuration for details)."
msgid ""
"Using #{lb config}# without any arguments would be suitable for users who "
"need a very basic image, or who intend to later provide a more complete "
-"configuration via auto/config (see {Managing a configuration}#managing-a-"
+"configuration via #{auto/config}# (see {Managing a configuration}#managing-a-"
"configuration for details)."
msgstr ""
"L'uso di #{lb config}# senza argomenti è adatto ad utenti che necessitano di "
@@ -367,7 +338,7 @@ msgstr ""
"configurazione}#managing-a-configuration)."
#. type: Plain text
-#: en/user_overview.ssi:78
+#: en/user_overview.ssi:46
msgid ""
"Normally, you will want to specify some options. For example, to include the "
"'gnome' package list in your configuration:"
@@ -376,37 +347,42 @@ msgstr ""
"nella propria configurazione l'elenco del pacchetto \"gnome\":"
#. type: Plain text
-#: en/user_overview.ssi:82
+#: en/user_overview.ssi:50
#, no-wrap
msgid " $ lb config -p gnome\n"
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:86
+#: en/user_overview.ssi:54
msgid "It is possible to specify many options, such as:"
msgstr "È possibile specificare molte opzioni, come:"
#. type: Plain text
-#: en/user_overview.ssi:90
+#: en/user_overview.ssi:58
#, no-wrap
msgid " $ lb config --binary-images net --hostname live-machine --username live-user ...\n"
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:94
+#: en/user_overview.ssi:62
msgid "A full list of options is available in the #{lb_config}# man page."
msgstr ""
"Una lista completa delle opzioni è disponibile nel manuale di #{lb_config}#."
#. type: Plain text
-#: en/user_overview.ssi:96
+#: en/user_overview.ssi:64
msgid "3~lb-build The #{lb build}# command"
msgstr "3~lb-build Il comando #{lb build}#"
#. type: Plain text
-#: en/user_overview.ssi:98
+#: en/user_overview.ssi:66
+#, fuzzy
+#| msgid ""
+#| "The #{lb build}# command reads in your configuration from the config/ "
+#| "directory. It then runs the lower level commands needed to build your "
+#| "Live system."
msgid ""
-"The #{lb build}# command reads in your configuration from the config/ "
+"The #{lb build}# command reads in your configuration from the #{config/}# "
"directory. It then runs the lower level commands needed to build your Live "
"system."
msgstr ""
@@ -415,12 +391,12 @@ msgstr ""
"live."
#. type: Plain text
-#: en/user_overview.ssi:100
+#: en/user_overview.ssi:68
msgid "3~lb-clean The #{lb clean}# command"
msgstr "3~lb-clean Il comando #{lb clean}#"
#. type: Plain text
-#: en/user_overview.ssi:102
+#: en/user_overview.ssi:70
msgid ""
"It is the job of the #{lb clean}# command to remove various parts of a build "
"so subsequent builds can start from a clean state. By default, #{chroot}#, #"
@@ -440,12 +416,12 @@ msgstr ""
"{lb_clean}#."
#. type: Plain text
-#: en/user_overview.ssi:104
+#: en/user_overview.ssi:72
msgid "2~live-boot The live-boot package"
msgstr "2~live-boot Il pacchetto live-boot"
#. type: Plain text
-#: en/user_overview.ssi:106
+#: en/user_overview.ssi:74
msgid ""
"live-boot is a collection of scripts providing hooks for the initramfs-"
"tools, used to generate an initramfs capable of booting live systems, such "
@@ -458,9 +434,15 @@ msgstr ""
"per l'avvio da rete e immagini per penne USB."
#. type: Plain text
-#: en/user_overview.ssi:108
+#: en/user_overview.ssi:76
+#, fuzzy
+#| msgid ""
+#| "At boot time it will look for read-only media containing a \"/live\" "
+#| "directory where a root filesystem (often a compressed filesystem image "
+#| "like squashfs) is stored. If found, it will create a writable "
+#| "environment, using aufs, for Debian like systems to boot from."
msgid ""
-"At boot time it will look for read-only media containing a \"/live\" "
+"At boot time it will look for read-only media containing a #{/live/}# "
"directory where a root filesystem (often a compressed filesystem image like "
"squashfs) is stored. If found, it will create a writable environment, using "
"aufs, for Debian like systems to boot from."
@@ -471,7 +453,7 @@ msgstr ""
"avviarsi da sistemi simili a Debian."
#. type: Plain text
-#: en/user_overview.ssi:110
+#: en/user_overview.ssi:78
msgid ""
"More information on initial ramfs in Debian can be found in the Debian Linux "
"Kernel Handbook at http://kernel-handbook.alioth.debian.org/ in the chapter "
@@ -482,12 +464,12 @@ msgstr ""
"handbook.alioth.debian.org/."
#. type: Plain text
-#: en/user_overview.ssi:112
+#: en/user_overview.ssi:80
msgid "2~live-config The live-config package"
msgstr "2~live-config Il pacchetto live-config"
#. type: Plain text
-#: en/user_overview.ssi:113
+#: en/user_overview.ssi:81
msgid ""
"live-config consists of the scripts that run at boot time after live-boot to "
"configure the live system automatically. It handles such tasks as setting "
diff --git a/manual/po/pt_BR/index.html.in.po b/manual/po/pt_BR/index.html.in.po
index a600fbd..9155185 100644
--- a/manual/po/pt_BR/index.html.in.po
+++ b/manual/po/pt_BR/index.html.in.po
@@ -2,14 +2,15 @@
# 2010 Bruno Gurgel <bruno.gurgel at gmail.com>
# This file is distributed under the same license as the live-config package.
# Carlo Stemberger <carlo.stemberger at gmail.com>, 2010.
+# Carlos Zuferri «chals» <chals at altorricon.com>, 2011.
#
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-02-03 18:22-0400\n"
-"PO-Revision-Date: 2010-12-08 16:21+0100\n"
-"Last-Translator: Carlo Stemberger <carlo.stemberger at gmail.com>\n"
-"Language-Team: Italian <tp at lists.linux.it>\n"
+"POT-Creation-Date: 2011-12-03 18:55+0100\n"
+"PO-Revision-Date: 2011-11-25 22:27+0100\n"
+"Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
+"Language-Team: <debian-live at lists.debian.org>\n"
"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -29,75 +30,83 @@ msgstr "Manual do Debian Live"
#. type: Content of: <html><body><p>
#: en/index.html.in:12
msgid ""
+"<i>live-manual</i> is available in different file formats and it is "
+"translated into several languages. Keep in mind that some translations may "
+"be incomplete or may not be up to date."
+msgstr ""
+
+#. type: Content of: <html><body><p>
+#: en/index.html.in:17
+msgid ""
"Please report errors, omissions, patches and suggestions to our mailinglist "
"at <a href=\"mailto:debian-live at lists.debian.org\">debian-live at lists.debian."
-"org</a> and read about <a href=\"html/about-manual.html#how-to-contribute"
+"org</a> and read about <a href=\"html/about-manual.en.html#how-to-contribute"
"\">how to contribute</a> to the manual."
msgstr ""
"Por favor reporte erros, omissões, patches e sugestões para nossa lista de "
"discussão em <a href=\"mailto:debian-live at lists.debian.org\">debian-"
-"live at lists.debian.org</a> e leia sobre <a href=\"html/about-manual.html#how-"
-"to-contribute\">como contribuir</a> com o manual."
+"live at lists.debian.org</a> e leia sobre <a href=\"html/about-manual.pt_BR."
+"html#how-to-contribute\">como contribuir</a> com o manual."
#. type: Content of: <html><body><h3>
-#: en/index.html.in:15
+#: en/index.html.in:20
msgid "Available Formats"
msgstr "Formatos Disponíveis"
#. type: Content of: <html><body><ul><li>
-#: en/index.html.in:18
-msgid "<a href=\"epub/live-manual.epub\">EPUB</a>"
-msgstr "<a href=\"epub/live-manual.epub\">EPUB</a>"
+#: en/index.html.in:23
+msgid "<a href=\"epub/live-manual.en.epub\">EPUB</a>"
+msgstr "<a href=\"epub/live-manual.pt_BR.epub\">EPUB</a>"
#. type: Content of: <html><body><ul><li>
-#: en/index.html.in:19
+#: en/index.html.in:24
msgid ""
-"HTML: <a href=\"html/index.html\">multi page</a>, <a href=\"html/live-manual."
-"html\">single page</a>"
+"HTML: <a href=\"html/index.en.html\">multi page</a>, <a href=\"html/live-"
+"manual.en.html\">single page</a>"
msgstr ""
-"HTML: <a href=\"html/index.html\">Páginas multiplas</a>, <a href=\"html/live-"
-"manual.html\">Página única</a>"
+"HTML: <a href=\"html/index.pt_BR.html\">Páginas multiplas</a>, <a href="
+"\"html/live-manual.pt_BR.html\">Página única</a>"
#. type: Content of: <html><body><ul><li>
-#: en/index.html.in:20
-msgid "<a href=\"odf/live-manual.odt\">ODF</a>"
-msgstr "<a href=\"odf/live-manual.odt\">ODF</a>"
+#: en/index.html.in:25
+msgid "<a href=\"odf/live-manual.en.odt\">ODF</a>"
+msgstr "<a href=\"odf/live-manual.pt_BR.odt\">ODF</a>"
#. type: Content of: <html><body><ul><li>
-#: en/index.html.in:21
+#: en/index.html.in:26
msgid ""
-"PDF: <a href=\"pdf/live-manual.portrait-a4.pdf\">A4 portrait</a>, <a href="
-"\"pdf/live-manual.landscape-a4.pdf\">A4 landscape</a>, <a href=\"pdf/live-"
-"manual.portrait-letter.pdf\">letter portrait</a>, <a href=\"pdf/live-manual."
-"landscape-letter.pdf\">letter landscape</a>"
+"PDF: <a href=\"pdf/live-manual.portrait-a4.en.pdf\">A4 portrait</a>, <a href="
+"\"pdf/live-manual.landscape-a4.en.pdf\">A4 landscape</a>, <a href=\"pdf/live-"
+"manual.portrait-letter.en.pdf\">letter portrait</a>, <a href=\"pdf/live-"
+"manual.landscape-letter.en.pdf\">letter landscape</a>"
msgstr ""
-"PDF: <a href=\"pdf/live-manual.portrait-a4.pdf\">A4 retrato</a>, <a href="
-"\"pdf/live-manual.landscape-a4.pdf\">A4 paisagem</a>, <a href=\"pdf/live-"
-"manual.portrait-letter.pdf\">US retrato</a>, <a href=\"pdf/live-manual."
-"landscape-letter.pdf\">US paisagem</a>"
+"PDF: <a href=\"pdf/live-manual.portrait-a4.pt_BR.pdf\">A4 retrato</a>, <a "
+"href=\"pdf/live-manual.landscape-a4.pt_BR.pdf\">A4 paisagem</a>, <a href="
+"\"pdf/live-manual.portrait-letter.pt_BR.pdf\">US retrato</a>, <a href=\"pdf/"
+"live-manual.landscape-letter.pt_BR.pdf\">US paisagem</a>"
#. type: Content of: <html><body><ul><li>
-#: en/index.html.in:22
-msgid "<a href=\"txt/live-manual.txt\">Plain text</a>"
-msgstr "<a href=\"txt/live-manual.txt\">Texto plano</a>"
+#: en/index.html.in:27
+msgid "<a href=\"txt/live-manual.en.txt\">Plain text</a>"
+msgstr "<a href=\"txt/live-manual.pt_BR.txt\">Texto plano</a>"
#. type: Content of: <html><body><p>
-#: en/index.html.in:26
+#: en/index.html.in:31
msgid "Last changed: @DATE_CHANGE@"
msgstr "Última modificação: @DATE_CHANGE@"
#. type: Content of: <html><body><p>
-#: en/index.html.in:27
+#: en/index.html.in:32
msgid "Last built: @DATE_BUILD@"
msgstr "Última contrução: @DATE_BUILD@"
#. type: Content of: <html><body><h3>
-#: en/index.html.in:30
+#: en/index.html.in:35
msgid "Source"
msgstr "Fonte"
#. type: Content of: <html><body><p>
-#: en/index.html.in:33
+#: en/index.html.in:38
msgid ""
"The sources for this manual is available in a <a href=\"http://git.or.cz/"
"\">Git</a> repository at live.debian.net."
@@ -106,7 +115,7 @@ msgstr ""
"or.cz/\">Git</a> em live.debian.net."
#. type: Content of: <html><body><ul><li>
-#: en/index.html.in:37
+#: en/index.html.in:42
msgid ""
"Browse: <a href=\"http://live.debian.net/gitweb/?p=live-manual.git"
"\"><small><tt>http://live.debian.net/gitweb/?p=live-manual.git</tt></small></"
@@ -117,7 +126,7 @@ msgstr ""
"a>"
#. type: Content of: <html><body><ul><li>
-#: en/index.html.in:38
+#: en/index.html.in:43
msgid ""
"Git: <a href=\"git://live.debian.net/git/live-manual.git\"><small><tt>git://"
"live.debian.net/git/live-manual.git</tt></small></a>"
@@ -126,7 +135,7 @@ msgstr ""
"live.debian.net/git/live-manual.git</tt></small></a>"
#. type: Content of: <html><body><p>
-#: en/index.html.in:42
+#: en/index.html.in:47
msgid ""
"<a href=\"http://live.debian.net/\">Debian Live</a> <<a href=\"mailto:"
"debian-live at lists.debian.org\">debian-live at lists.debian.org</a>> - <a "
diff --git a/manual/po/pt_BR/live-manual.ssm.po b/manual/po/pt_BR/live-manual.ssm.po
index ff5944e..911de33 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 2.0.0\n"
-"POT-Creation-Date: 2011-09-30 14:54+0300\n"
+"POT-Creation-Date: 2011-12-04 10:22+0100\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: 2011-09-30\n"
+" :published: 2011-12-04\n"
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 7537f81..3ed9064 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 2.0.0\n"
-"POT-Creation-Date: 2011-04-14 18:03-0200\n"
+"POT-Creation-Date: 2011-11-02 12:23-0200\n"
"PO-Revision-Date: 2010-10-20 06:53-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -37,37 +37,38 @@ msgstr ""
#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
-#: en/user_customization-installer.ssi:43
+#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
-#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:53
-#: en/user_customization-packages.ssi:66 en/user_customization-packages.ssi:80
-#: en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:112
-#: en/user_customization-packages.ssi:142
-#: en/user_customization-packages.ssi:155
-#: en/user_customization-packages.ssi:165
-#: en/user_customization-packages.ssi:175
-#: en/user_customization-packages.ssi:185
-#: en/user_customization-packages.ssi:199
-#: en/user_customization-packages.ssi:215
-#: en/user_customization-packages.ssi:227
-#: en/user_customization-packages.ssi:291
-#: en/user_customization-packages.ssi:303
-#: en/user_customization-packages.ssi:313
-#: en/user_customization-packages.ssi:331
-#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
-#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
-#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
-#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
-#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:105
-#: 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:178 en/user_examples.ssi:190
-#: en/user_examples.ssi:206 en/user_examples.ssi:220 en/user_examples.ssi:229
-#: en/user_examples.ssi:247 en/user_examples.ssi:255 en/user_examples.ssi:268
-#: en/user_examples.ssi:283 en/user_installation.ssi:38
+#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:54
+#: en/user_customization-packages.ssi:67 en/user_customization-packages.ssi:81
+#: en/user_customization-packages.ssi:101
+#: en/user_customization-packages.ssi:131
+#: en/user_customization-packages.ssi:144
+#: en/user_customization-packages.ssi:154
+#: en/user_customization-packages.ssi:164
+#: en/user_customization-packages.ssi:174
+#: en/user_customization-packages.ssi:188
+#: en/user_customization-packages.ssi:204
+#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:320
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:345 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:24 en/user_customization-runtime.ssi:44
+#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:63
+#: en/user_customization-runtime.ssi:71 en/user_customization-runtime.ssi:80
+#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:111
+#: en/user_customization-runtime.ssi:119 en/user_examples.ssi:14
+#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
+#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
+#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
+#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
+#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
+#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
+#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:271
+#: en/user_examples.ssi:286 en/user_installation.ssi:38
#: en/user_installation.ssi:46 en/user_installation.ssi:56
#: en/user_installation.ssi:64 en/user_installation.ssi:74
#: en/user_installation.ssi:82 en/user_installation.ssi:90
@@ -100,38 +101,39 @@ msgstr "code{"
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
-#: en/user_customization-installer.ssi:37
-#: en/user_customization-installer.ssi:48
+#: en/user_customization-installer.ssi:38
+#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:70 en/user_customization-packages.ssi:84
-#: en/user_customization-packages.ssi:98
-#: en/user_customization-packages.ssi:116
-#: en/user_customization-packages.ssi:147
-#: en/user_customization-packages.ssi:161
-#: en/user_customization-packages.ssi:171
-#: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:191
-#: en/user_customization-packages.ssi:203
-#: en/user_customization-packages.ssi:219
-#: en/user_customization-packages.ssi:231
-#: en/user_customization-packages.ssi:295
-#: en/user_customization-packages.ssi:307
-#: en/user_customization-packages.ssi:317
-#: en/user_customization-packages.ssi:344
-#: en/user_customization-packages.ssi:353 en/user_customization-runtime.ssi:18
-#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
-#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
-#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
-#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:110
-#: 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:186 en/user_examples.ssi:202
-#: en/user_examples.ssi:210 en/user_examples.ssi:225 en/user_examples.ssi:233
-#: en/user_examples.ssi:251 en/user_examples.ssi:264 en/user_examples.ssi:279
-#: en/user_examples.ssi:297 en/user_installation.ssi:42
+#: en/user_customization-packages.ssi:46 en/user_customization-packages.ssi:59
+#: en/user_customization-packages.ssi:71 en/user_customization-packages.ssi:85
+#: en/user_customization-packages.ssi:105
+#: en/user_customization-packages.ssi:136
+#: en/user_customization-packages.ssi:150
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:180
+#: en/user_customization-packages.ssi:192
+#: en/user_customization-packages.ssi:208
+#: en/user_customization-packages.ssi:220
+#: en/user_customization-packages.ssi:284
+#: en/user_customization-packages.ssi:296
+#: en/user_customization-packages.ssi:306
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341
+#: en/user_customization-packages.ssi:350 en/user_customization-runtime.ssi:18
+#: en/user_customization-runtime.ssi:28 en/user_customization-runtime.ssi:48
+#: en/user_customization-runtime.ssi:59 en/user_customization-runtime.ssi:67
+#: en/user_customization-runtime.ssi:76 en/user_customization-runtime.ssi:85
+#: en/user_customization-runtime.ssi:105 en/user_customization-runtime.ssi:115
+#: en/user_customization-runtime.ssi:124 en/user_examples.ssi:20
+#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
+#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
+#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
+#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
+#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
+#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
+#: en/user_examples.ssi:254 en/user_examples.ssi:267 en/user_examples.ssi:282
+#: en/user_examples.ssi:300 en/user_installation.ssi:42
#: en/user_installation.ssi:50 en/user_installation.ssi:60
#: en/user_installation.ssi:70 en/user_installation.ssi:78
#: en/user_installation.ssi:86 en/user_installation.ssi:94
@@ -291,7 +293,7 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:44 en/user_basics.ssi:170 en/user_basics.ssi:238
-#: en/user_examples.ssi:109 en/user_examples.ssi:208
+#: en/user_examples.ssi:119 en/user_examples.ssi:211
#, no-wrap
msgid " # lb build\n"
msgstr ""
@@ -545,7 +547,7 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:142
#, no-wrap
-msgid " $ lb config --packages virtualbox-ose-guest-x11\n"
+msgid " $ echo virtualbox-ose-guest-x11 >> config/package-lists/my.list.chroot\n"
msgstr ""
#. type: Plain text
diff --git a/manual/po/pt_BR/user_customization-contents.ssi.po b/manual/po/pt_BR/user_customization-contents.ssi.po
index 1dba000..442cb93 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 2.0.0\n"
-"POT-Creation-Date: 2011-08-25 15:56+0300\n"
+"POT-Creation-Date: 2011-11-07 21:01-0400\n"
"PO-Revision-Date: 2010-10-22 07:52-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -37,48 +37,47 @@ msgstr ""
#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
-#: en/user_customization-installer.ssi:43
+#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
-#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:53
-#: en/user_customization-packages.ssi:66 en/user_customization-packages.ssi:80
-#: en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:112
-#: en/user_customization-packages.ssi:142
-#: en/user_customization-packages.ssi:155
-#: en/user_customization-packages.ssi:165
-#: en/user_customization-packages.ssi:175
-#: en/user_customization-packages.ssi:185
-#: en/user_customization-packages.ssi:199
-#: en/user_customization-packages.ssi:215
-#: en/user_customization-packages.ssi:227
-#: en/user_customization-packages.ssi:291
-#: en/user_customization-packages.ssi:303
-#: en/user_customization-packages.ssi:313
-#: en/user_customization-packages.ssi:331
-#: en/user_customization-packages.ssi:348
-#: en/user_customization-packages.ssi:356 en/user_customization-runtime.ssi:14
-#: en/user_customization-runtime.ssi:24 en/user_customization-runtime.ssi:44
-#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:63
-#: en/user_customization-runtime.ssi:71 en/user_customization-runtime.ssi:80
-#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:111
-#: en/user_customization-runtime.ssi:119 en/user_examples.ssi:14
+#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:54
+#: en/user_customization-packages.ssi:67 en/user_customization-packages.ssi:81
+#: en/user_customization-packages.ssi:101
+#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:140
+#: en/user_customization-packages.ssi:150
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:184
+#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:276
+#: en/user_customization-packages.ssi:288
+#: en/user_customization-packages.ssi:298
+#: en/user_customization-packages.ssi:316
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
+#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
+#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
+#: en/user_customization-runtime.ssi:104 en/user_customization-runtime.ssi:114
+#: en/user_customization-runtime.ssi:122 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:178 en/user_examples.ssi:190 en/user_examples.ssi:206
-#: en/user_examples.ssi:220 en/user_examples.ssi:229 en/user_examples.ssi:247
-#: en/user_examples.ssi:255 en/user_examples.ssi:268 en/user_examples.ssi:283
-#: en/user_installation.ssi:38 en/user_installation.ssi:46
-#: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi:74 en/user_installation.ssi:82
-#: en/user_installation.ssi:90 en/user_installation.ssi:114
-#: en/user_installation.ssi:129 en/user_installation.ssi:146
-#: en/user_managing_a_configuration.ssi:24
+#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
+#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
+#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
+#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
+#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
+#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
+#: en/user_examples.ssi:277 en/user_installation.ssi:38
+#: en/user_installation.ssi:46 en/user_installation.ssi:56
+#: en/user_installation.ssi:64 en/user_installation.ssi:74
+#: en/user_installation.ssi:82 en/user_installation.ssi:90
+#: en/user_installation.ssi:114 en/user_installation.ssi:129
+#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:80 en/user_overview.ssi:88
+#: en/user_overview.ssi:48 en/user_overview.ssi:56
msgid "code{"
msgstr "code{"
@@ -102,49 +101,48 @@ msgstr "code{"
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
-#: en/user_customization-installer.ssi:37
-#: en/user_customization-installer.ssi:48
+#: en/user_customization-installer.ssi:38
+#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:70 en/user_customization-packages.ssi:84
-#: en/user_customization-packages.ssi:98
-#: en/user_customization-packages.ssi:116
-#: en/user_customization-packages.ssi:147
-#: en/user_customization-packages.ssi:161
-#: en/user_customization-packages.ssi:171
-#: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:191
-#: en/user_customization-packages.ssi:203
-#: en/user_customization-packages.ssi:219
-#: en/user_customization-packages.ssi:231
-#: en/user_customization-packages.ssi:295
-#: en/user_customization-packages.ssi:307
-#: en/user_customization-packages.ssi:317
-#: en/user_customization-packages.ssi:344
-#: en/user_customization-packages.ssi:352
-#: en/user_customization-packages.ssi:361 en/user_customization-runtime.ssi:18
-#: en/user_customization-runtime.ssi:28 en/user_customization-runtime.ssi:48
-#: en/user_customization-runtime.ssi:59 en/user_customization-runtime.ssi:67
-#: en/user_customization-runtime.ssi:76 en/user_customization-runtime.ssi:85
-#: en/user_customization-runtime.ssi:105 en/user_customization-runtime.ssi:115
-#: en/user_customization-runtime.ssi:124 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:186 en/user_examples.ssi:202 en/user_examples.ssi:210
-#: en/user_examples.ssi:225 en/user_examples.ssi:233 en/user_examples.ssi:251
-#: en/user_examples.ssi:264 en/user_examples.ssi:279 en/user_examples.ssi:297
-#: en/user_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi:70
-#: en/user_installation.ssi:78 en/user_installation.ssi:86
-#: en/user_installation.ssi:94 en/user_installation.ssi:119
-#: en/user_installation.ssi:136 en/user_installation.ssi:149
-#: en/user_managing_a_configuration.ssi:31
+#: en/user_customization-packages.ssi:46 en/user_customization-packages.ssi:59
+#: en/user_customization-packages.ssi:71 en/user_customization-packages.ssi:85
+#: en/user_customization-packages.ssi:105
+#: en/user_customization-packages.ssi:132
+#: en/user_customization-packages.ssi:146
+#: en/user_customization-packages.ssi:156
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:329
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:346 en/user_customization-runtime.ssi:21
+#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
+#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
+#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
+#: en/user_customization-runtime.ssi:108 en/user_customization-runtime.ssi:118
+#: en/user_customization-runtime.ssi:127 en/user_examples.ssi:20
+#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
+#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
+#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
+#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
+#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
+#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
+#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
+#: en/user_examples.ssi:291 en/user_installation.ssi:42
+#: en/user_installation.ssi:50 en/user_installation.ssi:60
+#: en/user_installation.ssi:70 en/user_installation.ssi:78
+#: en/user_installation.ssi:86 en/user_installation.ssi:94
+#: en/user_installation.ssi:119 en/user_installation.ssi:136
+#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
-#: en/user_overview.ssi:84 en/user_overview.ssi:92
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:42
+#: en/user_overview.ssi:52 en/user_overview.ssi:60
msgid "}code"
msgstr "}code"
@@ -235,7 +233,7 @@ msgstr ""
#. type: Plain text
#: en/user_customization-contents.ssi:24
msgid ""
-"To include files, simply add them to your #{config/chroot_local-includes}# "
+"To include files, simply add them to your #{config/includes.chroot}# "
"directory. This directory corresponds to the root directory (#{/}#) of the "
"live system. For example, to add a file #{/var/www/index.html}# in the live "
"system, use:"
@@ -245,8 +243,8 @@ msgstr ""
#: en/user_customization-contents.ssi:29
#, no-wrap
msgid ""
-" $ mkdir -p config/chroot_local-includes/var/www\n"
-" $ cp /path/to/my/index.html config/chroot_local-includes/var/www\n"
+" $ mkdir -p config/includes.chroot/var/www\n"
+" $ cp /path/to/my/index.html config/includes.chroot/var/www\n"
msgstr ""
#. type: Plain text
@@ -260,7 +258,7 @@ msgstr ""
msgid ""
" -- config\n"
" [...]\n"
-" |-- chroot_local-includes\n"
+" |-- includes.chroot\n"
" | `-- var\n"
" | `-- www\n"
" | `-- index.html\n"
@@ -288,14 +286,14 @@ msgid ""
"booting the Live system, you can use binary local includes. This works in a "
"similar fashion to chroot local includes. For example, suppose the files #{~/"
"video_demo.*}# are demo videos of the live system described by and linked to "
-"by an HTML index page. Simply copy the material to #{config/binary_local-"
-"includes/}# as follows:"
+"by an HTML index page. Simply copy the material to #{config/includes.binary/}"
+"# as follows:"
msgstr ""
#. type: Plain text
#: en/user_customization-contents.ssi:56
#, no-wrap
-msgid " $ cp ~/video_demo.* config/binary_local-includes/\n"
+msgid " $ cp ~/video_demo.* config/includes.binary/\n"
msgstr ""
#. type: Plain text
@@ -349,12 +347,12 @@ msgstr ""
#. type: Plain text
#: en/user_customization-contents.ssi:80
msgid ""
-"To run commands in the chroot stage, create a hook script containing the "
-"commands in the #{config/chroot_local-hooks}# directory. The hook will run "
-"in the chroot after the rest of your chroot configuration has been applied, "
-"so remember to ensure your configuration includes all packages and files "
-"your hook needs in order to run. See the example chroot hook scripts for "
-"various common chroot customization tasks provided in #{/usr/share/live/"
+"To run commands in the chroot stage, create a hook script with a #{.chroot}# "
+"suffix containing the commands in the #{config/hooks/}# directory. The hook "
+"will run in the chroot after the rest of your chroot configuration has been "
+"applied, so remember to ensure your configuration includes all packages and "
+"files your hook needs in order to run. See the example chroot hook scripts "
+"for various common chroot customization tasks provided in #{/usr/share/live/"
"build/examples/hooks}# which you can copy or symlink to use them in your own "
"configuration."
msgstr ""
@@ -371,10 +369,9 @@ msgid ""
"explained in the \"Customization\" section of its man page. Examine live-"
"config's own hooks provided in #{/lib/live/config/}#, noting the sequence "
"numbers. Then provide your own hook prefixed with an appropriate sequence "
-"number, either as a chroot local include in #{config/chroot_local-includes/"
-"lib/live/config/}#, or as a custom package as discussed in {Installing "
-"modified or third-party packages}#installing-modified-or-third-party-"
-"packages."
+"number, either as a chroot local include in #{config/includes.chroot/lib/"
+"live/config/}#, or as a custom package as discussed in {Installing modified "
+"or third-party packages}#installing-modified-or-third-party-packages."
msgstr ""
#. type: Plain text
@@ -385,14 +382,15 @@ msgstr ""
#. type: Plain text
#: en/user_customization-contents.ssi:88
msgid ""
-"To run commands in the binary stage, create a hook script containing the "
-"commands in the #{config/binary_local-hooks}#. The hook will run after all "
-"other binary commands are run, but before binary_checksums, the very last "
-"binary commands The commands in your hook do not run in the chroot, so take "
-"care to not modify any files outside of the build tree, or you may damage "
-"your build system! See the example binary hook scripts for various common "
-"binary customization tasks provided in #{/usr/share/live/build/examples/"
-"hooks}# which you can copy or symlink to use them in your own configuration."
+"To run commands in the binary stage, create a hook script with a #{.binary}# "
+"suffix containing the commands in the #{config/hooks/}# directory. The hook "
+"will run after all other binary commands are run, but before "
+"binary_checksums, the very last binary command. The commands in your hook do "
+"not run in the chroot, so take care to not modify any files outside of the "
+"build tree, or you may damage your build system! See the example binary hook "
+"scripts for various common binary customization tasks provided in #{/usr/"
+"share/live/build/examples/hooks}# which you can copy or symlink to use them "
+"in your own configuration."
msgstr ""
#. type: Plain text
@@ -403,9 +401,10 @@ msgstr ""
#. type: Plain text
#: en/user_customization-contents.ssi:92
msgid ""
-"Files in the #{config/chroot_local-preseed}# directory are considered to be "
+"Files in the #{config/preseed/}# directory suffixed with #{.preseed}# "
+"followed by the stage (#{.chroot}# or #{.binary}#) are considered to be "
"debconf preseed files and are installed by live-build using #{debconf-set-"
-"selections}#."
+"selections}# during the corresponding stage."
msgstr ""
#. type: Plain text
diff --git a/manual/po/pt_BR/user_customization-installer.ssi.po b/manual/po/pt_BR/user_customization-installer.ssi.po
index dca0edf..ee1681c 100644
--- a/manual/po/pt_BR/user_customization-installer.ssi.po
+++ b/manual/po/pt_BR/user_customization-installer.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-04-03 07:04-0200\n"
+"POT-Creation-Date: 2011-11-07 21:19-0400\n"
"PO-Revision-Date: 2010-11-30 10:53+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -26,48 +26,49 @@ msgstr ""
#: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/user_basics.ssi:30 en/user_basics.ssi:40
-#: en/user_basics.ssi:56 en/user_basics.ssi:71 en/user_basics.ssi:106
-#: en/user_basics.ssi:114 en/user_basics.ssi:126 en/user_basics.ssi:138
-#: en/user_basics.ssi:150 en/user_basics.ssi:158 en/user_basics.ssi:166
-#: en/user_basics.ssi:182 en/user_basics.ssi:192 en/user_basics.ssi:200
-#: en/user_basics.ssi:216 en/user_basics.ssi:224 en/user_basics.ssi:234
-#: en/user_basics.ssi:252 en/user_basics.ssi:280 en/user_basics.ssi:296
-#: en/user_basics.ssi:304 en/user_basics.ssi:324 en/user_basics.ssi:349
+#: en/project_procedures.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
+#: en/user_basics.ssi:116 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:184 en/user_basics.ssi:194 en/user_basics.ssi:202
+#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
+#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
+#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
-#: en/user_customization-installer.ssi:43
+#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
-#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:53
-#: en/user_customization-packages.ssi:66 en/user_customization-packages.ssi:80
-#: en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:112
-#: en/user_customization-packages.ssi:142
-#: en/user_customization-packages.ssi:155
-#: en/user_customization-packages.ssi:165
-#: en/user_customization-packages.ssi:175
-#: en/user_customization-packages.ssi:185
-#: en/user_customization-packages.ssi:199
-#: en/user_customization-packages.ssi:215
-#: en/user_customization-packages.ssi:227
-#: en/user_customization-packages.ssi:291
-#: en/user_customization-packages.ssi:303
-#: en/user_customization-packages.ssi:313
-#: en/user_customization-packages.ssi:331
-#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
-#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
-#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
-#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
-#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:105
-#: 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:178 en/user_examples.ssi:190
-#: en/user_examples.ssi:206 en/user_examples.ssi:220 en/user_examples.ssi:229
-#: en/user_examples.ssi:247 en/user_examples.ssi:255 en/user_examples.ssi:268
-#: en/user_examples.ssi:283 en/user_installation.ssi:38
+#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:54
+#: en/user_customization-packages.ssi:67 en/user_customization-packages.ssi:81
+#: en/user_customization-packages.ssi:101
+#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:140
+#: en/user_customization-packages.ssi:150
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:184
+#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:276
+#: en/user_customization-packages.ssi:288
+#: en/user_customization-packages.ssi:298
+#: en/user_customization-packages.ssi:316
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
+#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
+#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
+#: en/user_customization-runtime.ssi:104 en/user_customization-runtime.ssi:114
+#: en/user_customization-runtime.ssi:122 en/user_examples.ssi:14
+#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
+#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
+#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
+#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
+#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
+#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
+#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
+#: en/user_examples.ssi:277 en/user_installation.ssi:38
#: en/user_installation.ssi:46 en/user_installation.ssi:56
#: en/user_installation.ssi:64 en/user_installation.ssi:74
#: en/user_installation.ssi:82 en/user_installation.ssi:90
@@ -76,7 +77,7 @@ msgstr ""
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:80 en/user_overview.ssi:88
+#: en/user_overview.ssi:48 en/user_overview.ssi:56
msgid "code{"
msgstr "code{"
@@ -90,48 +91,49 @@ msgstr "code{"
#: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/user_basics.ssi:34 en/user_basics.ssi:44
-#: en/user_basics.ssi:62 en/user_basics.ssi:75 en/user_basics.ssi:110
-#: en/user_basics.ssi:118 en/user_basics.ssi:132 en/user_basics.ssi:142
-#: en/user_basics.ssi:154 en/user_basics.ssi:162 en/user_basics.ssi:170
-#: en/user_basics.ssi:186 en/user_basics.ssi:196 en/user_basics.ssi:204
-#: en/user_basics.ssi:220 en/user_basics.ssi:228 en/user_basics.ssi:238
-#: en/user_basics.ssi:272 en/user_basics.ssi:284 en/user_basics.ssi:300
-#: en/user_basics.ssi:308 en/user_basics.ssi:335 en/user_basics.ssi:374
+#: en/project_procedures.ssi:131 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
+#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
+#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
+#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
+#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
-#: en/user_customization-installer.ssi:37
-#: en/user_customization-installer.ssi:48
+#: en/user_customization-installer.ssi:38
+#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:70 en/user_customization-packages.ssi:84
-#: en/user_customization-packages.ssi:98
-#: en/user_customization-packages.ssi:116
-#: en/user_customization-packages.ssi:147
-#: en/user_customization-packages.ssi:161
-#: en/user_customization-packages.ssi:171
-#: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:191
-#: en/user_customization-packages.ssi:203
-#: en/user_customization-packages.ssi:219
-#: en/user_customization-packages.ssi:231
-#: en/user_customization-packages.ssi:295
-#: en/user_customization-packages.ssi:307
-#: en/user_customization-packages.ssi:317
-#: en/user_customization-packages.ssi:344
-#: en/user_customization-packages.ssi:353 en/user_customization-runtime.ssi:18
-#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
-#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
-#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
-#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:110
-#: 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:186 en/user_examples.ssi:202
-#: en/user_examples.ssi:210 en/user_examples.ssi:225 en/user_examples.ssi:233
-#: en/user_examples.ssi:251 en/user_examples.ssi:264 en/user_examples.ssi:279
-#: en/user_examples.ssi:297 en/user_installation.ssi:42
+#: en/user_customization-packages.ssi:46 en/user_customization-packages.ssi:59
+#: en/user_customization-packages.ssi:71 en/user_customization-packages.ssi:85
+#: en/user_customization-packages.ssi:105
+#: en/user_customization-packages.ssi:132
+#: en/user_customization-packages.ssi:146
+#: en/user_customization-packages.ssi:156
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:329
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:346 en/user_customization-runtime.ssi:21
+#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
+#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
+#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
+#: en/user_customization-runtime.ssi:108 en/user_customization-runtime.ssi:118
+#: en/user_customization-runtime.ssi:127 en/user_examples.ssi:20
+#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
+#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
+#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
+#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
+#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
+#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
+#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
+#: en/user_examples.ssi:291 en/user_installation.ssi:42
#: en/user_installation.ssi:50 en/user_installation.ssi:60
#: en/user_installation.ssi:70 en/user_installation.ssi:78
#: en/user_installation.ssi:86 en/user_installation.ssi:94
@@ -139,8 +141,8 @@ msgstr "code{"
#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
-#: en/user_overview.ssi:84 en/user_overview.ssi:92
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:42
+#: en/user_overview.ssi:52 en/user_overview.ssi:60
msgid "}code"
msgstr "}code"
@@ -253,20 +255,21 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-installer.ssi:35
+#: en/user_customization-installer.ssi:36
#, no-wrap
msgid ""
" $ lb config --architecture i386 --linux-flavours 486 \\\n"
-" --debian-installer live --packages debian-installer-launcher\n"
+" --debian-installer live\n"
+" $ echo debian-installer-launcher >> config/package-lists/my.list.chroot\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-installer.ssi:39
+#: en/user_customization-installer.ssi:40
msgid "2~ Customizing Debian Installer by preseeding"
msgstr ""
#. type: Plain text
-#: en/user_customization-installer.ssi:41
+#: en/user_customization-installer.ssi:42
msgid ""
"As described in the Debian Installer Manual, Appendix B at http://www.debian."
"org/releases/stable/i386/apb.html, \"Preseeding provides a way to set "
@@ -280,7 +283,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-installer.ssi:46
+#: en/user_customization-installer.ssi:47
#, no-wrap
msgid ""
" $ echo \"d-i debian-installer/locale string en_US\" \\\n"
@@ -288,16 +291,16 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-installer.ssi:50
+#: en/user_customization-installer.ssi:51
msgid "2~ Customizing Debian Installer content"
msgstr ""
#. type: Plain text
-#: en/user_customization-installer.ssi:51
+#: en/user_customization-installer.ssi:52
msgid ""
"For experimental or debugging purposes, you might want to include locally "
-"built #{d-i}# component udeb packages. Place these in #{config/binary_local-"
-"udebs/}# to include them in the image. Additional or replacement files and "
+"built #{d-i}# component udeb packages. Place these in #{config/packages."
+"binary/}# to include them in the image. Additional or replacement files and "
"directories may be included in the installer initrd as well, in a similar "
"fashion to {Live/chroot local includes}#live-chroot-local-includes, by "
"placing the material in #{config/binary_debian-installer-includes/}#."
diff --git a/manual/po/pt_BR/user_customization-packages.ssi.po b/manual/po/pt_BR/user_customization-packages.ssi.po
index 0dc1c4a..e02e603 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 2.0.0\n"
-"POT-Creation-Date: 2011-08-14 16:53+0300\n"
+"POT-Creation-Date: 2011-11-07 21:01-0400\n"
"PO-Revision-Date: 2010-10-22 08:58-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -37,38 +37,38 @@ msgstr ""
#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
-#: en/user_customization-installer.ssi:43
+#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
-#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:53
-#: en/user_customization-packages.ssi:66 en/user_customization-packages.ssi:80
-#: en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:112
-#: en/user_customization-packages.ssi:142
-#: en/user_customization-packages.ssi:155
-#: en/user_customization-packages.ssi:165
-#: en/user_customization-packages.ssi:175
-#: en/user_customization-packages.ssi:185
-#: en/user_customization-packages.ssi:199
-#: en/user_customization-packages.ssi:215
-#: en/user_customization-packages.ssi:227
-#: en/user_customization-packages.ssi:291
-#: en/user_customization-packages.ssi:303
-#: en/user_customization-packages.ssi:313
-#: en/user_customization-packages.ssi:331
-#: en/user_customization-packages.ssi:348
-#: en/user_customization-packages.ssi:356 en/user_customization-runtime.ssi:14
-#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
-#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
-#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
-#: en/user_customization-runtime.ssi:99 en/user_customization-runtime.ssi:107
-#: 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:178 en/user_examples.ssi:190
-#: en/user_examples.ssi:206 en/user_examples.ssi:220 en/user_examples.ssi:229
-#: en/user_examples.ssi:247 en/user_examples.ssi:255 en/user_examples.ssi:268
-#: en/user_examples.ssi:283 en/user_installation.ssi:38
+#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:54
+#: en/user_customization-packages.ssi:67 en/user_customization-packages.ssi:81
+#: en/user_customization-packages.ssi:101
+#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:140
+#: en/user_customization-packages.ssi:150
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:184
+#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:276
+#: en/user_customization-packages.ssi:288
+#: en/user_customization-packages.ssi:298
+#: en/user_customization-packages.ssi:316
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
+#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
+#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
+#: en/user_customization-runtime.ssi:104 en/user_customization-runtime.ssi:114
+#: en/user_customization-runtime.ssi:122 en/user_examples.ssi:14
+#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
+#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
+#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
+#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
+#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
+#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
+#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
+#: en/user_examples.ssi:277 en/user_installation.ssi:38
#: en/user_installation.ssi:46 en/user_installation.ssi:56
#: en/user_installation.ssi:64 en/user_installation.ssi:74
#: en/user_installation.ssi:82 en/user_installation.ssi:90
@@ -77,7 +77,7 @@ msgstr ""
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:80 en/user_overview.ssi:88
+#: en/user_overview.ssi:48 en/user_overview.ssi:56
msgid "code{"
msgstr "code{"
@@ -101,39 +101,39 @@ msgstr "code{"
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
-#: en/user_customization-installer.ssi:37
-#: en/user_customization-installer.ssi:48
+#: en/user_customization-installer.ssi:38
+#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:70 en/user_customization-packages.ssi:84
-#: en/user_customization-packages.ssi:98
-#: en/user_customization-packages.ssi:116
-#: en/user_customization-packages.ssi:147
-#: en/user_customization-packages.ssi:161
-#: en/user_customization-packages.ssi:171
-#: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:191
-#: en/user_customization-packages.ssi:203
-#: en/user_customization-packages.ssi:219
-#: en/user_customization-packages.ssi:231
-#: en/user_customization-packages.ssi:295
-#: en/user_customization-packages.ssi:307
-#: en/user_customization-packages.ssi:317
-#: en/user_customization-packages.ssi:344
-#: en/user_customization-packages.ssi:352
-#: en/user_customization-packages.ssi:361 en/user_customization-runtime.ssi:18
-#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
-#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
-#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
-#: en/user_customization-runtime.ssi:103 en/user_customization-runtime.ssi:112
-#: 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:186 en/user_examples.ssi:202
-#: en/user_examples.ssi:210 en/user_examples.ssi:225 en/user_examples.ssi:233
-#: en/user_examples.ssi:251 en/user_examples.ssi:264 en/user_examples.ssi:279
-#: en/user_examples.ssi:297 en/user_installation.ssi:42
+#: en/user_customization-packages.ssi:46 en/user_customization-packages.ssi:59
+#: en/user_customization-packages.ssi:71 en/user_customization-packages.ssi:85
+#: en/user_customization-packages.ssi:105
+#: en/user_customization-packages.ssi:132
+#: en/user_customization-packages.ssi:146
+#: en/user_customization-packages.ssi:156
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:329
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:346 en/user_customization-runtime.ssi:21
+#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
+#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
+#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
+#: en/user_customization-runtime.ssi:108 en/user_customization-runtime.ssi:118
+#: en/user_customization-runtime.ssi:127 en/user_examples.ssi:20
+#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
+#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
+#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
+#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
+#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
+#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
+#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
+#: en/user_examples.ssi:291 en/user_installation.ssi:42
#: en/user_installation.ssi:50 en/user_installation.ssi:60
#: en/user_installation.ssi:70 en/user_installation.ssi:78
#: en/user_installation.ssi:86 en/user_installation.ssi:94
@@ -141,8 +141,8 @@ msgstr "code{"
#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
-#: en/user_overview.ssi:84 en/user_overview.ssi:92
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:42
+#: en/user_overview.ssi:52 en/user_overview.ssi:60
msgid "}code"
msgstr "}code"
@@ -191,7 +191,7 @@ msgstr ""
msgid ""
"The distribution you choose has the broadest impact on which packages are "
"available to include in your live image. Specify the codename, which "
-"defaults to #{squeeze}# for the Squeeze version of live-build. Any current "
+"defaults to #{wheezy}# for the Wheezy version of live-build. Any current "
"distribution carried in the Debian archive may be specified by its codename "
"here. (See {Terms}#terms for more details.) The #{--distribution}# option "
"not only influences the source of packages within the archive, but also "
@@ -248,15 +248,15 @@ msgstr ""
msgid ""
"The Debian archive is replicated across a large network of mirrors around "
"the world so that people in each region can choose a nearby mirror for best "
-"download speed. Each of the #{--mirror-*}# options governs which "
+"download speed. Each of the #{--parent-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."
+"those stages, and later, in the *binary* stage, the #{--parent-mirror-binary}"
+"# and #{--parent-mirror-binary-security}# values are used, superceding any "
+"mirrors used in an earlier stage."
msgstr ""
#. type: Plain text
@@ -269,173 +269,138 @@ msgstr ""
#: en/user_customization-packages.ssi:38
msgid ""
"To set the distribution mirrors used at build time to point at a local "
-"mirror, it is sufficient to set #{--mirror-bootstrap}# and #{--mirror-chroot-"
-"security}# as follows."
+"mirror, it is sufficient to set #{--parent-mirror-bootstrap}#, #{--parent-"
+"mirror-chroot-security}# and #{--parent-mirror-chroot-backports}# as follows."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:43
+#: en/user_customization-packages.ssi:44
#, no-wrap
msgid ""
-" $ lb config --mirror-bootstrap http://localhost/debian/ \\\n"
-" --mirror-chroot-security http://localhost/debian-security/\n"
+" $ lb config --parent-mirror-bootstrap http://localhost/debian/ \\\n"
+" --parent-mirror-chroot-security http://localhost/debian-security/ \\\n"
+"\t --parent-mirror-chroot-backports http://localhost/debian-backports/\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:47
+#: en/user_customization-packages.ssi:48
msgid ""
-"The chroot mirror, specified by #{--mirror-chroot}#, defaults to the #{--"
-"mirror-bootstrap}# value."
+"The chroot mirror, specified by #{--parent-mirror-chroot}#, defaults to the #"
+"{--parent-mirror-bootstrap}# value."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:49
+#: en/user_customization-packages.ssi:50
msgid "3~ Distribution mirrors used at run time"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:51
+#: en/user_customization-packages.ssi:52
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."
+"The #{--parent-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:56
+#: en/user_customization-packages.ssi:57
#, no-wrap
msgid ""
-" $ lb config --mirror-binary http://mirror/debian/ \\\n"
-" --mirror-binary-security http://mirror/debian-security/\n"
+" $ lb config --parent-mirror-binary http://mirror/debian/ \\\n"
+" --parent-mirror-binary-security http://mirror/debian-security/\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:60
+#: en/user_customization-packages.ssi:61
msgid "3~additional-repositories Additional repositories"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:62
+#: en/user_customization-packages.ssi:63
msgid ""
"You may add more repositories, broadening your package choices beyond what "
"is available in your target distribution. These may be, for example, for "
"backports, experimental or custom packages. To configure additional "
-"repositories, create #{config/chroot_sources/your-repository.chroot}#, and/"
-"or #{config/chroot_sources/your-repository.binary}# files. As with the #{--"
-"mirror-*}# options, these govern the repositories used in the *chroot* stage "
-"when building the image, and in the *binary* stage, i.e. for use when "
-"running the live system."
+"repositories, create #{config/archives/your-repository.list.chroot}#, and/or "
+"#{config/archives/your-repository.list.binary}# files. As with the #{--"
+"parent-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:64
+#: en/user_customization-packages.ssi:65
msgid ""
-"For example, #{config/chroot_sources/live.chroot}# allows you to install "
+"For example, #{config/archives/live.list.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:68
+#: en/user_customization-packages.ssi:69
#, no-wrap
msgid " deb http://live.debian.net/ sid-snapshots main contrib non-free\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:72
+#: en/user_customization-packages.ssi:73
msgid ""
-"If you add the same line to #{config/chroot_sources/live.binary}#, the "
+"If you add the same line to #{config/archives/live.list.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:74
+#: en/user_customization-packages.ssi:75
msgid "If such files exist, they will be picked up automatically."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:76
+#: en/user_customization-packages.ssi:77
msgid ""
"You should also put the GPG key used to sign the repository into #{config/"
-"chroot_sources/your-repository.{binary,chroot}.gpg}# files."
+"archives/your-repository.gpg.{binary,chroot}}# files."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:78
+#: en/user_customization-packages.ssi:79
#, no-wrap
-msgid "*{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:\n"
+msgid "*{Note:}* some preconfigured package repositories are available for easy selection through the #{--archives}# option, e.g. for enabling live snapshots, a simple command is enough to enable it:\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:82 en/user_installation.ssi:148
+#: en/user_customization-packages.ssi:83 en/user_installation.ssi:148
#, no-wrap
-msgid " $ lb config --repository live.debian.net\n"
+msgid " $ lb config --archives live.debian.net\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:86
+#: en/user_customization-packages.ssi:87
msgid "2~choosing-packages-to-install Choosing packages to install"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:88
+#: en/user_customization-packages.ssi:89
msgid ""
"There are a number of ways to choose which packages live-build will install "
"in your image, covering a variety of different needs. You can simply name "
-"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:90
-msgid "3~ Choosing a few packages"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:92
-msgid ""
-"When the number of packages added is small, simply specify #{--packages}#. "
-"For example:"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:96
-#, no-wrap
-msgid " $ lb config --packages \"package1 package2 package3\"\n"
+"individual packages to install in a package list. You can also choose "
+"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:100
-msgid ""
-"The behaviour of live-build when specifying a package that does not exist is "
-"determined by your choice of APT utility. See {Choosing apt or aptitude}"
-"#choosing-apt-or-aptitude for more details."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:102
-msgid ""
-"If you need to specify a large number of packages to be installed or you "
-"need flexibility regarding which packages to install, use package lists as "
-"discussed in the following section, {Package lists}#package-lists."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:104
+#: en/user_customization-packages.ssi:91
msgid "3~package-lists Package lists"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:106
+#: en/user_customization-packages.ssi:93
msgid ""
"Package lists are a powerful way of expressing which packages should be "
"installed. The list syntax supports included files and conditional sections "
@@ -448,114 +413,103 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:108
-msgid "3~ Predefined package lists"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:110
-msgid ""
-"The simplest way to use lists is to specify one or more predefined lists "
-"with the #{--packages-lists}# option. For example:"
+#: en/user_customization-packages.ssi:95
+#, no-wrap
+msgid "*{Note:}* 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.\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:114
-#, no-wrap
-msgid " $ lb config --packages-lists \"gnome-core rescue\"\n"
+#: en/user_customization-packages.ssi:97
+msgid "3~ Predefined package lists"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:118
+#: en/user_customization-packages.ssi:99
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."
+"The simplest way to use lists is to specify one or more predefined lists "
+"with the #{--package-lists}# option. For example:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:120
+#: en/user_customization-packages.ssi:103
#, no-wrap
-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.\n"
+msgid " $ lb config --package-lists \"gnome rescue\"\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:122
+#: en/user_customization-packages.ssi:107
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 "
+"build/package-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:124
+#: en/user_customization-packages.ssi:109
msgid "3~ Local package lists"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:126
+#: en/user_customization-packages.ssi:111
msgid ""
-"You may supplement or replace entirely the supplied lists using local "
-"package lists stored in #{config/chroot_local-packageslists/}#."
+"You may supplement the predefined lists using local package lists stored in #"
+"{config/package-lists/}#."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:128
+#: en/user_customization-packages.ssi:113
msgid ""
"Package lists that exist in this directory need to have a #{.list}# suffix "
-"in order to be processed. Local package lists always override package lists "
-"distributed with live-build. This can cause undesired effects, we therefore "
-"recommend to use unique names for local package lists."
+"in order to be processed, and then an additional stage suffix, #{.chroot}# "
+"or #{.binary}# to indicate which stage the list is for."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:130
-msgid "3~ Local binary package lists"
+#: en/user_customization-packages.ssi:115
+#, no-wrap
+msgid "*{Note:}* If you don't specify the stage suffix, the list will be used for both stages. Normally, you want to specify #{.list.chroot}# so that the packages will only be installed in the live filesystem and not have an extra copy of the #{.deb}# placed on the media.\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:132
-msgid ""
-"In case you want to include some required .deb packages to live media's #"
-"{pool/}# (without installing them onto the live image) you may need to use "
-"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."
+#: en/user_customization-packages.ssi:117
+msgid "3~ Local binary package lists"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:134
+#: en/user_customization-packages.ssi:119
msgid ""
-"Package lists that exist in this directory need to have a #{.list}# suffix "
-"in order to be processed."
+"To make a binary stage list, place a file suffixed with #{.list.binary}# in #"
+"{config/package-lists/}#. These packages are not installed in the live "
+"filesystem, but are included on the live media under #{pool/}#. You would "
+"typically use such a list with one of the non-live installer variants. As "
+"mentioned above, if you want this list to be the same as your chroot stage "
+"list, simply use the #{.list}# suffix by itself."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:136
+#: en/user_customization-packages.ssi:121
msgid "3~ Extending a provided package list using includes"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:138
+#: en/user_customization-packages.ssi:123
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."
+"includes. Refer to these in the #{/usr/share/live/build/package-lists/}# "
+"directory, as they serve as good examples of how to write your own lists."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:140
+#: en/user_customization-packages.ssi:125
msgid ""
"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:"
+"iceweasel, create #{config/package-lists/my.list.chroot}# with the following "
+"contents:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:145
+#: en/user_customization-packages.ssi:130
#, no-wrap
msgid ""
" #include <gnome>\n"
@@ -563,12 +517,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:134
msgid "3~ Using conditionals inside package lists"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:151
+#: en/user_customization-packages.ssi:136
msgid ""
"Any of the live-build configuration variables stored in #{config/*}# (minus "
"the #{LB_}# prefix) may be used in conditional statements in package lists. "
@@ -579,14 +533,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:153
+#: en/user_customization-packages.ssi:138
msgid ""
"For example, to install #{ia32-libs}# if the #{--architecture amd64}# is "
"specified:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:159
+#: en/user_customization-packages.ssi:144
#, no-wrap
msgid ""
" #if ARCHITECTURE amd64\n"
@@ -595,14 +549,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:148
msgid ""
"You may test for any one of a number of values, e.g. to install #{memtest86+}"
"# if either #{--architecture i386}# or #{--architecture amd64}# is specified:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:169
+#: en/user_customization-packages.ssi:154
#, no-wrap
msgid ""
" #if ARCHITECTURE i386 amd64\n"
@@ -611,7 +565,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:173
+#: en/user_customization-packages.ssi:158
msgid ""
"You may also test against variables that may contain more than one value, e."
"g. to install #{vrms}# if either #{contrib}# or #{non-free}# is specified "
@@ -619,7 +573,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:179
+#: en/user_customization-packages.ssi:164
#, no-wrap
msgid ""
" #if ARCHIVE_AREAS contrib non-free\n"
@@ -628,12 +582,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:183
+#: en/user_customization-packages.ssi:168
msgid "A conditional may surround an #{#include}# directive:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:174
#, no-wrap
msgid ""
" #if ARCHITECTURE amd64\n"
@@ -642,34 +596,37 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:178
msgid "The nesting of conditionals is not supported."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:195
+#: en/user_customization-packages.ssi:180
msgid "3~ Tasks"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:197
+#: en/user_customization-packages.ssi:182
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."
+"live-build by putting them in a list in #{config/task-lists/}#, as in the "
+"example below."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:187
#, no-wrap
-msgid " $ lb config --tasks \"mail-server file-server\"\n"
+msgid ""
+" $ lb config\n"
+" $ echo \"mail-server file-server\" >> config/task-lists/my.list.chroot\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:205
+#: en/user_customization-packages.ssi:191
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, "
@@ -678,97 +635,87 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:193
msgid "3~desktop-and-language-tasks Desktop and language tasks"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:209
+#: en/user_customization-packages.ssi:195
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 #{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."
+"Desktop and language tasks are special cases that need some extra planning "
+"and configuration. Live images are different from Debian Installer images in "
+"this respect. 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 internal #{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:211
+#: en/user_customization-packages.ssi:197
msgid ""
-"In live-build, therefore, these special cases are also given special "
-"consideration, but with three notable differences at the time of writing."
+"When developing a desktop live image, the image typically boots directly to "
+"a working desktop, the choices of both desktop and default language having "
+"been made at build time, not at run time as in the case of the Debian "
+"Installer. That's not to say that a live image couldn't be built to support "
+"multiple desktops or multiple languages and offer the user a choice, but "
+"that is not live-build's default behaviour."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:213
+#: en/user_customization-packages.ssi:199
msgid ""
-"First, there is no provision made yet automatically for language tasks, "
-"although a subset of those packages are included if you specify #{lb config "
-"--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:"
+"Because there is no provision made automatically for language tasks, which "
+"include such things as language-specific fonts and input-method packages, if "
+"you want them, you need to specify them in your configuration. For example, "
+"a GNOME desktop image containing support for Japanese might include these "
+"tasks:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:217
+#: en/user_customization-packages.ssi:205
#, no-wrap
-msgid " $ lb config --tasks \"japanese japanese-desktop japanese-gnome-desktop\"\n"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:221
msgid ""
-"Second, live-build supports #{*-desktop}# virtual package lists for each of "
-"the desktop flavours mentioned above, which select the #{standard-x11}# "
-"predefined package list, the corresponding #{*-desktop}# task and three "
-"additional tasks: #{desktop}#, #{standard}# and #{laptop}#. So, for example, "
-"if you specify #{--packages-lists gnome-desktop}#, it is equivalent to "
-"specifying #{--packages debian-installer-launcher --packages-lists standard-"
-"x11 --tasks \"gnome-desktop desktop standard laptop\"}#."
+" $ lb config\n"
+" $ echo \"gnome-desktop desktop standard laptop\" >> config/task-lists/my.list.chroot\n"
+" $ echo \"japanese japanese-desktop japanese-gnome-desktop\" >> config/task-lists/my.list.chroot\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:223
+#: en/user_customization-packages.ssi:209
msgid ""
-"Third, if any of the tasks for these desktop flavours are selected, either "
-"explicitly through #{--tasks}# or implicitly by #{--packages-lists}#, 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."
+"Since desktop tasks are \"internal\" tasks, for every desktop flavour task "
+"included in the image, the corresponding value, if it differs from the "
+"default, \"gnome\", must be preseeded in the \"tasksel/desktop\" debconf "
+"variable or else tasksel will not recognize and install it. Thus:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:225
+#: en/user_customization-packages.ssi:214
#, no-wrap
-msgid "*{Note:}* There is also an experimental #{--language}# option that has an overlapping purpose with language tasks. For any language for which it is known that there are #{*-l10n}# packages, if #{--language}# is specified, those packages will be installed. Furthermore, if any #{syslinux}# templates matching the language are found, they will be used instead of the default English templates. The package selection done by #{--language}# is a poor approximation of language tasks, as it requires that the list of packages to include per language be maintained internally in live-build, and besides, language tasks are more comprehensive and flexible. However, the #{syslinux}# aspect is still useful. Thus, if you use #{--bootloader syslinux}# and templates for the specified language exist either in #{/usr/share/live/build/templates/syslinux/}# or #{config/templates/syslinux/}#, consider using this option, possibly in combination with tasks to ensure all relevant packages are in
stalled. For example:\n"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:229
-#, no-wrap
-msgid " $ lb config --language es\n"
+msgid ""
+" $ lb config\n"
+" $ echo 'tasksel tasksel/desktop multiselect kde' >> config/preseed/my.preseed.chroot\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:233
+#: en/user_customization-packages.ssi:218
msgid ""
-"Even so, it is limited in that it only supports a single language and a "
-"single bootloader. Therefore, for all of these reasons, the future of this "
-"option is under review, possibly to be replaced with something entirely "
-"different in the next major release of live-build."
+"This parameter can take multiple values, e.g. \"lxde xfce\" instead of \"kde"
+"\"."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:235
+#: en/user_customization-packages.ssi:220
msgid ""
"2~installing-modified-or-third-party-packages Installing modified or third-"
"party packages"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:237
+#: en/user_customization-packages.ssi:222
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 "
@@ -779,7 +726,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:239
+#: en/user_customization-packages.ssi:224
msgid ""
"This section does not cover advice regarding building or maintaining "
"modified packages. Joachim Breitner's 'How to fork privately' method from "
@@ -790,90 +737,90 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:241
+#: en/user_customization-packages.ssi:226
msgid "There are two ways of installing modified custom packages:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:243
-msgid "_* #{chroot_local-packages}#"
+#: en/user_customization-packages.ssi:228
+msgid "_* #{packages.chroot}#"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:245
+#: en/user_customization-packages.ssi:230
msgid "_* Using a custom APT repository"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:247
+#: en/user_customization-packages.ssi:232
msgid ""
-"Using #{chroot_local-packages}# is simpler to achieve and useful for \"one-"
-"off\" customizations but has a number of drawbacks, whilst using a custom "
-"APT repository is more time-consuming to set up."
+"Using #{packages.chroot}# 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:249
-msgid "3~ Using #{chroot_local-packages}# to install custom packages"
+#: en/user_customization-packages.ssi:234
+msgid "3~ Using #{packages.chroot}# to install custom packages"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:251
+#: en/user_customization-packages.ssi:236
msgid ""
-"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/packages.chroot/}"
+"# 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:253
+#: en/user_customization-packages.ssi:238
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:255
+#: en/user_customization-packages.ssi:240
msgid ""
-"Using #{chroot_local-packages}# for installation of custom packages has "
+"Using #{packages.chroot}# for installation of custom packages has "
"disadvantages:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:257
+#: en/user_customization-packages.ssi:242
msgid "_* It is not possible to use secure APT."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:259
+#: en/user_customization-packages.ssi:244
msgid ""
-"_* You must install all appropriate packages in the #{config/chroot_local-"
-"packages/}# directory."
+"_* You must install all appropriate packages in the #{config/packages."
+"chroot/}# directory."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:261
+#: en/user_customization-packages.ssi:246
msgid ""
"_* It does not lend itself to storing Debian Live configurations in revision "
"control."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:263
+#: en/user_customization-packages.ssi:248
msgid "3~ Using an APT repository to install custom packages"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:265
+#: en/user_customization-packages.ssi:250
msgid ""
-"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."
+"Unlike using #{packages.chroot}#, 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."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:267
+#: en/user_customization-packages.ssi:252
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 "
@@ -881,12 +828,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:269
+#: en/user_customization-packages.ssi:254
msgid "3~ Custom packages and APT"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:271
+#: en/user_customization-packages.ssi:256
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 "
@@ -896,7 +843,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:273
+#: en/user_customization-packages.ssi:258
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 "
@@ -906,28 +853,28 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:275
+#: en/user_customization-packages.ssi:260
msgid "2~ Configuring APT at build time"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:277
+#: en/user_customization-packages.ssi:262
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 "
+"appropriate configurations through #{config/includes.chroot/}#.) 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:279
+#: en/user_customization-packages.ssi:264
msgid "3~choosing-apt-or-aptitude Choosing apt or aptitude"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:281
+#: en/user_customization-packages.ssi:266
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 "
@@ -937,26 +884,26 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:283
+#: en/user_customization-packages.ssi:268
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:285
+#: en/user_customization-packages.ssi:270
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:287
+#: en/user_customization-packages.ssi:272
msgid "3~ Using a proxy with APT"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:289
+#: en/user_customization-packages.ssi:274
msgid ""
"One commonly required APT configuration is to deal with building an image "
"behind a proxy. You may specify your APT proxy with the #{--apt-ftp-proxy}# "
@@ -964,18 +911,18 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:293
+#: en/user_customization-packages.ssi:278
#, no-wrap
msgid " $ lb config --apt-http-proxy http://proxy/\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:297
+#: en/user_customization-packages.ssi:282
msgid "3~ Tweaking APT to save space"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:299
+#: en/user_customization-packages.ssi:284
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 "
@@ -983,20 +930,20 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:301
+#: en/user_customization-packages.ssi:286
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:305
+#: en/user_customization-packages.ssi:290
#, no-wrap
-msgid " $ lb config --binary-indices false\n"
+msgid " $ lb config --apt-indices false\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:309
+#: en/user_customization-packages.ssi:294
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 "
@@ -1006,20 +953,20 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:311
+#: en/user_customization-packages.ssi:296
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:315
+#: en/user_customization-packages.ssi:300
#, no-wrap
msgid " $ lb config --apt-recommends false\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:319
+#: en/user_customization-packages.ssi:304
msgid ""
"The tradeoff here is that if you don't install recommended packages for a "
"given package, that is, \"packages that would be found together with this "
@@ -1035,12 +982,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:321
+#: en/user_customization-packages.ssi:306
msgid "3~ Passing options to apt or aptitude"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:323
+#: en/user_customization-packages.ssi:308
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 "
@@ -1049,43 +996,43 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:325
+#: en/user_customization-packages.ssi:310
msgid "3~apt-pinning APT pinning"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:327
+#: en/user_customization-packages.ssi:312
msgid ""
"For background, please first read the #{apt_preferences(5)}# man page. APT "
"pinning can be configured either for build time, or else for run time. For "
"the former, create #{config/chroot_apt/preferences}#. For the latter, create "
-"#{config/chroot_local-includes/etc/apt/preferences}#."
+"#{config/includes.chroot/etc/apt/preferences}#."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:329
+#: en/user_customization-packages.ssi:314
msgid ""
-"Let's say you are building a Squeeze live system but need all the live "
+"Let's say you are building a Wheezy live system but need all the live "
"packages that end up in the binary image to be installed from Sid at build "
"time. You need to add Sid to your APT sources and pin it so that only the "
"packages you want are installed from it at build time and all others are "
-"taken from the target system distribution, Squeeze. The following will "
+"taken from the target system distribution, Wheezy. The following will "
"accomplish this:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:322
#, no-wrap
msgid ""
-" $ echo \"deb http://mirror/debian sid main\" > config/chroot_sources/sid.chroot\n"
-" $ cat >>config/chroot_apt/preferences <<END\n"
+" $ echo \"deb http://mirror/debian sid main\" > config/archives/sid.list.chroot\n"
+" $ cat >> config/chroot_apt/preferences <<END\n"
" Package: live-boot live-boot-initramfs-tools live-config live-config-sysvinit\n"
" Pin: release n=sid\n"
" Pin-Priority: 600\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:342
+#: en/user_customization-packages.ssi:327
#, no-wrap
msgid ""
" Package: *\n"
@@ -1095,31 +1042,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:346
+#: en/user_customization-packages.ssi:331
#, no-wrap
msgid "*{Note:}* Wildcards can be used in package names (e.g. *{Package: live-*}*) with Apt version 0.8.14 or higher. This means that it works with Wheezy using:\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:350
+#: en/user_customization-packages.ssi:335
msgid "$ lb config --distribution wheezy"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:354
+#: en/user_customization-packages.ssi:339
msgid ""
"Negative pin priorities will prevent a package from being installed, as in "
"the case where you do not want a package that is recommended by another "
-"package. Suppose you are building an LXDE image using #{--packages-lists "
-"lxde}# option, but don't want the user prompted to store wifi passwords in "
-"the keyring. This list includes #{gdm}#, which depends on #{gksu}#, which in "
+"package. Suppose you are building an LXDE image using #{--package-lists lxde}"
+"# option, but don't want the user prompted to store wifi passwords in the "
+"keyring. This list includes #{gdm}#, which depends on #{gksu}#, which in "
"turn recommends #{gnome-keyring}#. So you want to omit the recommended #"
"{gnome-keyring}# package. This can be done by adding the following stanza to "
"#{config/chroot_apt/preferences}#:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:360
+#: en/user_customization-packages.ssi:345
#, no-wrap
msgid ""
" Package: gnome-keyring\n"
diff --git a/manual/po/pt_BR/user_customization-runtime.ssi.po b/manual/po/pt_BR/user_customization-runtime.ssi.po
index c004d2d..9e46904 100644
--- a/manual/po/pt_BR/user_customization-runtime.ssi.po
+++ b/manual/po/pt_BR/user_customization-runtime.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-08-25 17:01+0300\n"
+"POT-Creation-Date: 2011-11-07 21:01-0400\n"
"PO-Revision-Date: 2010-11-30 11:40+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -37,48 +37,47 @@ msgstr ""
#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
-#: en/user_customization-installer.ssi:43
+#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
-#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:53
-#: en/user_customization-packages.ssi:66 en/user_customization-packages.ssi:80
-#: en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:112
-#: en/user_customization-packages.ssi:142
-#: en/user_customization-packages.ssi:155
-#: en/user_customization-packages.ssi:165
-#: en/user_customization-packages.ssi:175
-#: en/user_customization-packages.ssi:185
-#: en/user_customization-packages.ssi:199
-#: en/user_customization-packages.ssi:215
-#: en/user_customization-packages.ssi:227
-#: en/user_customization-packages.ssi:291
-#: en/user_customization-packages.ssi:303
-#: en/user_customization-packages.ssi:313
-#: en/user_customization-packages.ssi:331
-#: en/user_customization-packages.ssi:348
-#: en/user_customization-packages.ssi:356 en/user_customization-runtime.ssi:14
-#: en/user_customization-runtime.ssi:24 en/user_customization-runtime.ssi:44
-#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:63
-#: en/user_customization-runtime.ssi:71 en/user_customization-runtime.ssi:80
-#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:111
-#: en/user_customization-runtime.ssi:119 en/user_examples.ssi:14
+#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:54
+#: en/user_customization-packages.ssi:67 en/user_customization-packages.ssi:81
+#: en/user_customization-packages.ssi:101
+#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:140
+#: en/user_customization-packages.ssi:150
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:184
+#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:276
+#: en/user_customization-packages.ssi:288
+#: en/user_customization-packages.ssi:298
+#: en/user_customization-packages.ssi:316
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
+#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
+#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
+#: en/user_customization-runtime.ssi:104 en/user_customization-runtime.ssi:114
+#: en/user_customization-runtime.ssi:122 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:178 en/user_examples.ssi:190 en/user_examples.ssi:206
-#: en/user_examples.ssi:220 en/user_examples.ssi:229 en/user_examples.ssi:247
-#: en/user_examples.ssi:255 en/user_examples.ssi:268 en/user_examples.ssi:283
-#: en/user_installation.ssi:38 en/user_installation.ssi:46
-#: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi:74 en/user_installation.ssi:82
-#: en/user_installation.ssi:90 en/user_installation.ssi:114
-#: en/user_installation.ssi:129 en/user_installation.ssi:146
-#: en/user_managing_a_configuration.ssi:24
+#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
+#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
+#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
+#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
+#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
+#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
+#: en/user_examples.ssi:277 en/user_installation.ssi:38
+#: en/user_installation.ssi:46 en/user_installation.ssi:56
+#: en/user_installation.ssi:64 en/user_installation.ssi:74
+#: en/user_installation.ssi:82 en/user_installation.ssi:90
+#: en/user_installation.ssi:114 en/user_installation.ssi:129
+#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:80 en/user_overview.ssi:88
+#: en/user_overview.ssi:48 en/user_overview.ssi:56
msgid "code{"
msgstr "code{"
@@ -102,49 +101,48 @@ msgstr "code{"
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
-#: en/user_customization-installer.ssi:37
-#: en/user_customization-installer.ssi:48
+#: en/user_customization-installer.ssi:38
+#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:70 en/user_customization-packages.ssi:84
-#: en/user_customization-packages.ssi:98
-#: en/user_customization-packages.ssi:116
-#: en/user_customization-packages.ssi:147
-#: en/user_customization-packages.ssi:161
-#: en/user_customization-packages.ssi:171
-#: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:191
-#: en/user_customization-packages.ssi:203
-#: en/user_customization-packages.ssi:219
-#: en/user_customization-packages.ssi:231
-#: en/user_customization-packages.ssi:295
-#: en/user_customization-packages.ssi:307
-#: en/user_customization-packages.ssi:317
-#: en/user_customization-packages.ssi:344
-#: en/user_customization-packages.ssi:352
-#: en/user_customization-packages.ssi:361 en/user_customization-runtime.ssi:18
-#: en/user_customization-runtime.ssi:28 en/user_customization-runtime.ssi:48
-#: en/user_customization-runtime.ssi:59 en/user_customization-runtime.ssi:67
-#: en/user_customization-runtime.ssi:76 en/user_customization-runtime.ssi:85
-#: en/user_customization-runtime.ssi:105 en/user_customization-runtime.ssi:115
-#: en/user_customization-runtime.ssi:124 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:186 en/user_examples.ssi:202 en/user_examples.ssi:210
-#: en/user_examples.ssi:225 en/user_examples.ssi:233 en/user_examples.ssi:251
-#: en/user_examples.ssi:264 en/user_examples.ssi:279 en/user_examples.ssi:297
-#: en/user_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi:70
-#: en/user_installation.ssi:78 en/user_installation.ssi:86
-#: en/user_installation.ssi:94 en/user_installation.ssi:119
-#: en/user_installation.ssi:136 en/user_installation.ssi:149
-#: en/user_managing_a_configuration.ssi:31
+#: en/user_customization-packages.ssi:46 en/user_customization-packages.ssi:59
+#: en/user_customization-packages.ssi:71 en/user_customization-packages.ssi:85
+#: en/user_customization-packages.ssi:105
+#: en/user_customization-packages.ssi:132
+#: en/user_customization-packages.ssi:146
+#: en/user_customization-packages.ssi:156
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:329
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:346 en/user_customization-runtime.ssi:21
+#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
+#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
+#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
+#: en/user_customization-runtime.ssi:108 en/user_customization-runtime.ssi:118
+#: en/user_customization-runtime.ssi:127 en/user_examples.ssi:20
+#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
+#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
+#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
+#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
+#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
+#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
+#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
+#: en/user_examples.ssi:291 en/user_installation.ssi:42
+#: en/user_installation.ssi:50 en/user_installation.ssi:60
+#: en/user_installation.ssi:70 en/user_installation.ssi:78
+#: en/user_installation.ssi:86 en/user_installation.ssi:94
+#: en/user_installation.ssi:119 en/user_installation.ssi:136
+#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
-#: en/user_overview.ssi:84 en/user_overview.ssi:92
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:42
+#: en/user_overview.ssi:52 en/user_overview.ssi:60
msgid "}code"
msgstr "}code"
@@ -187,18 +185,22 @@ msgstr ""
msgid ""
"You can specify additional groups that the live user will belong to by "
"preseeding the #{passwd/user-default-groups}# debconf value. For example, to "
-"add the live user to the #{fuse}# group, add the following to a file in the #"
-"{config/chroot_local-preseed}# directory:"
+"add the live user to the #{fuse}# group, add the following preseed under #"
+"{config/preseed/}# for the chroot stage:"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:16
+#: en/user_customization-runtime.ssi:19
#, no-wrap
-msgid " user-setup passwd/user-default-groups string audio cdrom dip floppy video plugdev netdev powerdev scanner bluetooth fuse\n"
+msgid ""
+" $ lb config\n"
+" $ echo user-setup passwd/user-default-groups string audio cdrom \\\n"
+" dip floppy video plugdev netdev powerdev scanner bluetooth fuse \\\n"
+" >> config/preseed/my.preseed.chroot\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:20
+#: en/user_customization-runtime.ssi:23
msgid ""
"It is also possible to change the default username \"user\" and the default "
"password \"live\". If you want to do that for any reason, you can easily "
@@ -206,53 +208,53 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:22
+#: en/user_customization-runtime.ssi:25
msgid ""
"To change the default username you can simply specify it in your config:"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:26
+#: en/user_customization-runtime.ssi:29
msgid "$ lb config --bootappend-live \"username=live-user\""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:30
+#: en/user_customization-runtime.ssi:33
msgid ""
"One possible way of changing the default password is by means of a hook as "
"described in {Boot-time hooks}#boot-time-hooks. In order to do that you can "
"use the \"passwd\" hook from #{/usr/share/doc/live-config/examples/hooks}#, "
-"prefix it accordingly (e.g. 200-passwd) and add it to #{config/chroot_local-"
-"includes/lib/live/config/}#"
+"prefix it accordingly (e.g. 200-passwd) and add it to #{config/includes."
+"chroot/lib/live/config/}#"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:32
+#: en/user_customization-runtime.ssi:35
msgid "2~customizing-locale-and-language Customizing locale and language"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:34
+#: en/user_customization-runtime.ssi:37
msgid "When the live system boots, language is involved in three steps:"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:36
+#: en/user_customization-runtime.ssi:39
msgid "_* the locale generation"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:38
+#: en/user_customization-runtime.ssi:41
msgid "_* setting the keyboard layout for the console"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:40
+#: en/user_customization-runtime.ssi:43
msgid "_* setting the keyboard layout for X"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:42
+#: en/user_customization-runtime.ssi:45
msgid ""
"The default locale when building a Live system is \"locales=en_US.UTF-8\". "
"To define the locale that should be generated, use the #{locales}# parameter "
@@ -260,20 +262,20 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:46
+#: en/user_customization-runtime.ssi:49
#, no-wrap
msgid " $ lb config --bootappend-live \"locales=de_CH.UTF-8\"\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:50
+#: en/user_customization-runtime.ssi:53
msgid ""
"This parameter can also be used at the kernel command line. You can specify "
"a locale by a full #{language_country.encoding}# word."
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:52
+#: en/user_customization-runtime.ssi:55
msgid ""
"Both the console and X keyboard configuration depend on the #{keyboard-"
"layouts}# parameter of the #{--bootappend-live}# option. Valid options for X "
@@ -284,7 +286,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:57
+#: en/user_customization-runtime.ssi:60
#, no-wrap
msgid ""
" $ grep -i sweden -C3 /usr/share/X11/xkb/rules/base.xml | grep name\n"
@@ -292,26 +294,26 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:61
+#: en/user_customization-runtime.ssi:64
msgid ""
"To get the locale files for German and Swiss German keyboard layout in X use:"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:65
+#: en/user_customization-runtime.ssi:68
#, no-wrap
msgid " $ lb config --bootappend-live \"locales=de_CH.UTF-8 keyboard-layouts=ch\"\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:69
+#: en/user_customization-runtime.ssi:72
msgid ""
"A list of the valid values of the keyboards for the console can be figured "
"with the following command:"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:74
+#: en/user_customization-runtime.ssi:77
#, no-wrap
msgid ""
" $ for i in $(find /usr/share/keymaps/ -iname \"*kmap.gz\"); \\\n"
@@ -319,7 +321,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:78
+#: en/user_customization-runtime.ssi:81
msgid ""
"Alternatively, you can use the #{console-setup}# package, a tool to let you "
"configure console layout using X (XKB) definitions; you can then set your "
@@ -331,7 +333,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:83
+#: en/user_customization-runtime.ssi:86
#, no-wrap
msgid ""
" $ lb config --bootappend-live \\\n"
@@ -339,12 +341,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:87
+#: en/user_customization-runtime.ssi:90
msgid "2~persistence Persistence"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:89
+#: en/user_customization-runtime.ssi:92
msgid ""
"A live cd paradigm is a pre-installed system which runs from read-only "
"media, like a cdrom, where writes and modifications do not survive reboots "
@@ -352,7 +354,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:91
+#: en/user_customization-runtime.ssi:94
msgid ""
"A Debian Live system is a generalization of this paradigm and thus supports "
"other media in addition to CDs; but still, in its default behaviour, it "
@@ -361,7 +363,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:93
+#: en/user_customization-runtime.ssi:96
msgid ""
"Persistence is a common name for different kinds of solutions for saving "
"across reboots some, or all, of this run-time evolution of the system. To "
@@ -372,7 +374,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:95
+#: en/user_customization-runtime.ssi:98
msgid ""
"The data stored on this ramdisk should be saved on a writable persistent "
"medium like a Hard Disk, a USB key, a network share or even a session of a "
@@ -382,12 +384,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:97
+#: en/user_customization-runtime.ssi:100
msgid "3~ Full persistence"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:99
+#: en/user_customization-runtime.ssi:102
msgid ""
"By 'full persistence' it is meant that instead of using a tmpfs for storing "
"modifications to the read-only media (with the copy-on-write, COW, system) a "
@@ -399,31 +401,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:103
+#: en/user_customization-runtime.ssi:106
#, no-wrap
msgid " # mkfs.ext2 -L live-rw /dev/sdb1\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:107
+#: en/user_customization-runtime.ssi:110
msgid "See also {Using the space left on a USB stick}#using-usb-extra-space."
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:109
+#: en/user_customization-runtime.ssi:112
msgid ""
"If you already have a partition on your device, you could just change the "
"label with one of the following:"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:113
+#: en/user_customization-runtime.ssi:116
#, no-wrap
msgid " # tune2fs -L live-rw /dev/sdb1 # for ext2,3,4 filesystems\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:117
+#: en/user_customization-runtime.ssi:120
msgid ""
"But since live system users cannot always use a hard drive partition, and "
"considering that most USB keys have poor write speeds, 'full' persistence "
@@ -433,7 +435,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:122
+#: en/user_customization-runtime.ssi:125
#, no-wrap
msgid ""
" $ dd if=/dev/null of=live-rw bs=1G seek=1 # for a 1GB sized image file\n"
@@ -441,19 +443,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:126
+#: en/user_customization-runtime.ssi:129
msgid ""
"Then copy the #{live-rw}# file to a writable partition and reboot with the "
"boot parameter 'persistent'."
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:128
+#: en/user_customization-runtime.ssi:131
msgid "3~ Home automounting"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:130
+#: en/user_customization-runtime.ssi:133
msgid ""
"If during the boot a partition (filesystem) image file or a partition "
"labeled #{home-rw}# is discovered, this filesystem will be directly mounted "
@@ -462,12 +464,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:132
+#: en/user_customization-runtime.ssi:135
msgid "3~ Snapshots"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:134
+#: en/user_customization-runtime.ssi:137
msgid ""
"Snapshots are collections of files and directories which are not mounted "
"while running but which are copied from a persistent device to the system "
@@ -484,26 +486,26 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:136
+#: en/user_customization-runtime.ssi:139
msgid ""
"A /home version of snapshot exists too and its label is #{home-sn.*}#; it "
"works the same as the main snapshot but it is only applied to /home."
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:138
+#: en/user_customization-runtime.ssi:141
msgid ""
"Snapshots cannot currently handle file deletion but full persistence and "
"home automounting can."
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:140
+#: en/user_customization-runtime.ssi:143
msgid "3~ Persistent SubText"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:142
+#: en/user_customization-runtime.ssi:145
msgid ""
"If a user would need multiple persistent storage of the same type for "
"different locations or testing, such as #{live-rw-nonwork}# and #{live-rw-"
@@ -515,12 +517,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:144
+#: en/user_customization-runtime.ssi:147
msgid "3~ Partial remastering"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:145
+#: en/user_customization-runtime.ssi:148
msgid ""
"The run-time modification of the tmpfs could be collected using live-"
"snapshot in a squashfs and added to the cd by remastering the iso in the "
diff --git a/manual/po/pt_BR/user_examples.ssi.po b/manual/po/pt_BR/user_examples.ssi.po
index a6f8c78..bce7893 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 2.0.0\n"
-"POT-Creation-Date: 2011-03-18 07:39-0200\n"
+"POT-Creation-Date: 2011-11-13 17:12+0100\n"
"PO-Revision-Date: 2010-11-04 16:34-0400\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -31,48 +31,49 @@ msgstr ""
#: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/user_basics.ssi:30 en/user_basics.ssi:40
-#: en/user_basics.ssi:56 en/user_basics.ssi:71 en/user_basics.ssi:106
-#: en/user_basics.ssi:114 en/user_basics.ssi:126 en/user_basics.ssi:138
-#: en/user_basics.ssi:150 en/user_basics.ssi:158 en/user_basics.ssi:166
-#: en/user_basics.ssi:182 en/user_basics.ssi:192 en/user_basics.ssi:200
-#: en/user_basics.ssi:216 en/user_basics.ssi:224 en/user_basics.ssi:234
-#: en/user_basics.ssi:252 en/user_basics.ssi:280 en/user_basics.ssi:296
-#: en/user_basics.ssi:304 en/user_basics.ssi:324 en/user_basics.ssi:349
+#: en/project_procedures.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
+#: en/user_basics.ssi:116 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:184 en/user_basics.ssi:194 en/user_basics.ssi:202
+#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
+#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
+#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
-#: en/user_customization-installer.ssi:43
+#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
-#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:53
-#: en/user_customization-packages.ssi:66 en/user_customization-packages.ssi:80
-#: en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:112
-#: en/user_customization-packages.ssi:142
-#: en/user_customization-packages.ssi:155
-#: en/user_customization-packages.ssi:165
-#: en/user_customization-packages.ssi:175
-#: en/user_customization-packages.ssi:185
-#: en/user_customization-packages.ssi:199
-#: en/user_customization-packages.ssi:215
-#: en/user_customization-packages.ssi:227
-#: en/user_customization-packages.ssi:291
-#: en/user_customization-packages.ssi:303
-#: en/user_customization-packages.ssi:313
-#: en/user_customization-packages.ssi:331
-#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
-#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
-#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
-#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
-#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:105
-#: 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:178 en/user_examples.ssi:190
-#: en/user_examples.ssi:206 en/user_examples.ssi:220 en/user_examples.ssi:229
-#: en/user_examples.ssi:247 en/user_examples.ssi:255 en/user_examples.ssi:268
-#: en/user_examples.ssi:283 en/user_installation.ssi:38
+#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:54
+#: en/user_customization-packages.ssi:67 en/user_customization-packages.ssi:81
+#: en/user_customization-packages.ssi:101
+#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:140
+#: en/user_customization-packages.ssi:150
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:184
+#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:276
+#: en/user_customization-packages.ssi:288
+#: en/user_customization-packages.ssi:298
+#: en/user_customization-packages.ssi:316
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
+#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
+#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
+#: en/user_customization-runtime.ssi:104 en/user_customization-runtime.ssi:114
+#: en/user_customization-runtime.ssi:122 en/user_examples.ssi:14
+#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
+#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
+#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
+#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
+#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
+#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
+#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
+#: en/user_examples.ssi:277 en/user_installation.ssi:38
#: en/user_installation.ssi:46 en/user_installation.ssi:56
#: en/user_installation.ssi:64 en/user_installation.ssi:74
#: en/user_installation.ssi:82 en/user_installation.ssi:90
@@ -81,7 +82,7 @@ msgstr ""
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:80 en/user_overview.ssi:88
+#: en/user_overview.ssi:48 en/user_overview.ssi:56
msgid "code{"
msgstr "code{"
@@ -95,48 +96,49 @@ msgstr "code{"
#: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/user_basics.ssi:34 en/user_basics.ssi:44
-#: en/user_basics.ssi:62 en/user_basics.ssi:75 en/user_basics.ssi:110
-#: en/user_basics.ssi:118 en/user_basics.ssi:132 en/user_basics.ssi:142
-#: en/user_basics.ssi:154 en/user_basics.ssi:162 en/user_basics.ssi:170
-#: en/user_basics.ssi:186 en/user_basics.ssi:196 en/user_basics.ssi:204
-#: en/user_basics.ssi:220 en/user_basics.ssi:228 en/user_basics.ssi:238
-#: en/user_basics.ssi:272 en/user_basics.ssi:284 en/user_basics.ssi:300
-#: en/user_basics.ssi:308 en/user_basics.ssi:335 en/user_basics.ssi:374
+#: en/project_procedures.ssi:131 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
+#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
+#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
+#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
+#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
-#: en/user_customization-installer.ssi:37
-#: en/user_customization-installer.ssi:48
+#: en/user_customization-installer.ssi:38
+#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:70 en/user_customization-packages.ssi:84
-#: en/user_customization-packages.ssi:98
-#: en/user_customization-packages.ssi:116
-#: en/user_customization-packages.ssi:147
-#: en/user_customization-packages.ssi:161
-#: en/user_customization-packages.ssi:171
-#: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:191
-#: en/user_customization-packages.ssi:203
-#: en/user_customization-packages.ssi:219
-#: en/user_customization-packages.ssi:231
-#: en/user_customization-packages.ssi:295
-#: en/user_customization-packages.ssi:307
-#: en/user_customization-packages.ssi:317
-#: en/user_customization-packages.ssi:344
-#: en/user_customization-packages.ssi:353 en/user_customization-runtime.ssi:18
-#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
-#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
-#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
-#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:110
-#: 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:186 en/user_examples.ssi:202
-#: en/user_examples.ssi:210 en/user_examples.ssi:225 en/user_examples.ssi:233
-#: en/user_examples.ssi:251 en/user_examples.ssi:264 en/user_examples.ssi:279
-#: en/user_examples.ssi:297 en/user_installation.ssi:42
+#: en/user_customization-packages.ssi:46 en/user_customization-packages.ssi:59
+#: en/user_customization-packages.ssi:71 en/user_customization-packages.ssi:85
+#: en/user_customization-packages.ssi:105
+#: en/user_customization-packages.ssi:132
+#: en/user_customization-packages.ssi:146
+#: en/user_customization-packages.ssi:156
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:329
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:346 en/user_customization-runtime.ssi:21
+#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
+#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
+#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
+#: en/user_customization-runtime.ssi:108 en/user_customization-runtime.ssi:118
+#: en/user_customization-runtime.ssi:127 en/user_examples.ssi:20
+#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
+#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
+#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
+#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
+#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
+#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
+#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
+#: en/user_examples.ssi:291 en/user_installation.ssi:42
#: en/user_installation.ssi:50 en/user_installation.ssi:60
#: en/user_installation.ssi:70 en/user_installation.ssi:78
#: en/user_installation.ssi:86 en/user_installation.ssi:94
@@ -144,14 +146,14 @@ msgstr "code{"
#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
-#: en/user_overview.ssi:84 en/user_overview.ssi:92
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:42
+#: en/user_overview.ssi:52 en/user_overview.ssi:60
msgid "}code"
msgstr "}code"
#. type: Plain text
-#: en/user_basics.ssi:42 en/user_basics.ssi:168 en/user_basics.ssi:236
-#: en/user_examples.ssi:109 en/user_examples.ssi:208
+#: en/user_basics.ssi:44 en/user_basics.ssi:170 en/user_basics.ssi:238
+#: en/user_examples.ssi:119 en/user_examples.ssi:211
#, no-wrap
msgid " # lb build\n"
msgstr ""
@@ -192,17 +194,18 @@ msgid ""
"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:"
+"and in it, set the corresponding #{LB_PARENT_MIRROR_*}# variables to your "
+"preferred mirror. All other mirrors used in the build will be defaulted from "
+"these values. For example:"
msgstr ""
#. type: Plain text
#: en/user_examples.ssi:18
#, no-wrap
msgid ""
-" LB_MIRROR_BOOTSTRAP=\"http://mirror/debian\"\n"
-" LB_MIRROR_CHROOT=\"http://mirror/debian\"\n"
-" LB_MIRROR_CHROOT_SECURITY=\"http://mirror/debian-security\"\n"
+" LB_PARENT_MIRROR_BOOTSTRAP=\"http://mirror/debian\"\n"
+" LB_PARENT_MIRROR_CHROOT_SECURITY=\"http://mirror/debian-security\"\n"
+" LB_PARENT_MIRROR_CHROOT_BACKPORTS=\"http://mirror/debian-updates\"\n"
msgstr ""
#. type: Plain text
@@ -250,7 +253,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:42 en/user_examples.ssi:66 en/user_examples.ssi:231
+#: en/user_examples.ssi:42 en/user_examples.ssi:69 en/user_examples.ssi:234
#, no-wrap
msgid " # lb build 2>&1 | tee binary.log\n"
msgstr ""
@@ -287,47 +290,51 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:56
+#: en/user_examples.ssi:59
#, no-wrap
-msgid " $ mkdir tutorial2 ; cd tutorial2 ; lb config -p lxde --packages iceweasel\n"
+msgid ""
+" $ mkdir tutorial2\n"
+" $ cd tutorial2\n"
+" $ lb config -p lxde\n"
+" $ echo iceweasel >> config/package-lists/my.list.chroot\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:60
+#: en/user_examples.ssi:63
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."
+"configuration for the web browser in #{config/includes.chroot/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
+#: en/user_examples.ssi:65
msgid ""
"Build the image, again as superuser, keeping a log as in {Tutorial 1}"
"#tutorial-1:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:70
+#: en/user_examples.ssi:73
msgid "Again, verify the image is OK and test, as in {Tutorial 1}#tutorial-1."
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:72
+#: en/user_examples.ssi:75
msgid "2~tutorial-3 Tutorial 3: A personalized image"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:74
+#: en/user_examples.ssi:77
#, 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
+#: en/user_examples.ssi:79
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 "
@@ -338,12 +345,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:78
+#: en/user_examples.ssi:81
msgid "3~ First revision"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:84
+#: en/user_examples.ssi:87
#, no-wrap
msgid ""
" $ mkdir -p tutorial3/auto\n"
@@ -352,53 +359,63 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:88
+#: en/user_examples.ssi:91
msgid "Edit #{auto/config}# to read as follows:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:92 en/user_examples.ssi:141
+#: en/user_examples.ssi:95
#, no-wrap
msgid " #!/bin/sh\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:99
+#: en/user_examples.ssi:101
#, no-wrap
msgid ""
" lb config noauto \\\n"
" --architecture i386 \\\n"
-" --linux-flavours 686 \\\n"
-" --packages-lists lxde \\\n"
-" --packages \"iceweasel xchat\" \\\n"
+" --linux-flavours 686-pae \\\n"
+" --package-lists lxde \\\n"
" \"${@}\"\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:103
+#: en/user_examples.ssi:105
+msgid "Now populate your local package list:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:109
+#, no-wrap
+msgid " $ echo \"iceweasel xchat\" >> config/package-lists/my.list.chroot\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:113
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}#."
+"{--linux-flavours 686-pae}# 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
+#: en/user_examples.ssi:115
msgid "Now, build the image:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:113
+#: en/user_examples.ssi:123
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
+#: en/user_examples.ssi:125
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 "
@@ -406,7 +423,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:121
+#: en/user_examples.ssi:131
#, no-wrap
msgid ""
" $ git init\n"
@@ -415,19 +432,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:125
+#: en/user_examples.ssi:135
msgid "3~ Second revision"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:127
+#: en/user_examples.ssi:137
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
+#: en/user_examples.ssi:139
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 "
@@ -436,51 +453,47 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:133
+#: en/user_examples.ssi:143
#, no-wrap
msgid " # lb clean\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:137
-msgid "Now edit #{auto/config}# to add the #{vlc}# package:"
+#: en/user_examples.ssi:147
+msgid ""
+"Now append the #{vlc}# package to our local package list in #{config/package-"
+"lists/my.list.chroot}#:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:148
+#: en/user_examples.ssi:151
#, no-wrap
-msgid ""
-" lb config noauto \\\n"
-" --architecture i386 \\\n"
-" --linux-flavours 686 \\\n"
-" --packages-lists lxde \\\n"
-" --packages \"iceweasel xchat vlc\" \\\n"
-" \"${@}\"\n"
+msgid " $ echo vlc >> config/package-lists/my.list.chroot\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:152
+#: en/user_examples.ssi:155
msgid "Build again:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:156
+#: en/user_examples.ssi:159
msgid "# lb build"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:160
+#: en/user_examples.ssi:163
msgid "Test, and when you're satisfied, commit the next revision:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:164
+#: en/user_examples.ssi:167
#, no-wrap
msgid " $ git commit -a -m \"Adding vlc media player.\"\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:168
+#: en/user_examples.ssi:171
msgid ""
"Of course, more complicated changes to the configuration are possible, "
"perhaps adding files in subdirectories of #{config/}#. When you commit new "
@@ -491,7 +504,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:170
+#: en/user_examples.ssi:173
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 "
@@ -501,37 +514,37 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:172
+#: en/user_examples.ssi:175
msgid "2~ A VNC Kiosk Client"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:174
+#: en/user_examples.ssi:177
#, no-wrap
msgid "*{Use case:}* Create an image with live-build to boot directly to a VNC server.\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:176
+#: en/user_examples.ssi:179
msgid ""
"Make a build directory and create a skeletal configuration in it built "
"around the standard-x11 list, including #{gdm3}#, #{metacity}# and #"
-"{xtightvncviewer}#, disabling recommends to make a minimal system:"
+"{xvnc4viewer}#, disabling recommends to make a minimal system:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:184
+#: en/user_examples.ssi:187
#, no-wrap
msgid ""
" $ mkdir vnc_kiosk_client\n"
" $ cd vnc_kiosk_client\n"
-" $ lb config -a i386 -k 686 -p standard-x11 \\\n"
-" --packages \"gdm3 metacity xvnc4viewer\" \\\n"
+" $ lb config -a i386 -k 686-pae -p standard-x11 \\\n"
" --apt-recommends false\n"
+" $ echo \"gdm3 metacity xvnc4viewer\" >> config/package-lists/my.list.chroot\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:188
+#: en/user_examples.ssi:191
msgid ""
"Create the directory #{/etc/skel}# and put a custom #{.xsession}# in it for "
"the default user that will launch metacity and start xvncviewer, connecting "
@@ -539,16 +552,16 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:194
+#: en/user_examples.ssi:197
#, no-wrap
msgid ""
-" $ mkdir -p config/chroot_local-includes/etc/skel\n"
-" $ cat >config/chroot_local-includes/etc/skel/.xsession <<END\n"
+" $ mkdir -p config/includes.chroot/etc/skel\n"
+" $ cat > config/includes.chroot/etc/skel/.xsession <<END\n"
" #!/bin/sh\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:197
+#: en/user_examples.ssi:200
#, no-wrap
msgid ""
" /usr/bin/metacity &\n"
@@ -556,7 +569,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:200
+#: en/user_examples.ssi:203
#, no-wrap
msgid ""
" exit\n"
@@ -564,28 +577,28 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:204
+#: en/user_examples.ssi:207
msgid "Build the image:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:212
+#: en/user_examples.ssi:215
msgid "Enjoy."
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:214
+#: en/user_examples.ssi:217
msgid "2~ A base image for a 128M USB key"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:216
+#: en/user_examples.ssi:219
#, 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:218
+#: en/user_examples.ssi:221
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 "
@@ -599,20 +612,20 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:223
+#: en/user_examples.ssi:226
#, no-wrap
msgid ""
-" $ lb config -k 486 -p minimal --binary-indices false \\\n"
+" $ lb config -k 486 -p minimal --apt-indices false \\\n"
" --memtest none --apt-recommends false --includes none\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:227
+#: en/user_examples.ssi:230
msgid "Now, build the image in the usual way:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:235
+#: en/user_examples.ssi:238
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 "
@@ -620,12 +633,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:237
+#: en/user_examples.ssi:240
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 "
+"instead of the default #{-k \"486 686-pae\"}#. Leaving off APT's indices "
+"with #{--apt-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 #{--"
@@ -638,18 +651,18 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:239
+#: en/user_examples.ssi:242
msgid "2~ A localized KDE desktop and installer"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:241
+#: en/user_examples.ssi:244
#, no-wrap
msgid "*{Use case:}* Create a KDE desktop image, localized for Brazilian Portuguese and including an installer.\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:243
+#: en/user_examples.ssi:246
msgid ""
"We want to make an iso-hybrid image for i386 architecture using our "
"preferred desktop, in this case KDE, containing all of the same packages "
@@ -657,76 +670,62 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:245
+#: en/user_examples.ssi:248
msgid ""
-"Our initial problem is the discovery of the names of the appropriate tasks. "
-"Currently, live-build cannot help with this. While we might get lucky and "
-"find this by trial-and-error, there is a tool, #{grep-dctrl}#, which can be "
-"used to dig it out of the task descriptions in tasksel-data, so to prepare, "
-"make sure you have both of those things:"
+"Our initial problem is the discovery of the names of the appropriate "
+"language tasks. Currently, live-build cannot help with this. While we might "
+"get lucky and find this by trial-and-error, there is a tool, #{grep-dctrl}#, "
+"which can be used to dig it out of the task descriptions in tasksel-data, so "
+"to prepare, make sure you have both of those things:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:249
+#: en/user_examples.ssi:252
#, no-wrap
msgid " # apt-get install dctrl-tools tasksel-data\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:253
+#: en/user_examples.ssi:256
msgid "Now we can search for the appropriate tasks, first with:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:262
+#: en/user_examples.ssi:261
#, no-wrap
msgid ""
-" $ grep-dctrl -FTest-lang pt_BR /usr/share/tasksel/debian-tasks.desc -sTask,Description\n"
+" $ grep-dctrl -FTest-lang pt_BR /usr/share/tasksel/descs/debian-tasks.desc -sTask\n"
" Task: brazilian-portuguese\n"
-" Description: Brazilian Portuguese environment\n"
-" This task installs programs, data files, and\n"
-" documentation that make it easier for Brazilian Portuguese speakers\n"
-" to use Debian.\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:266
+#: en/user_examples.ssi:265
msgid ""
"By this command, we discover the task is called, plainly enough, brazilian-"
"portuguese. Now to find the related tasks:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:273
+#: en/user_examples.ssi:271
#, no-wrap
msgid ""
-" $ grep-dctrl -FEnhances brazilian-portuguese /usr/share/tasksel/debian-tasks.desc -sTask,Description\n"
+" $ grep-dctrl -FEnhances brazilian-portuguese /usr/share/tasksel/descs/debian-tasks.desc -sTask\n"
" Task: brazilian-portuguese-desktop\n"
-" Description: Brazilian Portuguese desktop\n"
-" This task localises the desktop in Brasilian Portuguese.\n"
-msgstr ""
-
-#. type: Plain text
-#: en/user_examples.ssi:277
-#, no-wrap
-msgid ""
" Task: brazilian-portuguese-kde-desktop\n"
-" Description: Brazilian Portuguese KDE desktop\n"
-" This task localises the KDE desktop in Brazilian Portuguese.\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:281
+#: en/user_examples.ssi:275
msgid ""
-"We will use the experimental #{--language}# option, as live-build happens to "
-"include #{syslinux}# templates for pt_BR (see {Desktop and language tasks}"
-"#desktop-and-language-tasks for details). And at boot time we will generate "
-"the pt_BR.UTF-8 locale and select the pt-latin1 keyboard layout. Now let's "
-"put the pieces together:"
+"At boot time we will generate the pt_BR.UTF-8 locale and select the pt-"
+"latin1 keyboard layout. We will also need to preseed our desktop choice, "
+"\"kde\" so that tasksel will install the correct desktop task, as it differs "
+"from the default (see {Desktop and languages tasks}#desktop-and-language-"
+"tasks). Now let's put the pieces together:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:295
+#: en/user_examples.ssi:289
#, no-wrap
msgid ""
" $ mkdir live-pt_BR-kde\n"
@@ -734,16 +733,16 @@ msgid ""
" $ lb config \\\n"
" -a i386 \\\n"
" -k 486 \\\n"
-" -p kde-desktop \\\n"
-" --language pt_BR \\\n"
-" --tasks \"brazilian-portuguese brazilian-portuguese-desktop brazilian-portuguese-kde-desktop\" \\\n"
" --bootappend-live \"locales=pt_BR.UTF-8 keyboard-layouts=pt-latin1\" \\\n"
-" --debian-installer live \\\n"
-" --packages debian-installer-launcher\n"
+" --debian-installer live\n"
+" $ echo kde-desktop brazilian-portuguese brazilian-portuguese-desktop \\\n"
+" brazilian-portuguese-kde-desktop >> config/task-lists/my.list.chroot\n"
+" $ echo debian-installer-launcher >> config/package-lists/my.list.chroot\n"
+" $ echo tasksel tasksel/desktop multiselect kde >> config/preseed/my.preseed.chroot\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:298
+#: en/user_examples.ssi:292
msgid ""
"Note that we have included the #{debian-installer-launcher}# package to "
"launch the installer from the live desktop, and have also specified the 486 "
diff --git a/manual/po/pt_BR/user_installation.ssi.po b/manual/po/pt_BR/user_installation.ssi.po
index f4ddf39..eaa54fd 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 2.0.0\n"
-"POT-Creation-Date: 2011-06-21 09:17+0300\n"
+"POT-Creation-Date: 2011-11-07 17:40-0400\n"
"PO-Revision-Date: 2010-10-16 20:36-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -37,37 +37,38 @@ msgstr ""
#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
-#: en/user_customization-installer.ssi:43
+#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
-#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:53
-#: en/user_customization-packages.ssi:66 en/user_customization-packages.ssi:80
-#: en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:112
-#: en/user_customization-packages.ssi:142
-#: en/user_customization-packages.ssi:155
-#: en/user_customization-packages.ssi:165
-#: en/user_customization-packages.ssi:175
-#: en/user_customization-packages.ssi:185
-#: en/user_customization-packages.ssi:199
-#: en/user_customization-packages.ssi:215
-#: en/user_customization-packages.ssi:227
-#: en/user_customization-packages.ssi:291
-#: en/user_customization-packages.ssi:303
-#: en/user_customization-packages.ssi:313
-#: en/user_customization-packages.ssi:331
-#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
-#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
-#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
-#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
-#: en/user_customization-runtime.ssi:99 en/user_customization-runtime.ssi:107
-#: 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:178 en/user_examples.ssi:190
-#: en/user_examples.ssi:206 en/user_examples.ssi:220 en/user_examples.ssi:229
-#: en/user_examples.ssi:247 en/user_examples.ssi:255 en/user_examples.ssi:268
-#: en/user_examples.ssi:283 en/user_installation.ssi:38
+#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:54
+#: en/user_customization-packages.ssi:67 en/user_customization-packages.ssi:81
+#: en/user_customization-packages.ssi:101
+#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:140
+#: en/user_customization-packages.ssi:150
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:184
+#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:276
+#: en/user_customization-packages.ssi:288
+#: en/user_customization-packages.ssi:298
+#: en/user_customization-packages.ssi:316
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:24 en/user_customization-runtime.ssi:44
+#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:63
+#: en/user_customization-runtime.ssi:71 en/user_customization-runtime.ssi:80
+#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:111
+#: en/user_customization-runtime.ssi:119 en/user_examples.ssi:14
+#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
+#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
+#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
+#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
+#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
+#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
+#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
+#: en/user_examples.ssi:277 en/user_installation.ssi:38
#: en/user_installation.ssi:46 en/user_installation.ssi:56
#: en/user_installation.ssi:64 en/user_installation.ssi:74
#: en/user_installation.ssi:82 en/user_installation.ssi:90
@@ -76,7 +77,7 @@ msgstr ""
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:80 en/user_overview.ssi:88
+#: en/user_overview.ssi:48 en/user_overview.ssi:56
msgid "code{"
msgstr "code{"
@@ -100,38 +101,39 @@ msgstr "code{"
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
-#: en/user_customization-installer.ssi:37
-#: en/user_customization-installer.ssi:48
+#: en/user_customization-installer.ssi:38
+#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:70 en/user_customization-packages.ssi:84
-#: en/user_customization-packages.ssi:98
-#: en/user_customization-packages.ssi:116
-#: en/user_customization-packages.ssi:147
-#: en/user_customization-packages.ssi:161
-#: en/user_customization-packages.ssi:171
-#: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:191
-#: en/user_customization-packages.ssi:203
-#: en/user_customization-packages.ssi:219
-#: en/user_customization-packages.ssi:231
-#: en/user_customization-packages.ssi:295
-#: en/user_customization-packages.ssi:307
-#: en/user_customization-packages.ssi:317
-#: en/user_customization-packages.ssi:344
-#: en/user_customization-packages.ssi:353 en/user_customization-runtime.ssi:18
-#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
-#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
-#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
-#: en/user_customization-runtime.ssi:103 en/user_customization-runtime.ssi:112
-#: 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:186 en/user_examples.ssi:202
-#: en/user_examples.ssi:210 en/user_examples.ssi:225 en/user_examples.ssi:233
-#: en/user_examples.ssi:251 en/user_examples.ssi:264 en/user_examples.ssi:279
-#: en/user_examples.ssi:297 en/user_installation.ssi:42
+#: en/user_customization-packages.ssi:46 en/user_customization-packages.ssi:59
+#: en/user_customization-packages.ssi:71 en/user_customization-packages.ssi:85
+#: en/user_customization-packages.ssi:105
+#: en/user_customization-packages.ssi:132
+#: en/user_customization-packages.ssi:146
+#: en/user_customization-packages.ssi:156
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:329
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:346 en/user_customization-runtime.ssi:18
+#: en/user_customization-runtime.ssi:28 en/user_customization-runtime.ssi:48
+#: en/user_customization-runtime.ssi:59 en/user_customization-runtime.ssi:67
+#: en/user_customization-runtime.ssi:76 en/user_customization-runtime.ssi:85
+#: en/user_customization-runtime.ssi:105 en/user_customization-runtime.ssi:115
+#: en/user_customization-runtime.ssi:124 en/user_examples.ssi:20
+#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
+#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
+#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
+#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
+#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
+#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
+#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
+#: en/user_examples.ssi:291 en/user_installation.ssi:42
#: en/user_installation.ssi:50 en/user_installation.ssi:60
#: en/user_installation.ssi:70 en/user_installation.ssi:78
#: en/user_installation.ssi:86 en/user_installation.ssi:94
@@ -139,15 +141,15 @@ msgstr "code{"
#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
-#: en/user_overview.ssi:84 en/user_overview.ssi:92
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:42
+#: en/user_overview.ssi:52 en/user_overview.ssi:60
msgid "}code"
msgstr "}code"
#. type: Plain text
-#: en/user_customization-packages.ssi:82 en/user_installation.ssi:148
+#: en/user_customization-packages.ssi:83 en/user_installation.ssi:148
#, no-wrap
-msgid " $ lb config --repository live.debian.net\n"
+msgid " $ lb config --archives live.debian.net\n"
msgstr ""
#. type: Plain text
@@ -350,7 +352,7 @@ msgstr ""
#. type: Plain text
#: en/user_installation.ssi:102
#, no-wrap
-msgid "*{Note:}* You do not need to install live-boot or live-config on your system to create customized Debian Live systems. However, doing so will do no harm and is useful for reference purposes.\n"
+msgid "*{Note:}* You do not need to install live-boot or live-config on your system to create customized Debian Live systems. However, doing so will do no harm and is useful for reference purposes. If you only want the documentation, you may now install the live-boot-doc and live-config-doc packages separately.\n"
msgstr ""
#. type: Plain text
@@ -396,8 +398,8 @@ msgstr ""
#: en/user_installation.ssi:125
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 "
-"build against Squeeze."
+"your target platform: this means if your target is Wheezy then you should "
+"build against Wheezy."
msgstr ""
#. type: Plain text
@@ -405,9 +407,9 @@ msgstr ""
msgid ""
"Use a personal builder such as /{pbuilder}/ or /{sbuild}/ if you need to "
"build #{live-boot}# for a target distribution that differs from your build "
-"system. For example, for Squeeze live images, build #{live-boot}# in a "
-"Squeeze chroot. If your target distribution happens to match your build "
-"system distribution, you may build directly on the build system using #{dpkg-"
+"system. For example, for Wheezy live images, build #{live-boot}# in a Wheezy "
+"chroot. If your target distribution happens to match your build system "
+"distribution, you may build directly on the build system using #{dpkg-"
"buildpackage}# (provided by the /{dpkg-dev}/ package):"
msgstr ""
@@ -443,5 +445,5 @@ msgid ""
"You can let live-build automatically use the latest snapshots of live-boot "
"and live-config by configuring a third-party repository in your live-build "
"configuration directory. Assuming you have already created a configuration "
-"tree with #{lb config}#:"
+"tree in the current directory with #{lb config}#:"
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 c44b90d..9b761b5 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 2.0.0\n"
-"POT-Creation-Date: 2010-12-19 20:37-0400\n"
+"POT-Creation-Date: 2011-11-02 12:23-0200\n"
"PO-Revision-Date: 2010-10-13 17:00+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -19,55 +19,56 @@ msgstr ""
#. type: Plain text
#: 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/project_bugs.ssi:58
+#: en/about_manual.ssi:146 en/about_manual.ssi:157 en/about_manual.ssi:165
+#: en/about_manual.ssi:173 en/project_bugs.ssi:60
#: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
#: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
#: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/user_basics.ssi:30 en/user_basics.ssi:40
-#: en/user_basics.ssi:52 en/user_basics.ssi:64 en/user_basics.ssi:76
-#: en/user_basics.ssi:86 en/user_basics.ssi:100 en/user_basics.ssi:108
-#: en/user_basics.ssi:116 en/user_basics.ssi:126 en/user_basics.ssi:140
+#: en/project_procedures.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
+#: en/user_basics.ssi:116 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:218 en/user_basics.ssi:246 en/user_basics.ssi:262
-#: en/user_basics.ssi:270 en/user_basics.ssi:290 en/user_basics.ssi:315
+#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
+#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
+#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
+#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
-#: en/user_customization-installer.ssi:43
+#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
-#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:53
-#: en/user_customization-packages.ssi:66 en/user_customization-packages.ssi:80
-#: en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:112
-#: en/user_customization-packages.ssi:142
-#: en/user_customization-packages.ssi:155
-#: en/user_customization-packages.ssi:165
-#: en/user_customization-packages.ssi:175
-#: en/user_customization-packages.ssi:185
-#: en/user_customization-packages.ssi:199
-#: en/user_customization-packages.ssi:215
-#: en/user_customization-packages.ssi:227
-#: en/user_customization-packages.ssi:291
-#: en/user_customization-packages.ssi:303
-#: en/user_customization-packages.ssi:313
-#: en/user_customization-packages.ssi:331
-#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
-#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
-#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
-#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
-#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:106
-#: 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:178 en/user_examples.ssi:190
-#: en/user_examples.ssi:206 en/user_examples.ssi:220 en/user_examples.ssi:229
-#: en/user_examples.ssi:247 en/user_examples.ssi:255 en/user_examples.ssi:268
-#: en/user_examples.ssi:283 en/user_installation.ssi:38
+#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:54
+#: en/user_customization-packages.ssi:67 en/user_customization-packages.ssi:81
+#: en/user_customization-packages.ssi:101
+#: en/user_customization-packages.ssi:131
+#: en/user_customization-packages.ssi:144
+#: en/user_customization-packages.ssi:154
+#: en/user_customization-packages.ssi:164
+#: en/user_customization-packages.ssi:174
+#: en/user_customization-packages.ssi:188
+#: en/user_customization-packages.ssi:204
+#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:320
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:345 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:24 en/user_customization-runtime.ssi:44
+#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:63
+#: en/user_customization-runtime.ssi:71 en/user_customization-runtime.ssi:80
+#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:111
+#: en/user_customization-runtime.ssi:119 en/user_examples.ssi:14
+#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
+#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
+#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
+#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
+#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
+#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
+#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:271
+#: en/user_examples.ssi:286 en/user_installation.ssi:38
#: en/user_installation.ssi:46 en/user_installation.ssi:56
#: en/user_installation.ssi:64 en/user_installation.ssi:74
#: en/user_installation.ssi:82 en/user_installation.ssi:90
@@ -83,60 +84,61 @@ msgstr "code{"
#. type: Plain text
#: 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:174 en/project_bugs.ssi:62
+#: en/about_manual.ssi:151 en/about_manual.ssi:161 en/about_manual.ssi:169
+#: en/about_manual.ssi:177 en/project_bugs.ssi:64
#: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
#: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
#: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/user_basics.ssi:34 en/user_basics.ssi:44
-#: en/user_basics.ssi:58 en/user_basics.ssi:70 en/user_basics.ssi:80
-#: en/user_basics.ssi:92 en/user_basics.ssi:104 en/user_basics.ssi:112
-#: en/user_basics.ssi:120 en/user_basics.ssi:130 en/user_basics.ssi:146
+#: en/project_procedures.ssi:131 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:134 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:238 en/user_basics.ssi:250 en/user_basics.ssi:266
-#: en/user_basics.ssi:274 en/user_basics.ssi:301 en/user_basics.ssi:340
+#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
+#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
+#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
+#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
-#: en/user_customization-installer.ssi:37
-#: en/user_customization-installer.ssi:48
+#: en/user_customization-installer.ssi:38
+#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:70 en/user_customization-packages.ssi:84
-#: en/user_customization-packages.ssi:98
-#: en/user_customization-packages.ssi:116
-#: en/user_customization-packages.ssi:147
-#: en/user_customization-packages.ssi:161
-#: en/user_customization-packages.ssi:171
-#: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:191
-#: en/user_customization-packages.ssi:203
-#: en/user_customization-packages.ssi:219
-#: en/user_customization-packages.ssi:231
-#: en/user_customization-packages.ssi:295
-#: en/user_customization-packages.ssi:307
-#: en/user_customization-packages.ssi:317
-#: en/user_customization-packages.ssi:344
-#: en/user_customization-packages.ssi:354 en/user_customization-runtime.ssi:18
-#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
-#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
-#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
-#: en/user_customization-runtime.ssi:102 en/user_customization-runtime.ssi:111
-#: 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:186 en/user_examples.ssi:202
-#: en/user_examples.ssi:210 en/user_examples.ssi:225 en/user_examples.ssi:233
-#: en/user_examples.ssi:251 en/user_examples.ssi:264 en/user_examples.ssi:279
-#: en/user_examples.ssi:297 en/user_installation.ssi:42
+#: en/user_customization-packages.ssi:46 en/user_customization-packages.ssi:59
+#: en/user_customization-packages.ssi:71 en/user_customization-packages.ssi:85
+#: en/user_customization-packages.ssi:105
+#: en/user_customization-packages.ssi:136
+#: en/user_customization-packages.ssi:150
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:180
+#: en/user_customization-packages.ssi:192
+#: en/user_customization-packages.ssi:208
+#: en/user_customization-packages.ssi:220
+#: en/user_customization-packages.ssi:284
+#: en/user_customization-packages.ssi:296
+#: en/user_customization-packages.ssi:306
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341
+#: en/user_customization-packages.ssi:350 en/user_customization-runtime.ssi:18
+#: en/user_customization-runtime.ssi:28 en/user_customization-runtime.ssi:48
+#: en/user_customization-runtime.ssi:59 en/user_customization-runtime.ssi:67
+#: en/user_customization-runtime.ssi:76 en/user_customization-runtime.ssi:85
+#: en/user_customization-runtime.ssi:105 en/user_customization-runtime.ssi:115
+#: en/user_customization-runtime.ssi:124 en/user_examples.ssi:20
+#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
+#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
+#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
+#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
+#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
+#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
+#: en/user_examples.ssi:254 en/user_examples.ssi:267 en/user_examples.ssi:282
+#: en/user_examples.ssi:300 en/user_installation.ssi:42
#: en/user_installation.ssi:50 en/user_installation.ssi:60
#: en/user_installation.ssi:70 en/user_installation.ssi:78
#: en/user_installation.ssi:86 en/user_installation.ssi:94
#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_installation.ssi:150 en/user_managing_a_configuration.ssi:31
+#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
@@ -239,7 +241,7 @@ msgstr ""
msgid ""
" #!/bin/sh\n"
" lb config noauto \\\n"
-" --packages-lists \"standard\" \\\n"
+" --package-lists \"standard\" \\\n"
" \"${@}\"\n"
msgstr ""
@@ -286,10 +288,10 @@ msgid " $ cp /usr/share/live/build/examples/auto/* auto/\n"
msgstr ""
#. type: Plain text
-#: en/user_managing_a_configuration.ssi:62
+#: en/user_managing_a_configuration.ssi:61
msgid ""
"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. "
+"example above, #{--package-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/pt_BR/user_overview.ssi.po b/manual/po/pt_BR/user_overview.ssi.po
index a76f735..bef20fc 100644
--- a/manual/po/pt_BR/user_overview.ssi.po
+++ b/manual/po/pt_BR/user_overview.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-05-13 12:02-0200\n"
+"POT-Creation-Date: 2011-11-07 08:16-0400\n"
"PO-Revision-Date: 2010-10-22 07:52-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -37,37 +37,38 @@ msgstr ""
#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
-#: en/user_customization-installer.ssi:43
+#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
-#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:53
-#: en/user_customization-packages.ssi:66 en/user_customization-packages.ssi:80
-#: en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:112
-#: en/user_customization-packages.ssi:142
-#: en/user_customization-packages.ssi:155
-#: en/user_customization-packages.ssi:165
-#: en/user_customization-packages.ssi:175
-#: en/user_customization-packages.ssi:185
-#: en/user_customization-packages.ssi:199
-#: en/user_customization-packages.ssi:215
-#: en/user_customization-packages.ssi:227
-#: en/user_customization-packages.ssi:291
-#: en/user_customization-packages.ssi:303
-#: en/user_customization-packages.ssi:313
-#: en/user_customization-packages.ssi:331
-#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
-#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
-#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
-#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
-#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:105
-#: 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:178 en/user_examples.ssi:190
-#: en/user_examples.ssi:206 en/user_examples.ssi:220 en/user_examples.ssi:229
-#: en/user_examples.ssi:247 en/user_examples.ssi:255 en/user_examples.ssi:268
-#: en/user_examples.ssi:283 en/user_installation.ssi:38
+#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:54
+#: en/user_customization-packages.ssi:67 en/user_customization-packages.ssi:81
+#: en/user_customization-packages.ssi:101
+#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:140
+#: en/user_customization-packages.ssi:150
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:184
+#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:276
+#: en/user_customization-packages.ssi:288
+#: en/user_customization-packages.ssi:298
+#: en/user_customization-packages.ssi:316
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:24 en/user_customization-runtime.ssi:44
+#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:63
+#: en/user_customization-runtime.ssi:71 en/user_customization-runtime.ssi:80
+#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:111
+#: en/user_customization-runtime.ssi:119 en/user_examples.ssi:14
+#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
+#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
+#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
+#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
+#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
+#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
+#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
+#: en/user_examples.ssi:277 en/user_installation.ssi:38
#: en/user_installation.ssi:46 en/user_installation.ssi:56
#: en/user_installation.ssi:64 en/user_installation.ssi:74
#: en/user_installation.ssi:82 en/user_installation.ssi:90
@@ -76,7 +77,7 @@ msgstr ""
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:80 en/user_overview.ssi:88
+#: en/user_overview.ssi:48 en/user_overview.ssi:56
msgid "code{"
msgstr "code{"
@@ -100,38 +101,39 @@ msgstr "code{"
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
-#: en/user_customization-installer.ssi:37
-#: en/user_customization-installer.ssi:48
+#: en/user_customization-installer.ssi:38
+#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:70 en/user_customization-packages.ssi:84
-#: en/user_customization-packages.ssi:98
-#: en/user_customization-packages.ssi:116
-#: en/user_customization-packages.ssi:147
-#: en/user_customization-packages.ssi:161
-#: en/user_customization-packages.ssi:171
-#: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:191
-#: en/user_customization-packages.ssi:203
-#: en/user_customization-packages.ssi:219
-#: en/user_customization-packages.ssi:231
-#: en/user_customization-packages.ssi:295
-#: en/user_customization-packages.ssi:307
-#: en/user_customization-packages.ssi:317
-#: en/user_customization-packages.ssi:344
-#: en/user_customization-packages.ssi:353 en/user_customization-runtime.ssi:18
-#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
-#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
-#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
-#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:110
-#: 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:186 en/user_examples.ssi:202
-#: en/user_examples.ssi:210 en/user_examples.ssi:225 en/user_examples.ssi:233
-#: en/user_examples.ssi:251 en/user_examples.ssi:264 en/user_examples.ssi:279
-#: en/user_examples.ssi:297 en/user_installation.ssi:42
+#: en/user_customization-packages.ssi:46 en/user_customization-packages.ssi:59
+#: en/user_customization-packages.ssi:71 en/user_customization-packages.ssi:85
+#: en/user_customization-packages.ssi:105
+#: en/user_customization-packages.ssi:132
+#: en/user_customization-packages.ssi:146
+#: en/user_customization-packages.ssi:156
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:329
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:346 en/user_customization-runtime.ssi:18
+#: en/user_customization-runtime.ssi:28 en/user_customization-runtime.ssi:48
+#: en/user_customization-runtime.ssi:59 en/user_customization-runtime.ssi:67
+#: en/user_customization-runtime.ssi:76 en/user_customization-runtime.ssi:85
+#: en/user_customization-runtime.ssi:105 en/user_customization-runtime.ssi:115
+#: en/user_customization-runtime.ssi:124 en/user_examples.ssi:20
+#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
+#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
+#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
+#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
+#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
+#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
+#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
+#: en/user_examples.ssi:291 en/user_installation.ssi:42
#: en/user_installation.ssi:50 en/user_installation.ssi:60
#: en/user_installation.ssi:70 en/user_installation.ssi:78
#: en/user_installation.ssi:86 en/user_installation.ssi:94
@@ -139,8 +141,8 @@ msgstr "code{"
#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
-#: en/user_overview.ssi:84 en/user_overview.ssi:92
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:42
+#: en/user_overview.ssi:52 en/user_overview.ssi:60
msgid "}code"
msgstr "}code"
@@ -261,118 +263,77 @@ msgstr ""
#: en/user_overview.ssi:34
msgid ""
"Issuing #{lb config}# without any arguments creates a #{config/}# "
-"subdirectory which it populates with some default settings:"
+"subdirectory which it populates with some default settings, and a skeleton #"
+"{auto/}# subdirectory tree."
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:39
+#: en/user_overview.ssi:40
#, no-wrap
msgid ""
" $ lb config\n"
+" P: Considering defaults defined in /etc/live/build.conf\n"
" P: Creating config tree\n"
msgstr ""
#. type: Plain text
#: en/user_overview.ssi:44
-#, no-wrap
-msgid ""
-" $ ls -l\n"
-" total 8\n"
-" drwxr-xr-x 3 user user 4096 Sep 7 13:02 auto\n"
-" drwxr-xr-x 22 user user 4096 Sep 7 13:02 config\n"
-msgstr ""
-
-#. type: Plain text
-#: en/user_overview.ssi:72
-#, no-wrap
-msgid ""
-" $ ls -l config/\n"
-" total 104\n"
-" -rw-r--r-- 1 user user 4197 Sep 7 13:02 binary\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_debian-installer\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_debian-installer-includes\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_grub\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-debs\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-hooks\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-includes\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-packageslists\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-udebs\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_rootfs\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_syslinux\n"
-" -rw-r--r-- 1 user user 2051 Sep 7 13:02 bootstrap\n"
-" -rw-r--r-- 1 user user 1647 Sep 7 13:02 chroot\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_apt\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-hooks\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-includes\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-packages\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-packageslists\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-patches\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-preseed\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_sources\n"
-" -rw-r--r-- 1 user user 2954 Sep 7 13:02 common\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 includes\n"
-" -rw-r--r-- 1 user user 205 Sep 7 13:02 source\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 templates\n"
-msgstr ""
-
-#. type: Plain text
-#: en/user_overview.ssi:76
msgid ""
"Using #{lb config}# without any arguments would be suitable for users who "
"need a very basic image, or who intend to later provide a more complete "
-"configuration via auto/config (see {Managing a configuration}#managing-a-"
+"configuration via #{auto/config}# (see {Managing a configuration}#managing-a-"
"configuration for details)."
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:78
+#: en/user_overview.ssi:46
msgid ""
"Normally, you will want to specify some options. For example, to include the "
"'gnome' package list in your configuration:"
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:82
+#: en/user_overview.ssi:50
#, no-wrap
msgid " $ lb config -p gnome\n"
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:86
+#: en/user_overview.ssi:54
msgid "It is possible to specify many options, such as:"
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:90
+#: en/user_overview.ssi:58
#, no-wrap
msgid " $ lb config --binary-images net --hostname live-machine --username live-user ...\n"
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:94
+#: en/user_overview.ssi:62
msgid "A full list of options is available in the #{lb_config}# man page."
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:96
+#: en/user_overview.ssi:64
msgid "3~lb-build The #{lb build}# command"
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:98
+#: en/user_overview.ssi:66
msgid ""
-"The #{lb build}# command reads in your configuration from the config/ "
+"The #{lb build}# command reads in your configuration from the #{config/}# "
"directory. It then runs the lower level commands needed to build your Live "
"system."
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:100
+#: en/user_overview.ssi:68
msgid "3~lb-clean The #{lb clean}# command"
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:102
+#: en/user_overview.ssi:70
msgid ""
"It is the job of the #{lb clean}# command to remove various parts of a build "
"so subsequent builds can start from a clean state. By default, #{chroot}#, #"
@@ -384,12 +345,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:104
+#: en/user_overview.ssi:72
msgid "2~live-boot The live-boot package"
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:106
+#: en/user_overview.ssi:74
msgid ""
"live-boot is a collection of scripts providing hooks for the initramfs-"
"tools, used to generate an initramfs capable of booting live systems, such "
@@ -398,16 +359,16 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:108
+#: en/user_overview.ssi:76
msgid ""
-"At boot time it will look for read-only media containing a \"/live\" "
+"At boot time it will look for read-only media containing a #{/live/}# "
"directory where a root filesystem (often a compressed filesystem image like "
"squashfs) is stored. If found, it will create a writable environment, using "
"aufs, for Debian like systems to boot from."
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:110
+#: en/user_overview.ssi:78
msgid ""
"More information on initial ramfs in Debian can be found in the Debian Linux "
"Kernel Handbook at http://kernel-handbook.alioth.debian.org/ in the chapter "
@@ -415,12 +376,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:112
+#: en/user_overview.ssi:80
msgid "2~live-config The live-config package"
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:113
+#: en/user_overview.ssi:81
msgid ""
"live-config consists of the scripts that run at boot time after live-boot to "
"configure the live system automatically. It handles such tasks as setting "
diff --git a/manual/po/ro/about_project.ssi.po b/manual/po/ro/about_project.ssi.po
index 0f7030a..dbdb2d7 100644
--- a/manual/po/ro/about_project.ssi.po
+++ b/manual/po/ro/about_project.ssi.po
@@ -1,12 +1,20 @@
# Romanian translations for live-manual package
# 2010 Eugen Paiuc <linux51 at bluewin.ch>
# This file is distributed under the same license as the live-manual package.
+# Creatura85 <creatura85 at opensuse.org>, 2011.
#
msgid ""
msgstr ""
"Project-Id-Version: 2.0.0\n"
"POT-Creation-Date: 2011-08-29 08:54-0200\n"
-"Last-Translator: Eugen Paiuc <linux51 at bluewin.ch>\n"
+"PO-Revision-Date: 2011-12-03 16:06+0100\n"
+"Last-Translator: Creatura85 <creatura85 at opensuse.org>\n"
+"Language-Team: <debian-live at lists.debian.org>\n"
+"Language: ro\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. type: Plain text
#: en/about_project.ssi:2
@@ -41,12 +49,12 @@ msgstr ""
#. type: Plain text
#: en/about_project.ssi:12
-#, fuzzy
-#| msgid "_* They are unofficial projects, developed outside of Debian."
msgid ""
"_* They are not Debian projects and therefore lack support from within "
"Debian."
-msgstr "_* Sunt proiecte neoficiale, dezvoltate in afara proiectului Debian."
+msgstr ""
+"_* Ele nu sunt proiecte Debian si drept urmare nu au suport din partea "
+"Comunitatii Debian"
#. type: Plain text
#: en/about_project.ssi:14
@@ -71,7 +79,7 @@ msgstr ""
#. type: Plain text
#: en/about_project.ssi:20
msgid "_* They include packages from outside of the Debian archive."
-msgstr ""
+msgstr "_* Acestea includ pachete din afara arhivelor Debian"
#. type: Plain text
#: en/about_project.ssi:22
@@ -107,26 +115,19 @@ msgstr "3~ De ce e nevoie de propriul nostru sistem live ?"
#. type: Plain text
#: en/about_project.ssi:30
-#, fuzzy
-#| msgid ""
-#| "Debian is the Universal Operating System: Debian has an official live "
-#| "system for showing around and to officially represent the true, one and "
-#| "only Debian system with the following main advantages:"
msgid ""
"Debian is the Universal Operating System: Debian has a live system to show "
"around and to accurately represent the Debian system with the following main "
"advantages:"
msgstr ""
-"Debian este 'the Universal Operating System/Sistemul de Operare Universal' : "
-"Debian are un sistem live oficial pentru a se arata in jur si a reprezenta "
-"oficial adevarul, doar sistemul Debian are principalele avantaje:"
+"Debian se considera Sistemul de Operare Universal: Are un mecanism live "
+"pentru a se promova in jur si de a prezenta cu acuratete sistemul de operare "
+"ce are urmatoarele mari avantaje:"
#. type: Plain text
#: en/about_project.ssi:32
-#, fuzzy
-#| msgid "_* It would be an official Debian subproject."
msgid "_* It would be a subproject of Debian."
-msgstr "_* Acesta va fi un subpriect Debian oficial."
+msgstr "_* Acesta va fi un subproiect Debian."
#. type: Plain text
#: en/about_project.ssi:34
@@ -145,10 +146,8 @@ msgstr "_* Contine doar programe Debian."
#. type: Plain text
#: en/about_project.ssi:40
-#, fuzzy
-#| msgid "_* It does not contain any unofficial packages."
msgid "_* It does not contain any packages that are not in the Debian archive."
-msgstr "_* Nu contine programe neoficiale."
+msgstr "_* Nu contine nici un pachet care nu este din afara arhivelor Debian."
#. type: Plain text
#: en/about_project.ssi:42
@@ -162,26 +161,19 @@ msgstr "2~ Filozofia"
#. type: Plain text
#: en/about_project.ssi:46
-#, fuzzy
-#| msgid "3~ Only unchanged, official packages"
msgid "3~ Only unchanged packages from Debian \"main\""
-msgstr "3~ Doar programe oficiale, fara schimbari."
+msgstr "3~ Numai pachete neschimbate din Debian \"main\""
#. type: Plain text
#: en/about_project.ssi:48
-#, fuzzy
-#| msgid ""
-#| "We will only use official packages from the Debian repository in the "
-#| "\"main\" section. The non-free section is not part of Debian and "
-#| "therefore cannot be used at all for official live system images."
msgid ""
"We will only use packages from the Debian repository in the \"main\" "
"section. The non-free section is not part of Debian and therefore cannot be "
"used for official live system images."
msgstr ""
-"Vor fi folosite doar programe oficiale din depozitele Debian sectiunea \"main"
-"\". Sectiunea non-free nu e parte din Debian si deci nu poate fi folosita in "
-"nici un fel la construirea imaginilor live oficiale."
+"Se vor folosi numai pachete din depozitul Debian sectiunea \"main\". "
+"Sectiunea non-free nu este parte a Debian drept urmare nu poate fi folosita "
+"nici un fel la construirea imaginilor live cu Debian."
#. type: Plain text
#: en/about_project.ssi:50
diff --git a/manual/po/ro/index.html.in.po b/manual/po/ro/index.html.in.po
index ddb1cb2..e93290f 100644
--- a/manual/po/ro/index.html.in.po
+++ b/manual/po/ro/index.html.in.po
@@ -2,20 +2,20 @@
# Copyright (C) 2010 Free Software Foundation, Inc.
# This file is distributed under the same license as the live-manual package.
# Automatically generated, 2010.
+# Carlos Zuferri «chals» <chals at altorricon.com>, 2011.
#
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-02-03 18:22-0400\n"
-"PO-Revision-Date: 2010-10-20 20:02+0300\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
+"POT-Creation-Date: 2011-12-03 18:55+0100\n"
+"PO-Revision-Date: 2011-12-03 15:52+0100\n"
+"Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
+"Language-Team: <debian-live at lists.debian.org>\n"
"Language: ro\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
-"20)) ? 1 : 2;\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. type: Content of: <html><head><title>
#: en/index.html.in:4
@@ -30,72 +30,90 @@ msgstr ""
#. type: Content of: <html><body><p>
#: en/index.html.in:12
msgid ""
+"<i>live-manual</i> is available in different file formats and it is "
+"translated into several languages. Keep in mind that some translations may "
+"be incomplete or may not be up to date."
+msgstr ""
+
+#. type: Content of: <html><body><p>
+#: en/index.html.in:17
+msgid ""
"Please report errors, omissions, patches and suggestions to our mailinglist "
"at <a href=\"mailto:debian-live at lists.debian.org\">debian-live at lists.debian."
-"org</a> and read about <a href=\"html/about-manual.html#how-to-contribute"
+"org</a> and read about <a href=\"html/about-manual.en.html#how-to-contribute"
"\">how to contribute</a> to the manual."
msgstr ""
+"Please report errors, omissions, patches and suggestions to our mailinglist "
+"at <a href=\"mailto:debian-live at lists.debian.org\">debian-live at lists.debian."
+"org</a> and read about <a href=\"html/about-manual.ro.html#how-to-contribute"
+"\">how to contribute</a> to the manual."
#. type: Content of: <html><body><h3>
-#: en/index.html.in:15
+#: en/index.html.in:20
msgid "Available Formats"
msgstr ""
#. type: Content of: <html><body><ul><li>
-#: en/index.html.in:18
-msgid "<a href=\"epub/live-manual.epub\">EPUB</a>"
-msgstr ""
+#: en/index.html.in:23
+msgid "<a href=\"epub/live-manual.en.epub\">EPUB</a>"
+msgstr "<a href=\"epub/live-manual.ro.epub\">EPUB</a>"
#. type: Content of: <html><body><ul><li>
-#: en/index.html.in:19
+#: en/index.html.in:24
msgid ""
-"HTML: <a href=\"html/index.html\">multi page</a>, <a href=\"html/live-manual."
-"html\">single page</a>"
+"HTML: <a href=\"html/index.en.html\">multi page</a>, <a href=\"html/live-"
+"manual.en.html\">single page</a>"
msgstr ""
+"HTML: <a href=\"html/index.ro.html\">multi page</a>, <a href=\"html/live-"
+"manual.ro.html\">single page</a>"
#. type: Content of: <html><body><ul><li>
-#: en/index.html.in:20
-msgid "<a href=\"odf/live-manual.odt\">ODF</a>"
-msgstr ""
+#: en/index.html.in:25
+msgid "<a href=\"odf/live-manual.en.odt\">ODF</a>"
+msgstr "<a href=\"odf/live-manual.ro.odt\">ODF</a>"
#. type: Content of: <html><body><ul><li>
-#: en/index.html.in:21
+#: en/index.html.in:26
msgid ""
-"PDF: <a href=\"pdf/live-manual.portrait-a4.pdf\">A4 portrait</a>, <a href="
-"\"pdf/live-manual.landscape-a4.pdf\">A4 landscape</a>, <a href=\"pdf/live-"
-"manual.portrait-letter.pdf\">letter portrait</a>, <a href=\"pdf/live-manual."
-"landscape-letter.pdf\">letter landscape</a>"
+"PDF: <a href=\"pdf/live-manual.portrait-a4.en.pdf\">A4 portrait</a>, <a href="
+"\"pdf/live-manual.landscape-a4.en.pdf\">A4 landscape</a>, <a href=\"pdf/live-"
+"manual.portrait-letter.en.pdf\">letter portrait</a>, <a href=\"pdf/live-"
+"manual.landscape-letter.en.pdf\">letter landscape</a>"
msgstr ""
+"PDF: <a href=\"pdf/live-manual.portrait-a4.ro.pdf\">A4 portrait</a>, <a href="
+"\"pdf/live-manual.landscape-a4.ro.pdf\">A4 landscape</a>, <a href=\"pdf/live-"
+"manual.portrait-letter.ro.pdf\">letter portrait</a>, <a href=\"pdf/live-"
+"manual.landscape-letter.ro.pdf\">letter landscape</a>"
#. type: Content of: <html><body><ul><li>
-#: en/index.html.in:22
-msgid "<a href=\"txt/live-manual.txt\">Plain text</a>"
-msgstr ""
+#: en/index.html.in:27
+msgid "<a href=\"txt/live-manual.en.txt\">Plain text</a>"
+msgstr "<a href=\"txt/live-manual.ro.txt\">Plain text</a>"
#. type: Content of: <html><body><p>
-#: en/index.html.in:26
+#: en/index.html.in:31
msgid "Last changed: @DATE_CHANGE@"
msgstr ""
#. type: Content of: <html><body><p>
-#: en/index.html.in:27
+#: en/index.html.in:32
msgid "Last built: @DATE_BUILD@"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/index.html.in:30
+#: en/index.html.in:35
msgid "Source"
msgstr ""
#. type: Content of: <html><body><p>
-#: en/index.html.in:33
+#: en/index.html.in:38
msgid ""
"The sources for this manual is available in a <a href=\"http://git.or.cz/"
"\">Git</a> repository at live.debian.net."
msgstr ""
#. type: Content of: <html><body><ul><li>
-#: en/index.html.in:37
+#: en/index.html.in:42
msgid ""
"Browse: <a href=\"http://live.debian.net/gitweb/?p=live-manual.git"
"\"><small><tt>http://live.debian.net/gitweb/?p=live-manual.git</tt></small></"
@@ -103,14 +121,14 @@ msgid ""
msgstr ""
#. type: Content of: <html><body><ul><li>
-#: en/index.html.in:38
+#: en/index.html.in:43
msgid ""
"Git: <a href=\"git://live.debian.net/git/live-manual.git\"><small><tt>git://"
"live.debian.net/git/live-manual.git</tt></small></a>"
msgstr ""
#. type: Content of: <html><body><p>
-#: en/index.html.in:42
+#: en/index.html.in:47
msgid ""
"<a href=\"http://live.debian.net/\">Debian Live</a> <<a href=\"mailto:"
"debian-live at lists.debian.org\">debian-live at lists.debian.org</a>> - <a "
diff --git a/manual/po/ro/live-manual.ssm.po b/manual/po/ro/live-manual.ssm.po
index 63f6a70..bc042a4 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 2.0.0\n"
-"POT-Creation-Date: 2011-09-30 14:54+0300\n"
+"POT-Creation-Date: 2011-12-04 10:22+0100\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: 2011-09-30\n"
+" :published: 2011-12-04\n"
msgstr ""
#. type: Plain text
diff --git a/manual/po/ro/user_basics.ssi.po b/manual/po/ro/user_basics.ssi.po
index 9703873..94812d3 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 2.0.0\n"
-"POT-Creation-Date: 2011-04-14 18:03-0200\n"
+"POT-Creation-Date: 2011-11-02 12:23-0200\n"
"PO-Revision-Date: 2010-10-23 16:43+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -38,37 +38,38 @@ msgstr ""
#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
-#: en/user_customization-installer.ssi:43
+#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
-#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:53
-#: en/user_customization-packages.ssi:66 en/user_customization-packages.ssi:80
-#: en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:112
-#: en/user_customization-packages.ssi:142
-#: en/user_customization-packages.ssi:155
-#: en/user_customization-packages.ssi:165
-#: en/user_customization-packages.ssi:175
-#: en/user_customization-packages.ssi:185
-#: en/user_customization-packages.ssi:199
-#: en/user_customization-packages.ssi:215
-#: en/user_customization-packages.ssi:227
-#: en/user_customization-packages.ssi:291
-#: en/user_customization-packages.ssi:303
-#: en/user_customization-packages.ssi:313
-#: en/user_customization-packages.ssi:331
-#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
-#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
-#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
-#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
-#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:105
-#: 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:178 en/user_examples.ssi:190
-#: en/user_examples.ssi:206 en/user_examples.ssi:220 en/user_examples.ssi:229
-#: en/user_examples.ssi:247 en/user_examples.ssi:255 en/user_examples.ssi:268
-#: en/user_examples.ssi:283 en/user_installation.ssi:38
+#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:54
+#: en/user_customization-packages.ssi:67 en/user_customization-packages.ssi:81
+#: en/user_customization-packages.ssi:101
+#: en/user_customization-packages.ssi:131
+#: en/user_customization-packages.ssi:144
+#: en/user_customization-packages.ssi:154
+#: en/user_customization-packages.ssi:164
+#: en/user_customization-packages.ssi:174
+#: en/user_customization-packages.ssi:188
+#: en/user_customization-packages.ssi:204
+#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:320
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:345 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:24 en/user_customization-runtime.ssi:44
+#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:63
+#: en/user_customization-runtime.ssi:71 en/user_customization-runtime.ssi:80
+#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:111
+#: en/user_customization-runtime.ssi:119 en/user_examples.ssi:14
+#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
+#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
+#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
+#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
+#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
+#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
+#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:271
+#: en/user_examples.ssi:286 en/user_installation.ssi:38
#: en/user_installation.ssi:46 en/user_installation.ssi:56
#: en/user_installation.ssi:64 en/user_installation.ssi:74
#: en/user_installation.ssi:82 en/user_installation.ssi:90
@@ -101,38 +102,39 @@ msgstr "code{"
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
-#: en/user_customization-installer.ssi:37
-#: en/user_customization-installer.ssi:48
+#: en/user_customization-installer.ssi:38
+#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:70 en/user_customization-packages.ssi:84
-#: en/user_customization-packages.ssi:98
-#: en/user_customization-packages.ssi:116
-#: en/user_customization-packages.ssi:147
-#: en/user_customization-packages.ssi:161
-#: en/user_customization-packages.ssi:171
-#: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:191
-#: en/user_customization-packages.ssi:203
-#: en/user_customization-packages.ssi:219
-#: en/user_customization-packages.ssi:231
-#: en/user_customization-packages.ssi:295
-#: en/user_customization-packages.ssi:307
-#: en/user_customization-packages.ssi:317
-#: en/user_customization-packages.ssi:344
-#: en/user_customization-packages.ssi:353 en/user_customization-runtime.ssi:18
-#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
-#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
-#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
-#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:110
-#: 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:186 en/user_examples.ssi:202
-#: en/user_examples.ssi:210 en/user_examples.ssi:225 en/user_examples.ssi:233
-#: en/user_examples.ssi:251 en/user_examples.ssi:264 en/user_examples.ssi:279
-#: en/user_examples.ssi:297 en/user_installation.ssi:42
+#: en/user_customization-packages.ssi:46 en/user_customization-packages.ssi:59
+#: en/user_customization-packages.ssi:71 en/user_customization-packages.ssi:85
+#: en/user_customization-packages.ssi:105
+#: en/user_customization-packages.ssi:136
+#: en/user_customization-packages.ssi:150
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:180
+#: en/user_customization-packages.ssi:192
+#: en/user_customization-packages.ssi:208
+#: en/user_customization-packages.ssi:220
+#: en/user_customization-packages.ssi:284
+#: en/user_customization-packages.ssi:296
+#: en/user_customization-packages.ssi:306
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341
+#: en/user_customization-packages.ssi:350 en/user_customization-runtime.ssi:18
+#: en/user_customization-runtime.ssi:28 en/user_customization-runtime.ssi:48
+#: en/user_customization-runtime.ssi:59 en/user_customization-runtime.ssi:67
+#: en/user_customization-runtime.ssi:76 en/user_customization-runtime.ssi:85
+#: en/user_customization-runtime.ssi:105 en/user_customization-runtime.ssi:115
+#: en/user_customization-runtime.ssi:124 en/user_examples.ssi:20
+#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
+#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
+#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
+#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
+#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
+#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
+#: en/user_examples.ssi:254 en/user_examples.ssi:267 en/user_examples.ssi:282
+#: en/user_examples.ssi:300 en/user_installation.ssi:42
#: en/user_installation.ssi:50 en/user_installation.ssi:60
#: en/user_installation.ssi:70 en/user_installation.ssi:78
#: en/user_installation.ssi:86 en/user_installation.ssi:94
@@ -292,7 +294,7 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:44 en/user_basics.ssi:170 en/user_basics.ssi:238
-#: en/user_examples.ssi:109 en/user_examples.ssi:208
+#: en/user_examples.ssi:119 en/user_examples.ssi:211
#, no-wrap
msgid " # lb build\n"
msgstr ""
@@ -546,7 +548,7 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:142
#, no-wrap
-msgid " $ lb config --packages virtualbox-ose-guest-x11\n"
+msgid " $ echo virtualbox-ose-guest-x11 >> config/package-lists/my.list.chroot\n"
msgstr ""
#. type: Plain text
diff --git a/manual/po/ro/user_customization-contents.ssi.po b/manual/po/ro/user_customization-contents.ssi.po
index a4e6813..6d3543b 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 2.0.0\n"
-"POT-Creation-Date: 2011-08-25 15:56+0300\n"
+"POT-Creation-Date: 2011-11-07 21:01-0400\n"
"PO-Revision-Date: 2010-10-23 16:43+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -38,48 +38,47 @@ msgstr ""
#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
-#: en/user_customization-installer.ssi:43
+#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
-#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:53
-#: en/user_customization-packages.ssi:66 en/user_customization-packages.ssi:80
-#: en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:112
-#: en/user_customization-packages.ssi:142
-#: en/user_customization-packages.ssi:155
-#: en/user_customization-packages.ssi:165
-#: en/user_customization-packages.ssi:175
-#: en/user_customization-packages.ssi:185
-#: en/user_customization-packages.ssi:199
-#: en/user_customization-packages.ssi:215
-#: en/user_customization-packages.ssi:227
-#: en/user_customization-packages.ssi:291
-#: en/user_customization-packages.ssi:303
-#: en/user_customization-packages.ssi:313
-#: en/user_customization-packages.ssi:331
-#: en/user_customization-packages.ssi:348
-#: en/user_customization-packages.ssi:356 en/user_customization-runtime.ssi:14
-#: en/user_customization-runtime.ssi:24 en/user_customization-runtime.ssi:44
-#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:63
-#: en/user_customization-runtime.ssi:71 en/user_customization-runtime.ssi:80
-#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:111
-#: en/user_customization-runtime.ssi:119 en/user_examples.ssi:14
+#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:54
+#: en/user_customization-packages.ssi:67 en/user_customization-packages.ssi:81
+#: en/user_customization-packages.ssi:101
+#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:140
+#: en/user_customization-packages.ssi:150
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:184
+#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:276
+#: en/user_customization-packages.ssi:288
+#: en/user_customization-packages.ssi:298
+#: en/user_customization-packages.ssi:316
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
+#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
+#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
+#: en/user_customization-runtime.ssi:104 en/user_customization-runtime.ssi:114
+#: en/user_customization-runtime.ssi:122 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:178 en/user_examples.ssi:190 en/user_examples.ssi:206
-#: en/user_examples.ssi:220 en/user_examples.ssi:229 en/user_examples.ssi:247
-#: en/user_examples.ssi:255 en/user_examples.ssi:268 en/user_examples.ssi:283
-#: en/user_installation.ssi:38 en/user_installation.ssi:46
-#: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi:74 en/user_installation.ssi:82
-#: en/user_installation.ssi:90 en/user_installation.ssi:114
-#: en/user_installation.ssi:129 en/user_installation.ssi:146
-#: en/user_managing_a_configuration.ssi:24
+#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
+#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
+#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
+#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
+#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
+#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
+#: en/user_examples.ssi:277 en/user_installation.ssi:38
+#: en/user_installation.ssi:46 en/user_installation.ssi:56
+#: en/user_installation.ssi:64 en/user_installation.ssi:74
+#: en/user_installation.ssi:82 en/user_installation.ssi:90
+#: en/user_installation.ssi:114 en/user_installation.ssi:129
+#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:80 en/user_overview.ssi:88
+#: en/user_overview.ssi:48 en/user_overview.ssi:56
msgid "code{"
msgstr "code{"
@@ -103,49 +102,48 @@ msgstr "code{"
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
-#: en/user_customization-installer.ssi:37
-#: en/user_customization-installer.ssi:48
+#: en/user_customization-installer.ssi:38
+#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:70 en/user_customization-packages.ssi:84
-#: en/user_customization-packages.ssi:98
-#: en/user_customization-packages.ssi:116
-#: en/user_customization-packages.ssi:147
-#: en/user_customization-packages.ssi:161
-#: en/user_customization-packages.ssi:171
-#: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:191
-#: en/user_customization-packages.ssi:203
-#: en/user_customization-packages.ssi:219
-#: en/user_customization-packages.ssi:231
-#: en/user_customization-packages.ssi:295
-#: en/user_customization-packages.ssi:307
-#: en/user_customization-packages.ssi:317
-#: en/user_customization-packages.ssi:344
-#: en/user_customization-packages.ssi:352
-#: en/user_customization-packages.ssi:361 en/user_customization-runtime.ssi:18
-#: en/user_customization-runtime.ssi:28 en/user_customization-runtime.ssi:48
-#: en/user_customization-runtime.ssi:59 en/user_customization-runtime.ssi:67
-#: en/user_customization-runtime.ssi:76 en/user_customization-runtime.ssi:85
-#: en/user_customization-runtime.ssi:105 en/user_customization-runtime.ssi:115
-#: en/user_customization-runtime.ssi:124 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:186 en/user_examples.ssi:202 en/user_examples.ssi:210
-#: en/user_examples.ssi:225 en/user_examples.ssi:233 en/user_examples.ssi:251
-#: en/user_examples.ssi:264 en/user_examples.ssi:279 en/user_examples.ssi:297
-#: en/user_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi:70
-#: en/user_installation.ssi:78 en/user_installation.ssi:86
-#: en/user_installation.ssi:94 en/user_installation.ssi:119
-#: en/user_installation.ssi:136 en/user_installation.ssi:149
-#: en/user_managing_a_configuration.ssi:31
+#: en/user_customization-packages.ssi:46 en/user_customization-packages.ssi:59
+#: en/user_customization-packages.ssi:71 en/user_customization-packages.ssi:85
+#: en/user_customization-packages.ssi:105
+#: en/user_customization-packages.ssi:132
+#: en/user_customization-packages.ssi:146
+#: en/user_customization-packages.ssi:156
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:329
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:346 en/user_customization-runtime.ssi:21
+#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
+#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
+#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
+#: en/user_customization-runtime.ssi:108 en/user_customization-runtime.ssi:118
+#: en/user_customization-runtime.ssi:127 en/user_examples.ssi:20
+#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
+#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
+#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
+#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
+#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
+#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
+#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
+#: en/user_examples.ssi:291 en/user_installation.ssi:42
+#: en/user_installation.ssi:50 en/user_installation.ssi:60
+#: en/user_installation.ssi:70 en/user_installation.ssi:78
+#: en/user_installation.ssi:86 en/user_installation.ssi:94
+#: en/user_installation.ssi:119 en/user_installation.ssi:136
+#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
-#: en/user_overview.ssi:84 en/user_overview.ssi:92
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:42
+#: en/user_overview.ssi:52 en/user_overview.ssi:60
msgid "}code"
msgstr "}code"
@@ -236,7 +234,7 @@ msgstr ""
#. type: Plain text
#: en/user_customization-contents.ssi:24
msgid ""
-"To include files, simply add them to your #{config/chroot_local-includes}# "
+"To include files, simply add them to your #{config/includes.chroot}# "
"directory. This directory corresponds to the root directory (#{/}#) of the "
"live system. For example, to add a file #{/var/www/index.html}# in the live "
"system, use:"
@@ -246,8 +244,8 @@ msgstr ""
#: en/user_customization-contents.ssi:29
#, no-wrap
msgid ""
-" $ mkdir -p config/chroot_local-includes/var/www\n"
-" $ cp /path/to/my/index.html config/chroot_local-includes/var/www\n"
+" $ mkdir -p config/includes.chroot/var/www\n"
+" $ cp /path/to/my/index.html config/includes.chroot/var/www\n"
msgstr ""
#. type: Plain text
@@ -261,7 +259,7 @@ msgstr ""
msgid ""
" -- config\n"
" [...]\n"
-" |-- chroot_local-includes\n"
+" |-- includes.chroot\n"
" | `-- var\n"
" | `-- www\n"
" | `-- index.html\n"
@@ -289,14 +287,14 @@ msgid ""
"booting the Live system, you can use binary local includes. This works in a "
"similar fashion to chroot local includes. For example, suppose the files #{~/"
"video_demo.*}# are demo videos of the live system described by and linked to "
-"by an HTML index page. Simply copy the material to #{config/binary_local-"
-"includes/}# as follows:"
+"by an HTML index page. Simply copy the material to #{config/includes.binary/}"
+"# as follows:"
msgstr ""
#. type: Plain text
#: en/user_customization-contents.ssi:56
#, no-wrap
-msgid " $ cp ~/video_demo.* config/binary_local-includes/\n"
+msgid " $ cp ~/video_demo.* config/includes.binary/\n"
msgstr ""
#. type: Plain text
@@ -350,12 +348,12 @@ msgstr ""
#. type: Plain text
#: en/user_customization-contents.ssi:80
msgid ""
-"To run commands in the chroot stage, create a hook script containing the "
-"commands in the #{config/chroot_local-hooks}# directory. The hook will run "
-"in the chroot after the rest of your chroot configuration has been applied, "
-"so remember to ensure your configuration includes all packages and files "
-"your hook needs in order to run. See the example chroot hook scripts for "
-"various common chroot customization tasks provided in #{/usr/share/live/"
+"To run commands in the chroot stage, create a hook script with a #{.chroot}# "
+"suffix containing the commands in the #{config/hooks/}# directory. The hook "
+"will run in the chroot after the rest of your chroot configuration has been "
+"applied, so remember to ensure your configuration includes all packages and "
+"files your hook needs in order to run. See the example chroot hook scripts "
+"for various common chroot customization tasks provided in #{/usr/share/live/"
"build/examples/hooks}# which you can copy or symlink to use them in your own "
"configuration."
msgstr ""
@@ -372,10 +370,9 @@ msgid ""
"explained in the \"Customization\" section of its man page. Examine live-"
"config's own hooks provided in #{/lib/live/config/}#, noting the sequence "
"numbers. Then provide your own hook prefixed with an appropriate sequence "
-"number, either as a chroot local include in #{config/chroot_local-includes/"
-"lib/live/config/}#, or as a custom package as discussed in {Installing "
-"modified or third-party packages}#installing-modified-or-third-party-"
-"packages."
+"number, either as a chroot local include in #{config/includes.chroot/lib/"
+"live/config/}#, or as a custom package as discussed in {Installing modified "
+"or third-party packages}#installing-modified-or-third-party-packages."
msgstr ""
#. type: Plain text
@@ -386,14 +383,15 @@ msgstr ""
#. type: Plain text
#: en/user_customization-contents.ssi:88
msgid ""
-"To run commands in the binary stage, create a hook script containing the "
-"commands in the #{config/binary_local-hooks}#. The hook will run after all "
-"other binary commands are run, but before binary_checksums, the very last "
-"binary commands The commands in your hook do not run in the chroot, so take "
-"care to not modify any files outside of the build tree, or you may damage "
-"your build system! See the example binary hook scripts for various common "
-"binary customization tasks provided in #{/usr/share/live/build/examples/"
-"hooks}# which you can copy or symlink to use them in your own configuration."
+"To run commands in the binary stage, create a hook script with a #{.binary}# "
+"suffix containing the commands in the #{config/hooks/}# directory. The hook "
+"will run after all other binary commands are run, but before "
+"binary_checksums, the very last binary command. The commands in your hook do "
+"not run in the chroot, so take care to not modify any files outside of the "
+"build tree, or you may damage your build system! See the example binary hook "
+"scripts for various common binary customization tasks provided in #{/usr/"
+"share/live/build/examples/hooks}# which you can copy or symlink to use them "
+"in your own configuration."
msgstr ""
#. type: Plain text
@@ -404,9 +402,10 @@ msgstr ""
#. type: Plain text
#: en/user_customization-contents.ssi:92
msgid ""
-"Files in the #{config/chroot_local-preseed}# directory are considered to be "
+"Files in the #{config/preseed/}# directory suffixed with #{.preseed}# "
+"followed by the stage (#{.chroot}# or #{.binary}#) are considered to be "
"debconf preseed files and are installed by live-build using #{debconf-set-"
-"selections}#."
+"selections}# during the corresponding stage."
msgstr ""
#. type: Plain text
diff --git a/manual/po/ro/user_customization-installer.ssi.po b/manual/po/ro/user_customization-installer.ssi.po
index 4099b4e..fb410bf 100644
--- a/manual/po/ro/user_customization-installer.ssi.po
+++ b/manual/po/ro/user_customization-installer.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-04-03 07:04-0200\n"
+"POT-Creation-Date: 2011-11-07 21:19-0400\n"
"PO-Revision-Date: 2010-11-30 10:53+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -27,48 +27,49 @@ msgstr ""
#: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/user_basics.ssi:30 en/user_basics.ssi:40
-#: en/user_basics.ssi:56 en/user_basics.ssi:71 en/user_basics.ssi:106
-#: en/user_basics.ssi:114 en/user_basics.ssi:126 en/user_basics.ssi:138
-#: en/user_basics.ssi:150 en/user_basics.ssi:158 en/user_basics.ssi:166
-#: en/user_basics.ssi:182 en/user_basics.ssi:192 en/user_basics.ssi:200
-#: en/user_basics.ssi:216 en/user_basics.ssi:224 en/user_basics.ssi:234
-#: en/user_basics.ssi:252 en/user_basics.ssi:280 en/user_basics.ssi:296
-#: en/user_basics.ssi:304 en/user_basics.ssi:324 en/user_basics.ssi:349
+#: en/project_procedures.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
+#: en/user_basics.ssi:116 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:184 en/user_basics.ssi:194 en/user_basics.ssi:202
+#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
+#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
+#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
-#: en/user_customization-installer.ssi:43
+#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
-#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:53
-#: en/user_customization-packages.ssi:66 en/user_customization-packages.ssi:80
-#: en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:112
-#: en/user_customization-packages.ssi:142
-#: en/user_customization-packages.ssi:155
-#: en/user_customization-packages.ssi:165
-#: en/user_customization-packages.ssi:175
-#: en/user_customization-packages.ssi:185
-#: en/user_customization-packages.ssi:199
-#: en/user_customization-packages.ssi:215
-#: en/user_customization-packages.ssi:227
-#: en/user_customization-packages.ssi:291
-#: en/user_customization-packages.ssi:303
-#: en/user_customization-packages.ssi:313
-#: en/user_customization-packages.ssi:331
-#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
-#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
-#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
-#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
-#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:105
-#: 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:178 en/user_examples.ssi:190
-#: en/user_examples.ssi:206 en/user_examples.ssi:220 en/user_examples.ssi:229
-#: en/user_examples.ssi:247 en/user_examples.ssi:255 en/user_examples.ssi:268
-#: en/user_examples.ssi:283 en/user_installation.ssi:38
+#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:54
+#: en/user_customization-packages.ssi:67 en/user_customization-packages.ssi:81
+#: en/user_customization-packages.ssi:101
+#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:140
+#: en/user_customization-packages.ssi:150
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:184
+#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:276
+#: en/user_customization-packages.ssi:288
+#: en/user_customization-packages.ssi:298
+#: en/user_customization-packages.ssi:316
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
+#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
+#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
+#: en/user_customization-runtime.ssi:104 en/user_customization-runtime.ssi:114
+#: en/user_customization-runtime.ssi:122 en/user_examples.ssi:14
+#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
+#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
+#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
+#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
+#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
+#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
+#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
+#: en/user_examples.ssi:277 en/user_installation.ssi:38
#: en/user_installation.ssi:46 en/user_installation.ssi:56
#: en/user_installation.ssi:64 en/user_installation.ssi:74
#: en/user_installation.ssi:82 en/user_installation.ssi:90
@@ -77,7 +78,7 @@ msgstr ""
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:80 en/user_overview.ssi:88
+#: en/user_overview.ssi:48 en/user_overview.ssi:56
msgid "code{"
msgstr "code{"
@@ -91,48 +92,49 @@ msgstr "code{"
#: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/user_basics.ssi:34 en/user_basics.ssi:44
-#: en/user_basics.ssi:62 en/user_basics.ssi:75 en/user_basics.ssi:110
-#: en/user_basics.ssi:118 en/user_basics.ssi:132 en/user_basics.ssi:142
-#: en/user_basics.ssi:154 en/user_basics.ssi:162 en/user_basics.ssi:170
-#: en/user_basics.ssi:186 en/user_basics.ssi:196 en/user_basics.ssi:204
-#: en/user_basics.ssi:220 en/user_basics.ssi:228 en/user_basics.ssi:238
-#: en/user_basics.ssi:272 en/user_basics.ssi:284 en/user_basics.ssi:300
-#: en/user_basics.ssi:308 en/user_basics.ssi:335 en/user_basics.ssi:374
+#: en/project_procedures.ssi:131 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
+#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
+#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
+#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
+#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
-#: en/user_customization-installer.ssi:37
-#: en/user_customization-installer.ssi:48
+#: en/user_customization-installer.ssi:38
+#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:70 en/user_customization-packages.ssi:84
-#: en/user_customization-packages.ssi:98
-#: en/user_customization-packages.ssi:116
-#: en/user_customization-packages.ssi:147
-#: en/user_customization-packages.ssi:161
-#: en/user_customization-packages.ssi:171
-#: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:191
-#: en/user_customization-packages.ssi:203
-#: en/user_customization-packages.ssi:219
-#: en/user_customization-packages.ssi:231
-#: en/user_customization-packages.ssi:295
-#: en/user_customization-packages.ssi:307
-#: en/user_customization-packages.ssi:317
-#: en/user_customization-packages.ssi:344
-#: en/user_customization-packages.ssi:353 en/user_customization-runtime.ssi:18
-#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
-#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
-#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
-#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:110
-#: 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:186 en/user_examples.ssi:202
-#: en/user_examples.ssi:210 en/user_examples.ssi:225 en/user_examples.ssi:233
-#: en/user_examples.ssi:251 en/user_examples.ssi:264 en/user_examples.ssi:279
-#: en/user_examples.ssi:297 en/user_installation.ssi:42
+#: en/user_customization-packages.ssi:46 en/user_customization-packages.ssi:59
+#: en/user_customization-packages.ssi:71 en/user_customization-packages.ssi:85
+#: en/user_customization-packages.ssi:105
+#: en/user_customization-packages.ssi:132
+#: en/user_customization-packages.ssi:146
+#: en/user_customization-packages.ssi:156
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:329
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:346 en/user_customization-runtime.ssi:21
+#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
+#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
+#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
+#: en/user_customization-runtime.ssi:108 en/user_customization-runtime.ssi:118
+#: en/user_customization-runtime.ssi:127 en/user_examples.ssi:20
+#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
+#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
+#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
+#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
+#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
+#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
+#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
+#: en/user_examples.ssi:291 en/user_installation.ssi:42
#: en/user_installation.ssi:50 en/user_installation.ssi:60
#: en/user_installation.ssi:70 en/user_installation.ssi:78
#: en/user_installation.ssi:86 en/user_installation.ssi:94
@@ -140,8 +142,8 @@ msgstr "code{"
#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
-#: en/user_overview.ssi:84 en/user_overview.ssi:92
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:42
+#: en/user_overview.ssi:52 en/user_overview.ssi:60
msgid "}code"
msgstr "}code"
@@ -254,20 +256,21 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-installer.ssi:35
+#: en/user_customization-installer.ssi:36
#, no-wrap
msgid ""
" $ lb config --architecture i386 --linux-flavours 486 \\\n"
-" --debian-installer live --packages debian-installer-launcher\n"
+" --debian-installer live\n"
+" $ echo debian-installer-launcher >> config/package-lists/my.list.chroot\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-installer.ssi:39
+#: en/user_customization-installer.ssi:40
msgid "2~ Customizing Debian Installer by preseeding"
msgstr ""
#. type: Plain text
-#: en/user_customization-installer.ssi:41
+#: en/user_customization-installer.ssi:42
msgid ""
"As described in the Debian Installer Manual, Appendix B at http://www.debian."
"org/releases/stable/i386/apb.html, \"Preseeding provides a way to set "
@@ -281,7 +284,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-installer.ssi:46
+#: en/user_customization-installer.ssi:47
#, no-wrap
msgid ""
" $ echo \"d-i debian-installer/locale string en_US\" \\\n"
@@ -289,16 +292,16 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-installer.ssi:50
+#: en/user_customization-installer.ssi:51
msgid "2~ Customizing Debian Installer content"
msgstr ""
#. type: Plain text
-#: en/user_customization-installer.ssi:51
+#: en/user_customization-installer.ssi:52
msgid ""
"For experimental or debugging purposes, you might want to include locally "
-"built #{d-i}# component udeb packages. Place these in #{config/binary_local-"
-"udebs/}# to include them in the image. Additional or replacement files and "
+"built #{d-i}# component udeb packages. Place these in #{config/packages."
+"binary/}# to include them in the image. Additional or replacement files and "
"directories may be included in the installer initrd as well, in a similar "
"fashion to {Live/chroot local includes}#live-chroot-local-includes, by "
"placing the material in #{config/binary_debian-installer-includes/}#."
diff --git a/manual/po/ro/user_customization-packages.ssi.po b/manual/po/ro/user_customization-packages.ssi.po
index 3a5893e..7ab64d6 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 2.0.0\n"
-"POT-Creation-Date: 2011-08-14 16:53+0300\n"
+"POT-Creation-Date: 2011-11-07 21:01-0400\n"
"PO-Revision-Date: 2010-10-22 08:58-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -38,38 +38,38 @@ msgstr ""
#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
-#: en/user_customization-installer.ssi:43
+#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
-#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:53
-#: en/user_customization-packages.ssi:66 en/user_customization-packages.ssi:80
-#: en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:112
-#: en/user_customization-packages.ssi:142
-#: en/user_customization-packages.ssi:155
-#: en/user_customization-packages.ssi:165
-#: en/user_customization-packages.ssi:175
-#: en/user_customization-packages.ssi:185
-#: en/user_customization-packages.ssi:199
-#: en/user_customization-packages.ssi:215
-#: en/user_customization-packages.ssi:227
-#: en/user_customization-packages.ssi:291
-#: en/user_customization-packages.ssi:303
-#: en/user_customization-packages.ssi:313
-#: en/user_customization-packages.ssi:331
-#: en/user_customization-packages.ssi:348
-#: en/user_customization-packages.ssi:356 en/user_customization-runtime.ssi:14
-#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
-#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
-#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
-#: en/user_customization-runtime.ssi:99 en/user_customization-runtime.ssi:107
-#: 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:178 en/user_examples.ssi:190
-#: en/user_examples.ssi:206 en/user_examples.ssi:220 en/user_examples.ssi:229
-#: en/user_examples.ssi:247 en/user_examples.ssi:255 en/user_examples.ssi:268
-#: en/user_examples.ssi:283 en/user_installation.ssi:38
+#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:54
+#: en/user_customization-packages.ssi:67 en/user_customization-packages.ssi:81
+#: en/user_customization-packages.ssi:101
+#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:140
+#: en/user_customization-packages.ssi:150
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:184
+#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:276
+#: en/user_customization-packages.ssi:288
+#: en/user_customization-packages.ssi:298
+#: en/user_customization-packages.ssi:316
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
+#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
+#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
+#: en/user_customization-runtime.ssi:104 en/user_customization-runtime.ssi:114
+#: en/user_customization-runtime.ssi:122 en/user_examples.ssi:14
+#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
+#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
+#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
+#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
+#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
+#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
+#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
+#: en/user_examples.ssi:277 en/user_installation.ssi:38
#: en/user_installation.ssi:46 en/user_installation.ssi:56
#: en/user_installation.ssi:64 en/user_installation.ssi:74
#: en/user_installation.ssi:82 en/user_installation.ssi:90
@@ -78,7 +78,7 @@ msgstr ""
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:80 en/user_overview.ssi:88
+#: en/user_overview.ssi:48 en/user_overview.ssi:56
msgid "code{"
msgstr "code{"
@@ -102,39 +102,39 @@ msgstr "code{"
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
-#: en/user_customization-installer.ssi:37
-#: en/user_customization-installer.ssi:48
+#: en/user_customization-installer.ssi:38
+#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:70 en/user_customization-packages.ssi:84
-#: en/user_customization-packages.ssi:98
-#: en/user_customization-packages.ssi:116
-#: en/user_customization-packages.ssi:147
-#: en/user_customization-packages.ssi:161
-#: en/user_customization-packages.ssi:171
-#: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:191
-#: en/user_customization-packages.ssi:203
-#: en/user_customization-packages.ssi:219
-#: en/user_customization-packages.ssi:231
-#: en/user_customization-packages.ssi:295
-#: en/user_customization-packages.ssi:307
-#: en/user_customization-packages.ssi:317
-#: en/user_customization-packages.ssi:344
-#: en/user_customization-packages.ssi:352
-#: en/user_customization-packages.ssi:361 en/user_customization-runtime.ssi:18
-#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
-#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
-#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
-#: en/user_customization-runtime.ssi:103 en/user_customization-runtime.ssi:112
-#: 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:186 en/user_examples.ssi:202
-#: en/user_examples.ssi:210 en/user_examples.ssi:225 en/user_examples.ssi:233
-#: en/user_examples.ssi:251 en/user_examples.ssi:264 en/user_examples.ssi:279
-#: en/user_examples.ssi:297 en/user_installation.ssi:42
+#: en/user_customization-packages.ssi:46 en/user_customization-packages.ssi:59
+#: en/user_customization-packages.ssi:71 en/user_customization-packages.ssi:85
+#: en/user_customization-packages.ssi:105
+#: en/user_customization-packages.ssi:132
+#: en/user_customization-packages.ssi:146
+#: en/user_customization-packages.ssi:156
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:329
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:346 en/user_customization-runtime.ssi:21
+#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
+#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
+#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
+#: en/user_customization-runtime.ssi:108 en/user_customization-runtime.ssi:118
+#: en/user_customization-runtime.ssi:127 en/user_examples.ssi:20
+#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
+#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
+#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
+#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
+#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
+#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
+#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
+#: en/user_examples.ssi:291 en/user_installation.ssi:42
#: en/user_installation.ssi:50 en/user_installation.ssi:60
#: en/user_installation.ssi:70 en/user_installation.ssi:78
#: en/user_installation.ssi:86 en/user_installation.ssi:94
@@ -142,8 +142,8 @@ msgstr "code{"
#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
-#: en/user_overview.ssi:84 en/user_overview.ssi:92
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:42
+#: en/user_overview.ssi:52 en/user_overview.ssi:60
msgid "}code"
msgstr "}code"
@@ -192,7 +192,7 @@ msgstr ""
msgid ""
"The distribution you choose has the broadest impact on which packages are "
"available to include in your live image. Specify the codename, which "
-"defaults to #{squeeze}# for the Squeeze version of live-build. Any current "
+"defaults to #{wheezy}# for the Wheezy version of live-build. Any current "
"distribution carried in the Debian archive may be specified by its codename "
"here. (See {Terms}#terms for more details.) The #{--distribution}# option "
"not only influences the source of packages within the archive, but also "
@@ -249,15 +249,15 @@ msgstr ""
msgid ""
"The Debian archive is replicated across a large network of mirrors around "
"the world so that people in each region can choose a nearby mirror for best "
-"download speed. Each of the #{--mirror-*}# options governs which "
+"download speed. Each of the #{--parent-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."
+"those stages, and later, in the *binary* stage, the #{--parent-mirror-binary}"
+"# and #{--parent-mirror-binary-security}# values are used, superceding any "
+"mirrors used in an earlier stage."
msgstr ""
#. type: Plain text
@@ -270,173 +270,138 @@ msgstr ""
#: en/user_customization-packages.ssi:38
msgid ""
"To set the distribution mirrors used at build time to point at a local "
-"mirror, it is sufficient to set #{--mirror-bootstrap}# and #{--mirror-chroot-"
-"security}# as follows."
+"mirror, it is sufficient to set #{--parent-mirror-bootstrap}#, #{--parent-"
+"mirror-chroot-security}# and #{--parent-mirror-chroot-backports}# as follows."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:43
+#: en/user_customization-packages.ssi:44
#, no-wrap
msgid ""
-" $ lb config --mirror-bootstrap http://localhost/debian/ \\\n"
-" --mirror-chroot-security http://localhost/debian-security/\n"
+" $ lb config --parent-mirror-bootstrap http://localhost/debian/ \\\n"
+" --parent-mirror-chroot-security http://localhost/debian-security/ \\\n"
+"\t --parent-mirror-chroot-backports http://localhost/debian-backports/\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:47
+#: en/user_customization-packages.ssi:48
msgid ""
-"The chroot mirror, specified by #{--mirror-chroot}#, defaults to the #{--"
-"mirror-bootstrap}# value."
+"The chroot mirror, specified by #{--parent-mirror-chroot}#, defaults to the #"
+"{--parent-mirror-bootstrap}# value."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:49
+#: en/user_customization-packages.ssi:50
msgid "3~ Distribution mirrors used at run time"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:51
+#: en/user_customization-packages.ssi:52
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."
+"The #{--parent-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:56
+#: en/user_customization-packages.ssi:57
#, no-wrap
msgid ""
-" $ lb config --mirror-binary http://mirror/debian/ \\\n"
-" --mirror-binary-security http://mirror/debian-security/\n"
+" $ lb config --parent-mirror-binary http://mirror/debian/ \\\n"
+" --parent-mirror-binary-security http://mirror/debian-security/\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:60
+#: en/user_customization-packages.ssi:61
msgid "3~additional-repositories Additional repositories"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:62
+#: en/user_customization-packages.ssi:63
msgid ""
"You may add more repositories, broadening your package choices beyond what "
"is available in your target distribution. These may be, for example, for "
"backports, experimental or custom packages. To configure additional "
-"repositories, create #{config/chroot_sources/your-repository.chroot}#, and/"
-"or #{config/chroot_sources/your-repository.binary}# files. As with the #{--"
-"mirror-*}# options, these govern the repositories used in the *chroot* stage "
-"when building the image, and in the *binary* stage, i.e. for use when "
-"running the live system."
+"repositories, create #{config/archives/your-repository.list.chroot}#, and/or "
+"#{config/archives/your-repository.list.binary}# files. As with the #{--"
+"parent-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:64
+#: en/user_customization-packages.ssi:65
msgid ""
-"For example, #{config/chroot_sources/live.chroot}# allows you to install "
+"For example, #{config/archives/live.list.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:68
+#: en/user_customization-packages.ssi:69
#, no-wrap
msgid " deb http://live.debian.net/ sid-snapshots main contrib non-free\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:72
+#: en/user_customization-packages.ssi:73
msgid ""
-"If you add the same line to #{config/chroot_sources/live.binary}#, the "
+"If you add the same line to #{config/archives/live.list.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:74
+#: en/user_customization-packages.ssi:75
msgid "If such files exist, they will be picked up automatically."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:76
+#: en/user_customization-packages.ssi:77
msgid ""
"You should also put the GPG key used to sign the repository into #{config/"
-"chroot_sources/your-repository.{binary,chroot}.gpg}# files."
+"archives/your-repository.gpg.{binary,chroot}}# files."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:78
+#: en/user_customization-packages.ssi:79
#, no-wrap
-msgid "*{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:\n"
+msgid "*{Note:}* some preconfigured package repositories are available for easy selection through the #{--archives}# option, e.g. for enabling live snapshots, a simple command is enough to enable it:\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:82 en/user_installation.ssi:148
+#: en/user_customization-packages.ssi:83 en/user_installation.ssi:148
#, no-wrap
-msgid " $ lb config --repository live.debian.net\n"
+msgid " $ lb config --archives live.debian.net\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:86
+#: en/user_customization-packages.ssi:87
msgid "2~choosing-packages-to-install Choosing packages to install"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:88
+#: en/user_customization-packages.ssi:89
msgid ""
"There are a number of ways to choose which packages live-build will install "
"in your image, covering a variety of different needs. You can simply name "
-"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:90
-msgid "3~ Choosing a few packages"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:92
-msgid ""
-"When the number of packages added is small, simply specify #{--packages}#. "
-"For example:"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:96
-#, no-wrap
-msgid " $ lb config --packages \"package1 package2 package3\"\n"
+"individual packages to install in a package list. You can also choose "
+"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:100
-msgid ""
-"The behaviour of live-build when specifying a package that does not exist is "
-"determined by your choice of APT utility. See {Choosing apt or aptitude}"
-"#choosing-apt-or-aptitude for more details."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:102
-msgid ""
-"If you need to specify a large number of packages to be installed or you "
-"need flexibility regarding which packages to install, use package lists as "
-"discussed in the following section, {Package lists}#package-lists."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:104
+#: en/user_customization-packages.ssi:91
msgid "3~package-lists Package lists"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:106
+#: en/user_customization-packages.ssi:93
msgid ""
"Package lists are a powerful way of expressing which packages should be "
"installed. The list syntax supports included files and conditional sections "
@@ -449,114 +414,103 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:108
-msgid "3~ Predefined package lists"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:110
-msgid ""
-"The simplest way to use lists is to specify one or more predefined lists "
-"with the #{--packages-lists}# option. For example:"
+#: en/user_customization-packages.ssi:95
+#, no-wrap
+msgid "*{Note:}* 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.\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:114
-#, no-wrap
-msgid " $ lb config --packages-lists \"gnome-core rescue\"\n"
+#: en/user_customization-packages.ssi:97
+msgid "3~ Predefined package lists"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:118
+#: en/user_customization-packages.ssi:99
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."
+"The simplest way to use lists is to specify one or more predefined lists "
+"with the #{--package-lists}# option. For example:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:120
+#: en/user_customization-packages.ssi:103
#, no-wrap
-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.\n"
+msgid " $ lb config --package-lists \"gnome rescue\"\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:122
+#: en/user_customization-packages.ssi:107
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 "
+"build/package-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:124
+#: en/user_customization-packages.ssi:109
msgid "3~ Local package lists"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:126
+#: en/user_customization-packages.ssi:111
msgid ""
-"You may supplement or replace entirely the supplied lists using local "
-"package lists stored in #{config/chroot_local-packageslists/}#."
+"You may supplement the predefined lists using local package lists stored in #"
+"{config/package-lists/}#."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:128
+#: en/user_customization-packages.ssi:113
msgid ""
"Package lists that exist in this directory need to have a #{.list}# suffix "
-"in order to be processed. Local package lists always override package lists "
-"distributed with live-build. This can cause undesired effects, we therefore "
-"recommend to use unique names for local package lists."
+"in order to be processed, and then an additional stage suffix, #{.chroot}# "
+"or #{.binary}# to indicate which stage the list is for."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:130
-msgid "3~ Local binary package lists"
+#: en/user_customization-packages.ssi:115
+#, no-wrap
+msgid "*{Note:}* If you don't specify the stage suffix, the list will be used for both stages. Normally, you want to specify #{.list.chroot}# so that the packages will only be installed in the live filesystem and not have an extra copy of the #{.deb}# placed on the media.\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:132
-msgid ""
-"In case you want to include some required .deb packages to live media's #"
-"{pool/}# (without installing them onto the live image) you may need to use "
-"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."
+#: en/user_customization-packages.ssi:117
+msgid "3~ Local binary package lists"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:134
+#: en/user_customization-packages.ssi:119
msgid ""
-"Package lists that exist in this directory need to have a #{.list}# suffix "
-"in order to be processed."
+"To make a binary stage list, place a file suffixed with #{.list.binary}# in #"
+"{config/package-lists/}#. These packages are not installed in the live "
+"filesystem, but are included on the live media under #{pool/}#. You would "
+"typically use such a list with one of the non-live installer variants. As "
+"mentioned above, if you want this list to be the same as your chroot stage "
+"list, simply use the #{.list}# suffix by itself."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:136
+#: en/user_customization-packages.ssi:121
msgid "3~ Extending a provided package list using includes"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:138
+#: en/user_customization-packages.ssi:123
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."
+"includes. Refer to these in the #{/usr/share/live/build/package-lists/}# "
+"directory, as they serve as good examples of how to write your own lists."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:140
+#: en/user_customization-packages.ssi:125
msgid ""
"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:"
+"iceweasel, create #{config/package-lists/my.list.chroot}# with the following "
+"contents:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:145
+#: en/user_customization-packages.ssi:130
#, no-wrap
msgid ""
" #include <gnome>\n"
@@ -564,12 +518,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:134
msgid "3~ Using conditionals inside package lists"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:151
+#: en/user_customization-packages.ssi:136
msgid ""
"Any of the live-build configuration variables stored in #{config/*}# (minus "
"the #{LB_}# prefix) may be used in conditional statements in package lists. "
@@ -580,14 +534,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:153
+#: en/user_customization-packages.ssi:138
msgid ""
"For example, to install #{ia32-libs}# if the #{--architecture amd64}# is "
"specified:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:159
+#: en/user_customization-packages.ssi:144
#, no-wrap
msgid ""
" #if ARCHITECTURE amd64\n"
@@ -596,14 +550,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:148
msgid ""
"You may test for any one of a number of values, e.g. to install #{memtest86+}"
"# if either #{--architecture i386}# or #{--architecture amd64}# is specified:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:169
+#: en/user_customization-packages.ssi:154
#, no-wrap
msgid ""
" #if ARCHITECTURE i386 amd64\n"
@@ -612,7 +566,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:173
+#: en/user_customization-packages.ssi:158
msgid ""
"You may also test against variables that may contain more than one value, e."
"g. to install #{vrms}# if either #{contrib}# or #{non-free}# is specified "
@@ -620,7 +574,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:179
+#: en/user_customization-packages.ssi:164
#, no-wrap
msgid ""
" #if ARCHIVE_AREAS contrib non-free\n"
@@ -629,12 +583,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:183
+#: en/user_customization-packages.ssi:168
msgid "A conditional may surround an #{#include}# directive:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:174
#, no-wrap
msgid ""
" #if ARCHITECTURE amd64\n"
@@ -643,34 +597,37 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:178
msgid "The nesting of conditionals is not supported."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:195
+#: en/user_customization-packages.ssi:180
msgid "3~ Tasks"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:197
+#: en/user_customization-packages.ssi:182
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."
+"live-build by putting them in a list in #{config/task-lists/}#, as in the "
+"example below."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:187
#, no-wrap
-msgid " $ lb config --tasks \"mail-server file-server\"\n"
+msgid ""
+" $ lb config\n"
+" $ echo \"mail-server file-server\" >> config/task-lists/my.list.chroot\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:205
+#: en/user_customization-packages.ssi:191
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, "
@@ -679,97 +636,87 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:193
msgid "3~desktop-and-language-tasks Desktop and language tasks"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:209
+#: en/user_customization-packages.ssi:195
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 #{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."
+"Desktop and language tasks are special cases that need some extra planning "
+"and configuration. Live images are different from Debian Installer images in "
+"this respect. 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 internal #{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:211
+#: en/user_customization-packages.ssi:197
msgid ""
-"In live-build, therefore, these special cases are also given special "
-"consideration, but with three notable differences at the time of writing."
+"When developing a desktop live image, the image typically boots directly to "
+"a working desktop, the choices of both desktop and default language having "
+"been made at build time, not at run time as in the case of the Debian "
+"Installer. That's not to say that a live image couldn't be built to support "
+"multiple desktops or multiple languages and offer the user a choice, but "
+"that is not live-build's default behaviour."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:213
+#: en/user_customization-packages.ssi:199
msgid ""
-"First, there is no provision made yet automatically for language tasks, "
-"although a subset of those packages are included if you specify #{lb config "
-"--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:"
+"Because there is no provision made automatically for language tasks, which "
+"include such things as language-specific fonts and input-method packages, if "
+"you want them, you need to specify them in your configuration. For example, "
+"a GNOME desktop image containing support for Japanese might include these "
+"tasks:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:217
+#: en/user_customization-packages.ssi:205
#, no-wrap
-msgid " $ lb config --tasks \"japanese japanese-desktop japanese-gnome-desktop\"\n"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:221
msgid ""
-"Second, live-build supports #{*-desktop}# virtual package lists for each of "
-"the desktop flavours mentioned above, which select the #{standard-x11}# "
-"predefined package list, the corresponding #{*-desktop}# task and three "
-"additional tasks: #{desktop}#, #{standard}# and #{laptop}#. So, for example, "
-"if you specify #{--packages-lists gnome-desktop}#, it is equivalent to "
-"specifying #{--packages debian-installer-launcher --packages-lists standard-"
-"x11 --tasks \"gnome-desktop desktop standard laptop\"}#."
+" $ lb config\n"
+" $ echo \"gnome-desktop desktop standard laptop\" >> config/task-lists/my.list.chroot\n"
+" $ echo \"japanese japanese-desktop japanese-gnome-desktop\" >> config/task-lists/my.list.chroot\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:223
+#: en/user_customization-packages.ssi:209
msgid ""
-"Third, if any of the tasks for these desktop flavours are selected, either "
-"explicitly through #{--tasks}# or implicitly by #{--packages-lists}#, 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."
+"Since desktop tasks are \"internal\" tasks, for every desktop flavour task "
+"included in the image, the corresponding value, if it differs from the "
+"default, \"gnome\", must be preseeded in the \"tasksel/desktop\" debconf "
+"variable or else tasksel will not recognize and install it. Thus:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:225
+#: en/user_customization-packages.ssi:214
#, no-wrap
-msgid "*{Note:}* There is also an experimental #{--language}# option that has an overlapping purpose with language tasks. For any language for which it is known that there are #{*-l10n}# packages, if #{--language}# is specified, those packages will be installed. Furthermore, if any #{syslinux}# templates matching the language are found, they will be used instead of the default English templates. The package selection done by #{--language}# is a poor approximation of language tasks, as it requires that the list of packages to include per language be maintained internally in live-build, and besides, language tasks are more comprehensive and flexible. However, the #{syslinux}# aspect is still useful. Thus, if you use #{--bootloader syslinux}# and templates for the specified language exist either in #{/usr/share/live/build/templates/syslinux/}# or #{config/templates/syslinux/}#, consider using this option, possibly in combination with tasks to ensure all relevant packages are in
stalled. For example:\n"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:229
-#, no-wrap
-msgid " $ lb config --language es\n"
+msgid ""
+" $ lb config\n"
+" $ echo 'tasksel tasksel/desktop multiselect kde' >> config/preseed/my.preseed.chroot\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:233
+#: en/user_customization-packages.ssi:218
msgid ""
-"Even so, it is limited in that it only supports a single language and a "
-"single bootloader. Therefore, for all of these reasons, the future of this "
-"option is under review, possibly to be replaced with something entirely "
-"different in the next major release of live-build."
+"This parameter can take multiple values, e.g. \"lxde xfce\" instead of \"kde"
+"\"."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:235
+#: en/user_customization-packages.ssi:220
msgid ""
"2~installing-modified-or-third-party-packages Installing modified or third-"
"party packages"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:237
+#: en/user_customization-packages.ssi:222
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 "
@@ -780,7 +727,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:239
+#: en/user_customization-packages.ssi:224
msgid ""
"This section does not cover advice regarding building or maintaining "
"modified packages. Joachim Breitner's 'How to fork privately' method from "
@@ -791,90 +738,90 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:241
+#: en/user_customization-packages.ssi:226
msgid "There are two ways of installing modified custom packages:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:243
-msgid "_* #{chroot_local-packages}#"
+#: en/user_customization-packages.ssi:228
+msgid "_* #{packages.chroot}#"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:245
+#: en/user_customization-packages.ssi:230
msgid "_* Using a custom APT repository"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:247
+#: en/user_customization-packages.ssi:232
msgid ""
-"Using #{chroot_local-packages}# is simpler to achieve and useful for \"one-"
-"off\" customizations but has a number of drawbacks, whilst using a custom "
-"APT repository is more time-consuming to set up."
+"Using #{packages.chroot}# 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:249
-msgid "3~ Using #{chroot_local-packages}# to install custom packages"
+#: en/user_customization-packages.ssi:234
+msgid "3~ Using #{packages.chroot}# to install custom packages"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:251
+#: en/user_customization-packages.ssi:236
msgid ""
-"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/packages.chroot/}"
+"# 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:253
+#: en/user_customization-packages.ssi:238
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:255
+#: en/user_customization-packages.ssi:240
msgid ""
-"Using #{chroot_local-packages}# for installation of custom packages has "
+"Using #{packages.chroot}# for installation of custom packages has "
"disadvantages:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:257
+#: en/user_customization-packages.ssi:242
msgid "_* It is not possible to use secure APT."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:259
+#: en/user_customization-packages.ssi:244
msgid ""
-"_* You must install all appropriate packages in the #{config/chroot_local-"
-"packages/}# directory."
+"_* You must install all appropriate packages in the #{config/packages."
+"chroot/}# directory."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:261
+#: en/user_customization-packages.ssi:246
msgid ""
"_* It does not lend itself to storing Debian Live configurations in revision "
"control."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:263
+#: en/user_customization-packages.ssi:248
msgid "3~ Using an APT repository to install custom packages"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:265
+#: en/user_customization-packages.ssi:250
msgid ""
-"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."
+"Unlike using #{packages.chroot}#, 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."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:267
+#: en/user_customization-packages.ssi:252
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 "
@@ -882,12 +829,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:269
+#: en/user_customization-packages.ssi:254
msgid "3~ Custom packages and APT"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:271
+#: en/user_customization-packages.ssi:256
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 "
@@ -897,7 +844,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:273
+#: en/user_customization-packages.ssi:258
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 "
@@ -907,28 +854,28 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:275
+#: en/user_customization-packages.ssi:260
msgid "2~ Configuring APT at build time"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:277
+#: en/user_customization-packages.ssi:262
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 "
+"appropriate configurations through #{config/includes.chroot/}#.) 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:279
+#: en/user_customization-packages.ssi:264
msgid "3~choosing-apt-or-aptitude Choosing apt or aptitude"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:281
+#: en/user_customization-packages.ssi:266
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 "
@@ -938,26 +885,26 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:283
+#: en/user_customization-packages.ssi:268
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:285
+#: en/user_customization-packages.ssi:270
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:287
+#: en/user_customization-packages.ssi:272
msgid "3~ Using a proxy with APT"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:289
+#: en/user_customization-packages.ssi:274
msgid ""
"One commonly required APT configuration is to deal with building an image "
"behind a proxy. You may specify your APT proxy with the #{--apt-ftp-proxy}# "
@@ -965,18 +912,18 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:293
+#: en/user_customization-packages.ssi:278
#, no-wrap
msgid " $ lb config --apt-http-proxy http://proxy/\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:297
+#: en/user_customization-packages.ssi:282
msgid "3~ Tweaking APT to save space"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:299
+#: en/user_customization-packages.ssi:284
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 "
@@ -984,20 +931,20 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:301
+#: en/user_customization-packages.ssi:286
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:305
+#: en/user_customization-packages.ssi:290
#, no-wrap
-msgid " $ lb config --binary-indices false\n"
+msgid " $ lb config --apt-indices false\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:309
+#: en/user_customization-packages.ssi:294
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 "
@@ -1007,20 +954,20 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:311
+#: en/user_customization-packages.ssi:296
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:315
+#: en/user_customization-packages.ssi:300
#, no-wrap
msgid " $ lb config --apt-recommends false\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:319
+#: en/user_customization-packages.ssi:304
msgid ""
"The tradeoff here is that if you don't install recommended packages for a "
"given package, that is, \"packages that would be found together with this "
@@ -1036,12 +983,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:321
+#: en/user_customization-packages.ssi:306
msgid "3~ Passing options to apt or aptitude"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:323
+#: en/user_customization-packages.ssi:308
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 "
@@ -1050,43 +997,43 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:325
+#: en/user_customization-packages.ssi:310
msgid "3~apt-pinning APT pinning"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:327
+#: en/user_customization-packages.ssi:312
msgid ""
"For background, please first read the #{apt_preferences(5)}# man page. APT "
"pinning can be configured either for build time, or else for run time. For "
"the former, create #{config/chroot_apt/preferences}#. For the latter, create "
-"#{config/chroot_local-includes/etc/apt/preferences}#."
+"#{config/includes.chroot/etc/apt/preferences}#."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:329
+#: en/user_customization-packages.ssi:314
msgid ""
-"Let's say you are building a Squeeze live system but need all the live "
+"Let's say you are building a Wheezy live system but need all the live "
"packages that end up in the binary image to be installed from Sid at build "
"time. You need to add Sid to your APT sources and pin it so that only the "
"packages you want are installed from it at build time and all others are "
-"taken from the target system distribution, Squeeze. The following will "
+"taken from the target system distribution, Wheezy. The following will "
"accomplish this:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:322
#, no-wrap
msgid ""
-" $ echo \"deb http://mirror/debian sid main\" > config/chroot_sources/sid.chroot\n"
-" $ cat >>config/chroot_apt/preferences <<END\n"
+" $ echo \"deb http://mirror/debian sid main\" > config/archives/sid.list.chroot\n"
+" $ cat >> config/chroot_apt/preferences <<END\n"
" Package: live-boot live-boot-initramfs-tools live-config live-config-sysvinit\n"
" Pin: release n=sid\n"
" Pin-Priority: 600\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:342
+#: en/user_customization-packages.ssi:327
#, no-wrap
msgid ""
" Package: *\n"
@@ -1096,31 +1043,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:346
+#: en/user_customization-packages.ssi:331
#, no-wrap
msgid "*{Note:}* Wildcards can be used in package names (e.g. *{Package: live-*}*) with Apt version 0.8.14 or higher. This means that it works with Wheezy using:\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:350
+#: en/user_customization-packages.ssi:335
msgid "$ lb config --distribution wheezy"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:354
+#: en/user_customization-packages.ssi:339
msgid ""
"Negative pin priorities will prevent a package from being installed, as in "
"the case where you do not want a package that is recommended by another "
-"package. Suppose you are building an LXDE image using #{--packages-lists "
-"lxde}# option, but don't want the user prompted to store wifi passwords in "
-"the keyring. This list includes #{gdm}#, which depends on #{gksu}#, which in "
+"package. Suppose you are building an LXDE image using #{--package-lists lxde}"
+"# option, but don't want the user prompted to store wifi passwords in the "
+"keyring. This list includes #{gdm}#, which depends on #{gksu}#, which in "
"turn recommends #{gnome-keyring}#. So you want to omit the recommended #"
"{gnome-keyring}# package. This can be done by adding the following stanza to "
"#{config/chroot_apt/preferences}#:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:360
+#: en/user_customization-packages.ssi:345
#, no-wrap
msgid ""
" Package: gnome-keyring\n"
diff --git a/manual/po/ro/user_customization-runtime.ssi.po b/manual/po/ro/user_customization-runtime.ssi.po
index c782616..81415fc 100644
--- a/manual/po/ro/user_customization-runtime.ssi.po
+++ b/manual/po/ro/user_customization-runtime.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-08-25 17:01+0300\n"
+"POT-Creation-Date: 2011-11-07 21:01-0400\n"
"PO-Revision-Date: 2010-11-30 11:40+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -38,48 +38,47 @@ msgstr ""
#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
-#: en/user_customization-installer.ssi:43
+#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
-#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:53
-#: en/user_customization-packages.ssi:66 en/user_customization-packages.ssi:80
-#: en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:112
-#: en/user_customization-packages.ssi:142
-#: en/user_customization-packages.ssi:155
-#: en/user_customization-packages.ssi:165
-#: en/user_customization-packages.ssi:175
-#: en/user_customization-packages.ssi:185
-#: en/user_customization-packages.ssi:199
-#: en/user_customization-packages.ssi:215
-#: en/user_customization-packages.ssi:227
-#: en/user_customization-packages.ssi:291
-#: en/user_customization-packages.ssi:303
-#: en/user_customization-packages.ssi:313
-#: en/user_customization-packages.ssi:331
-#: en/user_customization-packages.ssi:348
-#: en/user_customization-packages.ssi:356 en/user_customization-runtime.ssi:14
-#: en/user_customization-runtime.ssi:24 en/user_customization-runtime.ssi:44
-#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:63
-#: en/user_customization-runtime.ssi:71 en/user_customization-runtime.ssi:80
-#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:111
-#: en/user_customization-runtime.ssi:119 en/user_examples.ssi:14
+#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:54
+#: en/user_customization-packages.ssi:67 en/user_customization-packages.ssi:81
+#: en/user_customization-packages.ssi:101
+#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:140
+#: en/user_customization-packages.ssi:150
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:184
+#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:276
+#: en/user_customization-packages.ssi:288
+#: en/user_customization-packages.ssi:298
+#: en/user_customization-packages.ssi:316
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
+#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
+#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
+#: en/user_customization-runtime.ssi:104 en/user_customization-runtime.ssi:114
+#: en/user_customization-runtime.ssi:122 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:178 en/user_examples.ssi:190 en/user_examples.ssi:206
-#: en/user_examples.ssi:220 en/user_examples.ssi:229 en/user_examples.ssi:247
-#: en/user_examples.ssi:255 en/user_examples.ssi:268 en/user_examples.ssi:283
-#: en/user_installation.ssi:38 en/user_installation.ssi:46
-#: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi:74 en/user_installation.ssi:82
-#: en/user_installation.ssi:90 en/user_installation.ssi:114
-#: en/user_installation.ssi:129 en/user_installation.ssi:146
-#: en/user_managing_a_configuration.ssi:24
+#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
+#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
+#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
+#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
+#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
+#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
+#: en/user_examples.ssi:277 en/user_installation.ssi:38
+#: en/user_installation.ssi:46 en/user_installation.ssi:56
+#: en/user_installation.ssi:64 en/user_installation.ssi:74
+#: en/user_installation.ssi:82 en/user_installation.ssi:90
+#: en/user_installation.ssi:114 en/user_installation.ssi:129
+#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:80 en/user_overview.ssi:88
+#: en/user_overview.ssi:48 en/user_overview.ssi:56
msgid "code{"
msgstr "code{"
@@ -103,49 +102,48 @@ msgstr "code{"
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
-#: en/user_customization-installer.ssi:37
-#: en/user_customization-installer.ssi:48
+#: en/user_customization-installer.ssi:38
+#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:70 en/user_customization-packages.ssi:84
-#: en/user_customization-packages.ssi:98
-#: en/user_customization-packages.ssi:116
-#: en/user_customization-packages.ssi:147
-#: en/user_customization-packages.ssi:161
-#: en/user_customization-packages.ssi:171
-#: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:191
-#: en/user_customization-packages.ssi:203
-#: en/user_customization-packages.ssi:219
-#: en/user_customization-packages.ssi:231
-#: en/user_customization-packages.ssi:295
-#: en/user_customization-packages.ssi:307
-#: en/user_customization-packages.ssi:317
-#: en/user_customization-packages.ssi:344
-#: en/user_customization-packages.ssi:352
-#: en/user_customization-packages.ssi:361 en/user_customization-runtime.ssi:18
-#: en/user_customization-runtime.ssi:28 en/user_customization-runtime.ssi:48
-#: en/user_customization-runtime.ssi:59 en/user_customization-runtime.ssi:67
-#: en/user_customization-runtime.ssi:76 en/user_customization-runtime.ssi:85
-#: en/user_customization-runtime.ssi:105 en/user_customization-runtime.ssi:115
-#: en/user_customization-runtime.ssi:124 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:186 en/user_examples.ssi:202 en/user_examples.ssi:210
-#: en/user_examples.ssi:225 en/user_examples.ssi:233 en/user_examples.ssi:251
-#: en/user_examples.ssi:264 en/user_examples.ssi:279 en/user_examples.ssi:297
-#: en/user_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi:70
-#: en/user_installation.ssi:78 en/user_installation.ssi:86
-#: en/user_installation.ssi:94 en/user_installation.ssi:119
-#: en/user_installation.ssi:136 en/user_installation.ssi:149
-#: en/user_managing_a_configuration.ssi:31
+#: en/user_customization-packages.ssi:46 en/user_customization-packages.ssi:59
+#: en/user_customization-packages.ssi:71 en/user_customization-packages.ssi:85
+#: en/user_customization-packages.ssi:105
+#: en/user_customization-packages.ssi:132
+#: en/user_customization-packages.ssi:146
+#: en/user_customization-packages.ssi:156
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:329
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:346 en/user_customization-runtime.ssi:21
+#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
+#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
+#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
+#: en/user_customization-runtime.ssi:108 en/user_customization-runtime.ssi:118
+#: en/user_customization-runtime.ssi:127 en/user_examples.ssi:20
+#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
+#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
+#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
+#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
+#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
+#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
+#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
+#: en/user_examples.ssi:291 en/user_installation.ssi:42
+#: en/user_installation.ssi:50 en/user_installation.ssi:60
+#: en/user_installation.ssi:70 en/user_installation.ssi:78
+#: en/user_installation.ssi:86 en/user_installation.ssi:94
+#: en/user_installation.ssi:119 en/user_installation.ssi:136
+#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
-#: en/user_overview.ssi:84 en/user_overview.ssi:92
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:42
+#: en/user_overview.ssi:52 en/user_overview.ssi:60
msgid "}code"
msgstr "}code"
@@ -188,18 +186,22 @@ msgstr ""
msgid ""
"You can specify additional groups that the live user will belong to by "
"preseeding the #{passwd/user-default-groups}# debconf value. For example, to "
-"add the live user to the #{fuse}# group, add the following to a file in the #"
-"{config/chroot_local-preseed}# directory:"
+"add the live user to the #{fuse}# group, add the following preseed under #"
+"{config/preseed/}# for the chroot stage:"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:16
+#: en/user_customization-runtime.ssi:19
#, no-wrap
-msgid " user-setup passwd/user-default-groups string audio cdrom dip floppy video plugdev netdev powerdev scanner bluetooth fuse\n"
+msgid ""
+" $ lb config\n"
+" $ echo user-setup passwd/user-default-groups string audio cdrom \\\n"
+" dip floppy video plugdev netdev powerdev scanner bluetooth fuse \\\n"
+" >> config/preseed/my.preseed.chroot\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:20
+#: en/user_customization-runtime.ssi:23
msgid ""
"It is also possible to change the default username \"user\" and the default "
"password \"live\". If you want to do that for any reason, you can easily "
@@ -207,53 +209,53 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:22
+#: en/user_customization-runtime.ssi:25
msgid ""
"To change the default username you can simply specify it in your config:"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:26
+#: en/user_customization-runtime.ssi:29
msgid "$ lb config --bootappend-live \"username=live-user\""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:30
+#: en/user_customization-runtime.ssi:33
msgid ""
"One possible way of changing the default password is by means of a hook as "
"described in {Boot-time hooks}#boot-time-hooks. In order to do that you can "
"use the \"passwd\" hook from #{/usr/share/doc/live-config/examples/hooks}#, "
-"prefix it accordingly (e.g. 200-passwd) and add it to #{config/chroot_local-"
-"includes/lib/live/config/}#"
+"prefix it accordingly (e.g. 200-passwd) and add it to #{config/includes."
+"chroot/lib/live/config/}#"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:32
+#: en/user_customization-runtime.ssi:35
msgid "2~customizing-locale-and-language Customizing locale and language"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:34
+#: en/user_customization-runtime.ssi:37
msgid "When the live system boots, language is involved in three steps:"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:36
+#: en/user_customization-runtime.ssi:39
msgid "_* the locale generation"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:38
+#: en/user_customization-runtime.ssi:41
msgid "_* setting the keyboard layout for the console"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:40
+#: en/user_customization-runtime.ssi:43
msgid "_* setting the keyboard layout for X"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:42
+#: en/user_customization-runtime.ssi:45
msgid ""
"The default locale when building a Live system is \"locales=en_US.UTF-8\". "
"To define the locale that should be generated, use the #{locales}# parameter "
@@ -261,20 +263,20 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:46
+#: en/user_customization-runtime.ssi:49
#, no-wrap
msgid " $ lb config --bootappend-live \"locales=de_CH.UTF-8\"\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:50
+#: en/user_customization-runtime.ssi:53
msgid ""
"This parameter can also be used at the kernel command line. You can specify "
"a locale by a full #{language_country.encoding}# word."
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:52
+#: en/user_customization-runtime.ssi:55
msgid ""
"Both the console and X keyboard configuration depend on the #{keyboard-"
"layouts}# parameter of the #{--bootappend-live}# option. Valid options for X "
@@ -285,7 +287,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:57
+#: en/user_customization-runtime.ssi:60
#, no-wrap
msgid ""
" $ grep -i sweden -C3 /usr/share/X11/xkb/rules/base.xml | grep name\n"
@@ -293,26 +295,26 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:61
+#: en/user_customization-runtime.ssi:64
msgid ""
"To get the locale files for German and Swiss German keyboard layout in X use:"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:65
+#: en/user_customization-runtime.ssi:68
#, no-wrap
msgid " $ lb config --bootappend-live \"locales=de_CH.UTF-8 keyboard-layouts=ch\"\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:69
+#: en/user_customization-runtime.ssi:72
msgid ""
"A list of the valid values of the keyboards for the console can be figured "
"with the following command:"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:74
+#: en/user_customization-runtime.ssi:77
#, no-wrap
msgid ""
" $ for i in $(find /usr/share/keymaps/ -iname \"*kmap.gz\"); \\\n"
@@ -320,7 +322,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:78
+#: en/user_customization-runtime.ssi:81
msgid ""
"Alternatively, you can use the #{console-setup}# package, a tool to let you "
"configure console layout using X (XKB) definitions; you can then set your "
@@ -332,7 +334,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:83
+#: en/user_customization-runtime.ssi:86
#, no-wrap
msgid ""
" $ lb config --bootappend-live \\\n"
@@ -340,12 +342,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:87
+#: en/user_customization-runtime.ssi:90
msgid "2~persistence Persistence"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:89
+#: en/user_customization-runtime.ssi:92
msgid ""
"A live cd paradigm is a pre-installed system which runs from read-only "
"media, like a cdrom, where writes and modifications do not survive reboots "
@@ -353,7 +355,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:91
+#: en/user_customization-runtime.ssi:94
msgid ""
"A Debian Live system is a generalization of this paradigm and thus supports "
"other media in addition to CDs; but still, in its default behaviour, it "
@@ -362,7 +364,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:93
+#: en/user_customization-runtime.ssi:96
msgid ""
"Persistence is a common name for different kinds of solutions for saving "
"across reboots some, or all, of this run-time evolution of the system. To "
@@ -373,7 +375,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:95
+#: en/user_customization-runtime.ssi:98
msgid ""
"The data stored on this ramdisk should be saved on a writable persistent "
"medium like a Hard Disk, a USB key, a network share or even a session of a "
@@ -383,12 +385,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:97
+#: en/user_customization-runtime.ssi:100
msgid "3~ Full persistence"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:99
+#: en/user_customization-runtime.ssi:102
msgid ""
"By 'full persistence' it is meant that instead of using a tmpfs for storing "
"modifications to the read-only media (with the copy-on-write, COW, system) a "
@@ -400,31 +402,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:103
+#: en/user_customization-runtime.ssi:106
#, no-wrap
msgid " # mkfs.ext2 -L live-rw /dev/sdb1\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:107
+#: en/user_customization-runtime.ssi:110
msgid "See also {Using the space left on a USB stick}#using-usb-extra-space."
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:109
+#: en/user_customization-runtime.ssi:112
msgid ""
"If you already have a partition on your device, you could just change the "
"label with one of the following:"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:113
+#: en/user_customization-runtime.ssi:116
#, no-wrap
msgid " # tune2fs -L live-rw /dev/sdb1 # for ext2,3,4 filesystems\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:117
+#: en/user_customization-runtime.ssi:120
msgid ""
"But since live system users cannot always use a hard drive partition, and "
"considering that most USB keys have poor write speeds, 'full' persistence "
@@ -434,7 +436,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:122
+#: en/user_customization-runtime.ssi:125
#, no-wrap
msgid ""
" $ dd if=/dev/null of=live-rw bs=1G seek=1 # for a 1GB sized image file\n"
@@ -442,19 +444,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:126
+#: en/user_customization-runtime.ssi:129
msgid ""
"Then copy the #{live-rw}# file to a writable partition and reboot with the "
"boot parameter 'persistent'."
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:128
+#: en/user_customization-runtime.ssi:131
msgid "3~ Home automounting"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:130
+#: en/user_customization-runtime.ssi:133
msgid ""
"If during the boot a partition (filesystem) image file or a partition "
"labeled #{home-rw}# is discovered, this filesystem will be directly mounted "
@@ -463,12 +465,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:132
+#: en/user_customization-runtime.ssi:135
msgid "3~ Snapshots"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:134
+#: en/user_customization-runtime.ssi:137
msgid ""
"Snapshots are collections of files and directories which are not mounted "
"while running but which are copied from a persistent device to the system "
@@ -485,26 +487,26 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:136
+#: en/user_customization-runtime.ssi:139
msgid ""
"A /home version of snapshot exists too and its label is #{home-sn.*}#; it "
"works the same as the main snapshot but it is only applied to /home."
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:138
+#: en/user_customization-runtime.ssi:141
msgid ""
"Snapshots cannot currently handle file deletion but full persistence and "
"home automounting can."
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:140
+#: en/user_customization-runtime.ssi:143
msgid "3~ Persistent SubText"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:142
+#: en/user_customization-runtime.ssi:145
msgid ""
"If a user would need multiple persistent storage of the same type for "
"different locations or testing, such as #{live-rw-nonwork}# and #{live-rw-"
@@ -516,12 +518,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:144
+#: en/user_customization-runtime.ssi:147
msgid "3~ Partial remastering"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:145
+#: en/user_customization-runtime.ssi:148
msgid ""
"The run-time modification of the tmpfs could be collected using live-"
"snapshot in a squashfs and added to the cd by remastering the iso in the "
diff --git a/manual/po/ro/user_examples.ssi.po b/manual/po/ro/user_examples.ssi.po
index b299e57..3f33218 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 2.0.0\n"
-"POT-Creation-Date: 2011-03-18 07:39-0200\n"
+"POT-Creation-Date: 2011-11-13 17:12+0100\n"
"PO-Revision-Date: 2010-11-04 16:34-0400\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -32,48 +32,49 @@ msgstr ""
#: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/user_basics.ssi:30 en/user_basics.ssi:40
-#: en/user_basics.ssi:56 en/user_basics.ssi:71 en/user_basics.ssi:106
-#: en/user_basics.ssi:114 en/user_basics.ssi:126 en/user_basics.ssi:138
-#: en/user_basics.ssi:150 en/user_basics.ssi:158 en/user_basics.ssi:166
-#: en/user_basics.ssi:182 en/user_basics.ssi:192 en/user_basics.ssi:200
-#: en/user_basics.ssi:216 en/user_basics.ssi:224 en/user_basics.ssi:234
-#: en/user_basics.ssi:252 en/user_basics.ssi:280 en/user_basics.ssi:296
-#: en/user_basics.ssi:304 en/user_basics.ssi:324 en/user_basics.ssi:349
+#: en/project_procedures.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
+#: en/user_basics.ssi:116 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:184 en/user_basics.ssi:194 en/user_basics.ssi:202
+#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
+#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
+#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
-#: en/user_customization-installer.ssi:43
+#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
-#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:53
-#: en/user_customization-packages.ssi:66 en/user_customization-packages.ssi:80
-#: en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:112
-#: en/user_customization-packages.ssi:142
-#: en/user_customization-packages.ssi:155
-#: en/user_customization-packages.ssi:165
-#: en/user_customization-packages.ssi:175
-#: en/user_customization-packages.ssi:185
-#: en/user_customization-packages.ssi:199
-#: en/user_customization-packages.ssi:215
-#: en/user_customization-packages.ssi:227
-#: en/user_customization-packages.ssi:291
-#: en/user_customization-packages.ssi:303
-#: en/user_customization-packages.ssi:313
-#: en/user_customization-packages.ssi:331
-#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
-#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
-#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
-#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
-#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:105
-#: 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:178 en/user_examples.ssi:190
-#: en/user_examples.ssi:206 en/user_examples.ssi:220 en/user_examples.ssi:229
-#: en/user_examples.ssi:247 en/user_examples.ssi:255 en/user_examples.ssi:268
-#: en/user_examples.ssi:283 en/user_installation.ssi:38
+#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:54
+#: en/user_customization-packages.ssi:67 en/user_customization-packages.ssi:81
+#: en/user_customization-packages.ssi:101
+#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:140
+#: en/user_customization-packages.ssi:150
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:184
+#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:276
+#: en/user_customization-packages.ssi:288
+#: en/user_customization-packages.ssi:298
+#: en/user_customization-packages.ssi:316
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
+#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
+#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
+#: en/user_customization-runtime.ssi:104 en/user_customization-runtime.ssi:114
+#: en/user_customization-runtime.ssi:122 en/user_examples.ssi:14
+#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
+#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
+#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
+#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
+#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
+#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
+#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
+#: en/user_examples.ssi:277 en/user_installation.ssi:38
#: en/user_installation.ssi:46 en/user_installation.ssi:56
#: en/user_installation.ssi:64 en/user_installation.ssi:74
#: en/user_installation.ssi:82 en/user_installation.ssi:90
@@ -82,7 +83,7 @@ msgstr ""
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:80 en/user_overview.ssi:88
+#: en/user_overview.ssi:48 en/user_overview.ssi:56
msgid "code{"
msgstr "code{"
@@ -96,48 +97,49 @@ msgstr "code{"
#: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/user_basics.ssi:34 en/user_basics.ssi:44
-#: en/user_basics.ssi:62 en/user_basics.ssi:75 en/user_basics.ssi:110
-#: en/user_basics.ssi:118 en/user_basics.ssi:132 en/user_basics.ssi:142
-#: en/user_basics.ssi:154 en/user_basics.ssi:162 en/user_basics.ssi:170
-#: en/user_basics.ssi:186 en/user_basics.ssi:196 en/user_basics.ssi:204
-#: en/user_basics.ssi:220 en/user_basics.ssi:228 en/user_basics.ssi:238
-#: en/user_basics.ssi:272 en/user_basics.ssi:284 en/user_basics.ssi:300
-#: en/user_basics.ssi:308 en/user_basics.ssi:335 en/user_basics.ssi:374
+#: en/project_procedures.ssi:131 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
+#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
+#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
+#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
+#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
-#: en/user_customization-installer.ssi:37
-#: en/user_customization-installer.ssi:48
+#: en/user_customization-installer.ssi:38
+#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:70 en/user_customization-packages.ssi:84
-#: en/user_customization-packages.ssi:98
-#: en/user_customization-packages.ssi:116
-#: en/user_customization-packages.ssi:147
-#: en/user_customization-packages.ssi:161
-#: en/user_customization-packages.ssi:171
-#: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:191
-#: en/user_customization-packages.ssi:203
-#: en/user_customization-packages.ssi:219
-#: en/user_customization-packages.ssi:231
-#: en/user_customization-packages.ssi:295
-#: en/user_customization-packages.ssi:307
-#: en/user_customization-packages.ssi:317
-#: en/user_customization-packages.ssi:344
-#: en/user_customization-packages.ssi:353 en/user_customization-runtime.ssi:18
-#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
-#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
-#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
-#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:110
-#: 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:186 en/user_examples.ssi:202
-#: en/user_examples.ssi:210 en/user_examples.ssi:225 en/user_examples.ssi:233
-#: en/user_examples.ssi:251 en/user_examples.ssi:264 en/user_examples.ssi:279
-#: en/user_examples.ssi:297 en/user_installation.ssi:42
+#: en/user_customization-packages.ssi:46 en/user_customization-packages.ssi:59
+#: en/user_customization-packages.ssi:71 en/user_customization-packages.ssi:85
+#: en/user_customization-packages.ssi:105
+#: en/user_customization-packages.ssi:132
+#: en/user_customization-packages.ssi:146
+#: en/user_customization-packages.ssi:156
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:329
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:346 en/user_customization-runtime.ssi:21
+#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
+#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
+#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
+#: en/user_customization-runtime.ssi:108 en/user_customization-runtime.ssi:118
+#: en/user_customization-runtime.ssi:127 en/user_examples.ssi:20
+#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
+#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
+#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
+#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
+#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
+#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
+#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
+#: en/user_examples.ssi:291 en/user_installation.ssi:42
#: en/user_installation.ssi:50 en/user_installation.ssi:60
#: en/user_installation.ssi:70 en/user_installation.ssi:78
#: en/user_installation.ssi:86 en/user_installation.ssi:94
@@ -145,14 +147,14 @@ msgstr "code{"
#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
-#: en/user_overview.ssi:84 en/user_overview.ssi:92
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:42
+#: en/user_overview.ssi:52 en/user_overview.ssi:60
msgid "}code"
msgstr "}code"
#. type: Plain text
-#: en/user_basics.ssi:42 en/user_basics.ssi:168 en/user_basics.ssi:236
-#: en/user_examples.ssi:109 en/user_examples.ssi:208
+#: en/user_basics.ssi:44 en/user_basics.ssi:170 en/user_basics.ssi:238
+#: en/user_examples.ssi:119 en/user_examples.ssi:211
#, no-wrap
msgid " # lb build\n"
msgstr ""
@@ -193,17 +195,18 @@ msgid ""
"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:"
+"and in it, set the corresponding #{LB_PARENT_MIRROR_*}# variables to your "
+"preferred mirror. All other mirrors used in the build will be defaulted from "
+"these values. For example:"
msgstr ""
#. type: Plain text
#: en/user_examples.ssi:18
#, no-wrap
msgid ""
-" LB_MIRROR_BOOTSTRAP=\"http://mirror/debian\"\n"
-" LB_MIRROR_CHROOT=\"http://mirror/debian\"\n"
-" LB_MIRROR_CHROOT_SECURITY=\"http://mirror/debian-security\"\n"
+" LB_PARENT_MIRROR_BOOTSTRAP=\"http://mirror/debian\"\n"
+" LB_PARENT_MIRROR_CHROOT_SECURITY=\"http://mirror/debian-security\"\n"
+" LB_PARENT_MIRROR_CHROOT_BACKPORTS=\"http://mirror/debian-updates\"\n"
msgstr ""
#. type: Plain text
@@ -251,7 +254,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:42 en/user_examples.ssi:66 en/user_examples.ssi:231
+#: en/user_examples.ssi:42 en/user_examples.ssi:69 en/user_examples.ssi:234
#, no-wrap
msgid " # lb build 2>&1 | tee binary.log\n"
msgstr ""
@@ -288,47 +291,51 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:56
+#: en/user_examples.ssi:59
#, no-wrap
-msgid " $ mkdir tutorial2 ; cd tutorial2 ; lb config -p lxde --packages iceweasel\n"
+msgid ""
+" $ mkdir tutorial2\n"
+" $ cd tutorial2\n"
+" $ lb config -p lxde\n"
+" $ echo iceweasel >> config/package-lists/my.list.chroot\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:60
+#: en/user_examples.ssi:63
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."
+"configuration for the web browser in #{config/includes.chroot/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
+#: en/user_examples.ssi:65
msgid ""
"Build the image, again as superuser, keeping a log as in {Tutorial 1}"
"#tutorial-1:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:70
+#: en/user_examples.ssi:73
msgid "Again, verify the image is OK and test, as in {Tutorial 1}#tutorial-1."
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:72
+#: en/user_examples.ssi:75
msgid "2~tutorial-3 Tutorial 3: A personalized image"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:74
+#: en/user_examples.ssi:77
#, 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
+#: en/user_examples.ssi:79
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 "
@@ -339,12 +346,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:78
+#: en/user_examples.ssi:81
msgid "3~ First revision"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:84
+#: en/user_examples.ssi:87
#, no-wrap
msgid ""
" $ mkdir -p tutorial3/auto\n"
@@ -353,53 +360,63 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:88
+#: en/user_examples.ssi:91
msgid "Edit #{auto/config}# to read as follows:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:92 en/user_examples.ssi:141
+#: en/user_examples.ssi:95
#, no-wrap
msgid " #!/bin/sh\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:99
+#: en/user_examples.ssi:101
#, no-wrap
msgid ""
" lb config noauto \\\n"
" --architecture i386 \\\n"
-" --linux-flavours 686 \\\n"
-" --packages-lists lxde \\\n"
-" --packages \"iceweasel xchat\" \\\n"
+" --linux-flavours 686-pae \\\n"
+" --package-lists lxde \\\n"
" \"${@}\"\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:103
+#: en/user_examples.ssi:105
+msgid "Now populate your local package list:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:109
+#, no-wrap
+msgid " $ echo \"iceweasel xchat\" >> config/package-lists/my.list.chroot\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:113
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}#."
+"{--linux-flavours 686-pae}# 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
+#: en/user_examples.ssi:115
msgid "Now, build the image:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:113
+#: en/user_examples.ssi:123
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
+#: en/user_examples.ssi:125
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 "
@@ -407,7 +424,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:121
+#: en/user_examples.ssi:131
#, no-wrap
msgid ""
" $ git init\n"
@@ -416,19 +433,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:125
+#: en/user_examples.ssi:135
msgid "3~ Second revision"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:127
+#: en/user_examples.ssi:137
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
+#: en/user_examples.ssi:139
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 "
@@ -437,51 +454,47 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:133
+#: en/user_examples.ssi:143
#, no-wrap
msgid " # lb clean\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:137
-msgid "Now edit #{auto/config}# to add the #{vlc}# package:"
+#: en/user_examples.ssi:147
+msgid ""
+"Now append the #{vlc}# package to our local package list in #{config/package-"
+"lists/my.list.chroot}#:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:148
+#: en/user_examples.ssi:151
#, no-wrap
-msgid ""
-" lb config noauto \\\n"
-" --architecture i386 \\\n"
-" --linux-flavours 686 \\\n"
-" --packages-lists lxde \\\n"
-" --packages \"iceweasel xchat vlc\" \\\n"
-" \"${@}\"\n"
+msgid " $ echo vlc >> config/package-lists/my.list.chroot\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:152
+#: en/user_examples.ssi:155
msgid "Build again:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:156
+#: en/user_examples.ssi:159
msgid "# lb build"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:160
+#: en/user_examples.ssi:163
msgid "Test, and when you're satisfied, commit the next revision:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:164
+#: en/user_examples.ssi:167
#, no-wrap
msgid " $ git commit -a -m \"Adding vlc media player.\"\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:168
+#: en/user_examples.ssi:171
msgid ""
"Of course, more complicated changes to the configuration are possible, "
"perhaps adding files in subdirectories of #{config/}#. When you commit new "
@@ -492,7 +505,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:170
+#: en/user_examples.ssi:173
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 "
@@ -502,37 +515,37 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:172
+#: en/user_examples.ssi:175
msgid "2~ A VNC Kiosk Client"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:174
+#: en/user_examples.ssi:177
#, no-wrap
msgid "*{Use case:}* Create an image with live-build to boot directly to a VNC server.\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:176
+#: en/user_examples.ssi:179
msgid ""
"Make a build directory and create a skeletal configuration in it built "
"around the standard-x11 list, including #{gdm3}#, #{metacity}# and #"
-"{xtightvncviewer}#, disabling recommends to make a minimal system:"
+"{xvnc4viewer}#, disabling recommends to make a minimal system:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:184
+#: en/user_examples.ssi:187
#, no-wrap
msgid ""
" $ mkdir vnc_kiosk_client\n"
" $ cd vnc_kiosk_client\n"
-" $ lb config -a i386 -k 686 -p standard-x11 \\\n"
-" --packages \"gdm3 metacity xvnc4viewer\" \\\n"
+" $ lb config -a i386 -k 686-pae -p standard-x11 \\\n"
" --apt-recommends false\n"
+" $ echo \"gdm3 metacity xvnc4viewer\" >> config/package-lists/my.list.chroot\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:188
+#: en/user_examples.ssi:191
msgid ""
"Create the directory #{/etc/skel}# and put a custom #{.xsession}# in it for "
"the default user that will launch metacity and start xvncviewer, connecting "
@@ -540,16 +553,16 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:194
+#: en/user_examples.ssi:197
#, no-wrap
msgid ""
-" $ mkdir -p config/chroot_local-includes/etc/skel\n"
-" $ cat >config/chroot_local-includes/etc/skel/.xsession <<END\n"
+" $ mkdir -p config/includes.chroot/etc/skel\n"
+" $ cat > config/includes.chroot/etc/skel/.xsession <<END\n"
" #!/bin/sh\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:197
+#: en/user_examples.ssi:200
#, no-wrap
msgid ""
" /usr/bin/metacity &\n"
@@ -557,7 +570,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:200
+#: en/user_examples.ssi:203
#, no-wrap
msgid ""
" exit\n"
@@ -565,28 +578,28 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:204
+#: en/user_examples.ssi:207
msgid "Build the image:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:212
+#: en/user_examples.ssi:215
msgid "Enjoy."
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:214
+#: en/user_examples.ssi:217
msgid "2~ A base image for a 128M USB key"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:216
+#: en/user_examples.ssi:219
#, 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:218
+#: en/user_examples.ssi:221
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 "
@@ -600,20 +613,20 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:223
+#: en/user_examples.ssi:226
#, no-wrap
msgid ""
-" $ lb config -k 486 -p minimal --binary-indices false \\\n"
+" $ lb config -k 486 -p minimal --apt-indices false \\\n"
" --memtest none --apt-recommends false --includes none\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:227
+#: en/user_examples.ssi:230
msgid "Now, build the image in the usual way:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:235
+#: en/user_examples.ssi:238
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 "
@@ -621,12 +634,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:237
+#: en/user_examples.ssi:240
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 "
+"instead of the default #{-k \"486 686-pae\"}#. Leaving off APT's indices "
+"with #{--apt-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 #{--"
@@ -639,18 +652,18 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:239
+#: en/user_examples.ssi:242
msgid "2~ A localized KDE desktop and installer"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:241
+#: en/user_examples.ssi:244
#, no-wrap
msgid "*{Use case:}* Create a KDE desktop image, localized for Brazilian Portuguese and including an installer.\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:243
+#: en/user_examples.ssi:246
msgid ""
"We want to make an iso-hybrid image for i386 architecture using our "
"preferred desktop, in this case KDE, containing all of the same packages "
@@ -658,76 +671,62 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:245
+#: en/user_examples.ssi:248
msgid ""
-"Our initial problem is the discovery of the names of the appropriate tasks. "
-"Currently, live-build cannot help with this. While we might get lucky and "
-"find this by trial-and-error, there is a tool, #{grep-dctrl}#, which can be "
-"used to dig it out of the task descriptions in tasksel-data, so to prepare, "
-"make sure you have both of those things:"
+"Our initial problem is the discovery of the names of the appropriate "
+"language tasks. Currently, live-build cannot help with this. While we might "
+"get lucky and find this by trial-and-error, there is a tool, #{grep-dctrl}#, "
+"which can be used to dig it out of the task descriptions in tasksel-data, so "
+"to prepare, make sure you have both of those things:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:249
+#: en/user_examples.ssi:252
#, no-wrap
msgid " # apt-get install dctrl-tools tasksel-data\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:253
+#: en/user_examples.ssi:256
msgid "Now we can search for the appropriate tasks, first with:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:262
+#: en/user_examples.ssi:261
#, no-wrap
msgid ""
-" $ grep-dctrl -FTest-lang pt_BR /usr/share/tasksel/debian-tasks.desc -sTask,Description\n"
+" $ grep-dctrl -FTest-lang pt_BR /usr/share/tasksel/descs/debian-tasks.desc -sTask\n"
" Task: brazilian-portuguese\n"
-" Description: Brazilian Portuguese environment\n"
-" This task installs programs, data files, and\n"
-" documentation that make it easier for Brazilian Portuguese speakers\n"
-" to use Debian.\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:266
+#: en/user_examples.ssi:265
msgid ""
"By this command, we discover the task is called, plainly enough, brazilian-"
"portuguese. Now to find the related tasks:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:273
+#: en/user_examples.ssi:271
#, no-wrap
msgid ""
-" $ grep-dctrl -FEnhances brazilian-portuguese /usr/share/tasksel/debian-tasks.desc -sTask,Description\n"
+" $ grep-dctrl -FEnhances brazilian-portuguese /usr/share/tasksel/descs/debian-tasks.desc -sTask\n"
" Task: brazilian-portuguese-desktop\n"
-" Description: Brazilian Portuguese desktop\n"
-" This task localises the desktop in Brasilian Portuguese.\n"
-msgstr ""
-
-#. type: Plain text
-#: en/user_examples.ssi:277
-#, no-wrap
-msgid ""
" Task: brazilian-portuguese-kde-desktop\n"
-" Description: Brazilian Portuguese KDE desktop\n"
-" This task localises the KDE desktop in Brazilian Portuguese.\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:281
+#: en/user_examples.ssi:275
msgid ""
-"We will use the experimental #{--language}# option, as live-build happens to "
-"include #{syslinux}# templates for pt_BR (see {Desktop and language tasks}"
-"#desktop-and-language-tasks for details). And at boot time we will generate "
-"the pt_BR.UTF-8 locale and select the pt-latin1 keyboard layout. Now let's "
-"put the pieces together:"
+"At boot time we will generate the pt_BR.UTF-8 locale and select the pt-"
+"latin1 keyboard layout. We will also need to preseed our desktop choice, "
+"\"kde\" so that tasksel will install the correct desktop task, as it differs "
+"from the default (see {Desktop and languages tasks}#desktop-and-language-"
+"tasks). Now let's put the pieces together:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:295
+#: en/user_examples.ssi:289
#, no-wrap
msgid ""
" $ mkdir live-pt_BR-kde\n"
@@ -735,16 +734,16 @@ msgid ""
" $ lb config \\\n"
" -a i386 \\\n"
" -k 486 \\\n"
-" -p kde-desktop \\\n"
-" --language pt_BR \\\n"
-" --tasks \"brazilian-portuguese brazilian-portuguese-desktop brazilian-portuguese-kde-desktop\" \\\n"
" --bootappend-live \"locales=pt_BR.UTF-8 keyboard-layouts=pt-latin1\" \\\n"
-" --debian-installer live \\\n"
-" --packages debian-installer-launcher\n"
+" --debian-installer live\n"
+" $ echo kde-desktop brazilian-portuguese brazilian-portuguese-desktop \\\n"
+" brazilian-portuguese-kde-desktop >> config/task-lists/my.list.chroot\n"
+" $ echo debian-installer-launcher >> config/package-lists/my.list.chroot\n"
+" $ echo tasksel tasksel/desktop multiselect kde >> config/preseed/my.preseed.chroot\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:298
+#: en/user_examples.ssi:292
msgid ""
"Note that we have included the #{debian-installer-launcher}# package to "
"launch the installer from the live desktop, and have also specified the 486 "
diff --git a/manual/po/ro/user_installation.ssi.po b/manual/po/ro/user_installation.ssi.po
index dfe12af..d13b05d 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 2.0.0\n"
-"POT-Creation-Date: 2011-06-21 09:17+0300\n"
+"POT-Creation-Date: 2011-11-07 17:40-0400\n"
"PO-Revision-Date: 2010-10-23 16:43+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -38,37 +38,38 @@ msgstr ""
#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
-#: en/user_customization-installer.ssi:43
+#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
-#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:53
-#: en/user_customization-packages.ssi:66 en/user_customization-packages.ssi:80
-#: en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:112
-#: en/user_customization-packages.ssi:142
-#: en/user_customization-packages.ssi:155
-#: en/user_customization-packages.ssi:165
-#: en/user_customization-packages.ssi:175
-#: en/user_customization-packages.ssi:185
-#: en/user_customization-packages.ssi:199
-#: en/user_customization-packages.ssi:215
-#: en/user_customization-packages.ssi:227
-#: en/user_customization-packages.ssi:291
-#: en/user_customization-packages.ssi:303
-#: en/user_customization-packages.ssi:313
-#: en/user_customization-packages.ssi:331
-#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
-#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
-#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
-#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
-#: en/user_customization-runtime.ssi:99 en/user_customization-runtime.ssi:107
-#: 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:178 en/user_examples.ssi:190
-#: en/user_examples.ssi:206 en/user_examples.ssi:220 en/user_examples.ssi:229
-#: en/user_examples.ssi:247 en/user_examples.ssi:255 en/user_examples.ssi:268
-#: en/user_examples.ssi:283 en/user_installation.ssi:38
+#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:54
+#: en/user_customization-packages.ssi:67 en/user_customization-packages.ssi:81
+#: en/user_customization-packages.ssi:101
+#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:140
+#: en/user_customization-packages.ssi:150
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:184
+#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:276
+#: en/user_customization-packages.ssi:288
+#: en/user_customization-packages.ssi:298
+#: en/user_customization-packages.ssi:316
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:24 en/user_customization-runtime.ssi:44
+#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:63
+#: en/user_customization-runtime.ssi:71 en/user_customization-runtime.ssi:80
+#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:111
+#: en/user_customization-runtime.ssi:119 en/user_examples.ssi:14
+#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
+#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
+#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
+#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
+#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
+#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
+#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
+#: en/user_examples.ssi:277 en/user_installation.ssi:38
#: en/user_installation.ssi:46 en/user_installation.ssi:56
#: en/user_installation.ssi:64 en/user_installation.ssi:74
#: en/user_installation.ssi:82 en/user_installation.ssi:90
@@ -77,7 +78,7 @@ msgstr ""
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:80 en/user_overview.ssi:88
+#: en/user_overview.ssi:48 en/user_overview.ssi:56
msgid "code{"
msgstr "code{"
@@ -101,38 +102,39 @@ msgstr "code{"
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
-#: en/user_customization-installer.ssi:37
-#: en/user_customization-installer.ssi:48
+#: en/user_customization-installer.ssi:38
+#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:70 en/user_customization-packages.ssi:84
-#: en/user_customization-packages.ssi:98
-#: en/user_customization-packages.ssi:116
-#: en/user_customization-packages.ssi:147
-#: en/user_customization-packages.ssi:161
-#: en/user_customization-packages.ssi:171
-#: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:191
-#: en/user_customization-packages.ssi:203
-#: en/user_customization-packages.ssi:219
-#: en/user_customization-packages.ssi:231
-#: en/user_customization-packages.ssi:295
-#: en/user_customization-packages.ssi:307
-#: en/user_customization-packages.ssi:317
-#: en/user_customization-packages.ssi:344
-#: en/user_customization-packages.ssi:353 en/user_customization-runtime.ssi:18
-#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
-#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
-#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
-#: en/user_customization-runtime.ssi:103 en/user_customization-runtime.ssi:112
-#: 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:186 en/user_examples.ssi:202
-#: en/user_examples.ssi:210 en/user_examples.ssi:225 en/user_examples.ssi:233
-#: en/user_examples.ssi:251 en/user_examples.ssi:264 en/user_examples.ssi:279
-#: en/user_examples.ssi:297 en/user_installation.ssi:42
+#: en/user_customization-packages.ssi:46 en/user_customization-packages.ssi:59
+#: en/user_customization-packages.ssi:71 en/user_customization-packages.ssi:85
+#: en/user_customization-packages.ssi:105
+#: en/user_customization-packages.ssi:132
+#: en/user_customization-packages.ssi:146
+#: en/user_customization-packages.ssi:156
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:329
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:346 en/user_customization-runtime.ssi:18
+#: en/user_customization-runtime.ssi:28 en/user_customization-runtime.ssi:48
+#: en/user_customization-runtime.ssi:59 en/user_customization-runtime.ssi:67
+#: en/user_customization-runtime.ssi:76 en/user_customization-runtime.ssi:85
+#: en/user_customization-runtime.ssi:105 en/user_customization-runtime.ssi:115
+#: en/user_customization-runtime.ssi:124 en/user_examples.ssi:20
+#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
+#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
+#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
+#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
+#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
+#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
+#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
+#: en/user_examples.ssi:291 en/user_installation.ssi:42
#: en/user_installation.ssi:50 en/user_installation.ssi:60
#: en/user_installation.ssi:70 en/user_installation.ssi:78
#: en/user_installation.ssi:86 en/user_installation.ssi:94
@@ -140,15 +142,15 @@ msgstr "code{"
#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
-#: en/user_overview.ssi:84 en/user_overview.ssi:92
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:42
+#: en/user_overview.ssi:52 en/user_overview.ssi:60
msgid "}code"
msgstr "}code"
#. type: Plain text
-#: en/user_customization-packages.ssi:82 en/user_installation.ssi:148
+#: en/user_customization-packages.ssi:83 en/user_installation.ssi:148
#, no-wrap
-msgid " $ lb config --repository live.debian.net\n"
+msgid " $ lb config --archives live.debian.net\n"
msgstr ""
#. type: Plain text
@@ -351,7 +353,7 @@ msgstr ""
#. type: Plain text
#: en/user_installation.ssi:102
#, no-wrap
-msgid "*{Note:}* You do not need to install live-boot or live-config on your system to create customized Debian Live systems. However, doing so will do no harm and is useful for reference purposes.\n"
+msgid "*{Note:}* You do not need to install live-boot or live-config on your system to create customized Debian Live systems. However, doing so will do no harm and is useful for reference purposes. If you only want the documentation, you may now install the live-boot-doc and live-config-doc packages separately.\n"
msgstr ""
#. type: Plain text
@@ -397,8 +399,8 @@ msgstr ""
#: en/user_installation.ssi:125
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 "
-"build against Squeeze."
+"your target platform: this means if your target is Wheezy then you should "
+"build against Wheezy."
msgstr ""
#. type: Plain text
@@ -406,9 +408,9 @@ msgstr ""
msgid ""
"Use a personal builder such as /{pbuilder}/ or /{sbuild}/ if you need to "
"build #{live-boot}# for a target distribution that differs from your build "
-"system. For example, for Squeeze live images, build #{live-boot}# in a "
-"Squeeze chroot. If your target distribution happens to match your build "
-"system distribution, you may build directly on the build system using #{dpkg-"
+"system. For example, for Wheezy live images, build #{live-boot}# in a Wheezy "
+"chroot. If your target distribution happens to match your build system "
+"distribution, you may build directly on the build system using #{dpkg-"
"buildpackage}# (provided by the /{dpkg-dev}/ package):"
msgstr ""
@@ -444,5 +446,5 @@ msgid ""
"You can let live-build automatically use the latest snapshots of live-boot "
"and live-config by configuring a third-party repository in your live-build "
"configuration directory. Assuming you have already created a configuration "
-"tree with #{lb config}#:"
+"tree in the current directory with #{lb config}#:"
msgstr ""
diff --git a/manual/po/ro/user_managing_a_configuration.ssi.po b/manual/po/ro/user_managing_a_configuration.ssi.po
index 7508a18..f16d24f 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 2.0.0\n"
-"POT-Creation-Date: 2010-12-19 20:37-0400\n"
+"POT-Creation-Date: 2011-11-02 12:23-0200\n"
"PO-Revision-Date: 2010-10-13 17:00+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -20,55 +20,56 @@ msgstr ""
#. type: Plain text
#: 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/project_bugs.ssi:58
+#: en/about_manual.ssi:146 en/about_manual.ssi:157 en/about_manual.ssi:165
+#: en/about_manual.ssi:173 en/project_bugs.ssi:60
#: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
#: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
#: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/user_basics.ssi:30 en/user_basics.ssi:40
-#: en/user_basics.ssi:52 en/user_basics.ssi:64 en/user_basics.ssi:76
-#: en/user_basics.ssi:86 en/user_basics.ssi:100 en/user_basics.ssi:108
-#: en/user_basics.ssi:116 en/user_basics.ssi:126 en/user_basics.ssi:140
+#: en/project_procedures.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
+#: en/user_basics.ssi:116 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:218 en/user_basics.ssi:246 en/user_basics.ssi:262
-#: en/user_basics.ssi:270 en/user_basics.ssi:290 en/user_basics.ssi:315
+#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
+#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
+#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
+#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
-#: en/user_customization-installer.ssi:43
+#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
-#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:53
-#: en/user_customization-packages.ssi:66 en/user_customization-packages.ssi:80
-#: en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:112
-#: en/user_customization-packages.ssi:142
-#: en/user_customization-packages.ssi:155
-#: en/user_customization-packages.ssi:165
-#: en/user_customization-packages.ssi:175
-#: en/user_customization-packages.ssi:185
-#: en/user_customization-packages.ssi:199
-#: en/user_customization-packages.ssi:215
-#: en/user_customization-packages.ssi:227
-#: en/user_customization-packages.ssi:291
-#: en/user_customization-packages.ssi:303
-#: en/user_customization-packages.ssi:313
-#: en/user_customization-packages.ssi:331
-#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
-#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
-#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
-#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
-#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:106
-#: 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:178 en/user_examples.ssi:190
-#: en/user_examples.ssi:206 en/user_examples.ssi:220 en/user_examples.ssi:229
-#: en/user_examples.ssi:247 en/user_examples.ssi:255 en/user_examples.ssi:268
-#: en/user_examples.ssi:283 en/user_installation.ssi:38
+#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:54
+#: en/user_customization-packages.ssi:67 en/user_customization-packages.ssi:81
+#: en/user_customization-packages.ssi:101
+#: en/user_customization-packages.ssi:131
+#: en/user_customization-packages.ssi:144
+#: en/user_customization-packages.ssi:154
+#: en/user_customization-packages.ssi:164
+#: en/user_customization-packages.ssi:174
+#: en/user_customization-packages.ssi:188
+#: en/user_customization-packages.ssi:204
+#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:320
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:345 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:24 en/user_customization-runtime.ssi:44
+#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:63
+#: en/user_customization-runtime.ssi:71 en/user_customization-runtime.ssi:80
+#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:111
+#: en/user_customization-runtime.ssi:119 en/user_examples.ssi:14
+#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
+#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
+#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
+#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
+#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
+#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
+#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:271
+#: en/user_examples.ssi:286 en/user_installation.ssi:38
#: en/user_installation.ssi:46 en/user_installation.ssi:56
#: en/user_installation.ssi:64 en/user_installation.ssi:74
#: en/user_installation.ssi:82 en/user_installation.ssi:90
@@ -84,60 +85,61 @@ msgstr "code{"
#. type: Plain text
#: 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:174 en/project_bugs.ssi:62
+#: en/about_manual.ssi:151 en/about_manual.ssi:161 en/about_manual.ssi:169
+#: en/about_manual.ssi:177 en/project_bugs.ssi:64
#: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
#: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
#: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/user_basics.ssi:34 en/user_basics.ssi:44
-#: en/user_basics.ssi:58 en/user_basics.ssi:70 en/user_basics.ssi:80
-#: en/user_basics.ssi:92 en/user_basics.ssi:104 en/user_basics.ssi:112
-#: en/user_basics.ssi:120 en/user_basics.ssi:130 en/user_basics.ssi:146
+#: en/project_procedures.ssi:131 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:134 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:238 en/user_basics.ssi:250 en/user_basics.ssi:266
-#: en/user_basics.ssi:274 en/user_basics.ssi:301 en/user_basics.ssi:340
+#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
+#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
+#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
+#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
-#: en/user_customization-installer.ssi:37
-#: en/user_customization-installer.ssi:48
+#: en/user_customization-installer.ssi:38
+#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:70 en/user_customization-packages.ssi:84
-#: en/user_customization-packages.ssi:98
-#: en/user_customization-packages.ssi:116
-#: en/user_customization-packages.ssi:147
-#: en/user_customization-packages.ssi:161
-#: en/user_customization-packages.ssi:171
-#: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:191
-#: en/user_customization-packages.ssi:203
-#: en/user_customization-packages.ssi:219
-#: en/user_customization-packages.ssi:231
-#: en/user_customization-packages.ssi:295
-#: en/user_customization-packages.ssi:307
-#: en/user_customization-packages.ssi:317
-#: en/user_customization-packages.ssi:344
-#: en/user_customization-packages.ssi:354 en/user_customization-runtime.ssi:18
-#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
-#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
-#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
-#: en/user_customization-runtime.ssi:102 en/user_customization-runtime.ssi:111
-#: 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:186 en/user_examples.ssi:202
-#: en/user_examples.ssi:210 en/user_examples.ssi:225 en/user_examples.ssi:233
-#: en/user_examples.ssi:251 en/user_examples.ssi:264 en/user_examples.ssi:279
-#: en/user_examples.ssi:297 en/user_installation.ssi:42
+#: en/user_customization-packages.ssi:46 en/user_customization-packages.ssi:59
+#: en/user_customization-packages.ssi:71 en/user_customization-packages.ssi:85
+#: en/user_customization-packages.ssi:105
+#: en/user_customization-packages.ssi:136
+#: en/user_customization-packages.ssi:150
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:180
+#: en/user_customization-packages.ssi:192
+#: en/user_customization-packages.ssi:208
+#: en/user_customization-packages.ssi:220
+#: en/user_customization-packages.ssi:284
+#: en/user_customization-packages.ssi:296
+#: en/user_customization-packages.ssi:306
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341
+#: en/user_customization-packages.ssi:350 en/user_customization-runtime.ssi:18
+#: en/user_customization-runtime.ssi:28 en/user_customization-runtime.ssi:48
+#: en/user_customization-runtime.ssi:59 en/user_customization-runtime.ssi:67
+#: en/user_customization-runtime.ssi:76 en/user_customization-runtime.ssi:85
+#: en/user_customization-runtime.ssi:105 en/user_customization-runtime.ssi:115
+#: en/user_customization-runtime.ssi:124 en/user_examples.ssi:20
+#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
+#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
+#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
+#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
+#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
+#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
+#: en/user_examples.ssi:254 en/user_examples.ssi:267 en/user_examples.ssi:282
+#: en/user_examples.ssi:300 en/user_installation.ssi:42
#: en/user_installation.ssi:50 en/user_installation.ssi:60
#: en/user_installation.ssi:70 en/user_installation.ssi:78
#: en/user_installation.ssi:86 en/user_installation.ssi:94
#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_installation.ssi:150 en/user_managing_a_configuration.ssi:31
+#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
@@ -240,7 +242,7 @@ msgstr ""
msgid ""
" #!/bin/sh\n"
" lb config noauto \\\n"
-" --packages-lists \"standard\" \\\n"
+" --package-lists \"standard\" \\\n"
" \"${@}\"\n"
msgstr ""
@@ -287,10 +289,10 @@ msgid " $ cp /usr/share/live/build/examples/auto/* auto/\n"
msgstr ""
#. type: Plain text
-#: en/user_managing_a_configuration.ssi:62
+#: en/user_managing_a_configuration.ssi:61
msgid ""
"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. "
+"example above, #{--package-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/ro/user_overview.ssi.po b/manual/po/ro/user_overview.ssi.po
index fdacd76..4bd5b5d 100644
--- a/manual/po/ro/user_overview.ssi.po
+++ b/manual/po/ro/user_overview.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-05-13 12:02-0200\n"
+"POT-Creation-Date: 2011-11-07 08:16-0400\n"
"PO-Revision-Date: 2010-10-22 07:52-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -38,37 +38,38 @@ msgstr ""
#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
-#: en/user_customization-installer.ssi:43
+#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
-#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:53
-#: en/user_customization-packages.ssi:66 en/user_customization-packages.ssi:80
-#: en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:112
-#: en/user_customization-packages.ssi:142
-#: en/user_customization-packages.ssi:155
-#: en/user_customization-packages.ssi:165
-#: en/user_customization-packages.ssi:175
-#: en/user_customization-packages.ssi:185
-#: en/user_customization-packages.ssi:199
-#: en/user_customization-packages.ssi:215
-#: en/user_customization-packages.ssi:227
-#: en/user_customization-packages.ssi:291
-#: en/user_customization-packages.ssi:303
-#: en/user_customization-packages.ssi:313
-#: en/user_customization-packages.ssi:331
-#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
-#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
-#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
-#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
-#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:105
-#: 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:178 en/user_examples.ssi:190
-#: en/user_examples.ssi:206 en/user_examples.ssi:220 en/user_examples.ssi:229
-#: en/user_examples.ssi:247 en/user_examples.ssi:255 en/user_examples.ssi:268
-#: en/user_examples.ssi:283 en/user_installation.ssi:38
+#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:54
+#: en/user_customization-packages.ssi:67 en/user_customization-packages.ssi:81
+#: en/user_customization-packages.ssi:101
+#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:140
+#: en/user_customization-packages.ssi:150
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:184
+#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:276
+#: en/user_customization-packages.ssi:288
+#: en/user_customization-packages.ssi:298
+#: en/user_customization-packages.ssi:316
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:24 en/user_customization-runtime.ssi:44
+#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:63
+#: en/user_customization-runtime.ssi:71 en/user_customization-runtime.ssi:80
+#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:111
+#: en/user_customization-runtime.ssi:119 en/user_examples.ssi:14
+#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
+#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
+#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
+#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
+#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
+#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
+#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
+#: en/user_examples.ssi:277 en/user_installation.ssi:38
#: en/user_installation.ssi:46 en/user_installation.ssi:56
#: en/user_installation.ssi:64 en/user_installation.ssi:74
#: en/user_installation.ssi:82 en/user_installation.ssi:90
@@ -77,7 +78,7 @@ msgstr ""
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:80 en/user_overview.ssi:88
+#: en/user_overview.ssi:48 en/user_overview.ssi:56
msgid "code{"
msgstr "code{"
@@ -101,38 +102,39 @@ msgstr "code{"
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
-#: en/user_customization-installer.ssi:37
-#: en/user_customization-installer.ssi:48
+#: en/user_customization-installer.ssi:38
+#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:70 en/user_customization-packages.ssi:84
-#: en/user_customization-packages.ssi:98
-#: en/user_customization-packages.ssi:116
-#: en/user_customization-packages.ssi:147
-#: en/user_customization-packages.ssi:161
-#: en/user_customization-packages.ssi:171
-#: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:191
-#: en/user_customization-packages.ssi:203
-#: en/user_customization-packages.ssi:219
-#: en/user_customization-packages.ssi:231
-#: en/user_customization-packages.ssi:295
-#: en/user_customization-packages.ssi:307
-#: en/user_customization-packages.ssi:317
-#: en/user_customization-packages.ssi:344
-#: en/user_customization-packages.ssi:353 en/user_customization-runtime.ssi:18
-#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
-#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
-#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
-#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:110
-#: 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:186 en/user_examples.ssi:202
-#: en/user_examples.ssi:210 en/user_examples.ssi:225 en/user_examples.ssi:233
-#: en/user_examples.ssi:251 en/user_examples.ssi:264 en/user_examples.ssi:279
-#: en/user_examples.ssi:297 en/user_installation.ssi:42
+#: en/user_customization-packages.ssi:46 en/user_customization-packages.ssi:59
+#: en/user_customization-packages.ssi:71 en/user_customization-packages.ssi:85
+#: en/user_customization-packages.ssi:105
+#: en/user_customization-packages.ssi:132
+#: en/user_customization-packages.ssi:146
+#: en/user_customization-packages.ssi:156
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:329
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:346 en/user_customization-runtime.ssi:18
+#: en/user_customization-runtime.ssi:28 en/user_customization-runtime.ssi:48
+#: en/user_customization-runtime.ssi:59 en/user_customization-runtime.ssi:67
+#: en/user_customization-runtime.ssi:76 en/user_customization-runtime.ssi:85
+#: en/user_customization-runtime.ssi:105 en/user_customization-runtime.ssi:115
+#: en/user_customization-runtime.ssi:124 en/user_examples.ssi:20
+#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
+#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
+#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
+#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
+#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
+#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
+#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
+#: en/user_examples.ssi:291 en/user_installation.ssi:42
#: en/user_installation.ssi:50 en/user_installation.ssi:60
#: en/user_installation.ssi:70 en/user_installation.ssi:78
#: en/user_installation.ssi:86 en/user_installation.ssi:94
@@ -140,8 +142,8 @@ msgstr "code{"
#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
-#: en/user_overview.ssi:84 en/user_overview.ssi:92
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:42
+#: en/user_overview.ssi:52 en/user_overview.ssi:60
msgid "}code"
msgstr "}code"
@@ -262,118 +264,77 @@ msgstr ""
#: en/user_overview.ssi:34
msgid ""
"Issuing #{lb config}# without any arguments creates a #{config/}# "
-"subdirectory which it populates with some default settings:"
+"subdirectory which it populates with some default settings, and a skeleton #"
+"{auto/}# subdirectory tree."
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:39
+#: en/user_overview.ssi:40
#, no-wrap
msgid ""
" $ lb config\n"
+" P: Considering defaults defined in /etc/live/build.conf\n"
" P: Creating config tree\n"
msgstr ""
#. type: Plain text
#: en/user_overview.ssi:44
-#, no-wrap
-msgid ""
-" $ ls -l\n"
-" total 8\n"
-" drwxr-xr-x 3 user user 4096 Sep 7 13:02 auto\n"
-" drwxr-xr-x 22 user user 4096 Sep 7 13:02 config\n"
-msgstr ""
-
-#. type: Plain text
-#: en/user_overview.ssi:72
-#, no-wrap
-msgid ""
-" $ ls -l config/\n"
-" total 104\n"
-" -rw-r--r-- 1 user user 4197 Sep 7 13:02 binary\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_debian-installer\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_debian-installer-includes\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_grub\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-debs\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-hooks\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-includes\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-packageslists\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-udebs\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_rootfs\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_syslinux\n"
-" -rw-r--r-- 1 user user 2051 Sep 7 13:02 bootstrap\n"
-" -rw-r--r-- 1 user user 1647 Sep 7 13:02 chroot\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_apt\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-hooks\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-includes\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-packages\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-packageslists\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-patches\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-preseed\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_sources\n"
-" -rw-r--r-- 1 user user 2954 Sep 7 13:02 common\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 includes\n"
-" -rw-r--r-- 1 user user 205 Sep 7 13:02 source\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 templates\n"
-msgstr ""
-
-#. type: Plain text
-#: en/user_overview.ssi:76
msgid ""
"Using #{lb config}# without any arguments would be suitable for users who "
"need a very basic image, or who intend to later provide a more complete "
-"configuration via auto/config (see {Managing a configuration}#managing-a-"
+"configuration via #{auto/config}# (see {Managing a configuration}#managing-a-"
"configuration for details)."
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:78
+#: en/user_overview.ssi:46
msgid ""
"Normally, you will want to specify some options. For example, to include the "
"'gnome' package list in your configuration:"
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:82
+#: en/user_overview.ssi:50
#, no-wrap
msgid " $ lb config -p gnome\n"
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:86
+#: en/user_overview.ssi:54
msgid "It is possible to specify many options, such as:"
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:90
+#: en/user_overview.ssi:58
#, no-wrap
msgid " $ lb config --binary-images net --hostname live-machine --username live-user ...\n"
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:94
+#: en/user_overview.ssi:62
msgid "A full list of options is available in the #{lb_config}# man page."
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:96
+#: en/user_overview.ssi:64
msgid "3~lb-build The #{lb build}# command"
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:98
+#: en/user_overview.ssi:66
msgid ""
-"The #{lb build}# command reads in your configuration from the config/ "
+"The #{lb build}# command reads in your configuration from the #{config/}# "
"directory. It then runs the lower level commands needed to build your Live "
"system."
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:100
+#: en/user_overview.ssi:68
msgid "3~lb-clean The #{lb clean}# command"
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:102
+#: en/user_overview.ssi:70
msgid ""
"It is the job of the #{lb clean}# command to remove various parts of a build "
"so subsequent builds can start from a clean state. By default, #{chroot}#, #"
@@ -385,12 +346,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:104
+#: en/user_overview.ssi:72
msgid "2~live-boot The live-boot package"
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:106
+#: en/user_overview.ssi:74
msgid ""
"live-boot is a collection of scripts providing hooks for the initramfs-"
"tools, used to generate an initramfs capable of booting live systems, such "
@@ -399,16 +360,16 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:108
+#: en/user_overview.ssi:76
msgid ""
-"At boot time it will look for read-only media containing a \"/live\" "
+"At boot time it will look for read-only media containing a #{/live/}# "
"directory where a root filesystem (often a compressed filesystem image like "
"squashfs) is stored. If found, it will create a writable environment, using "
"aufs, for Debian like systems to boot from."
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:110
+#: en/user_overview.ssi:78
msgid ""
"More information on initial ramfs in Debian can be found in the Debian Linux "
"Kernel Handbook at http://kernel-handbook.alioth.debian.org/ in the chapter "
@@ -416,12 +377,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:112
+#: en/user_overview.ssi:80
msgid "2~live-config The live-config package"
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:113
+#: en/user_overview.ssi:81
msgid ""
"live-config consists of the scripts that run at boot time after live-boot to "
"configure the live system automatically. It handles such tasks as setting "
diff --git a/manual/pot/index.html.in.pot b/manual/pot/index.html.in.pot
index f1862ef..7ee9eb3 100644
--- a/manual/pot/index.html.in.pot
+++ b/manual/pot/index.html.in.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2011-04-23 14:15+0300\n"
+"POT-Creation-Date: 2011-12-03 18:55+0100\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"
@@ -29,72 +29,80 @@ msgstr ""
#. type: Content of: <html><body><p>
#: en/index.html.in:12
msgid ""
+"<i>live-manual</i> is available in different file formats and it is "
+"translated into several languages. Keep in mind that some translations may "
+"be incomplete or may not be up to date."
+msgstr ""
+
+#. type: Content of: <html><body><p>
+#: en/index.html.in:17
+msgid ""
"Please report errors, omissions, patches and suggestions to our mailinglist "
"at <a href=\"mailto:debian-live at lists.debian.org\">debian-live at lists.debian."
-"org</a> and read about <a href=\"html/about-manual.html#how-to-contribute"
+"org</a> and read about <a href=\"html/about-manual.en.html#how-to-contribute"
"\">how to contribute</a> to the manual."
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/index.html.in:15
+#: en/index.html.in:20
msgid "Available Formats"
msgstr ""
#. type: Content of: <html><body><ul><li>
-#: en/index.html.in:18
-msgid "<a href=\"epub/live-manual.epub\">EPUB</a>"
+#: en/index.html.in:23
+msgid "<a href=\"epub/live-manual.en.epub\">EPUB</a>"
msgstr ""
#. type: Content of: <html><body><ul><li>
-#: en/index.html.in:19
+#: en/index.html.in:24
msgid ""
-"HTML: <a href=\"html/index.html\">multi page</a>, <a href=\"html/live-manual."
-"html\">single page</a>"
+"HTML: <a href=\"html/index.en.html\">multi page</a>, <a href=\"html/live-"
+"manual.en.html\">single page</a>"
msgstr ""
#. type: Content of: <html><body><ul><li>
-#: en/index.html.in:20
-msgid "<a href=\"odf/live-manual.odt\">ODF</a>"
+#: en/index.html.in:25
+msgid "<a href=\"odf/live-manual.en.odt\">ODF</a>"
msgstr ""
#. type: Content of: <html><body><ul><li>
-#: en/index.html.in:21
+#: en/index.html.in:26
msgid ""
-"PDF: <a href=\"pdf/live-manual.portrait-a4.pdf\">A4 portrait</a>, <a href="
-"\"pdf/live-manual.landscape-a4.pdf\">A4 landscape</a>, <a href=\"pdf/live-"
-"manual.portrait-letter.pdf\">letter portrait</a>, <a href=\"pdf/live-manual."
-"landscape-letter.pdf\">letter landscape</a>"
+"PDF: <a href=\"pdf/live-manual.portrait-a4.en.pdf\">A4 portrait</a>, <a href="
+"\"pdf/live-manual.landscape-a4.en.pdf\">A4 landscape</a>, <a href=\"pdf/live-"
+"manual.portrait-letter.en.pdf\">letter portrait</a>, <a href=\"pdf/live-"
+"manual.landscape-letter.en.pdf\">letter landscape</a>"
msgstr ""
#. type: Content of: <html><body><ul><li>
-#: en/index.html.in:22
-msgid "<a href=\"txt/live-manual.txt\">Plain text</a>"
+#: en/index.html.in:27
+msgid "<a href=\"txt/live-manual.en.txt\">Plain text</a>"
msgstr ""
#. type: Content of: <html><body><p>
-#: en/index.html.in:26
+#: en/index.html.in:31
msgid "Last changed: @DATE_CHANGE@"
msgstr ""
#. type: Content of: <html><body><p>
-#: en/index.html.in:27
+#: en/index.html.in:32
msgid "Last built: @DATE_BUILD@"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/index.html.in:30
+#: en/index.html.in:35
msgid "Source"
msgstr ""
#. type: Content of: <html><body><p>
-#: en/index.html.in:33
+#: en/index.html.in:38
msgid ""
"The sources for this manual is available in a <a href=\"http://git.or.cz/"
"\">Git</a> repository at live.debian.net."
msgstr ""
#. type: Content of: <html><body><ul><li>
-#: en/index.html.in:37
+#: en/index.html.in:42
msgid ""
"Browse: <a href=\"http://live.debian.net/gitweb/?p=live-manual.git"
"\"><small><tt>http://live.debian.net/gitweb/?p=live-manual.git</tt></small></"
@@ -102,14 +110,14 @@ msgid ""
msgstr ""
#. type: Content of: <html><body><ul><li>
-#: en/index.html.in:38
+#: en/index.html.in:43
msgid ""
"Git: <a href=\"git://live.debian.net/git/live-manual.git\"><small><tt>git://"
"live.debian.net/git/live-manual.git</tt></small></a>"
msgstr ""
#. type: Content of: <html><body><p>
-#: en/index.html.in:42
+#: en/index.html.in:47
msgid ""
"<a href=\"http://live.debian.net/\">Debian Live</a> <<a href=\"mailto:"
"debian-live at lists.debian.org\">debian-live at lists.debian.org</a>> - <a "
diff --git a/manual/pot/live-manual.ssm.pot b/manual/pot/live-manual.ssm.pot
index cacb1c1..e5de218 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: 2011-09-30 14:54+0300\n"
+"POT-Creation-Date: 2011-12-04 10:22+0100\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: 2011-09-30\n"
+" :published: 2011-12-04\n"
msgstr ""
#. type: Plain text
diff --git a/manual/pot/user_basics.ssi.pot b/manual/pot/user_basics.ssi.pot
index 4c0bc02..dbed8ee 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: 2011-04-23 14:15+0300\n"
+"POT-Creation-Date: 2011-11-02 12:23-0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -37,37 +37,38 @@ msgstr ""
#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
-#: en/user_customization-installer.ssi:43
+#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
-#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:53
-#: en/user_customization-packages.ssi:66 en/user_customization-packages.ssi:80
-#: en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:112
-#: en/user_customization-packages.ssi:142
-#: en/user_customization-packages.ssi:155
-#: en/user_customization-packages.ssi:165
-#: en/user_customization-packages.ssi:175
-#: en/user_customization-packages.ssi:185
-#: en/user_customization-packages.ssi:199
-#: en/user_customization-packages.ssi:215
-#: en/user_customization-packages.ssi:227
-#: en/user_customization-packages.ssi:291
-#: en/user_customization-packages.ssi:303
-#: en/user_customization-packages.ssi:313
-#: en/user_customization-packages.ssi:331
-#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
-#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
-#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
-#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
-#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:105
-#: 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:178 en/user_examples.ssi:190
-#: en/user_examples.ssi:206 en/user_examples.ssi:220 en/user_examples.ssi:229
-#: en/user_examples.ssi:247 en/user_examples.ssi:255 en/user_examples.ssi:268
-#: en/user_examples.ssi:283 en/user_installation.ssi:38
+#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:54
+#: en/user_customization-packages.ssi:67 en/user_customization-packages.ssi:81
+#: en/user_customization-packages.ssi:101
+#: en/user_customization-packages.ssi:131
+#: en/user_customization-packages.ssi:144
+#: en/user_customization-packages.ssi:154
+#: en/user_customization-packages.ssi:164
+#: en/user_customization-packages.ssi:174
+#: en/user_customization-packages.ssi:188
+#: en/user_customization-packages.ssi:204
+#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:320
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:345 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:24 en/user_customization-runtime.ssi:44
+#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:63
+#: en/user_customization-runtime.ssi:71 en/user_customization-runtime.ssi:80
+#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:111
+#: en/user_customization-runtime.ssi:119 en/user_examples.ssi:14
+#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
+#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
+#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
+#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
+#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
+#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
+#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:271
+#: en/user_examples.ssi:286 en/user_installation.ssi:38
#: en/user_installation.ssi:46 en/user_installation.ssi:56
#: en/user_installation.ssi:64 en/user_installation.ssi:74
#: en/user_installation.ssi:82 en/user_installation.ssi:90
@@ -100,38 +101,39 @@ msgstr ""
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
-#: en/user_customization-installer.ssi:37
-#: en/user_customization-installer.ssi:48
+#: en/user_customization-installer.ssi:38
+#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:70 en/user_customization-packages.ssi:84
-#: en/user_customization-packages.ssi:98
-#: en/user_customization-packages.ssi:116
-#: en/user_customization-packages.ssi:147
-#: en/user_customization-packages.ssi:161
-#: en/user_customization-packages.ssi:171
-#: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:191
-#: en/user_customization-packages.ssi:203
-#: en/user_customization-packages.ssi:219
-#: en/user_customization-packages.ssi:231
-#: en/user_customization-packages.ssi:295
-#: en/user_customization-packages.ssi:307
-#: en/user_customization-packages.ssi:317
-#: en/user_customization-packages.ssi:344
-#: en/user_customization-packages.ssi:353 en/user_customization-runtime.ssi:18
-#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
-#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
-#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
-#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:110
-#: 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:186 en/user_examples.ssi:202
-#: en/user_examples.ssi:210 en/user_examples.ssi:225 en/user_examples.ssi:233
-#: en/user_examples.ssi:251 en/user_examples.ssi:264 en/user_examples.ssi:279
-#: en/user_examples.ssi:297 en/user_installation.ssi:42
+#: en/user_customization-packages.ssi:46 en/user_customization-packages.ssi:59
+#: en/user_customization-packages.ssi:71 en/user_customization-packages.ssi:85
+#: en/user_customization-packages.ssi:105
+#: en/user_customization-packages.ssi:136
+#: en/user_customization-packages.ssi:150
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:180
+#: en/user_customization-packages.ssi:192
+#: en/user_customization-packages.ssi:208
+#: en/user_customization-packages.ssi:220
+#: en/user_customization-packages.ssi:284
+#: en/user_customization-packages.ssi:296
+#: en/user_customization-packages.ssi:306
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341
+#: en/user_customization-packages.ssi:350 en/user_customization-runtime.ssi:18
+#: en/user_customization-runtime.ssi:28 en/user_customization-runtime.ssi:48
+#: en/user_customization-runtime.ssi:59 en/user_customization-runtime.ssi:67
+#: en/user_customization-runtime.ssi:76 en/user_customization-runtime.ssi:85
+#: en/user_customization-runtime.ssi:105 en/user_customization-runtime.ssi:115
+#: en/user_customization-runtime.ssi:124 en/user_examples.ssi:20
+#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
+#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
+#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
+#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
+#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
+#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
+#: en/user_examples.ssi:254 en/user_examples.ssi:267 en/user_examples.ssi:282
+#: en/user_examples.ssi:300 en/user_installation.ssi:42
#: en/user_installation.ssi:50 en/user_installation.ssi:60
#: en/user_installation.ssi:70 en/user_installation.ssi:78
#: en/user_installation.ssi:86 en/user_installation.ssi:94
@@ -291,7 +293,7 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:44 en/user_basics.ssi:170 en/user_basics.ssi:238
-#: en/user_examples.ssi:109 en/user_examples.ssi:208
+#: en/user_examples.ssi:119 en/user_examples.ssi:211
#, no-wrap
msgid " # lb build\n"
msgstr ""
@@ -545,7 +547,7 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:142
#, no-wrap
-msgid " $ lb config --packages virtualbox-ose-guest-x11\n"
+msgid " $ echo virtualbox-ose-guest-x11 >> config/package-lists/my.list.chroot\n"
msgstr ""
#. type: Plain text
diff --git a/manual/pot/user_customization-contents.ssi.pot b/manual/pot/user_customization-contents.ssi.pot
index 0dccb5f..d8950f0 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: 2011-08-25 15:56+0300\n"
+"POT-Creation-Date: 2011-11-07 21:01-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"
@@ -37,48 +37,47 @@ msgstr ""
#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
-#: en/user_customization-installer.ssi:43
+#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
-#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:53
-#: en/user_customization-packages.ssi:66 en/user_customization-packages.ssi:80
-#: en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:112
-#: en/user_customization-packages.ssi:142
-#: en/user_customization-packages.ssi:155
-#: en/user_customization-packages.ssi:165
-#: en/user_customization-packages.ssi:175
-#: en/user_customization-packages.ssi:185
-#: en/user_customization-packages.ssi:199
-#: en/user_customization-packages.ssi:215
-#: en/user_customization-packages.ssi:227
-#: en/user_customization-packages.ssi:291
-#: en/user_customization-packages.ssi:303
-#: en/user_customization-packages.ssi:313
-#: en/user_customization-packages.ssi:331
-#: en/user_customization-packages.ssi:348
-#: en/user_customization-packages.ssi:356 en/user_customization-runtime.ssi:14
-#: en/user_customization-runtime.ssi:24 en/user_customization-runtime.ssi:44
-#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:63
-#: en/user_customization-runtime.ssi:71 en/user_customization-runtime.ssi:80
-#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:111
-#: en/user_customization-runtime.ssi:119 en/user_examples.ssi:14
+#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:54
+#: en/user_customization-packages.ssi:67 en/user_customization-packages.ssi:81
+#: en/user_customization-packages.ssi:101
+#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:140
+#: en/user_customization-packages.ssi:150
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:184
+#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:276
+#: en/user_customization-packages.ssi:288
+#: en/user_customization-packages.ssi:298
+#: en/user_customization-packages.ssi:316
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
+#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
+#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
+#: en/user_customization-runtime.ssi:104 en/user_customization-runtime.ssi:114
+#: en/user_customization-runtime.ssi:122 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:178 en/user_examples.ssi:190 en/user_examples.ssi:206
-#: en/user_examples.ssi:220 en/user_examples.ssi:229 en/user_examples.ssi:247
-#: en/user_examples.ssi:255 en/user_examples.ssi:268 en/user_examples.ssi:283
-#: en/user_installation.ssi:38 en/user_installation.ssi:46
-#: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi:74 en/user_installation.ssi:82
-#: en/user_installation.ssi:90 en/user_installation.ssi:114
-#: en/user_installation.ssi:129 en/user_installation.ssi:146
-#: en/user_managing_a_configuration.ssi:24
+#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
+#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
+#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
+#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
+#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
+#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
+#: en/user_examples.ssi:277 en/user_installation.ssi:38
+#: en/user_installation.ssi:46 en/user_installation.ssi:56
+#: en/user_installation.ssi:64 en/user_installation.ssi:74
+#: en/user_installation.ssi:82 en/user_installation.ssi:90
+#: en/user_installation.ssi:114 en/user_installation.ssi:129
+#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:80 en/user_overview.ssi:88
+#: en/user_overview.ssi:48 en/user_overview.ssi:56
msgid "code{"
msgstr ""
@@ -102,49 +101,48 @@ msgstr ""
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
-#: en/user_customization-installer.ssi:37
-#: en/user_customization-installer.ssi:48
+#: en/user_customization-installer.ssi:38
+#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:70 en/user_customization-packages.ssi:84
-#: en/user_customization-packages.ssi:98
-#: en/user_customization-packages.ssi:116
-#: en/user_customization-packages.ssi:147
-#: en/user_customization-packages.ssi:161
-#: en/user_customization-packages.ssi:171
-#: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:191
-#: en/user_customization-packages.ssi:203
-#: en/user_customization-packages.ssi:219
-#: en/user_customization-packages.ssi:231
-#: en/user_customization-packages.ssi:295
-#: en/user_customization-packages.ssi:307
-#: en/user_customization-packages.ssi:317
-#: en/user_customization-packages.ssi:344
-#: en/user_customization-packages.ssi:352
-#: en/user_customization-packages.ssi:361 en/user_customization-runtime.ssi:18
-#: en/user_customization-runtime.ssi:28 en/user_customization-runtime.ssi:48
-#: en/user_customization-runtime.ssi:59 en/user_customization-runtime.ssi:67
-#: en/user_customization-runtime.ssi:76 en/user_customization-runtime.ssi:85
-#: en/user_customization-runtime.ssi:105 en/user_customization-runtime.ssi:115
-#: en/user_customization-runtime.ssi:124 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:186 en/user_examples.ssi:202 en/user_examples.ssi:210
-#: en/user_examples.ssi:225 en/user_examples.ssi:233 en/user_examples.ssi:251
-#: en/user_examples.ssi:264 en/user_examples.ssi:279 en/user_examples.ssi:297
-#: en/user_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi:70
-#: en/user_installation.ssi:78 en/user_installation.ssi:86
-#: en/user_installation.ssi:94 en/user_installation.ssi:119
-#: en/user_installation.ssi:136 en/user_installation.ssi:149
-#: en/user_managing_a_configuration.ssi:31
+#: en/user_customization-packages.ssi:46 en/user_customization-packages.ssi:59
+#: en/user_customization-packages.ssi:71 en/user_customization-packages.ssi:85
+#: en/user_customization-packages.ssi:105
+#: en/user_customization-packages.ssi:132
+#: en/user_customization-packages.ssi:146
+#: en/user_customization-packages.ssi:156
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:329
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:346 en/user_customization-runtime.ssi:21
+#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
+#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
+#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
+#: en/user_customization-runtime.ssi:108 en/user_customization-runtime.ssi:118
+#: en/user_customization-runtime.ssi:127 en/user_examples.ssi:20
+#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
+#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
+#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
+#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
+#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
+#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
+#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
+#: en/user_examples.ssi:291 en/user_installation.ssi:42
+#: en/user_installation.ssi:50 en/user_installation.ssi:60
+#: en/user_installation.ssi:70 en/user_installation.ssi:78
+#: en/user_installation.ssi:86 en/user_installation.ssi:94
+#: en/user_installation.ssi:119 en/user_installation.ssi:136
+#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
-#: en/user_overview.ssi:84 en/user_overview.ssi:92
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:42
+#: en/user_overview.ssi:52 en/user_overview.ssi:60
msgid "}code"
msgstr ""
@@ -235,7 +233,7 @@ msgstr ""
#. type: Plain text
#: en/user_customization-contents.ssi:24
msgid ""
-"To include files, simply add them to your #{config/chroot_local-includes}# "
+"To include files, simply add them to your #{config/includes.chroot}# "
"directory. This directory corresponds to the root directory (#{/}#) of the "
"live system. For example, to add a file #{/var/www/index.html}# in the live "
"system, use:"
@@ -245,8 +243,8 @@ msgstr ""
#: en/user_customization-contents.ssi:29
#, no-wrap
msgid ""
-" $ mkdir -p config/chroot_local-includes/var/www\n"
-" $ cp /path/to/my/index.html config/chroot_local-includes/var/www\n"
+" $ mkdir -p config/includes.chroot/var/www\n"
+" $ cp /path/to/my/index.html config/includes.chroot/var/www\n"
msgstr ""
#. type: Plain text
@@ -260,7 +258,7 @@ msgstr ""
msgid ""
" -- config\n"
" [...]\n"
-" |-- chroot_local-includes\n"
+" |-- includes.chroot\n"
" | `-- var\n"
" | `-- www\n"
" | `-- index.html\n"
@@ -288,14 +286,14 @@ msgid ""
"booting the Live system, you can use binary local includes. This works in a "
"similar fashion to chroot local includes. For example, suppose the files #{~/"
"video_demo.*}# are demo videos of the live system described by and linked to "
-"by an HTML index page. Simply copy the material to #{config/binary_local-"
-"includes/}# as follows:"
+"by an HTML index page. Simply copy the material to #{config/includes.binary/}"
+"# as follows:"
msgstr ""
#. type: Plain text
#: en/user_customization-contents.ssi:56
#, no-wrap
-msgid " $ cp ~/video_demo.* config/binary_local-includes/\n"
+msgid " $ cp ~/video_demo.* config/includes.binary/\n"
msgstr ""
#. type: Plain text
@@ -349,12 +347,12 @@ msgstr ""
#. type: Plain text
#: en/user_customization-contents.ssi:80
msgid ""
-"To run commands in the chroot stage, create a hook script containing the "
-"commands in the #{config/chroot_local-hooks}# directory. The hook will run "
-"in the chroot after the rest of your chroot configuration has been applied, "
-"so remember to ensure your configuration includes all packages and files "
-"your hook needs in order to run. See the example chroot hook scripts for "
-"various common chroot customization tasks provided in #{/usr/share/live/"
+"To run commands in the chroot stage, create a hook script with a #{.chroot}# "
+"suffix containing the commands in the #{config/hooks/}# directory. The hook "
+"will run in the chroot after the rest of your chroot configuration has been "
+"applied, so remember to ensure your configuration includes all packages and "
+"files your hook needs in order to run. See the example chroot hook scripts "
+"for various common chroot customization tasks provided in #{/usr/share/live/"
"build/examples/hooks}# which you can copy or symlink to use them in your own "
"configuration."
msgstr ""
@@ -371,10 +369,9 @@ msgid ""
"explained in the \"Customization\" section of its man page. Examine live-"
"config's own hooks provided in #{/lib/live/config/}#, noting the sequence "
"numbers. Then provide your own hook prefixed with an appropriate sequence "
-"number, either as a chroot local include in #{config/chroot_local-includes/"
-"lib/live/config/}#, or as a custom package as discussed in {Installing "
-"modified or third-party packages}#installing-modified-or-third-party-"
-"packages."
+"number, either as a chroot local include in #{config/includes.chroot/lib/"
+"live/config/}#, or as a custom package as discussed in {Installing modified "
+"or third-party packages}#installing-modified-or-third-party-packages."
msgstr ""
#. type: Plain text
@@ -385,14 +382,15 @@ msgstr ""
#. type: Plain text
#: en/user_customization-contents.ssi:88
msgid ""
-"To run commands in the binary stage, create a hook script containing the "
-"commands in the #{config/binary_local-hooks}#. The hook will run after all "
-"other binary commands are run, but before binary_checksums, the very last "
-"binary commands The commands in your hook do not run in the chroot, so take "
-"care to not modify any files outside of the build tree, or you may damage "
-"your build system! See the example binary hook scripts for various common "
-"binary customization tasks provided in #{/usr/share/live/build/examples/"
-"hooks}# which you can copy or symlink to use them in your own configuration."
+"To run commands in the binary stage, create a hook script with a #{.binary}# "
+"suffix containing the commands in the #{config/hooks/}# directory. The hook "
+"will run after all other binary commands are run, but before "
+"binary_checksums, the very last binary command. The commands in your hook do "
+"not run in the chroot, so take care to not modify any files outside of the "
+"build tree, or you may damage your build system! See the example binary hook "
+"scripts for various common binary customization tasks provided in #{/usr/"
+"share/live/build/examples/hooks}# which you can copy or symlink to use them "
+"in your own configuration."
msgstr ""
#. type: Plain text
@@ -403,9 +401,10 @@ msgstr ""
#. type: Plain text
#: en/user_customization-contents.ssi:92
msgid ""
-"Files in the #{config/chroot_local-preseed}# directory are considered to be "
+"Files in the #{config/preseed/}# directory suffixed with #{.preseed}# "
+"followed by the stage (#{.chroot}# or #{.binary}#) are considered to be "
"debconf preseed files and are installed by live-build using #{debconf-set-"
-"selections}#."
+"selections}# during the corresponding stage."
msgstr ""
#. type: Plain text
diff --git a/manual/pot/user_customization-installer.ssi.pot b/manual/pot/user_customization-installer.ssi.pot
index 080e722..019df52 100644
--- a/manual/pot/user_customization-installer.ssi.pot
+++ b/manual/pot/user_customization-installer.ssi.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2011-04-23 14:15+0300\n"
+"POT-Creation-Date: 2011-11-07 21:19-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"
@@ -37,37 +37,38 @@ msgstr ""
#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
-#: en/user_customization-installer.ssi:43
+#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
-#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:53
-#: en/user_customization-packages.ssi:66 en/user_customization-packages.ssi:80
-#: en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:112
-#: en/user_customization-packages.ssi:142
-#: en/user_customization-packages.ssi:155
-#: en/user_customization-packages.ssi:165
-#: en/user_customization-packages.ssi:175
-#: en/user_customization-packages.ssi:185
-#: en/user_customization-packages.ssi:199
-#: en/user_customization-packages.ssi:215
-#: en/user_customization-packages.ssi:227
-#: en/user_customization-packages.ssi:291
-#: en/user_customization-packages.ssi:303
-#: en/user_customization-packages.ssi:313
-#: en/user_customization-packages.ssi:331
-#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
-#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
-#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
-#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
-#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:105
-#: 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:178 en/user_examples.ssi:190
-#: en/user_examples.ssi:206 en/user_examples.ssi:220 en/user_examples.ssi:229
-#: en/user_examples.ssi:247 en/user_examples.ssi:255 en/user_examples.ssi:268
-#: en/user_examples.ssi:283 en/user_installation.ssi:38
+#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:54
+#: en/user_customization-packages.ssi:67 en/user_customization-packages.ssi:81
+#: en/user_customization-packages.ssi:101
+#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:140
+#: en/user_customization-packages.ssi:150
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:184
+#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:276
+#: en/user_customization-packages.ssi:288
+#: en/user_customization-packages.ssi:298
+#: en/user_customization-packages.ssi:316
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
+#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
+#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
+#: en/user_customization-runtime.ssi:104 en/user_customization-runtime.ssi:114
+#: en/user_customization-runtime.ssi:122 en/user_examples.ssi:14
+#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
+#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
+#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
+#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
+#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
+#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
+#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
+#: en/user_examples.ssi:277 en/user_installation.ssi:38
#: en/user_installation.ssi:46 en/user_installation.ssi:56
#: en/user_installation.ssi:64 en/user_installation.ssi:74
#: en/user_installation.ssi:82 en/user_installation.ssi:90
@@ -76,7 +77,7 @@ msgstr ""
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:80 en/user_overview.ssi:88
+#: en/user_overview.ssi:48 en/user_overview.ssi:56
msgid "code{"
msgstr ""
@@ -100,38 +101,39 @@ msgstr ""
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
-#: en/user_customization-installer.ssi:37
-#: en/user_customization-installer.ssi:48
+#: en/user_customization-installer.ssi:38
+#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:70 en/user_customization-packages.ssi:84
-#: en/user_customization-packages.ssi:98
-#: en/user_customization-packages.ssi:116
-#: en/user_customization-packages.ssi:147
-#: en/user_customization-packages.ssi:161
-#: en/user_customization-packages.ssi:171
-#: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:191
-#: en/user_customization-packages.ssi:203
-#: en/user_customization-packages.ssi:219
-#: en/user_customization-packages.ssi:231
-#: en/user_customization-packages.ssi:295
-#: en/user_customization-packages.ssi:307
-#: en/user_customization-packages.ssi:317
-#: en/user_customization-packages.ssi:344
-#: en/user_customization-packages.ssi:353 en/user_customization-runtime.ssi:18
-#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
-#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
-#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
-#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:110
-#: 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:186 en/user_examples.ssi:202
-#: en/user_examples.ssi:210 en/user_examples.ssi:225 en/user_examples.ssi:233
-#: en/user_examples.ssi:251 en/user_examples.ssi:264 en/user_examples.ssi:279
-#: en/user_examples.ssi:297 en/user_installation.ssi:42
+#: en/user_customization-packages.ssi:46 en/user_customization-packages.ssi:59
+#: en/user_customization-packages.ssi:71 en/user_customization-packages.ssi:85
+#: en/user_customization-packages.ssi:105
+#: en/user_customization-packages.ssi:132
+#: en/user_customization-packages.ssi:146
+#: en/user_customization-packages.ssi:156
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:329
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:346 en/user_customization-runtime.ssi:21
+#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
+#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
+#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
+#: en/user_customization-runtime.ssi:108 en/user_customization-runtime.ssi:118
+#: en/user_customization-runtime.ssi:127 en/user_examples.ssi:20
+#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
+#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
+#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
+#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
+#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
+#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
+#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
+#: en/user_examples.ssi:291 en/user_installation.ssi:42
#: en/user_installation.ssi:50 en/user_installation.ssi:60
#: en/user_installation.ssi:70 en/user_installation.ssi:78
#: en/user_installation.ssi:86 en/user_installation.ssi:94
@@ -139,8 +141,8 @@ msgstr ""
#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
-#: en/user_overview.ssi:84 en/user_overview.ssi:92
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:42
+#: en/user_overview.ssi:52 en/user_overview.ssi:60
msgid "}code"
msgstr ""
@@ -253,20 +255,21 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-installer.ssi:35
+#: en/user_customization-installer.ssi:36
#, no-wrap
msgid ""
" $ lb config --architecture i386 --linux-flavours 486 \\\n"
-" --debian-installer live --packages debian-installer-launcher\n"
+" --debian-installer live\n"
+" $ echo debian-installer-launcher >> config/package-lists/my.list.chroot\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-installer.ssi:39
+#: en/user_customization-installer.ssi:40
msgid "2~ Customizing Debian Installer by preseeding"
msgstr ""
#. type: Plain text
-#: en/user_customization-installer.ssi:41
+#: en/user_customization-installer.ssi:42
msgid ""
"As described in the Debian Installer Manual, Appendix B at http://www.debian."
"org/releases/stable/i386/apb.html, \"Preseeding provides a way to set "
@@ -280,7 +283,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-installer.ssi:46
+#: en/user_customization-installer.ssi:47
#, no-wrap
msgid ""
" $ echo \"d-i debian-installer/locale string en_US\" \\\n"
@@ -288,16 +291,16 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-installer.ssi:50
+#: en/user_customization-installer.ssi:51
msgid "2~ Customizing Debian Installer content"
msgstr ""
#. type: Plain text
-#: en/user_customization-installer.ssi:51
+#: en/user_customization-installer.ssi:52
msgid ""
"For experimental or debugging purposes, you might want to include locally "
-"built #{d-i}# component udeb packages. Place these in #{config/binary_local-"
-"udebs/}# to include them in the image. Additional or replacement files and "
+"built #{d-i}# component udeb packages. Place these in #{config/packages."
+"binary/}# to include them in the image. Additional or replacement files and "
"directories may be included in the installer initrd as well, in a similar "
"fashion to {Live/chroot local includes}#live-chroot-local-includes, by "
"placing the material in #{config/binary_debian-installer-includes/}#."
diff --git a/manual/pot/user_customization-packages.ssi.pot b/manual/pot/user_customization-packages.ssi.pot
index 34d5a7c..eb25145 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: 2011-08-14 16:53+0300\n"
+"POT-Creation-Date: 2011-11-07 21:01-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"
@@ -37,38 +37,38 @@ msgstr ""
#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
-#: en/user_customization-installer.ssi:43
+#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
-#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:53
-#: en/user_customization-packages.ssi:66 en/user_customization-packages.ssi:80
-#: en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:112
-#: en/user_customization-packages.ssi:142
-#: en/user_customization-packages.ssi:155
-#: en/user_customization-packages.ssi:165
-#: en/user_customization-packages.ssi:175
-#: en/user_customization-packages.ssi:185
-#: en/user_customization-packages.ssi:199
-#: en/user_customization-packages.ssi:215
-#: en/user_customization-packages.ssi:227
-#: en/user_customization-packages.ssi:291
-#: en/user_customization-packages.ssi:303
-#: en/user_customization-packages.ssi:313
-#: en/user_customization-packages.ssi:331
-#: en/user_customization-packages.ssi:348
-#: en/user_customization-packages.ssi:356 en/user_customization-runtime.ssi:14
-#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
-#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
-#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
-#: en/user_customization-runtime.ssi:99 en/user_customization-runtime.ssi:107
-#: 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:178 en/user_examples.ssi:190
-#: en/user_examples.ssi:206 en/user_examples.ssi:220 en/user_examples.ssi:229
-#: en/user_examples.ssi:247 en/user_examples.ssi:255 en/user_examples.ssi:268
-#: en/user_examples.ssi:283 en/user_installation.ssi:38
+#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:54
+#: en/user_customization-packages.ssi:67 en/user_customization-packages.ssi:81
+#: en/user_customization-packages.ssi:101
+#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:140
+#: en/user_customization-packages.ssi:150
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:184
+#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:276
+#: en/user_customization-packages.ssi:288
+#: en/user_customization-packages.ssi:298
+#: en/user_customization-packages.ssi:316
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
+#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
+#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
+#: en/user_customization-runtime.ssi:104 en/user_customization-runtime.ssi:114
+#: en/user_customization-runtime.ssi:122 en/user_examples.ssi:14
+#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
+#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
+#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
+#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
+#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
+#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
+#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
+#: en/user_examples.ssi:277 en/user_installation.ssi:38
#: en/user_installation.ssi:46 en/user_installation.ssi:56
#: en/user_installation.ssi:64 en/user_installation.ssi:74
#: en/user_installation.ssi:82 en/user_installation.ssi:90
@@ -77,7 +77,7 @@ msgstr ""
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:80 en/user_overview.ssi:88
+#: en/user_overview.ssi:48 en/user_overview.ssi:56
msgid "code{"
msgstr ""
@@ -101,39 +101,39 @@ msgstr ""
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
-#: en/user_customization-installer.ssi:37
-#: en/user_customization-installer.ssi:48
+#: en/user_customization-installer.ssi:38
+#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:70 en/user_customization-packages.ssi:84
-#: en/user_customization-packages.ssi:98
-#: en/user_customization-packages.ssi:116
-#: en/user_customization-packages.ssi:147
-#: en/user_customization-packages.ssi:161
-#: en/user_customization-packages.ssi:171
-#: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:191
-#: en/user_customization-packages.ssi:203
-#: en/user_customization-packages.ssi:219
-#: en/user_customization-packages.ssi:231
-#: en/user_customization-packages.ssi:295
-#: en/user_customization-packages.ssi:307
-#: en/user_customization-packages.ssi:317
-#: en/user_customization-packages.ssi:344
-#: en/user_customization-packages.ssi:352
-#: en/user_customization-packages.ssi:361 en/user_customization-runtime.ssi:18
-#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
-#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
-#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
-#: en/user_customization-runtime.ssi:103 en/user_customization-runtime.ssi:112
-#: 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:186 en/user_examples.ssi:202
-#: en/user_examples.ssi:210 en/user_examples.ssi:225 en/user_examples.ssi:233
-#: en/user_examples.ssi:251 en/user_examples.ssi:264 en/user_examples.ssi:279
-#: en/user_examples.ssi:297 en/user_installation.ssi:42
+#: en/user_customization-packages.ssi:46 en/user_customization-packages.ssi:59
+#: en/user_customization-packages.ssi:71 en/user_customization-packages.ssi:85
+#: en/user_customization-packages.ssi:105
+#: en/user_customization-packages.ssi:132
+#: en/user_customization-packages.ssi:146
+#: en/user_customization-packages.ssi:156
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:329
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:346 en/user_customization-runtime.ssi:21
+#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
+#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
+#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
+#: en/user_customization-runtime.ssi:108 en/user_customization-runtime.ssi:118
+#: en/user_customization-runtime.ssi:127 en/user_examples.ssi:20
+#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
+#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
+#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
+#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
+#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
+#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
+#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
+#: en/user_examples.ssi:291 en/user_installation.ssi:42
#: en/user_installation.ssi:50 en/user_installation.ssi:60
#: en/user_installation.ssi:70 en/user_installation.ssi:78
#: en/user_installation.ssi:86 en/user_installation.ssi:94
@@ -141,8 +141,8 @@ msgstr ""
#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
-#: en/user_overview.ssi:84 en/user_overview.ssi:92
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:42
+#: en/user_overview.ssi:52 en/user_overview.ssi:60
msgid "}code"
msgstr ""
@@ -191,7 +191,7 @@ msgstr ""
msgid ""
"The distribution you choose has the broadest impact on which packages are "
"available to include in your live image. Specify the codename, which "
-"defaults to #{squeeze}# for the Squeeze version of live-build. Any current "
+"defaults to #{wheezy}# for the Wheezy version of live-build. Any current "
"distribution carried in the Debian archive may be specified by its codename "
"here. (See {Terms}#terms for more details.) The #{--distribution}# option "
"not only influences the source of packages within the archive, but also "
@@ -248,15 +248,15 @@ msgstr ""
msgid ""
"The Debian archive is replicated across a large network of mirrors around "
"the world so that people in each region can choose a nearby mirror for best "
-"download speed. Each of the #{--mirror-*}# options governs which "
+"download speed. Each of the #{--parent-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."
+"those stages, and later, in the *binary* stage, the #{--parent-mirror-binary}"
+"# and #{--parent-mirror-binary-security}# values are used, superceding any "
+"mirrors used in an earlier stage."
msgstr ""
#. type: Plain text
@@ -269,173 +269,138 @@ msgstr ""
#: en/user_customization-packages.ssi:38
msgid ""
"To set the distribution mirrors used at build time to point at a local "
-"mirror, it is sufficient to set #{--mirror-bootstrap}# and #{--mirror-chroot-"
-"security}# as follows."
+"mirror, it is sufficient to set #{--parent-mirror-bootstrap}#, #{--parent-"
+"mirror-chroot-security}# and #{--parent-mirror-chroot-backports}# as follows."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:43
+#: en/user_customization-packages.ssi:44
#, no-wrap
msgid ""
-" $ lb config --mirror-bootstrap http://localhost/debian/ \\\n"
-" --mirror-chroot-security http://localhost/debian-security/\n"
+" $ lb config --parent-mirror-bootstrap http://localhost/debian/ \\\n"
+" --parent-mirror-chroot-security http://localhost/debian-security/ \\\n"
+"\t --parent-mirror-chroot-backports http://localhost/debian-backports/\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:47
+#: en/user_customization-packages.ssi:48
msgid ""
-"The chroot mirror, specified by #{--mirror-chroot}#, defaults to the #{--"
-"mirror-bootstrap}# value."
+"The chroot mirror, specified by #{--parent-mirror-chroot}#, defaults to the #"
+"{--parent-mirror-bootstrap}# value."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:49
+#: en/user_customization-packages.ssi:50
msgid "3~ Distribution mirrors used at run time"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:51
+#: en/user_customization-packages.ssi:52
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."
+"The #{--parent-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:56
+#: en/user_customization-packages.ssi:57
#, no-wrap
msgid ""
-" $ lb config --mirror-binary http://mirror/debian/ \\\n"
-" --mirror-binary-security http://mirror/debian-security/\n"
+" $ lb config --parent-mirror-binary http://mirror/debian/ \\\n"
+" --parent-mirror-binary-security http://mirror/debian-security/\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:60
+#: en/user_customization-packages.ssi:61
msgid "3~additional-repositories Additional repositories"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:62
+#: en/user_customization-packages.ssi:63
msgid ""
"You may add more repositories, broadening your package choices beyond what "
"is available in your target distribution. These may be, for example, for "
"backports, experimental or custom packages. To configure additional "
-"repositories, create #{config/chroot_sources/your-repository.chroot}#, and/"
-"or #{config/chroot_sources/your-repository.binary}# files. As with the #{--"
-"mirror-*}# options, these govern the repositories used in the *chroot* stage "
-"when building the image, and in the *binary* stage, i.e. for use when "
-"running the live system."
+"repositories, create #{config/archives/your-repository.list.chroot}#, and/or "
+"#{config/archives/your-repository.list.binary}# files. As with the #{--"
+"parent-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:64
+#: en/user_customization-packages.ssi:65
msgid ""
-"For example, #{config/chroot_sources/live.chroot}# allows you to install "
+"For example, #{config/archives/live.list.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:68
+#: en/user_customization-packages.ssi:69
#, no-wrap
msgid " deb http://live.debian.net/ sid-snapshots main contrib non-free\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:72
+#: en/user_customization-packages.ssi:73
msgid ""
-"If you add the same line to #{config/chroot_sources/live.binary}#, the "
+"If you add the same line to #{config/archives/live.list.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:74
+#: en/user_customization-packages.ssi:75
msgid "If such files exist, they will be picked up automatically."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:76
+#: en/user_customization-packages.ssi:77
msgid ""
"You should also put the GPG key used to sign the repository into #{config/"
-"chroot_sources/your-repository.{binary,chroot}.gpg}# files."
+"archives/your-repository.gpg.{binary,chroot}}# files."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:78
+#: en/user_customization-packages.ssi:79
#, no-wrap
-msgid "*{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:\n"
+msgid "*{Note:}* some preconfigured package repositories are available for easy selection through the #{--archives}# option, e.g. for enabling live snapshots, a simple command is enough to enable it:\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:82 en/user_installation.ssi:148
+#: en/user_customization-packages.ssi:83 en/user_installation.ssi:148
#, no-wrap
-msgid " $ lb config --repository live.debian.net\n"
+msgid " $ lb config --archives live.debian.net\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:86
+#: en/user_customization-packages.ssi:87
msgid "2~choosing-packages-to-install Choosing packages to install"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:88
+#: en/user_customization-packages.ssi:89
msgid ""
"There are a number of ways to choose which packages live-build will install "
"in your image, covering a variety of different needs. You can simply name "
-"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:90
-msgid "3~ Choosing a few packages"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:92
-msgid ""
-"When the number of packages added is small, simply specify #{--packages}#. "
-"For example:"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:96
-#, no-wrap
-msgid " $ lb config --packages \"package1 package2 package3\"\n"
+"individual packages to install in a package list. You can also choose "
+"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:100
-msgid ""
-"The behaviour of live-build when specifying a package that does not exist is "
-"determined by your choice of APT utility. See {Choosing apt or aptitude}"
-"#choosing-apt-or-aptitude for more details."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:102
-msgid ""
-"If you need to specify a large number of packages to be installed or you "
-"need flexibility regarding which packages to install, use package lists as "
-"discussed in the following section, {Package lists}#package-lists."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:104
+#: en/user_customization-packages.ssi:91
msgid "3~package-lists Package lists"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:106
+#: en/user_customization-packages.ssi:93
msgid ""
"Package lists are a powerful way of expressing which packages should be "
"installed. The list syntax supports included files and conditional sections "
@@ -448,114 +413,103 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:108
-msgid "3~ Predefined package lists"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:110
-msgid ""
-"The simplest way to use lists is to specify one or more predefined lists "
-"with the #{--packages-lists}# option. For example:"
+#: en/user_customization-packages.ssi:95
+#, no-wrap
+msgid "*{Note:}* 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.\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:114
-#, no-wrap
-msgid " $ lb config --packages-lists \"gnome-core rescue\"\n"
+#: en/user_customization-packages.ssi:97
+msgid "3~ Predefined package lists"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:118
+#: en/user_customization-packages.ssi:99
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."
+"The simplest way to use lists is to specify one or more predefined lists "
+"with the #{--package-lists}# option. For example:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:120
+#: en/user_customization-packages.ssi:103
#, no-wrap
-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.\n"
+msgid " $ lb config --package-lists \"gnome rescue\"\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:122
+#: en/user_customization-packages.ssi:107
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 "
+"build/package-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:124
+#: en/user_customization-packages.ssi:109
msgid "3~ Local package lists"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:126
+#: en/user_customization-packages.ssi:111
msgid ""
-"You may supplement or replace entirely the supplied lists using local "
-"package lists stored in #{config/chroot_local-packageslists/}#."
+"You may supplement the predefined lists using local package lists stored in #"
+"{config/package-lists/}#."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:128
+#: en/user_customization-packages.ssi:113
msgid ""
"Package lists that exist in this directory need to have a #{.list}# suffix "
-"in order to be processed. Local package lists always override package lists "
-"distributed with live-build. This can cause undesired effects, we therefore "
-"recommend to use unique names for local package lists."
+"in order to be processed, and then an additional stage suffix, #{.chroot}# "
+"or #{.binary}# to indicate which stage the list is for."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:130
-msgid "3~ Local binary package lists"
+#: en/user_customization-packages.ssi:115
+#, no-wrap
+msgid "*{Note:}* If you don't specify the stage suffix, the list will be used for both stages. Normally, you want to specify #{.list.chroot}# so that the packages will only be installed in the live filesystem and not have an extra copy of the #{.deb}# placed on the media.\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:132
-msgid ""
-"In case you want to include some required .deb packages to live media's #"
-"{pool/}# (without installing them onto the live image) you may need to use "
-"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."
+#: en/user_customization-packages.ssi:117
+msgid "3~ Local binary package lists"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:134
+#: en/user_customization-packages.ssi:119
msgid ""
-"Package lists that exist in this directory need to have a #{.list}# suffix "
-"in order to be processed."
+"To make a binary stage list, place a file suffixed with #{.list.binary}# in #"
+"{config/package-lists/}#. These packages are not installed in the live "
+"filesystem, but are included on the live media under #{pool/}#. You would "
+"typically use such a list with one of the non-live installer variants. As "
+"mentioned above, if you want this list to be the same as your chroot stage "
+"list, simply use the #{.list}# suffix by itself."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:136
+#: en/user_customization-packages.ssi:121
msgid "3~ Extending a provided package list using includes"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:138
+#: en/user_customization-packages.ssi:123
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."
+"includes. Refer to these in the #{/usr/share/live/build/package-lists/}# "
+"directory, as they serve as good examples of how to write your own lists."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:140
+#: en/user_customization-packages.ssi:125
msgid ""
"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:"
+"iceweasel, create #{config/package-lists/my.list.chroot}# with the following "
+"contents:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:145
+#: en/user_customization-packages.ssi:130
#, no-wrap
msgid ""
" #include <gnome>\n"
@@ -563,12 +517,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:134
msgid "3~ Using conditionals inside package lists"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:151
+#: en/user_customization-packages.ssi:136
msgid ""
"Any of the live-build configuration variables stored in #{config/*}# (minus "
"the #{LB_}# prefix) may be used in conditional statements in package lists. "
@@ -579,14 +533,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:153
+#: en/user_customization-packages.ssi:138
msgid ""
"For example, to install #{ia32-libs}# if the #{--architecture amd64}# is "
"specified:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:159
+#: en/user_customization-packages.ssi:144
#, no-wrap
msgid ""
" #if ARCHITECTURE amd64\n"
@@ -595,14 +549,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:148
msgid ""
"You may test for any one of a number of values, e.g. to install #{memtest86+}"
"# if either #{--architecture i386}# or #{--architecture amd64}# is specified:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:169
+#: en/user_customization-packages.ssi:154
#, no-wrap
msgid ""
" #if ARCHITECTURE i386 amd64\n"
@@ -611,7 +565,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:173
+#: en/user_customization-packages.ssi:158
msgid ""
"You may also test against variables that may contain more than one value, e."
"g. to install #{vrms}# if either #{contrib}# or #{non-free}# is specified "
@@ -619,7 +573,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:179
+#: en/user_customization-packages.ssi:164
#, no-wrap
msgid ""
" #if ARCHIVE_AREAS contrib non-free\n"
@@ -628,12 +582,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:183
+#: en/user_customization-packages.ssi:168
msgid "A conditional may surround an #{#include}# directive:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:174
#, no-wrap
msgid ""
" #if ARCHITECTURE amd64\n"
@@ -642,34 +596,37 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:178
msgid "The nesting of conditionals is not supported."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:195
+#: en/user_customization-packages.ssi:180
msgid "3~ Tasks"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:197
+#: en/user_customization-packages.ssi:182
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."
+"live-build by putting them in a list in #{config/task-lists/}#, as in the "
+"example below."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:187
#, no-wrap
-msgid " $ lb config --tasks \"mail-server file-server\"\n"
+msgid ""
+" $ lb config\n"
+" $ echo \"mail-server file-server\" >> config/task-lists/my.list.chroot\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:205
+#: en/user_customization-packages.ssi:191
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, "
@@ -678,97 +635,87 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:193
msgid "3~desktop-and-language-tasks Desktop and language tasks"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:209
+#: en/user_customization-packages.ssi:195
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 #{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."
+"Desktop and language tasks are special cases that need some extra planning "
+"and configuration. Live images are different from Debian Installer images in "
+"this respect. 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 internal #{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:211
+#: en/user_customization-packages.ssi:197
msgid ""
-"In live-build, therefore, these special cases are also given special "
-"consideration, but with three notable differences at the time of writing."
+"When developing a desktop live image, the image typically boots directly to "
+"a working desktop, the choices of both desktop and default language having "
+"been made at build time, not at run time as in the case of the Debian "
+"Installer. That's not to say that a live image couldn't be built to support "
+"multiple desktops or multiple languages and offer the user a choice, but "
+"that is not live-build's default behaviour."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:213
+#: en/user_customization-packages.ssi:199
msgid ""
-"First, there is no provision made yet automatically for language tasks, "
-"although a subset of those packages are included if you specify #{lb config "
-"--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:"
+"Because there is no provision made automatically for language tasks, which "
+"include such things as language-specific fonts and input-method packages, if "
+"you want them, you need to specify them in your configuration. For example, "
+"a GNOME desktop image containing support for Japanese might include these "
+"tasks:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:217
+#: en/user_customization-packages.ssi:205
#, no-wrap
-msgid " $ lb config --tasks \"japanese japanese-desktop japanese-gnome-desktop\"\n"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:221
msgid ""
-"Second, live-build supports #{*-desktop}# virtual package lists for each of "
-"the desktop flavours mentioned above, which select the #{standard-x11}# "
-"predefined package list, the corresponding #{*-desktop}# task and three "
-"additional tasks: #{desktop}#, #{standard}# and #{laptop}#. So, for example, "
-"if you specify #{--packages-lists gnome-desktop}#, it is equivalent to "
-"specifying #{--packages debian-installer-launcher --packages-lists standard-"
-"x11 --tasks \"gnome-desktop desktop standard laptop\"}#."
+" $ lb config\n"
+" $ echo \"gnome-desktop desktop standard laptop\" >> config/task-lists/my.list.chroot\n"
+" $ echo \"japanese japanese-desktop japanese-gnome-desktop\" >> config/task-lists/my.list.chroot\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:223
+#: en/user_customization-packages.ssi:209
msgid ""
-"Third, if any of the tasks for these desktop flavours are selected, either "
-"explicitly through #{--tasks}# or implicitly by #{--packages-lists}#, 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."
+"Since desktop tasks are \"internal\" tasks, for every desktop flavour task "
+"included in the image, the corresponding value, if it differs from the "
+"default, \"gnome\", must be preseeded in the \"tasksel/desktop\" debconf "
+"variable or else tasksel will not recognize and install it. Thus:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:225
+#: en/user_customization-packages.ssi:214
#, no-wrap
-msgid "*{Note:}* There is also an experimental #{--language}# option that has an overlapping purpose with language tasks. For any language for which it is known that there are #{*-l10n}# packages, if #{--language}# is specified, those packages will be installed. Furthermore, if any #{syslinux}# templates matching the language are found, they will be used instead of the default English templates. The package selection done by #{--language}# is a poor approximation of language tasks, as it requires that the list of packages to include per language be maintained internally in live-build, and besides, language tasks are more comprehensive and flexible. However, the #{syslinux}# aspect is still useful. Thus, if you use #{--bootloader syslinux}# and templates for the specified language exist either in #{/usr/share/live/build/templates/syslinux/}# or #{config/templates/syslinux/}#, consider using this option, possibly in combination with tasks to ensure all relevant packages are in
stalled. For example:\n"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:229
-#, no-wrap
-msgid " $ lb config --language es\n"
+msgid ""
+" $ lb config\n"
+" $ echo 'tasksel tasksel/desktop multiselect kde' >> config/preseed/my.preseed.chroot\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:233
+#: en/user_customization-packages.ssi:218
msgid ""
-"Even so, it is limited in that it only supports a single language and a "
-"single bootloader. Therefore, for all of these reasons, the future of this "
-"option is under review, possibly to be replaced with something entirely "
-"different in the next major release of live-build."
+"This parameter can take multiple values, e.g. \"lxde xfce\" instead of \"kde"
+"\"."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:235
+#: en/user_customization-packages.ssi:220
msgid ""
"2~installing-modified-or-third-party-packages Installing modified or third-"
"party packages"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:237
+#: en/user_customization-packages.ssi:222
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 "
@@ -779,7 +726,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:239
+#: en/user_customization-packages.ssi:224
msgid ""
"This section does not cover advice regarding building or maintaining "
"modified packages. Joachim Breitner's 'How to fork privately' method from "
@@ -790,90 +737,90 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:241
+#: en/user_customization-packages.ssi:226
msgid "There are two ways of installing modified custom packages:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:243
-msgid "_* #{chroot_local-packages}#"
+#: en/user_customization-packages.ssi:228
+msgid "_* #{packages.chroot}#"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:245
+#: en/user_customization-packages.ssi:230
msgid "_* Using a custom APT repository"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:247
+#: en/user_customization-packages.ssi:232
msgid ""
-"Using #{chroot_local-packages}# is simpler to achieve and useful for \"one-"
-"off\" customizations but has a number of drawbacks, whilst using a custom "
-"APT repository is more time-consuming to set up."
+"Using #{packages.chroot}# 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:249
-msgid "3~ Using #{chroot_local-packages}# to install custom packages"
+#: en/user_customization-packages.ssi:234
+msgid "3~ Using #{packages.chroot}# to install custom packages"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:251
+#: en/user_customization-packages.ssi:236
msgid ""
-"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/packages.chroot/}"
+"# 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:253
+#: en/user_customization-packages.ssi:238
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:255
+#: en/user_customization-packages.ssi:240
msgid ""
-"Using #{chroot_local-packages}# for installation of custom packages has "
+"Using #{packages.chroot}# for installation of custom packages has "
"disadvantages:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:257
+#: en/user_customization-packages.ssi:242
msgid "_* It is not possible to use secure APT."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:259
+#: en/user_customization-packages.ssi:244
msgid ""
-"_* You must install all appropriate packages in the #{config/chroot_local-"
-"packages/}# directory."
+"_* You must install all appropriate packages in the #{config/packages."
+"chroot/}# directory."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:261
+#: en/user_customization-packages.ssi:246
msgid ""
"_* It does not lend itself to storing Debian Live configurations in revision "
"control."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:263
+#: en/user_customization-packages.ssi:248
msgid "3~ Using an APT repository to install custom packages"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:265
+#: en/user_customization-packages.ssi:250
msgid ""
-"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."
+"Unlike using #{packages.chroot}#, 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."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:267
+#: en/user_customization-packages.ssi:252
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 "
@@ -881,12 +828,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:269
+#: en/user_customization-packages.ssi:254
msgid "3~ Custom packages and APT"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:271
+#: en/user_customization-packages.ssi:256
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 "
@@ -896,7 +843,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:273
+#: en/user_customization-packages.ssi:258
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 "
@@ -906,28 +853,28 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:275
+#: en/user_customization-packages.ssi:260
msgid "2~ Configuring APT at build time"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:277
+#: en/user_customization-packages.ssi:262
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 "
+"appropriate configurations through #{config/includes.chroot/}#.) 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:279
+#: en/user_customization-packages.ssi:264
msgid "3~choosing-apt-or-aptitude Choosing apt or aptitude"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:281
+#: en/user_customization-packages.ssi:266
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 "
@@ -937,26 +884,26 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:283
+#: en/user_customization-packages.ssi:268
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:285
+#: en/user_customization-packages.ssi:270
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:287
+#: en/user_customization-packages.ssi:272
msgid "3~ Using a proxy with APT"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:289
+#: en/user_customization-packages.ssi:274
msgid ""
"One commonly required APT configuration is to deal with building an image "
"behind a proxy. You may specify your APT proxy with the #{--apt-ftp-proxy}# "
@@ -964,18 +911,18 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:293
+#: en/user_customization-packages.ssi:278
#, no-wrap
msgid " $ lb config --apt-http-proxy http://proxy/\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:297
+#: en/user_customization-packages.ssi:282
msgid "3~ Tweaking APT to save space"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:299
+#: en/user_customization-packages.ssi:284
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 "
@@ -983,20 +930,20 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:301
+#: en/user_customization-packages.ssi:286
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:305
+#: en/user_customization-packages.ssi:290
#, no-wrap
-msgid " $ lb config --binary-indices false\n"
+msgid " $ lb config --apt-indices false\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:309
+#: en/user_customization-packages.ssi:294
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 "
@@ -1006,20 +953,20 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:311
+#: en/user_customization-packages.ssi:296
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:315
+#: en/user_customization-packages.ssi:300
#, no-wrap
msgid " $ lb config --apt-recommends false\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:319
+#: en/user_customization-packages.ssi:304
msgid ""
"The tradeoff here is that if you don't install recommended packages for a "
"given package, that is, \"packages that would be found together with this "
@@ -1035,12 +982,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:321
+#: en/user_customization-packages.ssi:306
msgid "3~ Passing options to apt or aptitude"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:323
+#: en/user_customization-packages.ssi:308
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 "
@@ -1049,43 +996,43 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:325
+#: en/user_customization-packages.ssi:310
msgid "3~apt-pinning APT pinning"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:327
+#: en/user_customization-packages.ssi:312
msgid ""
"For background, please first read the #{apt_preferences(5)}# man page. APT "
"pinning can be configured either for build time, or else for run time. For "
"the former, create #{config/chroot_apt/preferences}#. For the latter, create "
-"#{config/chroot_local-includes/etc/apt/preferences}#."
+"#{config/includes.chroot/etc/apt/preferences}#."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:329
+#: en/user_customization-packages.ssi:314
msgid ""
-"Let's say you are building a Squeeze live system but need all the live "
+"Let's say you are building a Wheezy live system but need all the live "
"packages that end up in the binary image to be installed from Sid at build "
"time. You need to add Sid to your APT sources and pin it so that only the "
"packages you want are installed from it at build time and all others are "
-"taken from the target system distribution, Squeeze. The following will "
+"taken from the target system distribution, Wheezy. The following will "
"accomplish this:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:322
#, no-wrap
msgid ""
-" $ echo \"deb http://mirror/debian sid main\" > config/chroot_sources/sid.chroot\n"
-" $ cat >>config/chroot_apt/preferences <<END\n"
+" $ echo \"deb http://mirror/debian sid main\" > config/archives/sid.list.chroot\n"
+" $ cat >> config/chroot_apt/preferences <<END\n"
" Package: live-boot live-boot-initramfs-tools live-config live-config-sysvinit\n"
" Pin: release n=sid\n"
" Pin-Priority: 600\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:342
+#: en/user_customization-packages.ssi:327
#, no-wrap
msgid ""
" Package: *\n"
@@ -1095,31 +1042,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:346
+#: en/user_customization-packages.ssi:331
#, no-wrap
msgid "*{Note:}* Wildcards can be used in package names (e.g. *{Package: live-*}*) with Apt version 0.8.14 or higher. This means that it works with Wheezy using:\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:350
+#: en/user_customization-packages.ssi:335
msgid "$ lb config --distribution wheezy"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:354
+#: en/user_customization-packages.ssi:339
msgid ""
"Negative pin priorities will prevent a package from being installed, as in "
"the case where you do not want a package that is recommended by another "
-"package. Suppose you are building an LXDE image using #{--packages-lists "
-"lxde}# option, but don't want the user prompted to store wifi passwords in "
-"the keyring. This list includes #{gdm}#, which depends on #{gksu}#, which in "
+"package. Suppose you are building an LXDE image using #{--package-lists lxde}"
+"# option, but don't want the user prompted to store wifi passwords in the "
+"keyring. This list includes #{gdm}#, which depends on #{gksu}#, which in "
"turn recommends #{gnome-keyring}#. So you want to omit the recommended #"
"{gnome-keyring}# package. This can be done by adding the following stanza to "
"#{config/chroot_apt/preferences}#:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:360
+#: en/user_customization-packages.ssi:345
#, no-wrap
msgid ""
" Package: gnome-keyring\n"
diff --git a/manual/pot/user_customization-runtime.ssi.pot b/manual/pot/user_customization-runtime.ssi.pot
index ceaaf5c..a7c3c3e 100644
--- a/manual/pot/user_customization-runtime.ssi.pot
+++ b/manual/pot/user_customization-runtime.ssi.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2011-08-25 17:01+0300\n"
+"POT-Creation-Date: 2011-11-07 21:01-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"
@@ -37,48 +37,47 @@ msgstr ""
#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
-#: en/user_customization-installer.ssi:43
+#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
-#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:53
-#: en/user_customization-packages.ssi:66 en/user_customization-packages.ssi:80
-#: en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:112
-#: en/user_customization-packages.ssi:142
-#: en/user_customization-packages.ssi:155
-#: en/user_customization-packages.ssi:165
-#: en/user_customization-packages.ssi:175
-#: en/user_customization-packages.ssi:185
-#: en/user_customization-packages.ssi:199
-#: en/user_customization-packages.ssi:215
-#: en/user_customization-packages.ssi:227
-#: en/user_customization-packages.ssi:291
-#: en/user_customization-packages.ssi:303
-#: en/user_customization-packages.ssi:313
-#: en/user_customization-packages.ssi:331
-#: en/user_customization-packages.ssi:348
-#: en/user_customization-packages.ssi:356 en/user_customization-runtime.ssi:14
-#: en/user_customization-runtime.ssi:24 en/user_customization-runtime.ssi:44
-#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:63
-#: en/user_customization-runtime.ssi:71 en/user_customization-runtime.ssi:80
-#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:111
-#: en/user_customization-runtime.ssi:119 en/user_examples.ssi:14
+#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:54
+#: en/user_customization-packages.ssi:67 en/user_customization-packages.ssi:81
+#: en/user_customization-packages.ssi:101
+#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:140
+#: en/user_customization-packages.ssi:150
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:184
+#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:276
+#: en/user_customization-packages.ssi:288
+#: en/user_customization-packages.ssi:298
+#: en/user_customization-packages.ssi:316
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
+#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
+#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
+#: en/user_customization-runtime.ssi:104 en/user_customization-runtime.ssi:114
+#: en/user_customization-runtime.ssi:122 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:178 en/user_examples.ssi:190 en/user_examples.ssi:206
-#: en/user_examples.ssi:220 en/user_examples.ssi:229 en/user_examples.ssi:247
-#: en/user_examples.ssi:255 en/user_examples.ssi:268 en/user_examples.ssi:283
-#: en/user_installation.ssi:38 en/user_installation.ssi:46
-#: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi:74 en/user_installation.ssi:82
-#: en/user_installation.ssi:90 en/user_installation.ssi:114
-#: en/user_installation.ssi:129 en/user_installation.ssi:146
-#: en/user_managing_a_configuration.ssi:24
+#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
+#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
+#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
+#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
+#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
+#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
+#: en/user_examples.ssi:277 en/user_installation.ssi:38
+#: en/user_installation.ssi:46 en/user_installation.ssi:56
+#: en/user_installation.ssi:64 en/user_installation.ssi:74
+#: en/user_installation.ssi:82 en/user_installation.ssi:90
+#: en/user_installation.ssi:114 en/user_installation.ssi:129
+#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:80 en/user_overview.ssi:88
+#: en/user_overview.ssi:48 en/user_overview.ssi:56
msgid "code{"
msgstr ""
@@ -102,49 +101,48 @@ msgstr ""
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
-#: en/user_customization-installer.ssi:37
-#: en/user_customization-installer.ssi:48
+#: en/user_customization-installer.ssi:38
+#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:70 en/user_customization-packages.ssi:84
-#: en/user_customization-packages.ssi:98
-#: en/user_customization-packages.ssi:116
-#: en/user_customization-packages.ssi:147
-#: en/user_customization-packages.ssi:161
-#: en/user_customization-packages.ssi:171
-#: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:191
-#: en/user_customization-packages.ssi:203
-#: en/user_customization-packages.ssi:219
-#: en/user_customization-packages.ssi:231
-#: en/user_customization-packages.ssi:295
-#: en/user_customization-packages.ssi:307
-#: en/user_customization-packages.ssi:317
-#: en/user_customization-packages.ssi:344
-#: en/user_customization-packages.ssi:352
-#: en/user_customization-packages.ssi:361 en/user_customization-runtime.ssi:18
-#: en/user_customization-runtime.ssi:28 en/user_customization-runtime.ssi:48
-#: en/user_customization-runtime.ssi:59 en/user_customization-runtime.ssi:67
-#: en/user_customization-runtime.ssi:76 en/user_customization-runtime.ssi:85
-#: en/user_customization-runtime.ssi:105 en/user_customization-runtime.ssi:115
-#: en/user_customization-runtime.ssi:124 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:186 en/user_examples.ssi:202 en/user_examples.ssi:210
-#: en/user_examples.ssi:225 en/user_examples.ssi:233 en/user_examples.ssi:251
-#: en/user_examples.ssi:264 en/user_examples.ssi:279 en/user_examples.ssi:297
-#: en/user_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi:70
-#: en/user_installation.ssi:78 en/user_installation.ssi:86
-#: en/user_installation.ssi:94 en/user_installation.ssi:119
-#: en/user_installation.ssi:136 en/user_installation.ssi:149
-#: en/user_managing_a_configuration.ssi:31
+#: en/user_customization-packages.ssi:46 en/user_customization-packages.ssi:59
+#: en/user_customization-packages.ssi:71 en/user_customization-packages.ssi:85
+#: en/user_customization-packages.ssi:105
+#: en/user_customization-packages.ssi:132
+#: en/user_customization-packages.ssi:146
+#: en/user_customization-packages.ssi:156
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:329
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:346 en/user_customization-runtime.ssi:21
+#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
+#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
+#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
+#: en/user_customization-runtime.ssi:108 en/user_customization-runtime.ssi:118
+#: en/user_customization-runtime.ssi:127 en/user_examples.ssi:20
+#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
+#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
+#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
+#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
+#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
+#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
+#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
+#: en/user_examples.ssi:291 en/user_installation.ssi:42
+#: en/user_installation.ssi:50 en/user_installation.ssi:60
+#: en/user_installation.ssi:70 en/user_installation.ssi:78
+#: en/user_installation.ssi:86 en/user_installation.ssi:94
+#: en/user_installation.ssi:119 en/user_installation.ssi:136
+#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
-#: en/user_overview.ssi:84 en/user_overview.ssi:92
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:42
+#: en/user_overview.ssi:52 en/user_overview.ssi:60
msgid "}code"
msgstr ""
@@ -187,18 +185,22 @@ msgstr ""
msgid ""
"You can specify additional groups that the live user will belong to by "
"preseeding the #{passwd/user-default-groups}# debconf value. For example, to "
-"add the live user to the #{fuse}# group, add the following to a file in the #"
-"{config/chroot_local-preseed}# directory:"
+"add the live user to the #{fuse}# group, add the following preseed under #"
+"{config/preseed/}# for the chroot stage:"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:16
+#: en/user_customization-runtime.ssi:19
#, no-wrap
-msgid " user-setup passwd/user-default-groups string audio cdrom dip floppy video plugdev netdev powerdev scanner bluetooth fuse\n"
+msgid ""
+" $ lb config\n"
+" $ echo user-setup passwd/user-default-groups string audio cdrom \\\n"
+" dip floppy video plugdev netdev powerdev scanner bluetooth fuse \\\n"
+" >> config/preseed/my.preseed.chroot\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:20
+#: en/user_customization-runtime.ssi:23
msgid ""
"It is also possible to change the default username \"user\" and the default "
"password \"live\". If you want to do that for any reason, you can easily "
@@ -206,53 +208,53 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:22
+#: en/user_customization-runtime.ssi:25
msgid ""
"To change the default username you can simply specify it in your config:"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:26
+#: en/user_customization-runtime.ssi:29
msgid "$ lb config --bootappend-live \"username=live-user\""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:30
+#: en/user_customization-runtime.ssi:33
msgid ""
"One possible way of changing the default password is by means of a hook as "
"described in {Boot-time hooks}#boot-time-hooks. In order to do that you can "
"use the \"passwd\" hook from #{/usr/share/doc/live-config/examples/hooks}#, "
-"prefix it accordingly (e.g. 200-passwd) and add it to #{config/chroot_local-"
-"includes/lib/live/config/}#"
+"prefix it accordingly (e.g. 200-passwd) and add it to #{config/includes."
+"chroot/lib/live/config/}#"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:32
+#: en/user_customization-runtime.ssi:35
msgid "2~customizing-locale-and-language Customizing locale and language"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:34
+#: en/user_customization-runtime.ssi:37
msgid "When the live system boots, language is involved in three steps:"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:36
+#: en/user_customization-runtime.ssi:39
msgid "_* the locale generation"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:38
+#: en/user_customization-runtime.ssi:41
msgid "_* setting the keyboard layout for the console"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:40
+#: en/user_customization-runtime.ssi:43
msgid "_* setting the keyboard layout for X"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:42
+#: en/user_customization-runtime.ssi:45
msgid ""
"The default locale when building a Live system is \"locales=en_US.UTF-8\". "
"To define the locale that should be generated, use the #{locales}# parameter "
@@ -260,20 +262,20 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:46
+#: en/user_customization-runtime.ssi:49
#, no-wrap
msgid " $ lb config --bootappend-live \"locales=de_CH.UTF-8\"\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:50
+#: en/user_customization-runtime.ssi:53
msgid ""
"This parameter can also be used at the kernel command line. You can specify "
"a locale by a full #{language_country.encoding}# word."
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:52
+#: en/user_customization-runtime.ssi:55
msgid ""
"Both the console and X keyboard configuration depend on the #{keyboard-"
"layouts}# parameter of the #{--bootappend-live}# option. Valid options for X "
@@ -284,7 +286,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:57
+#: en/user_customization-runtime.ssi:60
#, no-wrap
msgid ""
" $ grep -i sweden -C3 /usr/share/X11/xkb/rules/base.xml | grep name\n"
@@ -292,26 +294,26 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:61
+#: en/user_customization-runtime.ssi:64
msgid ""
"To get the locale files for German and Swiss German keyboard layout in X use:"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:65
+#: en/user_customization-runtime.ssi:68
#, no-wrap
msgid " $ lb config --bootappend-live \"locales=de_CH.UTF-8 keyboard-layouts=ch\"\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:69
+#: en/user_customization-runtime.ssi:72
msgid ""
"A list of the valid values of the keyboards for the console can be figured "
"with the following command:"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:74
+#: en/user_customization-runtime.ssi:77
#, no-wrap
msgid ""
" $ for i in $(find /usr/share/keymaps/ -iname \"*kmap.gz\"); \\\n"
@@ -319,7 +321,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:78
+#: en/user_customization-runtime.ssi:81
msgid ""
"Alternatively, you can use the #{console-setup}# package, a tool to let you "
"configure console layout using X (XKB) definitions; you can then set your "
@@ -331,7 +333,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:83
+#: en/user_customization-runtime.ssi:86
#, no-wrap
msgid ""
" $ lb config --bootappend-live \\\n"
@@ -339,12 +341,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:87
+#: en/user_customization-runtime.ssi:90
msgid "2~persistence Persistence"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:89
+#: en/user_customization-runtime.ssi:92
msgid ""
"A live cd paradigm is a pre-installed system which runs from read-only "
"media, like a cdrom, where writes and modifications do not survive reboots "
@@ -352,7 +354,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:91
+#: en/user_customization-runtime.ssi:94
msgid ""
"A Debian Live system is a generalization of this paradigm and thus supports "
"other media in addition to CDs; but still, in its default behaviour, it "
@@ -361,7 +363,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:93
+#: en/user_customization-runtime.ssi:96
msgid ""
"Persistence is a common name for different kinds of solutions for saving "
"across reboots some, or all, of this run-time evolution of the system. To "
@@ -372,7 +374,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:95
+#: en/user_customization-runtime.ssi:98
msgid ""
"The data stored on this ramdisk should be saved on a writable persistent "
"medium like a Hard Disk, a USB key, a network share or even a session of a "
@@ -382,12 +384,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:97
+#: en/user_customization-runtime.ssi:100
msgid "3~ Full persistence"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:99
+#: en/user_customization-runtime.ssi:102
msgid ""
"By 'full persistence' it is meant that instead of using a tmpfs for storing "
"modifications to the read-only media (with the copy-on-write, COW, system) a "
@@ -399,31 +401,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:103
+#: en/user_customization-runtime.ssi:106
#, no-wrap
msgid " # mkfs.ext2 -L live-rw /dev/sdb1\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:107
+#: en/user_customization-runtime.ssi:110
msgid "See also {Using the space left on a USB stick}#using-usb-extra-space."
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:109
+#: en/user_customization-runtime.ssi:112
msgid ""
"If you already have a partition on your device, you could just change the "
"label with one of the following:"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:113
+#: en/user_customization-runtime.ssi:116
#, no-wrap
msgid " # tune2fs -L live-rw /dev/sdb1 # for ext2,3,4 filesystems\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:117
+#: en/user_customization-runtime.ssi:120
msgid ""
"But since live system users cannot always use a hard drive partition, and "
"considering that most USB keys have poor write speeds, 'full' persistence "
@@ -433,7 +435,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:122
+#: en/user_customization-runtime.ssi:125
#, no-wrap
msgid ""
" $ dd if=/dev/null of=live-rw bs=1G seek=1 # for a 1GB sized image file\n"
@@ -441,19 +443,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:126
+#: en/user_customization-runtime.ssi:129
msgid ""
"Then copy the #{live-rw}# file to a writable partition and reboot with the "
"boot parameter 'persistent'."
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:128
+#: en/user_customization-runtime.ssi:131
msgid "3~ Home automounting"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:130
+#: en/user_customization-runtime.ssi:133
msgid ""
"If during the boot a partition (filesystem) image file or a partition "
"labeled #{home-rw}# is discovered, this filesystem will be directly mounted "
@@ -462,12 +464,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:132
+#: en/user_customization-runtime.ssi:135
msgid "3~ Snapshots"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:134
+#: en/user_customization-runtime.ssi:137
msgid ""
"Snapshots are collections of files and directories which are not mounted "
"while running but which are copied from a persistent device to the system "
@@ -484,26 +486,26 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:136
+#: en/user_customization-runtime.ssi:139
msgid ""
"A /home version of snapshot exists too and its label is #{home-sn.*}#; it "
"works the same as the main snapshot but it is only applied to /home."
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:138
+#: en/user_customization-runtime.ssi:141
msgid ""
"Snapshots cannot currently handle file deletion but full persistence and "
"home automounting can."
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:140
+#: en/user_customization-runtime.ssi:143
msgid "3~ Persistent SubText"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:142
+#: en/user_customization-runtime.ssi:145
msgid ""
"If a user would need multiple persistent storage of the same type for "
"different locations or testing, such as #{live-rw-nonwork}# and #{live-rw-"
@@ -515,12 +517,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:144
+#: en/user_customization-runtime.ssi:147
msgid "3~ Partial remastering"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:145
+#: en/user_customization-runtime.ssi:148
msgid ""
"The run-time modification of the tmpfs could be collected using live-"
"snapshot in a squashfs and added to the cd by remastering the iso in the "
diff --git a/manual/pot/user_examples.ssi.pot b/manual/pot/user_examples.ssi.pot
index 9269a75..06a4125 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: 2011-04-23 14:15+0300\n"
+"POT-Creation-Date: 2011-11-13 17:12+0100\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"
@@ -42,37 +42,38 @@ msgstr ""
#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
-#: en/user_customization-installer.ssi:43
+#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
-#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:53
-#: en/user_customization-packages.ssi:66 en/user_customization-packages.ssi:80
-#: en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:112
-#: en/user_customization-packages.ssi:142
-#: en/user_customization-packages.ssi:155
-#: en/user_customization-packages.ssi:165
-#: en/user_customization-packages.ssi:175
-#: en/user_customization-packages.ssi:185
-#: en/user_customization-packages.ssi:199
-#: en/user_customization-packages.ssi:215
-#: en/user_customization-packages.ssi:227
-#: en/user_customization-packages.ssi:291
-#: en/user_customization-packages.ssi:303
-#: en/user_customization-packages.ssi:313
-#: en/user_customization-packages.ssi:331
-#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
-#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
-#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
-#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
-#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:105
-#: 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:178 en/user_examples.ssi:190
-#: en/user_examples.ssi:206 en/user_examples.ssi:220 en/user_examples.ssi:229
-#: en/user_examples.ssi:247 en/user_examples.ssi:255 en/user_examples.ssi:268
-#: en/user_examples.ssi:283 en/user_installation.ssi:38
+#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:54
+#: en/user_customization-packages.ssi:67 en/user_customization-packages.ssi:81
+#: en/user_customization-packages.ssi:101
+#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:140
+#: en/user_customization-packages.ssi:150
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:184
+#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:276
+#: en/user_customization-packages.ssi:288
+#: en/user_customization-packages.ssi:298
+#: en/user_customization-packages.ssi:316
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
+#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
+#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
+#: en/user_customization-runtime.ssi:104 en/user_customization-runtime.ssi:114
+#: en/user_customization-runtime.ssi:122 en/user_examples.ssi:14
+#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
+#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
+#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
+#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
+#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
+#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
+#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
+#: en/user_examples.ssi:277 en/user_installation.ssi:38
#: en/user_installation.ssi:46 en/user_installation.ssi:56
#: en/user_installation.ssi:64 en/user_installation.ssi:74
#: en/user_installation.ssi:82 en/user_installation.ssi:90
@@ -81,7 +82,7 @@ msgstr ""
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:80 en/user_overview.ssi:88
+#: en/user_overview.ssi:48 en/user_overview.ssi:56
msgid "code{"
msgstr ""
@@ -105,38 +106,39 @@ msgstr ""
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
-#: en/user_customization-installer.ssi:37
-#: en/user_customization-installer.ssi:48
+#: en/user_customization-installer.ssi:38
+#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:70 en/user_customization-packages.ssi:84
-#: en/user_customization-packages.ssi:98
-#: en/user_customization-packages.ssi:116
-#: en/user_customization-packages.ssi:147
-#: en/user_customization-packages.ssi:161
-#: en/user_customization-packages.ssi:171
-#: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:191
-#: en/user_customization-packages.ssi:203
-#: en/user_customization-packages.ssi:219
-#: en/user_customization-packages.ssi:231
-#: en/user_customization-packages.ssi:295
-#: en/user_customization-packages.ssi:307
-#: en/user_customization-packages.ssi:317
-#: en/user_customization-packages.ssi:344
-#: en/user_customization-packages.ssi:353 en/user_customization-runtime.ssi:18
-#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
-#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
-#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
-#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:110
-#: 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:186 en/user_examples.ssi:202
-#: en/user_examples.ssi:210 en/user_examples.ssi:225 en/user_examples.ssi:233
-#: en/user_examples.ssi:251 en/user_examples.ssi:264 en/user_examples.ssi:279
-#: en/user_examples.ssi:297 en/user_installation.ssi:42
+#: en/user_customization-packages.ssi:46 en/user_customization-packages.ssi:59
+#: en/user_customization-packages.ssi:71 en/user_customization-packages.ssi:85
+#: en/user_customization-packages.ssi:105
+#: en/user_customization-packages.ssi:132
+#: en/user_customization-packages.ssi:146
+#: en/user_customization-packages.ssi:156
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:329
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:346 en/user_customization-runtime.ssi:21
+#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
+#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
+#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
+#: en/user_customization-runtime.ssi:108 en/user_customization-runtime.ssi:118
+#: en/user_customization-runtime.ssi:127 en/user_examples.ssi:20
+#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
+#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
+#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
+#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
+#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
+#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
+#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
+#: en/user_examples.ssi:291 en/user_installation.ssi:42
#: en/user_installation.ssi:50 en/user_installation.ssi:60
#: en/user_installation.ssi:70 en/user_installation.ssi:78
#: en/user_installation.ssi:86 en/user_installation.ssi:94
@@ -144,14 +146,14 @@ msgstr ""
#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
-#: en/user_overview.ssi:84 en/user_overview.ssi:92
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:42
+#: en/user_overview.ssi:52 en/user_overview.ssi:60
msgid "}code"
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:44 en/user_basics.ssi:170 en/user_basics.ssi:238
-#: en/user_examples.ssi:109 en/user_examples.ssi:208
+#: en/user_examples.ssi:119 en/user_examples.ssi:211
#, no-wrap
msgid " # lb build\n"
msgstr ""
@@ -192,17 +194,18 @@ msgid ""
"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:"
+"and in it, set the corresponding #{LB_PARENT_MIRROR_*}# variables to your "
+"preferred mirror. All other mirrors used in the build will be defaulted from "
+"these values. For example:"
msgstr ""
#. type: Plain text
#: en/user_examples.ssi:18
#, no-wrap
msgid ""
-" LB_MIRROR_BOOTSTRAP=\"http://mirror/debian\"\n"
-" LB_MIRROR_CHROOT=\"http://mirror/debian\"\n"
-" LB_MIRROR_CHROOT_SECURITY=\"http://mirror/debian-security\"\n"
+" LB_PARENT_MIRROR_BOOTSTRAP=\"http://mirror/debian\"\n"
+" LB_PARENT_MIRROR_CHROOT_SECURITY=\"http://mirror/debian-security\"\n"
+" LB_PARENT_MIRROR_CHROOT_BACKPORTS=\"http://mirror/debian-updates\"\n"
msgstr ""
#. type: Plain text
@@ -250,7 +253,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:42 en/user_examples.ssi:66 en/user_examples.ssi:231
+#: en/user_examples.ssi:42 en/user_examples.ssi:69 en/user_examples.ssi:234
#, no-wrap
msgid " # lb build 2>&1 | tee binary.log\n"
msgstr ""
@@ -287,47 +290,51 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:56
+#: en/user_examples.ssi:59
#, no-wrap
-msgid " $ mkdir tutorial2 ; cd tutorial2 ; lb config -p lxde --packages iceweasel\n"
+msgid ""
+" $ mkdir tutorial2\n"
+" $ cd tutorial2\n"
+" $ lb config -p lxde\n"
+" $ echo iceweasel >> config/package-lists/my.list.chroot\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:60
+#: en/user_examples.ssi:63
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."
+"configuration for the web browser in #{config/includes.chroot/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
+#: en/user_examples.ssi:65
msgid ""
"Build the image, again as superuser, keeping a log as in {Tutorial 1}"
"#tutorial-1:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:70
+#: en/user_examples.ssi:73
msgid "Again, verify the image is OK and test, as in {Tutorial 1}#tutorial-1."
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:72
+#: en/user_examples.ssi:75
msgid "2~tutorial-3 Tutorial 3: A personalized image"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:74
+#: en/user_examples.ssi:77
#, 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
+#: en/user_examples.ssi:79
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 "
@@ -338,12 +345,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:78
+#: en/user_examples.ssi:81
msgid "3~ First revision"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:84
+#: en/user_examples.ssi:87
#, no-wrap
msgid ""
" $ mkdir -p tutorial3/auto\n"
@@ -352,53 +359,63 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:88
+#: en/user_examples.ssi:91
msgid "Edit #{auto/config}# to read as follows:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:92 en/user_examples.ssi:141
+#: en/user_examples.ssi:95
#, no-wrap
msgid " #!/bin/sh\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:99
+#: en/user_examples.ssi:101
#, no-wrap
msgid ""
" lb config noauto \\\n"
" --architecture i386 \\\n"
-" --linux-flavours 686 \\\n"
-" --packages-lists lxde \\\n"
-" --packages \"iceweasel xchat\" \\\n"
+" --linux-flavours 686-pae \\\n"
+" --package-lists lxde \\\n"
" \"${@}\"\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:103
+#: en/user_examples.ssi:105
+msgid "Now populate your local package list:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:109
+#, no-wrap
+msgid " $ echo \"iceweasel xchat\" >> config/package-lists/my.list.chroot\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:113
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}#."
+"{--linux-flavours 686-pae}# 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
+#: en/user_examples.ssi:115
msgid "Now, build the image:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:113
+#: en/user_examples.ssi:123
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
+#: en/user_examples.ssi:125
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 "
@@ -406,7 +423,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:121
+#: en/user_examples.ssi:131
#, no-wrap
msgid ""
" $ git init\n"
@@ -415,19 +432,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:125
+#: en/user_examples.ssi:135
msgid "3~ Second revision"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:127
+#: en/user_examples.ssi:137
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
+#: en/user_examples.ssi:139
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 "
@@ -436,51 +453,47 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:133
+#: en/user_examples.ssi:143
#, no-wrap
msgid " # lb clean\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:137
-msgid "Now edit #{auto/config}# to add the #{vlc}# package:"
+#: en/user_examples.ssi:147
+msgid ""
+"Now append the #{vlc}# package to our local package list in #{config/package-"
+"lists/my.list.chroot}#:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:148
+#: en/user_examples.ssi:151
#, no-wrap
-msgid ""
-" lb config noauto \\\n"
-" --architecture i386 \\\n"
-" --linux-flavours 686 \\\n"
-" --packages-lists lxde \\\n"
-" --packages \"iceweasel xchat vlc\" \\\n"
-" \"${@}\"\n"
+msgid " $ echo vlc >> config/package-lists/my.list.chroot\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:152
+#: en/user_examples.ssi:155
msgid "Build again:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:156
+#: en/user_examples.ssi:159
msgid "# lb build"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:160
+#: en/user_examples.ssi:163
msgid "Test, and when you're satisfied, commit the next revision:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:164
+#: en/user_examples.ssi:167
#, no-wrap
msgid " $ git commit -a -m \"Adding vlc media player.\"\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:168
+#: en/user_examples.ssi:171
msgid ""
"Of course, more complicated changes to the configuration are possible, "
"perhaps adding files in subdirectories of #{config/}#. When you commit new "
@@ -491,7 +504,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:170
+#: en/user_examples.ssi:173
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 "
@@ -501,37 +514,37 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:172
+#: en/user_examples.ssi:175
msgid "2~ A VNC Kiosk Client"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:174
+#: en/user_examples.ssi:177
#, no-wrap
msgid "*{Use case:}* Create an image with live-build to boot directly to a VNC server.\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:176
+#: en/user_examples.ssi:179
msgid ""
"Make a build directory and create a skeletal configuration in it built "
"around the standard-x11 list, including #{gdm3}#, #{metacity}# and #"
-"{xtightvncviewer}#, disabling recommends to make a minimal system:"
+"{xvnc4viewer}#, disabling recommends to make a minimal system:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:184
+#: en/user_examples.ssi:187
#, no-wrap
msgid ""
" $ mkdir vnc_kiosk_client\n"
" $ cd vnc_kiosk_client\n"
-" $ lb config -a i386 -k 686 -p standard-x11 \\\n"
-" --packages \"gdm3 metacity xvnc4viewer\" \\\n"
+" $ lb config -a i386 -k 686-pae -p standard-x11 \\\n"
" --apt-recommends false\n"
+" $ echo \"gdm3 metacity xvnc4viewer\" >> config/package-lists/my.list.chroot\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:188
+#: en/user_examples.ssi:191
msgid ""
"Create the directory #{/etc/skel}# and put a custom #{.xsession}# in it for "
"the default user that will launch metacity and start xvncviewer, connecting "
@@ -539,16 +552,16 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:194
+#: en/user_examples.ssi:197
#, no-wrap
msgid ""
-" $ mkdir -p config/chroot_local-includes/etc/skel\n"
-" $ cat >config/chroot_local-includes/etc/skel/.xsession <<END\n"
+" $ mkdir -p config/includes.chroot/etc/skel\n"
+" $ cat > config/includes.chroot/etc/skel/.xsession <<END\n"
" #!/bin/sh\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:197
+#: en/user_examples.ssi:200
#, no-wrap
msgid ""
" /usr/bin/metacity &\n"
@@ -556,7 +569,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:200
+#: en/user_examples.ssi:203
#, no-wrap
msgid ""
" exit\n"
@@ -564,28 +577,28 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:204
+#: en/user_examples.ssi:207
msgid "Build the image:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:212
+#: en/user_examples.ssi:215
msgid "Enjoy."
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:214
+#: en/user_examples.ssi:217
msgid "2~ A base image for a 128M USB key"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:216
+#: en/user_examples.ssi:219
#, 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:218
+#: en/user_examples.ssi:221
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 "
@@ -599,20 +612,20 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:223
+#: en/user_examples.ssi:226
#, no-wrap
msgid ""
-" $ lb config -k 486 -p minimal --binary-indices false \\\n"
+" $ lb config -k 486 -p minimal --apt-indices false \\\n"
" --memtest none --apt-recommends false --includes none\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:227
+#: en/user_examples.ssi:230
msgid "Now, build the image in the usual way:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:235
+#: en/user_examples.ssi:238
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 "
@@ -620,12 +633,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:237
+#: en/user_examples.ssi:240
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 "
+"instead of the default #{-k \"486 686-pae\"}#. Leaving off APT's indices "
+"with #{--apt-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 #{--"
@@ -638,18 +651,18 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:239
+#: en/user_examples.ssi:242
msgid "2~ A localized KDE desktop and installer"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:241
+#: en/user_examples.ssi:244
#, no-wrap
msgid "*{Use case:}* Create a KDE desktop image, localized for Brazilian Portuguese and including an installer.\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:243
+#: en/user_examples.ssi:246
msgid ""
"We want to make an iso-hybrid image for i386 architecture using our "
"preferred desktop, in this case KDE, containing all of the same packages "
@@ -657,76 +670,62 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:245
+#: en/user_examples.ssi:248
msgid ""
-"Our initial problem is the discovery of the names of the appropriate tasks. "
-"Currently, live-build cannot help with this. While we might get lucky and "
-"find this by trial-and-error, there is a tool, #{grep-dctrl}#, which can be "
-"used to dig it out of the task descriptions in tasksel-data, so to prepare, "
-"make sure you have both of those things:"
+"Our initial problem is the discovery of the names of the appropriate "
+"language tasks. Currently, live-build cannot help with this. While we might "
+"get lucky and find this by trial-and-error, there is a tool, #{grep-dctrl}#, "
+"which can be used to dig it out of the task descriptions in tasksel-data, so "
+"to prepare, make sure you have both of those things:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:249
+#: en/user_examples.ssi:252
#, no-wrap
msgid " # apt-get install dctrl-tools tasksel-data\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:253
+#: en/user_examples.ssi:256
msgid "Now we can search for the appropriate tasks, first with:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:262
+#: en/user_examples.ssi:261
#, no-wrap
msgid ""
-" $ grep-dctrl -FTest-lang pt_BR /usr/share/tasksel/debian-tasks.desc -sTask,Description\n"
+" $ grep-dctrl -FTest-lang pt_BR /usr/share/tasksel/descs/debian-tasks.desc -sTask\n"
" Task: brazilian-portuguese\n"
-" Description: Brazilian Portuguese environment\n"
-" This task installs programs, data files, and\n"
-" documentation that make it easier for Brazilian Portuguese speakers\n"
-" to use Debian.\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:266
+#: en/user_examples.ssi:265
msgid ""
"By this command, we discover the task is called, plainly enough, brazilian-"
"portuguese. Now to find the related tasks:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:273
+#: en/user_examples.ssi:271
#, no-wrap
msgid ""
-" $ grep-dctrl -FEnhances brazilian-portuguese /usr/share/tasksel/debian-tasks.desc -sTask,Description\n"
+" $ grep-dctrl -FEnhances brazilian-portuguese /usr/share/tasksel/descs/debian-tasks.desc -sTask\n"
" Task: brazilian-portuguese-desktop\n"
-" Description: Brazilian Portuguese desktop\n"
-" This task localises the desktop in Brasilian Portuguese.\n"
-msgstr ""
-
-#. type: Plain text
-#: en/user_examples.ssi:277
-#, no-wrap
-msgid ""
" Task: brazilian-portuguese-kde-desktop\n"
-" Description: Brazilian Portuguese KDE desktop\n"
-" This task localises the KDE desktop in Brazilian Portuguese.\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:281
+#: en/user_examples.ssi:275
msgid ""
-"We will use the experimental #{--language}# option, as live-build happens to "
-"include #{syslinux}# templates for pt_BR (see {Desktop and language tasks}"
-"#desktop-and-language-tasks for details). And at boot time we will generate "
-"the pt_BR.UTF-8 locale and select the pt-latin1 keyboard layout. Now let's "
-"put the pieces together:"
+"At boot time we will generate the pt_BR.UTF-8 locale and select the pt-"
+"latin1 keyboard layout. We will also need to preseed our desktop choice, "
+"\"kde\" so that tasksel will install the correct desktop task, as it differs "
+"from the default (see {Desktop and languages tasks}#desktop-and-language-"
+"tasks). Now let's put the pieces together:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:295
+#: en/user_examples.ssi:289
#, no-wrap
msgid ""
" $ mkdir live-pt_BR-kde\n"
@@ -734,16 +733,16 @@ msgid ""
" $ lb config \\\n"
" -a i386 \\\n"
" -k 486 \\\n"
-" -p kde-desktop \\\n"
-" --language pt_BR \\\n"
-" --tasks \"brazilian-portuguese brazilian-portuguese-desktop brazilian-portuguese-kde-desktop\" \\\n"
" --bootappend-live \"locales=pt_BR.UTF-8 keyboard-layouts=pt-latin1\" \\\n"
-" --debian-installer live \\\n"
-" --packages debian-installer-launcher\n"
+" --debian-installer live\n"
+" $ echo kde-desktop brazilian-portuguese brazilian-portuguese-desktop \\\n"
+" brazilian-portuguese-kde-desktop >> config/task-lists/my.list.chroot\n"
+" $ echo debian-installer-launcher >> config/package-lists/my.list.chroot\n"
+" $ echo tasksel tasksel/desktop multiselect kde >> config/preseed/my.preseed.chroot\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:298
+#: en/user_examples.ssi:292
msgid ""
"Note that we have included the #{debian-installer-launcher}# package to "
"launch the installer from the live desktop, and have also specified the 486 "
diff --git a/manual/pot/user_installation.ssi.pot b/manual/pot/user_installation.ssi.pot
index de0a8c0..d4a9bee 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: 2011-06-21 09:17+0300\n"
+"POT-Creation-Date: 2011-11-07 17: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"
@@ -37,37 +37,38 @@ msgstr ""
#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
-#: en/user_customization-installer.ssi:43
+#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
-#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:53
-#: en/user_customization-packages.ssi:66 en/user_customization-packages.ssi:80
-#: en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:112
-#: en/user_customization-packages.ssi:142
-#: en/user_customization-packages.ssi:155
-#: en/user_customization-packages.ssi:165
-#: en/user_customization-packages.ssi:175
-#: en/user_customization-packages.ssi:185
-#: en/user_customization-packages.ssi:199
-#: en/user_customization-packages.ssi:215
-#: en/user_customization-packages.ssi:227
-#: en/user_customization-packages.ssi:291
-#: en/user_customization-packages.ssi:303
-#: en/user_customization-packages.ssi:313
-#: en/user_customization-packages.ssi:331
-#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
-#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
-#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
-#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
-#: en/user_customization-runtime.ssi:99 en/user_customization-runtime.ssi:107
-#: 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:178 en/user_examples.ssi:190
-#: en/user_examples.ssi:206 en/user_examples.ssi:220 en/user_examples.ssi:229
-#: en/user_examples.ssi:247 en/user_examples.ssi:255 en/user_examples.ssi:268
-#: en/user_examples.ssi:283 en/user_installation.ssi:38
+#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:54
+#: en/user_customization-packages.ssi:67 en/user_customization-packages.ssi:81
+#: en/user_customization-packages.ssi:101
+#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:140
+#: en/user_customization-packages.ssi:150
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:184
+#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:276
+#: en/user_customization-packages.ssi:288
+#: en/user_customization-packages.ssi:298
+#: en/user_customization-packages.ssi:316
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:24 en/user_customization-runtime.ssi:44
+#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:63
+#: en/user_customization-runtime.ssi:71 en/user_customization-runtime.ssi:80
+#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:111
+#: en/user_customization-runtime.ssi:119 en/user_examples.ssi:14
+#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
+#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
+#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
+#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
+#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
+#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
+#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
+#: en/user_examples.ssi:277 en/user_installation.ssi:38
#: en/user_installation.ssi:46 en/user_installation.ssi:56
#: en/user_installation.ssi:64 en/user_installation.ssi:74
#: en/user_installation.ssi:82 en/user_installation.ssi:90
@@ -76,7 +77,7 @@ msgstr ""
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:80 en/user_overview.ssi:88
+#: en/user_overview.ssi:48 en/user_overview.ssi:56
msgid "code{"
msgstr ""
@@ -100,38 +101,39 @@ msgstr ""
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
-#: en/user_customization-installer.ssi:37
-#: en/user_customization-installer.ssi:48
+#: en/user_customization-installer.ssi:38
+#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:70 en/user_customization-packages.ssi:84
-#: en/user_customization-packages.ssi:98
-#: en/user_customization-packages.ssi:116
-#: en/user_customization-packages.ssi:147
-#: en/user_customization-packages.ssi:161
-#: en/user_customization-packages.ssi:171
-#: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:191
-#: en/user_customization-packages.ssi:203
-#: en/user_customization-packages.ssi:219
-#: en/user_customization-packages.ssi:231
-#: en/user_customization-packages.ssi:295
-#: en/user_customization-packages.ssi:307
-#: en/user_customization-packages.ssi:317
-#: en/user_customization-packages.ssi:344
-#: en/user_customization-packages.ssi:353 en/user_customization-runtime.ssi:18
-#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
-#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
-#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
-#: en/user_customization-runtime.ssi:103 en/user_customization-runtime.ssi:112
-#: 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:186 en/user_examples.ssi:202
-#: en/user_examples.ssi:210 en/user_examples.ssi:225 en/user_examples.ssi:233
-#: en/user_examples.ssi:251 en/user_examples.ssi:264 en/user_examples.ssi:279
-#: en/user_examples.ssi:297 en/user_installation.ssi:42
+#: en/user_customization-packages.ssi:46 en/user_customization-packages.ssi:59
+#: en/user_customization-packages.ssi:71 en/user_customization-packages.ssi:85
+#: en/user_customization-packages.ssi:105
+#: en/user_customization-packages.ssi:132
+#: en/user_customization-packages.ssi:146
+#: en/user_customization-packages.ssi:156
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:329
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:346 en/user_customization-runtime.ssi:18
+#: en/user_customization-runtime.ssi:28 en/user_customization-runtime.ssi:48
+#: en/user_customization-runtime.ssi:59 en/user_customization-runtime.ssi:67
+#: en/user_customization-runtime.ssi:76 en/user_customization-runtime.ssi:85
+#: en/user_customization-runtime.ssi:105 en/user_customization-runtime.ssi:115
+#: en/user_customization-runtime.ssi:124 en/user_examples.ssi:20
+#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
+#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
+#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
+#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
+#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
+#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
+#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
+#: en/user_examples.ssi:291 en/user_installation.ssi:42
#: en/user_installation.ssi:50 en/user_installation.ssi:60
#: en/user_installation.ssi:70 en/user_installation.ssi:78
#: en/user_installation.ssi:86 en/user_installation.ssi:94
@@ -139,15 +141,15 @@ msgstr ""
#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
-#: en/user_overview.ssi:84 en/user_overview.ssi:92
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:42
+#: en/user_overview.ssi:52 en/user_overview.ssi:60
msgid "}code"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:82 en/user_installation.ssi:148
+#: en/user_customization-packages.ssi:83 en/user_installation.ssi:148
#, no-wrap
-msgid " $ lb config --repository live.debian.net\n"
+msgid " $ lb config --archives live.debian.net\n"
msgstr ""
#. type: Plain text
@@ -350,7 +352,7 @@ msgstr ""
#. type: Plain text
#: en/user_installation.ssi:102
#, no-wrap
-msgid "*{Note:}* You do not need to install live-boot or live-config on your system to create customized Debian Live systems. However, doing so will do no harm and is useful for reference purposes.\n"
+msgid "*{Note:}* You do not need to install live-boot or live-config on your system to create customized Debian Live systems. However, doing so will do no harm and is useful for reference purposes. If you only want the documentation, you may now install the live-boot-doc and live-config-doc packages separately.\n"
msgstr ""
#. type: Plain text
@@ -396,8 +398,8 @@ msgstr ""
#: en/user_installation.ssi:125
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 "
-"build against Squeeze."
+"your target platform: this means if your target is Wheezy then you should "
+"build against Wheezy."
msgstr ""
#. type: Plain text
@@ -405,9 +407,9 @@ msgstr ""
msgid ""
"Use a personal builder such as /{pbuilder}/ or /{sbuild}/ if you need to "
"build #{live-boot}# for a target distribution that differs from your build "
-"system. For example, for Squeeze live images, build #{live-boot}# in a "
-"Squeeze chroot. If your target distribution happens to match your build "
-"system distribution, you may build directly on the build system using #{dpkg-"
+"system. For example, for Wheezy live images, build #{live-boot}# in a Wheezy "
+"chroot. If your target distribution happens to match your build system "
+"distribution, you may build directly on the build system using #{dpkg-"
"buildpackage}# (provided by the /{dpkg-dev}/ package):"
msgstr ""
@@ -443,5 +445,5 @@ msgid ""
"You can let live-build automatically use the latest snapshots of live-boot "
"and live-config by configuring a third-party repository in your live-build "
"configuration directory. Assuming you have already created a configuration "
-"tree with #{lb config}#:"
+"tree in the current directory with #{lb config}#:"
msgstr ""
diff --git a/manual/pot/user_managing_a_configuration.ssi.pot b/manual/pot/user_managing_a_configuration.ssi.pot
index 9e81e1a..8436b29 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: 2011-04-23 14:15+0300\n"
+"POT-Creation-Date: 2011-11-02 12:23-0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -37,37 +37,38 @@ msgstr ""
#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
-#: en/user_customization-installer.ssi:43
+#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
-#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:53
-#: en/user_customization-packages.ssi:66 en/user_customization-packages.ssi:80
-#: en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:112
-#: en/user_customization-packages.ssi:142
-#: en/user_customization-packages.ssi:155
-#: en/user_customization-packages.ssi:165
-#: en/user_customization-packages.ssi:175
-#: en/user_customization-packages.ssi:185
-#: en/user_customization-packages.ssi:199
-#: en/user_customization-packages.ssi:215
-#: en/user_customization-packages.ssi:227
-#: en/user_customization-packages.ssi:291
-#: en/user_customization-packages.ssi:303
-#: en/user_customization-packages.ssi:313
-#: en/user_customization-packages.ssi:331
-#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
-#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
-#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
-#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
-#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:105
-#: 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:178 en/user_examples.ssi:190
-#: en/user_examples.ssi:206 en/user_examples.ssi:220 en/user_examples.ssi:229
-#: en/user_examples.ssi:247 en/user_examples.ssi:255 en/user_examples.ssi:268
-#: en/user_examples.ssi:283 en/user_installation.ssi:38
+#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:54
+#: en/user_customization-packages.ssi:67 en/user_customization-packages.ssi:81
+#: en/user_customization-packages.ssi:101
+#: en/user_customization-packages.ssi:131
+#: en/user_customization-packages.ssi:144
+#: en/user_customization-packages.ssi:154
+#: en/user_customization-packages.ssi:164
+#: en/user_customization-packages.ssi:174
+#: en/user_customization-packages.ssi:188
+#: en/user_customization-packages.ssi:204
+#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:320
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:345 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:24 en/user_customization-runtime.ssi:44
+#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:63
+#: en/user_customization-runtime.ssi:71 en/user_customization-runtime.ssi:80
+#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:111
+#: en/user_customization-runtime.ssi:119 en/user_examples.ssi:14
+#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
+#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
+#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
+#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
+#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
+#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
+#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:271
+#: en/user_examples.ssi:286 en/user_installation.ssi:38
#: en/user_installation.ssi:46 en/user_installation.ssi:56
#: en/user_installation.ssi:64 en/user_installation.ssi:74
#: en/user_installation.ssi:82 en/user_installation.ssi:90
@@ -100,38 +101,39 @@ msgstr ""
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
-#: en/user_customization-installer.ssi:37
-#: en/user_customization-installer.ssi:48
+#: en/user_customization-installer.ssi:38
+#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:70 en/user_customization-packages.ssi:84
-#: en/user_customization-packages.ssi:98
-#: en/user_customization-packages.ssi:116
-#: en/user_customization-packages.ssi:147
-#: en/user_customization-packages.ssi:161
-#: en/user_customization-packages.ssi:171
-#: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:191
-#: en/user_customization-packages.ssi:203
-#: en/user_customization-packages.ssi:219
-#: en/user_customization-packages.ssi:231
-#: en/user_customization-packages.ssi:295
-#: en/user_customization-packages.ssi:307
-#: en/user_customization-packages.ssi:317
-#: en/user_customization-packages.ssi:344
-#: en/user_customization-packages.ssi:353 en/user_customization-runtime.ssi:18
-#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
-#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
-#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
-#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:110
-#: 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:186 en/user_examples.ssi:202
-#: en/user_examples.ssi:210 en/user_examples.ssi:225 en/user_examples.ssi:233
-#: en/user_examples.ssi:251 en/user_examples.ssi:264 en/user_examples.ssi:279
-#: en/user_examples.ssi:297 en/user_installation.ssi:42
+#: en/user_customization-packages.ssi:46 en/user_customization-packages.ssi:59
+#: en/user_customization-packages.ssi:71 en/user_customization-packages.ssi:85
+#: en/user_customization-packages.ssi:105
+#: en/user_customization-packages.ssi:136
+#: en/user_customization-packages.ssi:150
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:180
+#: en/user_customization-packages.ssi:192
+#: en/user_customization-packages.ssi:208
+#: en/user_customization-packages.ssi:220
+#: en/user_customization-packages.ssi:284
+#: en/user_customization-packages.ssi:296
+#: en/user_customization-packages.ssi:306
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341
+#: en/user_customization-packages.ssi:350 en/user_customization-runtime.ssi:18
+#: en/user_customization-runtime.ssi:28 en/user_customization-runtime.ssi:48
+#: en/user_customization-runtime.ssi:59 en/user_customization-runtime.ssi:67
+#: en/user_customization-runtime.ssi:76 en/user_customization-runtime.ssi:85
+#: en/user_customization-runtime.ssi:105 en/user_customization-runtime.ssi:115
+#: en/user_customization-runtime.ssi:124 en/user_examples.ssi:20
+#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
+#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
+#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
+#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
+#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
+#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
+#: en/user_examples.ssi:254 en/user_examples.ssi:267 en/user_examples.ssi:282
+#: en/user_examples.ssi:300 en/user_installation.ssi:42
#: en/user_installation.ssi:50 en/user_installation.ssi:60
#: en/user_installation.ssi:70 en/user_installation.ssi:78
#: en/user_installation.ssi:86 en/user_installation.ssi:94
@@ -239,7 +241,7 @@ msgstr ""
msgid ""
" #!/bin/sh\n"
" lb config noauto \\\n"
-" --packages-lists \"standard\" \\\n"
+" --package-lists \"standard\" \\\n"
" \"${@}\"\n"
msgstr ""
@@ -289,7 +291,7 @@ msgstr ""
#: en/user_managing_a_configuration.ssi:61
msgid ""
"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. "
+"example above, #{--package-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/pot/user_overview.ssi.pot b/manual/pot/user_overview.ssi.pot
index 9acaf7c..ba7d3c7 100644
--- a/manual/pot/user_overview.ssi.pot
+++ b/manual/pot/user_overview.ssi.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2011-05-13 12:02-0200\n"
+"POT-Creation-Date: 2011-11-07 08: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"
@@ -37,37 +37,38 @@ msgstr ""
#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
-#: en/user_customization-installer.ssi:43
+#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
-#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:53
-#: en/user_customization-packages.ssi:66 en/user_customization-packages.ssi:80
-#: en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:112
-#: en/user_customization-packages.ssi:142
-#: en/user_customization-packages.ssi:155
-#: en/user_customization-packages.ssi:165
-#: en/user_customization-packages.ssi:175
-#: en/user_customization-packages.ssi:185
-#: en/user_customization-packages.ssi:199
-#: en/user_customization-packages.ssi:215
-#: en/user_customization-packages.ssi:227
-#: en/user_customization-packages.ssi:291
-#: en/user_customization-packages.ssi:303
-#: en/user_customization-packages.ssi:313
-#: en/user_customization-packages.ssi:331
-#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
-#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
-#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
-#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
-#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:105
-#: 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:178 en/user_examples.ssi:190
-#: en/user_examples.ssi:206 en/user_examples.ssi:220 en/user_examples.ssi:229
-#: en/user_examples.ssi:247 en/user_examples.ssi:255 en/user_examples.ssi:268
-#: en/user_examples.ssi:283 en/user_installation.ssi:38
+#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:54
+#: en/user_customization-packages.ssi:67 en/user_customization-packages.ssi:81
+#: en/user_customization-packages.ssi:101
+#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:140
+#: en/user_customization-packages.ssi:150
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:184
+#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:276
+#: en/user_customization-packages.ssi:288
+#: en/user_customization-packages.ssi:298
+#: en/user_customization-packages.ssi:316
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:24 en/user_customization-runtime.ssi:44
+#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:63
+#: en/user_customization-runtime.ssi:71 en/user_customization-runtime.ssi:80
+#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:111
+#: en/user_customization-runtime.ssi:119 en/user_examples.ssi:14
+#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
+#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
+#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
+#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
+#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
+#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
+#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
+#: en/user_examples.ssi:277 en/user_installation.ssi:38
#: en/user_installation.ssi:46 en/user_installation.ssi:56
#: en/user_installation.ssi:64 en/user_installation.ssi:74
#: en/user_installation.ssi:82 en/user_installation.ssi:90
@@ -76,7 +77,7 @@ msgstr ""
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:80 en/user_overview.ssi:88
+#: en/user_overview.ssi:48 en/user_overview.ssi:56
msgid "code{"
msgstr ""
@@ -100,38 +101,39 @@ msgstr ""
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
-#: en/user_customization-installer.ssi:37
-#: en/user_customization-installer.ssi:48
+#: en/user_customization-installer.ssi:38
+#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:70 en/user_customization-packages.ssi:84
-#: en/user_customization-packages.ssi:98
-#: en/user_customization-packages.ssi:116
-#: en/user_customization-packages.ssi:147
-#: en/user_customization-packages.ssi:161
-#: en/user_customization-packages.ssi:171
-#: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:191
-#: en/user_customization-packages.ssi:203
-#: en/user_customization-packages.ssi:219
-#: en/user_customization-packages.ssi:231
-#: en/user_customization-packages.ssi:295
-#: en/user_customization-packages.ssi:307
-#: en/user_customization-packages.ssi:317
-#: en/user_customization-packages.ssi:344
-#: en/user_customization-packages.ssi:353 en/user_customization-runtime.ssi:18
-#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
-#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
-#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
-#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:110
-#: 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:186 en/user_examples.ssi:202
-#: en/user_examples.ssi:210 en/user_examples.ssi:225 en/user_examples.ssi:233
-#: en/user_examples.ssi:251 en/user_examples.ssi:264 en/user_examples.ssi:279
-#: en/user_examples.ssi:297 en/user_installation.ssi:42
+#: en/user_customization-packages.ssi:46 en/user_customization-packages.ssi:59
+#: en/user_customization-packages.ssi:71 en/user_customization-packages.ssi:85
+#: en/user_customization-packages.ssi:105
+#: en/user_customization-packages.ssi:132
+#: en/user_customization-packages.ssi:146
+#: en/user_customization-packages.ssi:156
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:329
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:346 en/user_customization-runtime.ssi:18
+#: en/user_customization-runtime.ssi:28 en/user_customization-runtime.ssi:48
+#: en/user_customization-runtime.ssi:59 en/user_customization-runtime.ssi:67
+#: en/user_customization-runtime.ssi:76 en/user_customization-runtime.ssi:85
+#: en/user_customization-runtime.ssi:105 en/user_customization-runtime.ssi:115
+#: en/user_customization-runtime.ssi:124 en/user_examples.ssi:20
+#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
+#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
+#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
+#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
+#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
+#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
+#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
+#: en/user_examples.ssi:291 en/user_installation.ssi:42
#: en/user_installation.ssi:50 en/user_installation.ssi:60
#: en/user_installation.ssi:70 en/user_installation.ssi:78
#: en/user_installation.ssi:86 en/user_installation.ssi:94
@@ -139,8 +141,8 @@ msgstr ""
#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
-#: en/user_overview.ssi:84 en/user_overview.ssi:92
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:42
+#: en/user_overview.ssi:52 en/user_overview.ssi:60
msgid "}code"
msgstr ""
@@ -261,118 +263,77 @@ msgstr ""
#: en/user_overview.ssi:34
msgid ""
"Issuing #{lb config}# without any arguments creates a #{config/}# "
-"subdirectory which it populates with some default settings:"
+"subdirectory which it populates with some default settings, and a skeleton #"
+"{auto/}# subdirectory tree."
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:39
+#: en/user_overview.ssi:40
#, no-wrap
msgid ""
" $ lb config\n"
+" P: Considering defaults defined in /etc/live/build.conf\n"
" P: Creating config tree\n"
msgstr ""
#. type: Plain text
#: en/user_overview.ssi:44
-#, no-wrap
-msgid ""
-" $ ls -l\n"
-" total 8\n"
-" drwxr-xr-x 3 user user 4096 Sep 7 13:02 auto\n"
-" drwxr-xr-x 22 user user 4096 Sep 7 13:02 config\n"
-msgstr ""
-
-#. type: Plain text
-#: en/user_overview.ssi:72
-#, no-wrap
-msgid ""
-" $ ls -l config/\n"
-" total 104\n"
-" -rw-r--r-- 1 user user 4197 Sep 7 13:02 binary\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_debian-installer\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_debian-installer-includes\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_grub\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-debs\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-hooks\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-includes\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-packageslists\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-udebs\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_rootfs\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_syslinux\n"
-" -rw-r--r-- 1 user user 2051 Sep 7 13:02 bootstrap\n"
-" -rw-r--r-- 1 user user 1647 Sep 7 13:02 chroot\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_apt\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-hooks\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-includes\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-packages\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-packageslists\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-patches\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-preseed\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_sources\n"
-" -rw-r--r-- 1 user user 2954 Sep 7 13:02 common\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 includes\n"
-" -rw-r--r-- 1 user user 205 Sep 7 13:02 source\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 templates\n"
-msgstr ""
-
-#. type: Plain text
-#: en/user_overview.ssi:76
msgid ""
"Using #{lb config}# without any arguments would be suitable for users who "
"need a very basic image, or who intend to later provide a more complete "
-"configuration via auto/config (see {Managing a configuration}#managing-a-"
+"configuration via #{auto/config}# (see {Managing a configuration}#managing-a-"
"configuration for details)."
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:78
+#: en/user_overview.ssi:46
msgid ""
"Normally, you will want to specify some options. For example, to include the "
"'gnome' package list in your configuration:"
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:82
+#: en/user_overview.ssi:50
#, no-wrap
msgid " $ lb config -p gnome\n"
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:86
+#: en/user_overview.ssi:54
msgid "It is possible to specify many options, such as:"
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:90
+#: en/user_overview.ssi:58
#, no-wrap
msgid " $ lb config --binary-images net --hostname live-machine --username live-user ...\n"
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:94
+#: en/user_overview.ssi:62
msgid "A full list of options is available in the #{lb_config}# man page."
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:96
+#: en/user_overview.ssi:64
msgid "3~lb-build The #{lb build}# command"
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:98
+#: en/user_overview.ssi:66
msgid ""
-"The #{lb build}# command reads in your configuration from the config/ "
+"The #{lb build}# command reads in your configuration from the #{config/}# "
"directory. It then runs the lower level commands needed to build your Live "
"system."
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:100
+#: en/user_overview.ssi:68
msgid "3~lb-clean The #{lb clean}# command"
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:102
+#: en/user_overview.ssi:70
msgid ""
"It is the job of the #{lb clean}# command to remove various parts of a build "
"so subsequent builds can start from a clean state. By default, #{chroot}#, #"
@@ -384,12 +345,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:104
+#: en/user_overview.ssi:72
msgid "2~live-boot The live-boot package"
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:106
+#: en/user_overview.ssi:74
msgid ""
"live-boot is a collection of scripts providing hooks for the initramfs-"
"tools, used to generate an initramfs capable of booting live systems, such "
@@ -398,16 +359,16 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:108
+#: en/user_overview.ssi:76
msgid ""
-"At boot time it will look for read-only media containing a \"/live\" "
+"At boot time it will look for read-only media containing a #{/live/}# "
"directory where a root filesystem (often a compressed filesystem image like "
"squashfs) is stored. If found, it will create a writable environment, using "
"aufs, for Debian like systems to boot from."
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:110
+#: en/user_overview.ssi:78
msgid ""
"More information on initial ramfs in Debian can be found in the Debian Linux "
"Kernel Handbook at http://kernel-handbook.alioth.debian.org/ in the chapter "
@@ -415,12 +376,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:112
+#: en/user_overview.ssi:80
msgid "2~live-config The live-config package"
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:113
+#: en/user_overview.ssi:81
msgid ""
"live-config consists of the scripts that run at boot time after live-boot to "
"configure the live system automatically. It handles such tasks as setting "
diff --git a/manual/pt_BR/index.html.in b/manual/pt_BR/index.html.in
index f187810..bf06a76 100644
--- a/manual/pt_BR/index.html.in
+++ b/manual/pt_BR/index.html.in
@@ -9,25 +9,32 @@
<h2>Manual do Debian Live</h2>
<p>
+ <i>live-manual</i> is available in different file formats and it is
+translated into several languages. Keep in mind that some translations may
+be incomplete or may not be up to date.
+ </p>
+
+ <p>
+
Por favor reporte erros, omissões, patches e sugestões para nossa lista de
discussão em <a
href="mailto:debian-live at lists.debian.org">debian-live at lists.debian.org</a>
-e leia sobre <a href="html/about-manual.html#how-to-contribute">como
+e leia sobre <a href="html/about-manual.pt_BR.html#how-to-contribute">como
contribuir</a> com o manual.
</p>
<h3>Formatos Disponíveis</h3>
<ul>
- <li><a href="epub/live-manual.epub">EPUB</a></li>
- <li>HTML: <a href="html/index.html">Páginas multiplas</a>, <a
-href="html/live-manual.html">Página única</a></li>
- <li><a href="odf/live-manual.odt">ODF</a></li>
- <li>PDF: <a href="pdf/live-manual.portrait-a4.pdf">A4 retrato</a>, <a
-href="pdf/live-manual.landscape-a4.pdf">A4 paisagem</a>, <a
-href="pdf/live-manual.portrait-letter.pdf">US retrato</a>, <a
-href="pdf/live-manual.landscape-letter.pdf">US paisagem</a></li>
- <li><a href="txt/live-manual.txt">Texto plano</a></li>
+ <li><a href="epub/live-manual.pt_BR.epub">EPUB</a></li>
+ <li>HTML: <a href="html/index.pt_BR.html">Páginas multiplas</a>, <a
+href="html/live-manual.pt_BR.html">Página única</a></li>
+ <li><a href="odf/live-manual.pt_BR.odt">ODF</a></li>
+ <li>PDF: <a href="pdf/live-manual.portrait-a4.pt_BR.pdf">A4 retrato</a>, <a
+href="pdf/live-manual.landscape-a4.pt_BR.pdf">A4 paisagem</a>, <a
+href="pdf/live-manual.portrait-letter.pt_BR.pdf">US retrato</a>, <a
+href="pdf/live-manual.landscape-letter.pt_BR.pdf">US paisagem</a></li>
+ <li><a href="txt/live-manual.pt_BR.txt">Texto plano</a></li>
</ul>
<p>
diff --git a/manual/pt_BR/live-manual.ssm b/manual/pt_BR/live-manual.ssm
index 569cfd6..75eb990 100644
--- a/manual/pt_BR/live-manual.ssm
+++ b/manual/pt_BR/live-manual.ssm
@@ -9,7 +9,7 @@
:license: This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.<br><br>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.<br><br>You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses/. <br><br>The complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-3 file.
@date:
- :published: 2011-09-30
+ :published: 2011-12-04
@publisher: Debian Live Project <debian-live at lists.debian.org>
diff --git a/manual/pt_BR/user_basics.ssi b/manual/pt_BR/user_basics.ssi
index 4429660..4c42960 100644
--- a/manual/pt_BR/user_basics.ssi
+++ b/manual/pt_BR/user_basics.ssi
@@ -225,7 +225,7 @@ configuration. Otherwise, the resolution is limited to 800x600.
code{
- $ lb config --packages virtualbox-ose-guest-x11
+ $ echo virtualbox-ose-guest-x11 >> config/package-lists/my.list.chroot
}code
diff --git a/manual/pt_BR/user_customization-contents.ssi b/manual/pt_BR/user_customization-contents.ssi
index 814ba40..5759093 100644
--- a/manual/pt_BR/user_customization-contents.ssi
+++ b/manual/pt_BR/user_customization-contents.ssi
@@ -42,15 +42,15 @@ files that can be simply added or replaced in the image without processing;
see {Live/chroot local hooks}#live-chroot-local-hooks if processing is
needed.
-To include files, simply add them to your #{config/chroot_local-includes}#
+To include files, simply add them to your #{config/includes.chroot}#
directory. This directory corresponds to the root directory (#{/}#) of the
live system. For example, to add a file #{/var/www/index.html}# in the live
system, use:
code{
- $ mkdir -p config/chroot_local-includes/var/www
- $ cp /path/to/my/index.html config/chroot_local-includes/var/www
+ $ mkdir -p config/includes.chroot/var/www
+ $ cp /path/to/my/index.html config/includes.chroot/var/www
}code
@@ -60,7 +60,7 @@ code{
-- config
[...]
- |-- chroot_local-includes
+ |-- includes.chroot
| `-- var
| `-- www
| `-- index.html
@@ -80,11 +80,11 @@ booting the Live system, you can use binary local includes. This works in a
similar fashion to chroot local includes. For example, suppose the files
#{~/video_demo.*}# are demo videos of the live system described by and
linked to by an HTML index page. Simply copy the material to
-#{config/binary_local-includes/}# as follows:
+#{config/includes.binary/}# as follows:
code{
- $ cp ~/video_demo.* config/binary_local-includes/
+ $ cp ~/video_demo.* config/includes.binary/
}code
@@ -112,12 +112,12 @@ build in order to customize the image.
3~live-chroot-local-hooks Live/chroot local hooks
-To run commands in the chroot stage, create a hook script containing the
-commands in the #{config/chroot_local-hooks}# directory. The hook will run
-in the chroot after the rest of your chroot configuration has been applied,
-so remember to ensure your configuration includes all packages and files
-your hook needs in order to run. See the example chroot hook scripts for
-various common chroot customization tasks provided in
+To run commands in the chroot stage, create a hook script with a #{.chroot}#
+suffix containing the commands in the #{config/hooks/}# directory. The hook
+will run in the chroot after the rest of your chroot configuration has been
+applied, so remember to ensure your configuration includes all packages and
+files your hook needs in order to run. See the example chroot hook scripts
+for various common chroot customization tasks provided in
#{/usr/share/live/build/examples/hooks}# which you can copy or symlink to
use them in your own configuration.
@@ -128,27 +128,28 @@ explained in the "Customization" section of its man page. Examine
live-config's own hooks provided in #{/lib/live/config/}#, noting the
sequence numbers. Then provide your own hook prefixed with an appropriate
sequence number, either as a chroot local include in
-#{config/chroot_local-includes/lib/live/config/}#, or as a custom package as
+#{config/includes.chroot/lib/live/config/}#, or as a custom package as
discussed in {Installing modified or third-party
packages}#installing-modified-or-third-party-packages.
3~ Binary local hooks
-To run commands in the binary stage, create a hook script containing the
-commands in the #{config/binary_local-hooks}#. The hook will run after all
-other binary commands are run, but before binary_checksums, the very last
-binary commands The commands in your hook do not run in the chroot, so take
-care to not modify any files outside of the build tree, or you may damage
-your build system! See the example binary hook scripts for various common
-binary customization tasks provided in
+To run commands in the binary stage, create a hook script with a #{.binary}#
+suffix containing the commands in the #{config/hooks/}# directory. The hook
+will run after all other binary commands are run, but before
+binary_checksums, the very last binary command. The commands in your hook do
+not run in the chroot, so take care to not modify any files outside of the
+build tree, or you may damage your build system! See the example binary hook
+scripts for various common binary customization tasks provided in
#{/usr/share/live/build/examples/hooks}# which you can copy or symlink to
use them in your own configuration.
2~ Preseeding Debconf questions
-Files in the #{config/chroot_local-preseed}# directory are considered to be
+Files in the #{config/preseed/}# directory suffixed with #{.preseed}#
+followed by the stage (#{.chroot}# or #{.binary}#) are considered to be
debconf preseed files and are installed by live-build using
-#{debconf-set-selections}#.
+#{debconf-set-selections}# during the corresponding stage.
For more information about debconf, please see debconf(7) in the #{debconf}#
package.
diff --git a/manual/pt_BR/user_customization-installer.ssi b/manual/pt_BR/user_customization-installer.ssi
index 9349f27..d8d0c17 100644
--- a/manual/pt_BR/user_customization-installer.ssi
+++ b/manual/pt_BR/user_customization-installer.ssi
@@ -53,7 +53,8 @@ architecture. For example:
code{
$ lb config --architecture i386 --linux-flavours 486 \
- --debian-installer live --packages debian-installer-launcher
+ --debian-installer live
+ $ echo debian-installer-launcher >> config/package-lists/my.list.chroot
}code
@@ -81,7 +82,7 @@ code{
For experimental or debugging purposes, you might want to include locally
built #{d-i}# component udeb packages. Place these in
-#{config/binary_local-udebs/}# to include them in the image. Additional or
+#{config/packages.binary/}# to include them in the image. Additional or
replacement files and directories may be included in the installer initrd as
well, in a similar fashion to {Live/chroot local
includes}#live-chroot-local-includes, by placing the material in
diff --git a/manual/pt_BR/user_customization-packages.ssi b/manual/pt_BR/user_customization-packages.ssi
index 6b6f4fa..75d3198 100644
--- a/manual/pt_BR/user_customization-packages.ssi
+++ b/manual/pt_BR/user_customization-packages.ssi
@@ -24,7 +24,7 @@ installed via APT pinning, to name a few possibilities.
The distribution you choose has the broadest impact on which packages are
available to include in your live image. Specify the codename, which
-defaults to #{squeeze}# for the Squeeze version of live-build. Any current
+defaults to #{wheezy}# for the Wheezy version of live-build. Any current
distribution carried in the Debian archive may be specified by its codename
here. (See {Terms}#terms for more details.) The #{--distribution}# option
not only influences the source of packages within the archive, but also
@@ -62,38 +62,40 @@ also modifies live-build behaviour to suit the derivatives.
The Debian archive is replicated across a large network of mirrors around
the world so that people in each region can choose a nearby mirror for best
-download speed. Each of the #{--mirror-*}# options governs which
+download speed. Each of the #{--parent-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.
+those stages, and later, in the *binary* stage, the
+#{--parent-mirror-binary}# and #{--parent-mirror-binary-security}# values
+are used, superceding any mirrors used in an earlier stage.
3~distribution-mirrors-build-time Distribution mirrors used at build time
To set the distribution mirrors used at build time to point at a local
-mirror, it is sufficient to set #{--mirror-bootstrap}# and
-#{--mirror-chroot-security}# as follows.
+mirror, it is sufficient to set #{--parent-mirror-bootstrap}#,
+#{--parent-mirror-chroot-security}# and #{--parent-mirror-chroot-backports}#
+as follows.
code{
- $ lb config --mirror-bootstrap http://localhost/debian/ \
- --mirror-chroot-security http://localhost/debian-security/
+ $ lb config --parent-mirror-bootstrap http://localhost/debian/ \
+ --parent-mirror-chroot-security http://localhost/debian-security/ \
+ --parent-mirror-chroot-backports http://localhost/debian-backports/
}code
-The chroot mirror, specified by #{--mirror-chroot}#, defaults to the
-#{--mirror-bootstrap}# value.
+The chroot mirror, specified by #{--parent-mirror-chroot}#, defaults to the
+#{--parent-mirror-bootstrap}# value.
3~ Distribution mirrors used at run time
-The #{--mirror-binary*}# options govern the distribution mirrors placed in
-the binary image. These may be used to install additional packages while
-running the live system. The defaults employ #{cdn.debian.net}#, a service
-that chooses a geographically close mirror based on the user's IP
+The #{--parent-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
@@ -101,8 +103,8 @@ suitable for users on a network where "#{mirror}#" is reachable.
code{
- $ lb config --mirror-binary http://mirror/debian/ \
- --mirror-binary-security http://mirror/debian-security/
+ $ lb config --parent-mirror-binary http://mirror/debian/ \
+ --parent-mirror-binary-security http://mirror/debian-security/
}code
@@ -111,13 +113,13 @@ code{
You may add more repositories, broadening your package choices beyond what
is available in your target distribution. These may be, for example, for
backports, experimental or custom packages. To configure additional
-repositories, create #{config/chroot_sources/your-repository.chroot}#,
-and/or #{config/chroot_sources/your-repository.binary}# files. As with the
-#{--mirror-*}# options, these govern the repositories used in the *chroot*
-stage when building the image, and in the *binary* stage, i.e. for use when
-running the live system.
+repositories, create #{config/archives/your-repository.list.chroot}#, and/or
+#{config/archives/your-repository.list.binary}# files. As with the
+#{--parent-mirror-*}# options, these govern the repositories used in the
+*chroot* stage when building the image, and in the *binary* stage, i.e. for
+use when running the live system.
-For example, #{config/chroot_sources/live.chroot}# allows you to install
+For example, #{config/archives/live.list.chroot}# allows you to install
packages from the debian live snapshot repository at live system build time.
code{
@@ -126,20 +128,20 @@ code{
}code
-If you add the same line to #{config/chroot_sources/live.binary}#, the
+If you add the same line to #{config/archives/live.list.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 should also put the GPG key used to sign the repository into
-#{config/chroot_sources/your-repository.{binary,chroot}.gpg}# files.
+#{config/archives/your-repository.gpg.{binary,chroot}}# files.
-*{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:
+*{Note:}* some preconfigured package repositories are available for easy selection through the #{--archives}# option, e.g. for enabling live snapshots, a simple command is enough to enable it:
code{
- $ lb config --repository live.debian.net
+ $ lb config --archives live.debian.net
}code
@@ -147,31 +149,10 @@ code{
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.
-
-3~ Choosing a few packages
-
-When the number of packages added is small, simply specify
-#{--packages}#. For example:
-
-code{
-
- $ 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 {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, use package lists as
-discussed in the following section, {Package lists}#package-lists.
+individual packages to install in a package list. You can also choose
+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.
3~package-lists Package lists
@@ -184,61 +165,53 @@ 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.
+*{Note:}* 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.
+
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:
+with the #{--package-lists}# option. For example:
code{
- $ lb config --packages-lists "gnome-core rescue"
+ $ lb config --package-lists "gnome rescue"
}code
-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.
+#{/usr/share/live/build/package-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~ Local package lists
-You may supplement or replace entirely the supplied lists using local
-package lists stored in #{config/chroot_local-packageslists/}#.
+You may supplement the predefined lists using local package lists stored in
+#{config/package-lists/}#.
Package lists that exist in this directory need to have a #{.list}# suffix
-in order to be processed. Local package lists always override package lists
-distributed with live-build. This can cause undesired effects, we therefore
-recommend to use unique names for local package lists.
+in order to be processed, and then an additional stage suffix, #{.chroot}#
+or #{.binary}# to indicate which stage the list is for.
-3~ Local binary package lists
+*{Note:}* If you don't specify the stage suffix, the list will be used for both stages. Normally, you want to specify #{.list.chroot}# so that the packages will only be installed in the live filesystem and not have an extra copy of the #{.deb}# placed on the media.
-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.
+3~ Local binary package lists
-Package lists that exist in this directory need to have a #{.list}# suffix
-in order to be processed.
+To make a binary stage list, place a file suffixed with #{.list.binary}# in
+#{config/package-lists/}#. These packages are not installed in the live
+filesystem, but are included on the live media under #{pool/}#. You would
+typically use such a list with one of the non-live installer variants. As
+mentioned above, if you want this list to be the same as your chroot stage
+list, simply use the #{.list}# suffix by itself.
3~ Extending a provided package list using includes
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.
+includes. Refer to these in the #{/usr/share/live/build/package-lists/}#
+directory, as they serve as good examples of how to write your own 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:
+iceweasel, create #{config/package-lists/my.list.chroot}# with the following
+contents:
code{
@@ -310,11 +283,13 @@ 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.
+by putting them in a list in #{config/task-lists/}#, as in the example
+below.
code{
- $ lb config --tasks "mail-server file-server"
+ $ lb config
+ $ echo "mail-server file-server" >> config/task-lists/my.list.chroot
}code
@@ -325,55 +300,50 @@ including ones not included in this list, may be examined with #{tasksel
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
-#{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:
+Desktop and language tasks are special cases that need some extra planning
+and configuration. Live images are different from Debian Installer images in
+this respect. 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 internal #{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.
+
+When developing a desktop live image, the image typically boots directly to
+a working desktop, the choices of both desktop and default language having
+been made at build time, not at run time as in the case of the Debian
+Installer. That's not to say that a live image couldn't be built to support
+multiple desktops or multiple languages and offer the user a choice, but
+that is not live-build's default behaviour.
+
+Because there is no provision made automatically for language tasks, which
+include such things as language-specific fonts and input-method packages, if
+you want them, you need to specify them in your configuration. For example,
+a GNOME desktop image containing support for Japanese might include these
+tasks:
code{
- $ lb config --tasks "japanese japanese-desktop japanese-gnome-desktop"
+ $ lb config
+ $ echo "gnome-desktop desktop standard laptop" >> config/task-lists/my.list.chroot
+ $ echo "japanese japanese-desktop japanese-gnome-desktop" >> config/task-lists/my.list.chroot
}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-lists gnome-desktop}#, it is equivalent to
-specifying #{--packages debian-installer-launcher --packages-lists
-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-lists}#,
-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.
-
-*{Note:}* There is also an experimental #{--language}# option that has an overlapping purpose with language tasks. For any language for which it is known that there are #{*-l10n}# packages, if #{--language}# is specified, those packages will be installed. Furthermore, if any #{syslinux}# templates matching the language are found, they will be used instead of the default English templates. The package selection done by #{--language}# is a poor approximation of language tasks, as it requires that the list of packages to include per language be maintained internally in live-build, and besides, language tasks are more comprehensive and flexible. However, the #{syslinux}# aspect is still useful. Thus, if you use #{--bootloader syslinux}# and templates for the specified language exist either in #{/usr/share/live/build/templates/syslinux/}# or #{config/templates/syslinux/}#, consider using this option, possibly in combination with tasks to ensure all relevant packages are installed
. For example:
+Since desktop tasks are "internal" tasks, for every desktop flavour task
+included in the image, the corresponding value, if it differs from the
+default, "gnome", must be preseeded in the "tasksel/desktop" debconf
+variable or else tasksel will not recognize and install it. Thus:
code{
- $ lb config --language es
+ $ lb config
+ $ echo 'tasksel tasksel/desktop multiselect kde' >> config/preseed/my.preseed.chroot
}code
-Even so, it is limited in that it only supports a single language and a
-single bootloader. Therefore, for all of these reasons, the future of this
-option is under review, possibly to be replaced with something entirely
-different in the next major release of live-build.
+This parameter can take multiple values, e.g. "lxde xfce" instead of "kde".
2~installing-modified-or-third-party-packages Installing modified or
third-party packages
@@ -394,40 +364,40 @@ and elsewhere.
There are two ways of installing modified custom packages:
-_* #{chroot_local-packages}#
+_* #{packages.chroot}#
_* Using a custom APT repository
-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.
+Using #{packages.chroot}# 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
+3~ Using #{packages.chroot}# 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/packages.chroot/}# 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
+Using #{packages.chroot}# for installation of custom packages has
disadvantages:
_* It is not possible to use secure APT.
_* You must install all appropriate packages in the
-#{config/chroot_local-packages/}# directory.
+#{config/packages.chroot/}# directory.
_* 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 {Choosing
-packages to install}#choosing-packages-to-install for details.
+Unlike using #{packages.chroot}#, 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
@@ -452,7 +422,7 @@ pinning}#apt-pinning for more information.
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
+appropriate configurations through #{config/includes.chroot/}#.) For a
complete list, look for options starting with #{apt}# in the #{lb_config}#
man page.
@@ -493,7 +463,7 @@ with:
code{
- $ lb config --binary-indices false
+ $ lb config --apt-indices false
}code
@@ -536,19 +506,19 @@ and #{aptitude}# for details.
For background, please first read the #{apt_preferences(5)}# man page. APT
pinning can be configured either for build time, or else for run time. For
the former, create #{config/chroot_apt/preferences}#. For the latter, create
-#{config/chroot_local-includes/etc/apt/preferences}#.
+#{config/includes.chroot/etc/apt/preferences}#.
-Let's say you are building a Squeeze live system but need all the live
+Let's say you are building a Wheezy live system but need all the live
packages that end up in the binary image to be installed from Sid at build
time. You need to add Sid to your APT sources and pin it so that only the
packages you want are installed from it at build time and all others are
-taken from the target system distribution, Squeeze. The following will
+taken from the target system distribution, Wheezy. The following will
accomplish this:
code{
- $ echo "deb http://mirror/debian sid main" > config/chroot_sources/sid.chroot
- $ cat >>config/chroot_apt/preferences <<END
+ $ echo "deb http://mirror/debian sid main" > config/archives/sid.list.chroot
+ $ cat >> config/chroot_apt/preferences <<END
Package: live-boot live-boot-initramfs-tools live-config live-config-sysvinit
Pin: release n=sid
Pin-Priority: 600
@@ -570,7 +540,7 @@ $ lb config --distribution wheezy
Negative pin priorities will prevent a package from being installed, as in
the case where you do not want a package that is recommended by another
-package. Suppose you are building an LXDE image using #{--packages-lists
+package. Suppose you are building an LXDE image using #{--package-lists
lxde}# option, but don't want the user prompted to store wifi passwords in
the keyring. This list includes #{gdm}#, which depends on #{gksu}#, which in
turn recommends #{gnome-keyring}#. So you want to omit the recommended
diff --git a/manual/pt_BR/user_customization-runtime.ssi b/manual/pt_BR/user_customization-runtime.ssi
index 4bbf347..610fdb1 100644
--- a/manual/pt_BR/user_customization-runtime.ssi
+++ b/manual/pt_BR/user_customization-runtime.ssi
@@ -17,12 +17,15 @@ also any groups and permissions associated with the live user.
You can specify additional groups that the live user will belong to by
preseeding the #{passwd/user-default-groups}# debconf value. For example, to
-add the live user to the #{fuse}# group, add the following to a file in the
-#{config/chroot_local-preseed}# directory:
+add the live user to the #{fuse}# group, add the following preseed under
+#{config/preseed/}# for the chroot stage:
code{
- user-setup passwd/user-default-groups string audio cdrom dip floppy video plugdev netdev powerdev scanner bluetooth fuse
+ $ lb config
+ $ echo user-setup passwd/user-default-groups string audio cdrom \
+ dip floppy video plugdev netdev powerdev scanner bluetooth fuse \
+ >> config/preseed/my.preseed.chroot
}code
@@ -42,7 +45,7 @@ One possible way of changing the default password is by means of a hook as
described in {Boot-time hooks}#boot-time-hooks. In order to do that you can
use the "passwd" hook from #{/usr/share/doc/live-config/examples/hooks}#,
prefix it accordingly (e.g. 200-passwd) and add it to
-#{config/chroot_local-includes/lib/live/config/}#
+#{config/includes.chroot/lib/live/config/}#
2~customizing-locale-and-language Customizing locale and language
diff --git a/manual/pt_BR/user_examples.ssi b/manual/pt_BR/user_examples.ssi
index 5bb918a..ba37423 100644
--- a/manual/pt_BR/user_examples.ssi
+++ b/manual/pt_BR/user_examples.ssi
@@ -19,14 +19,15 @@ 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:
+this file and in it, set the corresponding #{LB_PARENT_MIRROR_*}# variables
+to your preferred mirror. All other mirrors used in the build will be
+defaulted from these values. For example:
code{
- LB_MIRROR_BOOTSTRAP="http://mirror/debian"
- LB_MIRROR_CHROOT="http://mirror/debian"
- LB_MIRROR_CHROOT_SECURITY="http://mirror/debian-security"
+ LB_PARENT_MIRROR_BOOTSTRAP="http://mirror/debian"
+ LB_PARENT_MIRROR_CHROOT_SECURITY="http://mirror/debian-security"
+ LB_PARENT_MIRROR_CHROOT_BACKPORTS="http://mirror/debian-updates"
}code
@@ -76,7 +77,10 @@ utility, serving as an introduction to customizing Debian Live images.
code{
- $ mkdir tutorial2 ; cd tutorial2 ; lb config -p lxde --packages iceweasel
+ $ mkdir tutorial2
+ $ cd tutorial2
+ $ lb config -p lxde
+ $ echo iceweasel >> config/package-lists/my.list.chroot
}code
@@ -84,9 +88,9 @@ 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.
+#{config/includes.chroot/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:
@@ -128,16 +132,23 @@ code{
lb config noauto \
--architecture i386 \
- --linux-flavours 686 \
- --packages-lists lxde \
- --packages "iceweasel xchat" \
+ --linux-flavours 686-pae \
+ --package-lists lxde \
"${@}"
}code
+Now populate your local package list:
+
+code{
+
+ $ echo "iceweasel xchat" >> config/package-lists/my.list.chroot
+
+}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
+#{--linux-flavours 686-pae}# 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}#.
@@ -181,18 +192,12 @@ code{
}code
-Now edit #{auto/config}# to add the #{vlc}# package:
+Now append the #{vlc}# package to our local package list in
+#{config/package-lists/my.list.chroot}#:
code{
- #!/bin/sh
-
- lb config noauto \
- --architecture i386 \
- --linux-flavours 686 \
- --packages-lists lxde \
- --packages "iceweasel xchat vlc" \
- "${@}"
+ $ echo vlc >> config/package-lists/my.list.chroot
}code
@@ -231,15 +236,15 @@ cases drawn from the collected experiences of users of Debian Live.
Make a build directory and create a skeletal configuration in it built
around the standard-x11 list, including #{gdm3}#, #{metacity}# and
-#{xtightvncviewer}#, disabling recommends to make a minimal system:
+#{xvnc4viewer}#, disabling recommends to make a minimal system:
code{
$ mkdir vnc_kiosk_client
$ cd vnc_kiosk_client
- $ lb config -a i386 -k 686 -p standard-x11 \
- --packages "gdm3 metacity xvnc4viewer" \
+ $ lb config -a i386 -k 686-pae -p standard-x11 \
--apt-recommends false
+ $ echo "gdm3 metacity xvnc4viewer" >> config/package-lists/my.list.chroot
}code
@@ -249,8 +254,8 @@ to port #{5901}# on a server at #{192.168.1.2}#:
code{
- $ mkdir -p config/chroot_local-includes/etc/skel
- $ cat >config/chroot_local-includes/etc/skel/.xsession <<END
+ $ mkdir -p config/includes.chroot/etc/skel
+ $ cat > config/includes.chroot/etc/skel/.xsession <<END
#!/bin/sh
/usr/bin/metacity &
@@ -287,7 +292,7 @@ packages will most likely produce a broken live system.
code{
- $ lb config -k 486 -p minimal --binary-indices false \
+ $ lb config -k 486 -p minimal --apt-indices false \
--memtest none --apt-recommends false --includes none
}code
@@ -306,8 +311,8 @@ 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
+instead of the default #{-k "486 686-pae"}#. Leaving off APT's indices with
+#{--apt-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
@@ -327,10 +332,10 @@ preferred desktop, in this case KDE, containing all of the same packages
that would be installed by the standard Debian installer for KDE.
Our initial problem is the discovery of the names of the appropriate
-tasks. Currently, live-build cannot help with this. While we might get lucky
-and find this by trial-and-error, there is a tool, #{grep-dctrl}#, which can
-be used to dig it out of the task descriptions in tasksel-data, so to
-prepare, make sure you have both of those things:
+language tasks. Currently, live-build cannot help with this. While we might
+get lucky and find this by trial-and-error, there is a tool, #{grep-dctrl}#,
+which can be used to dig it out of the task descriptions in tasksel-data, so
+to prepare, make sure you have both of those things:
code{
@@ -342,12 +347,8 @@ Now we can search for the appropriate tasks, first with:
code{
- $ grep-dctrl -FTest-lang pt_BR /usr/share/tasksel/debian-tasks.desc -sTask,Description
+ $ grep-dctrl -FTest-lang pt_BR /usr/share/tasksel/descs/debian-tasks.desc -sTask
Task: brazilian-portuguese
- Description: Brazilian Portuguese environment
- This task installs programs, data files, and
- documentation that make it easier for Brazilian Portuguese speakers
- to use Debian.
}code
@@ -356,22 +357,17 @@ brazilian-portuguese. Now to find the related tasks:
code{
- $ grep-dctrl -FEnhances brazilian-portuguese /usr/share/tasksel/debian-tasks.desc -sTask,Description
+ $ grep-dctrl -FEnhances brazilian-portuguese /usr/share/tasksel/descs/debian-tasks.desc -sTask
Task: brazilian-portuguese-desktop
- Description: Brazilian Portuguese desktop
- This task localises the desktop in Brasilian Portuguese.
-
Task: brazilian-portuguese-kde-desktop
- Description: Brazilian Portuguese KDE desktop
- This task localises the KDE desktop in Brazilian Portuguese.
}code
-We will use the experimental #{--language}# option, as live-build happens to
-include #{syslinux}# templates for pt_BR (see {Desktop and language
-tasks}#desktop-and-language-tasks for details). And at boot time we will
-generate the pt_BR.UTF-8 locale and select the pt-latin1 keyboard
-layout. Now let's put the pieces together:
+At boot time we will generate the pt_BR.UTF-8 locale and select the
+pt-latin1 keyboard layout. We will also need to preseed our desktop choice,
+"kde" so that tasksel will install the correct desktop task, as it differs
+from the default (see {Desktop and languages
+tasks}#desktop-and-language-tasks). Now let's put the pieces together:
code{
@@ -380,12 +376,12 @@ code{
$ lb config \
-a i386 \
-k 486 \
- -p kde-desktop \
- --language pt_BR \
- --tasks "brazilian-portuguese brazilian-portuguese-desktop brazilian-portuguese-kde-desktop" \
--bootappend-live "locales=pt_BR.UTF-8 keyboard-layouts=pt-latin1" \
- --debian-installer live \
- --packages debian-installer-launcher
+ --debian-installer live
+ $ echo kde-desktop brazilian-portuguese brazilian-portuguese-desktop \
+ brazilian-portuguese-kde-desktop >> config/task-lists/my.list.chroot
+ $ echo debian-installer-launcher >> config/package-lists/my.list.chroot
+ $ echo tasksel tasksel/desktop multiselect kde >> config/preseed/my.preseed.chroot
}code
diff --git a/manual/pt_BR/user_installation.ssi b/manual/pt_BR/user_installation.ssi
index 6141868..bd8393d 100644
--- a/manual/pt_BR/user_installation.ssi
+++ b/manual/pt_BR/user_installation.ssi
@@ -105,7 +105,7 @@ are available on http://live.debian.net/debian/.
2~ live-boot and live-config
-*{Note:}* You do not need to install live-boot or live-config on your system to create customized Debian Live systems. However, doing so will do no harm and is useful for reference purposes.
+*{Note:}* You do not need to install live-boot or live-config on your system to create customized Debian Live systems. However, doing so will do no harm and is useful for reference purposes. If you only want the documentation, you may now install the live-boot-doc and live-config-doc packages separately.
3~ From the Debian repository
@@ -132,14 +132,14 @@ if that is your reason for building these packages from source.
_* Build live-boot and live-config .deb files
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.
+your target platform: this means if your target is Wheezy then you should
+build against Wheezy.
Use a personal builder such as /{pbuilder}/ or /{sbuild}/ if you need to
build #{live-boot}# for a target distribution that differs from your build
-system. For example, for Squeeze live images, build #{live-boot}# in a
-Squeeze chroot. If your target distribution happens to match your build
-system distribution, you may build directly on the build system using
+system. For example, for Wheezy live images, build #{live-boot}# in a Wheezy
+chroot. If your target distribution happens to match your build system
+distribution, you may build directly on the build system using
#{dpkg-buildpackage}# (provided by the /{dpkg-dev}/ package):
code{
@@ -165,10 +165,10 @@ repositories}#additional-repositories.
You can let live-build automatically use the latest snapshots of live-boot
and live-config by configuring a third-party repository in your live-build
configuration directory. Assuming you have already created a configuration
-tree with #{lb config}#:
+tree in the current directory with #{lb config}#:
code{
- $ lb config --repository live.debian.net
+ $ lb config --archives live.debian.net
}code
diff --git a/manual/pt_BR/user_managing_a_configuration.ssi b/manual/pt_BR/user_managing_a_configuration.ssi
index 999c508..d0706a8 100644
--- a/manual/pt_BR/user_managing_a_configuration.ssi
+++ b/manual/pt_BR/user_managing_a_configuration.ssi
@@ -52,7 +52,7 @@ code{
#!/bin/sh
lb config noauto \
- --packages-lists "standard" \
+ --package-lists "standard" \
"${@}"
}code
@@ -88,7 +88,7 @@ code{
}code
Edit #{auto/config}#, changing or adding any options as you see fit. In the
-example above, #{--packages-lists standard}# is set to the default
+example above, #{--package-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/pt_BR/user_overview.ssi b/manual/pt_BR/user_overview.ssi
index ddb3b58..ad40e60 100644
--- a/manual/pt_BR/user_overview.ssi
+++ b/manual/pt_BR/user_overview.ssi
@@ -52,51 +52,20 @@ time-consuming and error-prone, the #{lb config}# command can be used to
create skeleton configuration folders.
Issuing #{lb config}# without any arguments creates a #{config/}#
-subdirectory which it populates with some default settings:
+subdirectory which it populates with some default settings, and a skeleton
+#{auto/}# subdirectory tree.
code{
$ lb config
+ P: Considering defaults defined in /etc/live/build.conf
P: Creating config tree
- $ ls -l
- total 8
- drwxr-xr-x 3 user user 4096 Sep 7 13:02 auto
- drwxr-xr-x 22 user user 4096 Sep 7 13:02 config
-
- $ ls -l config/
- total 104
- -rw-r--r-- 1 user user 4197 Sep 7 13:02 binary
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_debian-installer
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_debian-installer-includes
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_grub
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-debs
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-hooks
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-includes
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-packageslists
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-udebs
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_rootfs
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_syslinux
- -rw-r--r-- 1 user user 2051 Sep 7 13:02 bootstrap
- -rw-r--r-- 1 user user 1647 Sep 7 13:02 chroot
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_apt
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-hooks
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-includes
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-packages
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-packageslists
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-patches
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-preseed
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_sources
- -rw-r--r-- 1 user user 2954 Sep 7 13:02 common
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 includes
- -rw-r--r-- 1 user user 205 Sep 7 13:02 source
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 templates
-
}code
Using #{lb config}# without any arguments would be suitable for users who
need a very basic image, or who intend to later provide a more complete
-configuration via auto/config (see {Managing a
+configuration via #{auto/config}# (see {Managing a
configuration}#managing-a-configuration for details).
Normally, you will want to specify some options. For example, to include the
@@ -120,7 +89,7 @@ A full list of options is available in the #{lb_config}# man page.
3~lb-build The #{lb build}# command
-The #{lb build}# command reads in your configuration from the config/
+The #{lb build}# command reads in your configuration from the #{config/}#
directory. It then runs the lower level commands needed to build your Live
system.
@@ -141,10 +110,10 @@ initramfs-tools, used to generate an initramfs capable of booting live
systems, such as those created by live-build. This includes the Debian Live
ISOs, netboot tarballs, and USB stick images.
-At boot time it will look for read-only media containing a "/live" directory
-where a root filesystem (often a compressed filesystem image like squashfs)
-is stored. If found, it will create a writable environment, using aufs, for
-Debian like systems to boot from.
+At boot time it will look for read-only media containing a #{/live/}#
+directory where a root filesystem (often a compressed filesystem image like
+squashfs) is stored. If found, it will create a writable environment, using
+aufs, for Debian like systems to boot from.
More information on initial ramfs in Debian can be found in the Debian Linux
Kernel Handbook at http://kernel-handbook.alioth.debian.org/ in the chapter
diff --git a/manual/ro/about_project.ssi b/manual/ro/about_project.ssi
index 48b9a11..9af1b07 100644
--- a/manual/ro/about_project.ssi
+++ b/manual/ro/about_project.ssi
@@ -10,8 +10,8 @@ La momentul de inceput al proiectului Debian Live existau deja cateva
sisteme Debian live si ele au depus o munca interesanta. Din perspectiva
Debian marea majoritate a acestor sisteme au urmatoarele dezavantaje:
-_* They are not Debian projects and therefore lack support from within
-Debian.
+_* Ele nu sunt proiecte Debian si drept urmare nu au suport din partea
+Comunitatii Debian
_* Ele amalgameaza diferite distributii, ca *{testing}* si *{unstable}*.
@@ -20,7 +20,7 @@ _* Ele suporta doar arhitectura i386.
_* Ele au modificat comportamentul si /sau aspectul programelor pentru a
castuga spatiu.
-_* They include packages from outside of the Debian archive.
+_* Acestea includ pachete din afara arhivelor Debian
_* Ele folosesc kernele modificate care contin patch-uri ce nu fac parte din
Debian.
@@ -33,11 +33,11 @@ netboot images.
3~ De ce e nevoie de propriul nostru sistem live ?
-Debian is the Universal Operating System: Debian has a live system to show
-around and to accurately represent the Debian system with the following main
-advantages:
+Debian se considera Sistemul de Operare Universal: Are un mecanism live
+pentru a se promova in jur si de a prezenta cu acuratete sistemul de operare
+ce are urmatoarele mari avantaje:
-_* It would be a subproject of Debian.
+_* Acesta va fi un subproiect Debian.
_* El reflecta starea (actuala) a distributiei.
@@ -45,17 +45,17 @@ _* Se poate utiliza pe maximum de arhitecturi posibile.
_* Contine doar programe Debian.
-_* It does not contain any packages that are not in the Debian archive.
+_* Nu contine nici un pachet care nu este din afara arhivelor Debian.
_* Foloseste un kernel Debian nealterat, fara patch-uri aditionale.
2~ Filozofia
-3~ Only unchanged packages from Debian "main"
+3~ Numai pachete neschimbate din Debian "main"
-We will only use packages from the Debian repository in the "main"
-section. The non-free section is not part of Debian and therefore cannot be
-used for official live system images.
+Se vor folosi numai pachete din depozitul Debian sectiunea "main". Sectiunea
+non-free nu este parte a Debian drept urmare nu poate fi folosita nici un
+fel la construirea imaginilor live cu Debian.
Nu vor fi facute nici o schimbare in programe. Daca este nevoie de acest
lucru, schimbarile vor fi facute in coordonare cu responsabilul de program
diff --git a/manual/ro/index.html.in b/manual/ro/index.html.in
index 223cfe0..951cf9f 100644
--- a/manual/ro/index.html.in
+++ b/manual/ro/index.html.in
@@ -9,25 +9,32 @@
<h2>Debian Live Manual</h2>
<p>
+ <i>live-manual</i> is available in different file formats and it is
+translated into several languages. Keep in mind that some translations may
+be incomplete or may not be up to date.
+ </p>
+
+ <p>
+
Please report errors, omissions, patches and suggestions to our mailinglist
at <a
href="mailto:debian-live at lists.debian.org">debian-live at lists.debian.org</a>
-and read about <a href="html/about-manual.html#how-to-contribute">how to
+and read about <a href="html/about-manual.ro.html#how-to-contribute">how to
contribute</a> to the manual.
</p>
<h3>Available Formats</h3>
<ul>
- <li><a href="epub/live-manual.epub">EPUB</a></li>
- <li>HTML: <a href="html/index.html">multi page</a>, <a
-href="html/live-manual.html">single page</a></li>
- <li><a href="odf/live-manual.odt">ODF</a></li>
- <li>PDF: <a href="pdf/live-manual.portrait-a4.pdf">A4 portrait</a>, <a
-href="pdf/live-manual.landscape-a4.pdf">A4 landscape</a>, <a
-href="pdf/live-manual.portrait-letter.pdf">letter portrait</a>, <a
-href="pdf/live-manual.landscape-letter.pdf">letter landscape</a></li>
- <li><a href="txt/live-manual.txt">Plain text</a></li>
+ <li><a href="epub/live-manual.ro.epub">EPUB</a></li>
+ <li>HTML: <a href="html/index.ro.html">multi page</a>, <a
+href="html/live-manual.ro.html">single page</a></li>
+ <li><a href="odf/live-manual.ro.odt">ODF</a></li>
+ <li>PDF: <a href="pdf/live-manual.portrait-a4.ro.pdf">A4 portrait</a>, <a
+href="pdf/live-manual.landscape-a4.ro.pdf">A4 landscape</a>, <a
+href="pdf/live-manual.portrait-letter.ro.pdf">letter portrait</a>, <a
+href="pdf/live-manual.landscape-letter.ro.pdf">letter landscape</a></li>
+ <li><a href="txt/live-manual.ro.txt">Plain text</a></li>
</ul>
<p>
diff --git a/manual/ro/live-manual.ssm b/manual/ro/live-manual.ssm
index 569cfd6..75eb990 100644
--- a/manual/ro/live-manual.ssm
+++ b/manual/ro/live-manual.ssm
@@ -9,7 +9,7 @@
:license: This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.<br><br>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.<br><br>You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses/. <br><br>The complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-3 file.
@date:
- :published: 2011-09-30
+ :published: 2011-12-04
@publisher: Debian Live Project <debian-live at lists.debian.org>
diff --git a/manual/ro/user_basics.ssi b/manual/ro/user_basics.ssi
index 4429660..4c42960 100644
--- a/manual/ro/user_basics.ssi
+++ b/manual/ro/user_basics.ssi
@@ -225,7 +225,7 @@ configuration. Otherwise, the resolution is limited to 800x600.
code{
- $ lb config --packages virtualbox-ose-guest-x11
+ $ echo virtualbox-ose-guest-x11 >> config/package-lists/my.list.chroot
}code
diff --git a/manual/ro/user_customization-contents.ssi b/manual/ro/user_customization-contents.ssi
index 814ba40..5759093 100644
--- a/manual/ro/user_customization-contents.ssi
+++ b/manual/ro/user_customization-contents.ssi
@@ -42,15 +42,15 @@ files that can be simply added or replaced in the image without processing;
see {Live/chroot local hooks}#live-chroot-local-hooks if processing is
needed.
-To include files, simply add them to your #{config/chroot_local-includes}#
+To include files, simply add them to your #{config/includes.chroot}#
directory. This directory corresponds to the root directory (#{/}#) of the
live system. For example, to add a file #{/var/www/index.html}# in the live
system, use:
code{
- $ mkdir -p config/chroot_local-includes/var/www
- $ cp /path/to/my/index.html config/chroot_local-includes/var/www
+ $ mkdir -p config/includes.chroot/var/www
+ $ cp /path/to/my/index.html config/includes.chroot/var/www
}code
@@ -60,7 +60,7 @@ code{
-- config
[...]
- |-- chroot_local-includes
+ |-- includes.chroot
| `-- var
| `-- www
| `-- index.html
@@ -80,11 +80,11 @@ booting the Live system, you can use binary local includes. This works in a
similar fashion to chroot local includes. For example, suppose the files
#{~/video_demo.*}# are demo videos of the live system described by and
linked to by an HTML index page. Simply copy the material to
-#{config/binary_local-includes/}# as follows:
+#{config/includes.binary/}# as follows:
code{
- $ cp ~/video_demo.* config/binary_local-includes/
+ $ cp ~/video_demo.* config/includes.binary/
}code
@@ -112,12 +112,12 @@ build in order to customize the image.
3~live-chroot-local-hooks Live/chroot local hooks
-To run commands in the chroot stage, create a hook script containing the
-commands in the #{config/chroot_local-hooks}# directory. The hook will run
-in the chroot after the rest of your chroot configuration has been applied,
-so remember to ensure your configuration includes all packages and files
-your hook needs in order to run. See the example chroot hook scripts for
-various common chroot customization tasks provided in
+To run commands in the chroot stage, create a hook script with a #{.chroot}#
+suffix containing the commands in the #{config/hooks/}# directory. The hook
+will run in the chroot after the rest of your chroot configuration has been
+applied, so remember to ensure your configuration includes all packages and
+files your hook needs in order to run. See the example chroot hook scripts
+for various common chroot customization tasks provided in
#{/usr/share/live/build/examples/hooks}# which you can copy or symlink to
use them in your own configuration.
@@ -128,27 +128,28 @@ explained in the "Customization" section of its man page. Examine
live-config's own hooks provided in #{/lib/live/config/}#, noting the
sequence numbers. Then provide your own hook prefixed with an appropriate
sequence number, either as a chroot local include in
-#{config/chroot_local-includes/lib/live/config/}#, or as a custom package as
+#{config/includes.chroot/lib/live/config/}#, or as a custom package as
discussed in {Installing modified or third-party
packages}#installing-modified-or-third-party-packages.
3~ Binary local hooks
-To run commands in the binary stage, create a hook script containing the
-commands in the #{config/binary_local-hooks}#. The hook will run after all
-other binary commands are run, but before binary_checksums, the very last
-binary commands The commands in your hook do not run in the chroot, so take
-care to not modify any files outside of the build tree, or you may damage
-your build system! See the example binary hook scripts for various common
-binary customization tasks provided in
+To run commands in the binary stage, create a hook script with a #{.binary}#
+suffix containing the commands in the #{config/hooks/}# directory. The hook
+will run after all other binary commands are run, but before
+binary_checksums, the very last binary command. The commands in your hook do
+not run in the chroot, so take care to not modify any files outside of the
+build tree, or you may damage your build system! See the example binary hook
+scripts for various common binary customization tasks provided in
#{/usr/share/live/build/examples/hooks}# which you can copy or symlink to
use them in your own configuration.
2~ Preseeding Debconf questions
-Files in the #{config/chroot_local-preseed}# directory are considered to be
+Files in the #{config/preseed/}# directory suffixed with #{.preseed}#
+followed by the stage (#{.chroot}# or #{.binary}#) are considered to be
debconf preseed files and are installed by live-build using
-#{debconf-set-selections}#.
+#{debconf-set-selections}# during the corresponding stage.
For more information about debconf, please see debconf(7) in the #{debconf}#
package.
diff --git a/manual/ro/user_customization-installer.ssi b/manual/ro/user_customization-installer.ssi
index 9349f27..d8d0c17 100644
--- a/manual/ro/user_customization-installer.ssi
+++ b/manual/ro/user_customization-installer.ssi
@@ -53,7 +53,8 @@ architecture. For example:
code{
$ lb config --architecture i386 --linux-flavours 486 \
- --debian-installer live --packages debian-installer-launcher
+ --debian-installer live
+ $ echo debian-installer-launcher >> config/package-lists/my.list.chroot
}code
@@ -81,7 +82,7 @@ code{
For experimental or debugging purposes, you might want to include locally
built #{d-i}# component udeb packages. Place these in
-#{config/binary_local-udebs/}# to include them in the image. Additional or
+#{config/packages.binary/}# to include them in the image. Additional or
replacement files and directories may be included in the installer initrd as
well, in a similar fashion to {Live/chroot local
includes}#live-chroot-local-includes, by placing the material in
diff --git a/manual/ro/user_customization-packages.ssi b/manual/ro/user_customization-packages.ssi
index 6b6f4fa..75d3198 100644
--- a/manual/ro/user_customization-packages.ssi
+++ b/manual/ro/user_customization-packages.ssi
@@ -24,7 +24,7 @@ installed via APT pinning, to name a few possibilities.
The distribution you choose has the broadest impact on which packages are
available to include in your live image. Specify the codename, which
-defaults to #{squeeze}# for the Squeeze version of live-build. Any current
+defaults to #{wheezy}# for the Wheezy version of live-build. Any current
distribution carried in the Debian archive may be specified by its codename
here. (See {Terms}#terms for more details.) The #{--distribution}# option
not only influences the source of packages within the archive, but also
@@ -62,38 +62,40 @@ also modifies live-build behaviour to suit the derivatives.
The Debian archive is replicated across a large network of mirrors around
the world so that people in each region can choose a nearby mirror for best
-download speed. Each of the #{--mirror-*}# options governs which
+download speed. Each of the #{--parent-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.
+those stages, and later, in the *binary* stage, the
+#{--parent-mirror-binary}# and #{--parent-mirror-binary-security}# values
+are used, superceding any mirrors used in an earlier stage.
3~distribution-mirrors-build-time Distribution mirrors used at build time
To set the distribution mirrors used at build time to point at a local
-mirror, it is sufficient to set #{--mirror-bootstrap}# and
-#{--mirror-chroot-security}# as follows.
+mirror, it is sufficient to set #{--parent-mirror-bootstrap}#,
+#{--parent-mirror-chroot-security}# and #{--parent-mirror-chroot-backports}#
+as follows.
code{
- $ lb config --mirror-bootstrap http://localhost/debian/ \
- --mirror-chroot-security http://localhost/debian-security/
+ $ lb config --parent-mirror-bootstrap http://localhost/debian/ \
+ --parent-mirror-chroot-security http://localhost/debian-security/ \
+ --parent-mirror-chroot-backports http://localhost/debian-backports/
}code
-The chroot mirror, specified by #{--mirror-chroot}#, defaults to the
-#{--mirror-bootstrap}# value.
+The chroot mirror, specified by #{--parent-mirror-chroot}#, defaults to the
+#{--parent-mirror-bootstrap}# value.
3~ Distribution mirrors used at run time
-The #{--mirror-binary*}# options govern the distribution mirrors placed in
-the binary image. These may be used to install additional packages while
-running the live system. The defaults employ #{cdn.debian.net}#, a service
-that chooses a geographically close mirror based on the user's IP
+The #{--parent-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
@@ -101,8 +103,8 @@ suitable for users on a network where "#{mirror}#" is reachable.
code{
- $ lb config --mirror-binary http://mirror/debian/ \
- --mirror-binary-security http://mirror/debian-security/
+ $ lb config --parent-mirror-binary http://mirror/debian/ \
+ --parent-mirror-binary-security http://mirror/debian-security/
}code
@@ -111,13 +113,13 @@ code{
You may add more repositories, broadening your package choices beyond what
is available in your target distribution. These may be, for example, for
backports, experimental or custom packages. To configure additional
-repositories, create #{config/chroot_sources/your-repository.chroot}#,
-and/or #{config/chroot_sources/your-repository.binary}# files. As with the
-#{--mirror-*}# options, these govern the repositories used in the *chroot*
-stage when building the image, and in the *binary* stage, i.e. for use when
-running the live system.
+repositories, create #{config/archives/your-repository.list.chroot}#, and/or
+#{config/archives/your-repository.list.binary}# files. As with the
+#{--parent-mirror-*}# options, these govern the repositories used in the
+*chroot* stage when building the image, and in the *binary* stage, i.e. for
+use when running the live system.
-For example, #{config/chroot_sources/live.chroot}# allows you to install
+For example, #{config/archives/live.list.chroot}# allows you to install
packages from the debian live snapshot repository at live system build time.
code{
@@ -126,20 +128,20 @@ code{
}code
-If you add the same line to #{config/chroot_sources/live.binary}#, the
+If you add the same line to #{config/archives/live.list.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 should also put the GPG key used to sign the repository into
-#{config/chroot_sources/your-repository.{binary,chroot}.gpg}# files.
+#{config/archives/your-repository.gpg.{binary,chroot}}# files.
-*{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:
+*{Note:}* some preconfigured package repositories are available for easy selection through the #{--archives}# option, e.g. for enabling live snapshots, a simple command is enough to enable it:
code{
- $ lb config --repository live.debian.net
+ $ lb config --archives live.debian.net
}code
@@ -147,31 +149,10 @@ code{
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.
-
-3~ Choosing a few packages
-
-When the number of packages added is small, simply specify
-#{--packages}#. For example:
-
-code{
-
- $ 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 {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, use package lists as
-discussed in the following section, {Package lists}#package-lists.
+individual packages to install in a package list. You can also choose
+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.
3~package-lists Package lists
@@ -184,61 +165,53 @@ 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.
+*{Note:}* 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.
+
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:
+with the #{--package-lists}# option. For example:
code{
- $ lb config --packages-lists "gnome-core rescue"
+ $ lb config --package-lists "gnome rescue"
}code
-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.
+#{/usr/share/live/build/package-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~ Local package lists
-You may supplement or replace entirely the supplied lists using local
-package lists stored in #{config/chroot_local-packageslists/}#.
+You may supplement the predefined lists using local package lists stored in
+#{config/package-lists/}#.
Package lists that exist in this directory need to have a #{.list}# suffix
-in order to be processed. Local package lists always override package lists
-distributed with live-build. This can cause undesired effects, we therefore
-recommend to use unique names for local package lists.
+in order to be processed, and then an additional stage suffix, #{.chroot}#
+or #{.binary}# to indicate which stage the list is for.
-3~ Local binary package lists
+*{Note:}* If you don't specify the stage suffix, the list will be used for both stages. Normally, you want to specify #{.list.chroot}# so that the packages will only be installed in the live filesystem and not have an extra copy of the #{.deb}# placed on the media.
-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.
+3~ Local binary package lists
-Package lists that exist in this directory need to have a #{.list}# suffix
-in order to be processed.
+To make a binary stage list, place a file suffixed with #{.list.binary}# in
+#{config/package-lists/}#. These packages are not installed in the live
+filesystem, but are included on the live media under #{pool/}#. You would
+typically use such a list with one of the non-live installer variants. As
+mentioned above, if you want this list to be the same as your chroot stage
+list, simply use the #{.list}# suffix by itself.
3~ Extending a provided package list using includes
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.
+includes. Refer to these in the #{/usr/share/live/build/package-lists/}#
+directory, as they serve as good examples of how to write your own 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:
+iceweasel, create #{config/package-lists/my.list.chroot}# with the following
+contents:
code{
@@ -310,11 +283,13 @@ 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.
+by putting them in a list in #{config/task-lists/}#, as in the example
+below.
code{
- $ lb config --tasks "mail-server file-server"
+ $ lb config
+ $ echo "mail-server file-server" >> config/task-lists/my.list.chroot
}code
@@ -325,55 +300,50 @@ including ones not included in this list, may be examined with #{tasksel
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
-#{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:
+Desktop and language tasks are special cases that need some extra planning
+and configuration. Live images are different from Debian Installer images in
+this respect. 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 internal #{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.
+
+When developing a desktop live image, the image typically boots directly to
+a working desktop, the choices of both desktop and default language having
+been made at build time, not at run time as in the case of the Debian
+Installer. That's not to say that a live image couldn't be built to support
+multiple desktops or multiple languages and offer the user a choice, but
+that is not live-build's default behaviour.
+
+Because there is no provision made automatically for language tasks, which
+include such things as language-specific fonts and input-method packages, if
+you want them, you need to specify them in your configuration. For example,
+a GNOME desktop image containing support for Japanese might include these
+tasks:
code{
- $ lb config --tasks "japanese japanese-desktop japanese-gnome-desktop"
+ $ lb config
+ $ echo "gnome-desktop desktop standard laptop" >> config/task-lists/my.list.chroot
+ $ echo "japanese japanese-desktop japanese-gnome-desktop" >> config/task-lists/my.list.chroot
}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-lists gnome-desktop}#, it is equivalent to
-specifying #{--packages debian-installer-launcher --packages-lists
-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-lists}#,
-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.
-
-*{Note:}* There is also an experimental #{--language}# option that has an overlapping purpose with language tasks. For any language for which it is known that there are #{*-l10n}# packages, if #{--language}# is specified, those packages will be installed. Furthermore, if any #{syslinux}# templates matching the language are found, they will be used instead of the default English templates. The package selection done by #{--language}# is a poor approximation of language tasks, as it requires that the list of packages to include per language be maintained internally in live-build, and besides, language tasks are more comprehensive and flexible. However, the #{syslinux}# aspect is still useful. Thus, if you use #{--bootloader syslinux}# and templates for the specified language exist either in #{/usr/share/live/build/templates/syslinux/}# or #{config/templates/syslinux/}#, consider using this option, possibly in combination with tasks to ensure all relevant packages are installed
. For example:
+Since desktop tasks are "internal" tasks, for every desktop flavour task
+included in the image, the corresponding value, if it differs from the
+default, "gnome", must be preseeded in the "tasksel/desktop" debconf
+variable or else tasksel will not recognize and install it. Thus:
code{
- $ lb config --language es
+ $ lb config
+ $ echo 'tasksel tasksel/desktop multiselect kde' >> config/preseed/my.preseed.chroot
}code
-Even so, it is limited in that it only supports a single language and a
-single bootloader. Therefore, for all of these reasons, the future of this
-option is under review, possibly to be replaced with something entirely
-different in the next major release of live-build.
+This parameter can take multiple values, e.g. "lxde xfce" instead of "kde".
2~installing-modified-or-third-party-packages Installing modified or
third-party packages
@@ -394,40 +364,40 @@ and elsewhere.
There are two ways of installing modified custom packages:
-_* #{chroot_local-packages}#
+_* #{packages.chroot}#
_* Using a custom APT repository
-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.
+Using #{packages.chroot}# 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
+3~ Using #{packages.chroot}# 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/packages.chroot/}# 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
+Using #{packages.chroot}# for installation of custom packages has
disadvantages:
_* It is not possible to use secure APT.
_* You must install all appropriate packages in the
-#{config/chroot_local-packages/}# directory.
+#{config/packages.chroot/}# directory.
_* 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 {Choosing
-packages to install}#choosing-packages-to-install for details.
+Unlike using #{packages.chroot}#, 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
@@ -452,7 +422,7 @@ pinning}#apt-pinning for more information.
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
+appropriate configurations through #{config/includes.chroot/}#.) For a
complete list, look for options starting with #{apt}# in the #{lb_config}#
man page.
@@ -493,7 +463,7 @@ with:
code{
- $ lb config --binary-indices false
+ $ lb config --apt-indices false
}code
@@ -536,19 +506,19 @@ and #{aptitude}# for details.
For background, please first read the #{apt_preferences(5)}# man page. APT
pinning can be configured either for build time, or else for run time. For
the former, create #{config/chroot_apt/preferences}#. For the latter, create
-#{config/chroot_local-includes/etc/apt/preferences}#.
+#{config/includes.chroot/etc/apt/preferences}#.
-Let's say you are building a Squeeze live system but need all the live
+Let's say you are building a Wheezy live system but need all the live
packages that end up in the binary image to be installed from Sid at build
time. You need to add Sid to your APT sources and pin it so that only the
packages you want are installed from it at build time and all others are
-taken from the target system distribution, Squeeze. The following will
+taken from the target system distribution, Wheezy. The following will
accomplish this:
code{
- $ echo "deb http://mirror/debian sid main" > config/chroot_sources/sid.chroot
- $ cat >>config/chroot_apt/preferences <<END
+ $ echo "deb http://mirror/debian sid main" > config/archives/sid.list.chroot
+ $ cat >> config/chroot_apt/preferences <<END
Package: live-boot live-boot-initramfs-tools live-config live-config-sysvinit
Pin: release n=sid
Pin-Priority: 600
@@ -570,7 +540,7 @@ $ lb config --distribution wheezy
Negative pin priorities will prevent a package from being installed, as in
the case where you do not want a package that is recommended by another
-package. Suppose you are building an LXDE image using #{--packages-lists
+package. Suppose you are building an LXDE image using #{--package-lists
lxde}# option, but don't want the user prompted to store wifi passwords in
the keyring. This list includes #{gdm}#, which depends on #{gksu}#, which in
turn recommends #{gnome-keyring}#. So you want to omit the recommended
diff --git a/manual/ro/user_customization-runtime.ssi b/manual/ro/user_customization-runtime.ssi
index 4bbf347..610fdb1 100644
--- a/manual/ro/user_customization-runtime.ssi
+++ b/manual/ro/user_customization-runtime.ssi
@@ -17,12 +17,15 @@ also any groups and permissions associated with the live user.
You can specify additional groups that the live user will belong to by
preseeding the #{passwd/user-default-groups}# debconf value. For example, to
-add the live user to the #{fuse}# group, add the following to a file in the
-#{config/chroot_local-preseed}# directory:
+add the live user to the #{fuse}# group, add the following preseed under
+#{config/preseed/}# for the chroot stage:
code{
- user-setup passwd/user-default-groups string audio cdrom dip floppy video plugdev netdev powerdev scanner bluetooth fuse
+ $ lb config
+ $ echo user-setup passwd/user-default-groups string audio cdrom \
+ dip floppy video plugdev netdev powerdev scanner bluetooth fuse \
+ >> config/preseed/my.preseed.chroot
}code
@@ -42,7 +45,7 @@ One possible way of changing the default password is by means of a hook as
described in {Boot-time hooks}#boot-time-hooks. In order to do that you can
use the "passwd" hook from #{/usr/share/doc/live-config/examples/hooks}#,
prefix it accordingly (e.g. 200-passwd) and add it to
-#{config/chroot_local-includes/lib/live/config/}#
+#{config/includes.chroot/lib/live/config/}#
2~customizing-locale-and-language Customizing locale and language
diff --git a/manual/ro/user_examples.ssi b/manual/ro/user_examples.ssi
index 5bb918a..ba37423 100644
--- a/manual/ro/user_examples.ssi
+++ b/manual/ro/user_examples.ssi
@@ -19,14 +19,15 @@ 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:
+this file and in it, set the corresponding #{LB_PARENT_MIRROR_*}# variables
+to your preferred mirror. All other mirrors used in the build will be
+defaulted from these values. For example:
code{
- LB_MIRROR_BOOTSTRAP="http://mirror/debian"
- LB_MIRROR_CHROOT="http://mirror/debian"
- LB_MIRROR_CHROOT_SECURITY="http://mirror/debian-security"
+ LB_PARENT_MIRROR_BOOTSTRAP="http://mirror/debian"
+ LB_PARENT_MIRROR_CHROOT_SECURITY="http://mirror/debian-security"
+ LB_PARENT_MIRROR_CHROOT_BACKPORTS="http://mirror/debian-updates"
}code
@@ -76,7 +77,10 @@ utility, serving as an introduction to customizing Debian Live images.
code{
- $ mkdir tutorial2 ; cd tutorial2 ; lb config -p lxde --packages iceweasel
+ $ mkdir tutorial2
+ $ cd tutorial2
+ $ lb config -p lxde
+ $ echo iceweasel >> config/package-lists/my.list.chroot
}code
@@ -84,9 +88,9 @@ 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.
+#{config/includes.chroot/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:
@@ -128,16 +132,23 @@ code{
lb config noauto \
--architecture i386 \
- --linux-flavours 686 \
- --packages-lists lxde \
- --packages "iceweasel xchat" \
+ --linux-flavours 686-pae \
+ --package-lists lxde \
"${@}"
}code
+Now populate your local package list:
+
+code{
+
+ $ echo "iceweasel xchat" >> config/package-lists/my.list.chroot
+
+}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
+#{--linux-flavours 686-pae}# 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}#.
@@ -181,18 +192,12 @@ code{
}code
-Now edit #{auto/config}# to add the #{vlc}# package:
+Now append the #{vlc}# package to our local package list in
+#{config/package-lists/my.list.chroot}#:
code{
- #!/bin/sh
-
- lb config noauto \
- --architecture i386 \
- --linux-flavours 686 \
- --packages-lists lxde \
- --packages "iceweasel xchat vlc" \
- "${@}"
+ $ echo vlc >> config/package-lists/my.list.chroot
}code
@@ -231,15 +236,15 @@ cases drawn from the collected experiences of users of Debian Live.
Make a build directory and create a skeletal configuration in it built
around the standard-x11 list, including #{gdm3}#, #{metacity}# and
-#{xtightvncviewer}#, disabling recommends to make a minimal system:
+#{xvnc4viewer}#, disabling recommends to make a minimal system:
code{
$ mkdir vnc_kiosk_client
$ cd vnc_kiosk_client
- $ lb config -a i386 -k 686 -p standard-x11 \
- --packages "gdm3 metacity xvnc4viewer" \
+ $ lb config -a i386 -k 686-pae -p standard-x11 \
--apt-recommends false
+ $ echo "gdm3 metacity xvnc4viewer" >> config/package-lists/my.list.chroot
}code
@@ -249,8 +254,8 @@ to port #{5901}# on a server at #{192.168.1.2}#:
code{
- $ mkdir -p config/chroot_local-includes/etc/skel
- $ cat >config/chroot_local-includes/etc/skel/.xsession <<END
+ $ mkdir -p config/includes.chroot/etc/skel
+ $ cat > config/includes.chroot/etc/skel/.xsession <<END
#!/bin/sh
/usr/bin/metacity &
@@ -287,7 +292,7 @@ packages will most likely produce a broken live system.
code{
- $ lb config -k 486 -p minimal --binary-indices false \
+ $ lb config -k 486 -p minimal --apt-indices false \
--memtest none --apt-recommends false --includes none
}code
@@ -306,8 +311,8 @@ 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
+instead of the default #{-k "486 686-pae"}#. Leaving off APT's indices with
+#{--apt-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
@@ -327,10 +332,10 @@ preferred desktop, in this case KDE, containing all of the same packages
that would be installed by the standard Debian installer for KDE.
Our initial problem is the discovery of the names of the appropriate
-tasks. Currently, live-build cannot help with this. While we might get lucky
-and find this by trial-and-error, there is a tool, #{grep-dctrl}#, which can
-be used to dig it out of the task descriptions in tasksel-data, so to
-prepare, make sure you have both of those things:
+language tasks. Currently, live-build cannot help with this. While we might
+get lucky and find this by trial-and-error, there is a tool, #{grep-dctrl}#,
+which can be used to dig it out of the task descriptions in tasksel-data, so
+to prepare, make sure you have both of those things:
code{
@@ -342,12 +347,8 @@ Now we can search for the appropriate tasks, first with:
code{
- $ grep-dctrl -FTest-lang pt_BR /usr/share/tasksel/debian-tasks.desc -sTask,Description
+ $ grep-dctrl -FTest-lang pt_BR /usr/share/tasksel/descs/debian-tasks.desc -sTask
Task: brazilian-portuguese
- Description: Brazilian Portuguese environment
- This task installs programs, data files, and
- documentation that make it easier for Brazilian Portuguese speakers
- to use Debian.
}code
@@ -356,22 +357,17 @@ brazilian-portuguese. Now to find the related tasks:
code{
- $ grep-dctrl -FEnhances brazilian-portuguese /usr/share/tasksel/debian-tasks.desc -sTask,Description
+ $ grep-dctrl -FEnhances brazilian-portuguese /usr/share/tasksel/descs/debian-tasks.desc -sTask
Task: brazilian-portuguese-desktop
- Description: Brazilian Portuguese desktop
- This task localises the desktop in Brasilian Portuguese.
-
Task: brazilian-portuguese-kde-desktop
- Description: Brazilian Portuguese KDE desktop
- This task localises the KDE desktop in Brazilian Portuguese.
}code
-We will use the experimental #{--language}# option, as live-build happens to
-include #{syslinux}# templates for pt_BR (see {Desktop and language
-tasks}#desktop-and-language-tasks for details). And at boot time we will
-generate the pt_BR.UTF-8 locale and select the pt-latin1 keyboard
-layout. Now let's put the pieces together:
+At boot time we will generate the pt_BR.UTF-8 locale and select the
+pt-latin1 keyboard layout. We will also need to preseed our desktop choice,
+"kde" so that tasksel will install the correct desktop task, as it differs
+from the default (see {Desktop and languages
+tasks}#desktop-and-language-tasks). Now let's put the pieces together:
code{
@@ -380,12 +376,12 @@ code{
$ lb config \
-a i386 \
-k 486 \
- -p kde-desktop \
- --language pt_BR \
- --tasks "brazilian-portuguese brazilian-portuguese-desktop brazilian-portuguese-kde-desktop" \
--bootappend-live "locales=pt_BR.UTF-8 keyboard-layouts=pt-latin1" \
- --debian-installer live \
- --packages debian-installer-launcher
+ --debian-installer live
+ $ echo kde-desktop brazilian-portuguese brazilian-portuguese-desktop \
+ brazilian-portuguese-kde-desktop >> config/task-lists/my.list.chroot
+ $ echo debian-installer-launcher >> config/package-lists/my.list.chroot
+ $ echo tasksel tasksel/desktop multiselect kde >> config/preseed/my.preseed.chroot
}code
diff --git a/manual/ro/user_installation.ssi b/manual/ro/user_installation.ssi
index 6141868..bd8393d 100644
--- a/manual/ro/user_installation.ssi
+++ b/manual/ro/user_installation.ssi
@@ -105,7 +105,7 @@ are available on http://live.debian.net/debian/.
2~ live-boot and live-config
-*{Note:}* You do not need to install live-boot or live-config on your system to create customized Debian Live systems. However, doing so will do no harm and is useful for reference purposes.
+*{Note:}* You do not need to install live-boot or live-config on your system to create customized Debian Live systems. However, doing so will do no harm and is useful for reference purposes. If you only want the documentation, you may now install the live-boot-doc and live-config-doc packages separately.
3~ From the Debian repository
@@ -132,14 +132,14 @@ if that is your reason for building these packages from source.
_* Build live-boot and live-config .deb files
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.
+your target platform: this means if your target is Wheezy then you should
+build against Wheezy.
Use a personal builder such as /{pbuilder}/ or /{sbuild}/ if you need to
build #{live-boot}# for a target distribution that differs from your build
-system. For example, for Squeeze live images, build #{live-boot}# in a
-Squeeze chroot. If your target distribution happens to match your build
-system distribution, you may build directly on the build system using
+system. For example, for Wheezy live images, build #{live-boot}# in a Wheezy
+chroot. If your target distribution happens to match your build system
+distribution, you may build directly on the build system using
#{dpkg-buildpackage}# (provided by the /{dpkg-dev}/ package):
code{
@@ -165,10 +165,10 @@ repositories}#additional-repositories.
You can let live-build automatically use the latest snapshots of live-boot
and live-config by configuring a third-party repository in your live-build
configuration directory. Assuming you have already created a configuration
-tree with #{lb config}#:
+tree in the current directory with #{lb config}#:
code{
- $ lb config --repository live.debian.net
+ $ lb config --archives live.debian.net
}code
diff --git a/manual/ro/user_managing_a_configuration.ssi b/manual/ro/user_managing_a_configuration.ssi
index 999c508..d0706a8 100644
--- a/manual/ro/user_managing_a_configuration.ssi
+++ b/manual/ro/user_managing_a_configuration.ssi
@@ -52,7 +52,7 @@ code{
#!/bin/sh
lb config noauto \
- --packages-lists "standard" \
+ --package-lists "standard" \
"${@}"
}code
@@ -88,7 +88,7 @@ code{
}code
Edit #{auto/config}#, changing or adding any options as you see fit. In the
-example above, #{--packages-lists standard}# is set to the default
+example above, #{--package-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/user_overview.ssi b/manual/ro/user_overview.ssi
index ddb3b58..ad40e60 100644
--- a/manual/ro/user_overview.ssi
+++ b/manual/ro/user_overview.ssi
@@ -52,51 +52,20 @@ time-consuming and error-prone, the #{lb config}# command can be used to
create skeleton configuration folders.
Issuing #{lb config}# without any arguments creates a #{config/}#
-subdirectory which it populates with some default settings:
+subdirectory which it populates with some default settings, and a skeleton
+#{auto/}# subdirectory tree.
code{
$ lb config
+ P: Considering defaults defined in /etc/live/build.conf
P: Creating config tree
- $ ls -l
- total 8
- drwxr-xr-x 3 user user 4096 Sep 7 13:02 auto
- drwxr-xr-x 22 user user 4096 Sep 7 13:02 config
-
- $ ls -l config/
- total 104
- -rw-r--r-- 1 user user 4197 Sep 7 13:02 binary
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_debian-installer
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_debian-installer-includes
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_grub
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-debs
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-hooks
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-includes
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-packageslists
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-udebs
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_rootfs
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_syslinux
- -rw-r--r-- 1 user user 2051 Sep 7 13:02 bootstrap
- -rw-r--r-- 1 user user 1647 Sep 7 13:02 chroot
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_apt
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-hooks
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-includes
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-packages
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-packageslists
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-patches
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-preseed
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_sources
- -rw-r--r-- 1 user user 2954 Sep 7 13:02 common
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 includes
- -rw-r--r-- 1 user user 205 Sep 7 13:02 source
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 templates
-
}code
Using #{lb config}# without any arguments would be suitable for users who
need a very basic image, or who intend to later provide a more complete
-configuration via auto/config (see {Managing a
+configuration via #{auto/config}# (see {Managing a
configuration}#managing-a-configuration for details).
Normally, you will want to specify some options. For example, to include the
@@ -120,7 +89,7 @@ A full list of options is available in the #{lb_config}# man page.
3~lb-build The #{lb build}# command
-The #{lb build}# command reads in your configuration from the config/
+The #{lb build}# command reads in your configuration from the #{config/}#
directory. It then runs the lower level commands needed to build your Live
system.
@@ -141,10 +110,10 @@ initramfs-tools, used to generate an initramfs capable of booting live
systems, such as those created by live-build. This includes the Debian Live
ISOs, netboot tarballs, and USB stick images.
-At boot time it will look for read-only media containing a "/live" directory
-where a root filesystem (often a compressed filesystem image like squashfs)
-is stored. If found, it will create a writable environment, using aufs, for
-Debian like systems to boot from.
+At boot time it will look for read-only media containing a #{/live/}#
+directory where a root filesystem (often a compressed filesystem image like
+squashfs) is stored. If found, it will create a writable environment, using
+aufs, for Debian like systems to boot from.
More information on initial ramfs in Debian can be found in the Debian Linux
Kernel Handbook at http://kernel-handbook.alioth.debian.org/ in the chapter
--
live-manual
More information about the debian-live-changes
mailing list