[SCM] live-manual branch, debian, updated. debian/3.0_a9-1-42-gc85f6f4
Ben Armstrong
synrg at debian.org
Mon Feb 6 22:41:54 UTC 2012
The following commit has been merged in the debian branch:
commit a65038506262bf8ec949dddf08f6bc6ec06b570e
Author: Ben Armstrong <synrg at debian.org>
Date: Wed Jan 18 18:01:42 2012 -0400
Reverting to using non-parent mirror options since that now works in latest release.
diff --git a/manual/de/live-manual.ssm b/manual/de/live-manual.ssm
index fff8a64..a18d0fd 100644
--- a/manual/de/live-manual.ssm
+++ b/manual/de/live-manual.ssm
@@ -9,7 +9,7 @@
: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: 2012-01-15
+ :published: 2012-01-18
@publisher: Debian Live Projekt <debian-live at lists.debian.org>
diff --git a/manual/de/user_customization-packages.ssi b/manual/de/user_customization-packages.ssi
index 03dcde7..01fd8c2 100644
--- a/manual/de/user_customization-packages.ssi
+++ b/manual/de/user_customization-packages.ssi
@@ -62,40 +62,39 @@ 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 #{--parent-mirror-*}# options governs which
+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
-#{--parent-mirror-binary}# and #{--parent-mirror-binary-security}# values
-are used, superceding any mirrors used in an earlier stage.
+those stages, and later, in the *binary* stage, the #{--mirror-binary}# and
+#{--mirror-binary-security}# values are used, superceding any mirrors used
+in an earlier stage.
3~distribution-mirrors-build-time Distribution mirrors used at build time
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.
+mirror, it is sufficient to set #{--mirror-bootstrap}#,
+#{--mirror-chroot-security}# and #{--mirror-chroot-backports}# as follows.
code{
- $ lb config --parent-mirror-bootstrap http://localhost/debian/ \
- --parent-mirror-chroot-security http://localhost/debian-security/ \
- --parent-mirror-chroot-backports http://localhost/debian-backports/
+ $ lb config --mirror-bootstrap http://localhost/debian/ \
+ --mirror-chroot-security http://localhost/debian-security/ \
+ --mirror-chroot-backports http://localhost/debian-backports/
}code
-The chroot mirror, specified by #{--parent-mirror-chroot}#, defaults to the
-#{--parent-mirror-bootstrap}# value.
+The chroot mirror, specified by #{--mirror-chroot}#, defaults to the
+#{--mirror-bootstrap}# value.
3~ Distribution mirrors used at run time
-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
+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
@@ -103,8 +102,8 @@ suitable for users on a network where "#{mirror}#" is reachable.
code{
- $ lb config --parent-mirror-binary http://mirror/debian/ \
- --parent-mirror-binary-security http://mirror/debian-security/
+ $ lb config --mirror-binary http://mirror/debian/ \
+ --mirror-binary-security http://mirror/debian-security/
}code
@@ -115,9 +114,9 @@ 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.
+#{--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/archives/live.list.chroot}# allows you to install
packages from the debian live snapshot repository at live system build time.
diff --git a/manual/de/user_examples.ssi b/manual/de/user_examples.ssi
index 0a4ed52..1faee91 100644
--- a/manual/de/user_examples.ssi
+++ b/manual/de/user_examples.ssi
@@ -19,15 +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_PARENT_MIRROR_*}# variables
-to your preferred mirror. All other mirrors used in the build will be
-defaulted from these values. For example:
+this file and in it, set the corresponding #{LB_MIRROR_*}# variables to your
+preferred mirror. All other mirrors used in the build will be defaulted from
+these values. For example:
code{
- 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"
+ LB_MIRROR_BOOTSTRAP="http://mirror/debian"
+ LB_MIRROR_CHROOT_SECURITY="http://mirror/debian-security"
+ LB_MIRROR_CHROOT_BACKPORTS="http://mirror/debian-updates"
}code
diff --git a/manual/en/live-manual.ssm b/manual/en/live-manual.ssm
index 4705641..8742063 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: 2012-01-15
+ :published: 2012-01-18
@publisher: Debian Live Project <debian-live at lists.debian.org>
diff --git a/manual/en/user_customization-packages.ssi b/manual/en/user_customization-packages.ssi
index 63821a3..e7b277d 100644
--- a/manual/en/user_customization-packages.ssi
+++ b/manual/en/user_customization-packages.ssi
@@ -30,36 +30,36 @@ 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 #{--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.
+The Debian archive is replicated across a large network of mirrors around the world so that people in each region can choose a nearby mirror for best download speed. Each of the #{--mirror-*}# options governs which distribution mirror is used at various stages of the build. Recall from {Stages of the build}#stages-of-the-build that the *bootstrap* stage is when the chroot is initially populated by debootstrap with a minimal system, and the *chroot* stage is when the chroot used to construct the live system's filesystem is built. Thus, the corresponding mirror switches are used for those stages, and later, in the *binary* stage, the #{--mirror-binary}# and #{--mirror-binary-security}# values are used, superceding any mirrors used in an earlier stage.
3~distribution-mirrors-build-time Distribution mirrors used at build time
-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.
+To set the distribution mirrors used at build time to point at a local mirror, it is sufficient to set #{--mirror-bootstrap}#, #{--mirror-chroot-security}# and #{--mirror-chroot-backports}# as follows.
code{
- $ lb config --parent-mirror-bootstrap http://localhost/debian/ \
- --parent-mirror-chroot-security http://localhost/debian-security/ \
- --parent-mirror-chroot-backports http://localhost/debian-backports/
+ $ lb config --mirror-bootstrap http://localhost/debian/ \
+ --mirror-chroot-security http://localhost/debian-security/ \
+ --mirror-chroot-backports http://localhost/debian-backports/
}code
-The chroot mirror, specified by #{--parent-mirror-chroot}#, defaults to the #{--parent-mirror-bootstrap}# value.
+The chroot mirror, specified by #{--mirror-chroot}#, defaults to the #{--mirror-bootstrap}# value.
3~ Distribution mirrors used at run time
-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.
+The #{--mirror-binary*}# options govern the distribution mirrors placed in the binary image. These may be used to install additional packages while running the live system. The defaults employ #{cdn.debian.net}#, a service that chooses a geographically close mirror based on the user's IP number. This is a suitable choice when you cannot predict which mirror will be best for all of your users. Or you may specify your own values as shown in the example below. An image built from this configuration would only be suitable for users on a network where "#{mirror}#" is reachable.
code{
- $ lb config --parent-mirror-binary http://mirror/debian/ \
- --parent-mirror-binary-security http://mirror/debian-security/
+ $ lb config --mirror-binary http://mirror/debian/ \
+ --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/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.
+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 #{--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/archives/live.list.chroot}# allows you to install packages from the debian live snapshot repository at live system build time.
diff --git a/manual/en/user_examples.ssi b/manual/en/user_examples.ssi
index f0b5d52..834ef3f 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_PARENT_MIRROR_*}# variables to your preferred mirror. All other mirrors used in the build will be defaulted from these values. 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_MIRROR_*}# variables to your preferred mirror. All other mirrors used in the build will be defaulted from these values. For example:
code{
- 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"
+ LB_MIRROR_BOOTSTRAP="http://mirror/debian"
+ LB_MIRROR_CHROOT_SECURITY="http://mirror/debian-security"
+ LB_MIRROR_CHROOT_BACKPORTS="http://mirror/debian-updates"
}code
diff --git a/manual/es/live-manual.ssm b/manual/es/live-manual.ssm
index 5e9d7bd..5e2758a 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: 2012-01-15
+ :published: 2012-01-18
@publisher: Debian Live Project <debian-live at lists.debian.org>
diff --git a/manual/es/user_customization-packages.ssi b/manual/es/user_customization-packages.ssi
index 99723c0..0e32419 100644
--- a/manual/es/user_customization-packages.ssi
+++ b/manual/es/user_customization-packages.ssi
@@ -69,72 +69,64 @@ modificará su comportamiento para adecuarlo al modo seleccionado.
3~ Réplicas de Distribución Debian
-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
-#{--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
-#{--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.
+The Debian archive is replicated across a large network of mirrors around
+the world so that people in each region can choose a nearby mirror for best
+download speed. Each of the #{--mirror-*}# options governs which
+distribution mirror is used at various stages of the build. Recall from
+{Stages of the build}#stages-of-the-build that the *bootstrap* stage is when
+the chroot is initially populated by debootstrap with a minimal system, and
+the *chroot* stage is when the chroot used to construct the live system's
+filesystem is built. Thus, the corresponding mirror switches are used for
+those stages, and later, in the *binary* stage, the #{--mirror-binary}# and
+#{--mirror-binary-security}# values are used, superceding any mirrors used
+in an earlier stage.
3~distribution-mirrors-build-time Réplicas de Distribution utilizadas
durante la creación
-Para indicar qué réplicas deben ser utilizadas en el momento de crear la
-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.
+To set the distribution mirrors used at build time to point at a local
+mirror, it is sufficient to set #{--mirror-bootstrap}#,
+#{--mirror-chroot-security}# and #{--mirror-chroot-backports}# as follows.
code{
- $ lb config --parent-mirror-bootstrap http://localhost/debian/ \
- --parent-mirror-chroot-security http://localhost/debian-security/ \
- --parent-mirror-chroot-backports http://localhost/debian-backports/
+ $ lb config --mirror-bootstrap http://localhost/debian/ \
+ --mirror-chroot-security http://localhost/debian-security/ \
+ --mirror-chroot-backports http://localhost/debian-backports/
}code
-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.
+The chroot mirror, specified by #{--mirror-chroot}#, defaults to the
+#{--mirror-bootstrap}# value.
3~ Réplicas de distribución Debian utilizadas en la ejecución.
-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 imagen construida con esta
-configuración solamente sería accesible a los usuarios de una red donde
-"#{mirror}#" fuese alcanzable.
+The #{--mirror-binary*}# options govern the distribution mirrors placed in
+the binary image. These may be used to install additional packages while
+running the live system. The defaults employ #{cdn.debian.net}#, a service
+that chooses a geographically close mirror based on the user's IP
+number. This is a suitable choice when you cannot predict which mirror will
+be best for all of your users. Or you may specify your own values as shown
+in the example below. An image built from this configuration would only be
+suitable for users on a network where "#{mirror}#" is reachable.
code{
- $ lb config --parent-mirror-binary http://mirror/debian/ \
- --parent-mirror-binary-security http://mirror/debian-security/
+ $ lb config --mirror-binary http://mirror/debian/ \
+ --mirror-binary-security http://mirror/debian-security/
}code
3~additional-repositories Repositorios adicionales
-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/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.
+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
+#{--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.
Por ejemplo, #{config/archives/live.list.chroot}# permite instalar paquetes
de las instantáneas del repositorio Debian Live en el momento de crear la
diff --git a/manual/es/user_examples.ssi b/manual/es/user_examples.ssi
index ce89de7..280bfe7 100644
--- a/manual/es/user_examples.ssi
+++ b/manual/es/user_examples.ssi
@@ -15,23 +15,21 @@ cumpla con los requisitos enumerados en {Requisitos}#requirements y tener
live-build instalado tal y como se describe en {Instalación de
live-build}#installing-live-build.
-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
-acelerar las descargas considerablemente si se utiliza una réplica local. Se
-puede especificar las opciones cuando se usa #{lb config}#, tal y como se
-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 #{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:
+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. All other mirrors used in the build will be defaulted from
+these values. For example:
code{
- 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"
+ LB_MIRROR_BOOTSTRAP="http://mirror/debian"
+ LB_MIRROR_CHROOT_SECURITY="http://mirror/debian-security"
+ LB_MIRROR_CHROOT_BACKPORTS="http://mirror/debian-updates"
}code
diff --git a/manual/fr/live-manual.ssm b/manual/fr/live-manual.ssm
index 24f5455..995deeb 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: 2012-01-15
+ :published: 2012-01-18
@publisher: Debian Live Project <debian-live at lists.debian.org>
diff --git a/manual/fr/user_customization-packages.ssi b/manual/fr/user_customization-packages.ssi
index ee7eb5a..5cc7482 100644
--- a/manual/fr/user_customization-packages.ssi
+++ b/manual/fr/user_customization-packages.ssi
@@ -66,71 +66,64 @@ des dérivés.
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
-#{--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.
+The Debian archive is replicated across a large network of mirrors around
+the world so that people in each region can choose a nearby mirror for best
+download speed. Each of the #{--mirror-*}# options governs which
+distribution mirror is used at various stages of the build. Recall from
+{Stages of the build}#stages-of-the-build that the *bootstrap* stage is when
+the chroot is initially populated by debootstrap with a minimal system, and
+the *chroot* stage is when the chroot used to construct the live system's
+filesystem is built. Thus, the corresponding mirror switches are used for
+those stages, and later, in the *binary* stage, the #{--mirror-binary}# and
+#{--mirror-binary-security}# values are used, superceding any mirrors used
+in an earlier stage.
3~distribution-mirrors-build-time 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
-#{--parent-mirror-bootstrap}# , #{--parent-mirror-chroot-security}# et
-#{--parent-mirror-chroot-backports}# comme suit.
+To set the distribution mirrors used at build time to point at a local
+mirror, it is sufficient to set #{--mirror-bootstrap}#,
+#{--mirror-chroot-security}# and #{--mirror-chroot-backports}# as follows.
code{
- $ lb config --parent-mirror-bootstrap http://localhost/debian/ \
- --parent-mirror-chroot-security http://localhost/debian-security/ \
- --parent-mirror-chroot-backports http://localhost/debian-backports/
+ $ lb config --mirror-bootstrap http://localhost/debian/ \
+ --mirror-chroot-security http://localhost/debian-security/ \
+ --mirror-chroot-backports http://localhost/debian-backports/
}code
-Le miroir chroot, spécifiée par #{--parent-mirror-chroot}#, par défaut,
-c'est la valeur #{--parent-mirror-bootstrap}#.
+The chroot mirror, specified by #{--mirror-chroot}#, defaults to the
+#{--mirror-bootstrap}# value.
3~ Miroirs de distribution utilisés au moment de l'exécution
-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.
+The #{--mirror-binary*}# options govern the distribution mirrors placed in
+the binary image. These may be used to install additional packages while
+running the live system. The defaults employ #{cdn.debian.net}#, a service
+that chooses a geographically close mirror based on the user's IP
+number. This is a suitable choice when you cannot predict which mirror will
+be best for all of your users. Or you may specify your own values as shown
+in the example below. An image built from this configuration would only be
+suitable for users on a network where "#{mirror}#" is reachable.
code{
- $ lb config --parent-mirror-binary http://mirror/debian/ \
- --parent-mirror-binary-security http://mirror/debian-security/
+ $ lb config --mirror-binary http://mirror/debian/ \
+ --mirror-binary-security http://mirror/debian-security/
}code
3~additional-repositories Référentiels additionnels
-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/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.
+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
+#{--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.
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
diff --git a/manual/fr/user_examples.ssi b/manual/fr/user_examples.ssi
index 07e1623..45dbc8d 100644
--- a/manual/fr/user_examples.ssi
+++ b/manual/fr/user_examples.ssi
@@ -15,23 +15,21 @@ 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:
+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. All other mirrors used in the build will be defaulted from
+these values. For example:
code{
- 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"
+ LB_MIRROR_BOOTSTRAP="http://mirror/debian"
+ LB_MIRROR_CHROOT_SECURITY="http://mirror/debian-security"
+ LB_MIRROR_CHROOT_BACKPORTS="http://mirror/debian-updates"
}code
diff --git a/manual/it/live-manual.ssm b/manual/it/live-manual.ssm
index f7f7794..7e0860a 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: 2012-01-15
+ :published: 2012-01-18
@publisher: Debian Live Project <debian-live at lists.debian.org>
diff --git a/manual/it/user_customization-packages.ssi b/manual/it/user_customization-packages.ssi
index 8716f36..7dcefb0 100644
--- a/manual/it/user_customization-packages.ssi
+++ b/manual/it/user_customization-packages.ssi
@@ -65,69 +65,64 @@ 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
-#{--parent-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 #{--parent-mirror-binary}# e #{--parent-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 #{--mirror-*}# options governs which
+distribution mirror is used at various stages of the build. Recall from
+{Stages of the build}#stages-of-the-build that the *bootstrap* stage is when
+the chroot is initially populated by debootstrap with a minimal system, and
+the *chroot* stage is when the chroot used to construct the live system's
+filesystem is built. Thus, the corresponding mirror switches are used for
+those stages, and later, in the *binary* stage, the #{--mirror-binary}# and
+#{--mirror-binary-security}# values are used, superceding any mirrors used
+in an earlier stage.
3~distribution-mirrors-build-time Mirror delle distribuzioni usati in fase
di compilazione
-Per impostare i mirror delle distribuzioni usati in fase di compilazione ad
-uno locale, è sufficiente impostare #{--parent-mirror-bootstrap}#,
-#{--parent-mirror-chroot-security}# e #{--parent-mirror-chroot-backports}#
-come segue.
+To set the distribution mirrors used at build time to point at a local
+mirror, it is sufficient to set #{--mirror-bootstrap}#,
+#{--mirror-chroot-security}# and #{--mirror-chroot-backports}# as follows.
code{
- $ lb config --parent-mirror-bootstrap http://localhost/debian/ \
- --parent-mirror-chroot-security http://localhost/debian-security/ \
- --parent-mirror-chroot-backports http://localhost/debian-backports/
+ $ lb config --mirror-bootstrap http://localhost/debian/ \
+ --mirror-chroot-security http://localhost/debian-security/ \
+ --mirror-chroot-backports http://localhost/debian-backports/
}code
-Il mirror chroot, specificato da #{--parent-mirror-chroot}#, è impostato al
-valore di #{--parent-mirror-bootstrap}#.
+The chroot mirror, specified by #{--mirror-chroot}#, defaults to the
+#{--mirror-bootstrap}# value.
3~ Mirror delle distribuzioni usate durante l'esecuzione
-Le opzioni #{--parent-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 #{--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 --parent-mirror-binary http://mirror/debian/ \
- --parent-mirror-binary-security http://mirror/debian-security/
+ $ lb config --mirror-binary http://mirror/debian/ \
+ --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/archives/vostro-repository.list.chroot}#, o
-#{config/archives/vostro-repository.list.binary}#. Come per le opzioni
-#{--parent-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
+#{--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/archives/live.list.chroot}# permette di installare
pacchetti dal repository snapshot di debian live al momento della creazione
diff --git a/manual/it/user_examples.ssi b/manual/it/user_examples.ssi
index 478bfcd..14eb373 100644
--- a/manual/it/user_examples.ssi
+++ b/manual/it/user_examples.ssi
@@ -14,22 +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_PARENT_MIRROR_*}# per il mirror
-desiderato. Tutti gli altri mirror utilizzati nella costruzione avranno
-questi valori, 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_MIRROR_*}# variables to your
+preferred mirror. All other mirrors used in the build will be defaulted from
+these values. For example:
code{
- 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"
+ LB_MIRROR_BOOTSTRAP="http://mirror/debian"
+ LB_MIRROR_CHROOT_SECURITY="http://mirror/debian-security"
+ LB_MIRROR_CHROOT_BACKPORTS="http://mirror/debian-updates"
}code
diff --git a/manual/po/de/live-manual.ssm.po b/manual/po/de/live-manual.ssm.po
index 2568ef1..7f4b496 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: 2012-01-15 16:28+0100\n"
+"POT-Creation-Date: 2012-01-18 18:00-0400\n"
"PO-Revision-Date: 2011-04-23 14:15+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -48,7 +48,7 @@ msgstr ""
#, no-wrap
msgid ""
"@date:\n"
-" :published: 2012-01-15\n"
+" :published: 2012-01-18\n"
msgstr ""
#. type: Plain text
diff --git a/manual/po/de/user_customization-packages.ssi.po b/manual/po/de/user_customization-packages.ssi.po
index 0855f58..cac34dd 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: 2012-01-07 15:40+0100\n"
+"POT-Creation-Date: 2012-01-18 18:00-0400\n"
"PO-Revision-Date: 2011-04-23 14:15+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -34,6 +34,7 @@ msgstr ""
#: 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-binary.ssi:16 en/user_customization-binary.ssi:27
#: 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
@@ -99,6 +100,7 @@ msgstr ""
#: 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-binary.ssi:23 en/user_customization-binary.ssi:33
#: 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:38
@@ -248,15 +250,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 #{--parent-mirror-*}# options governs which "
+"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 #{--parent-mirror-binary}"
-"# and #{--parent-mirror-binary-security}# values are used, superceding any "
-"mirrors used in an earlier stage."
+"those stages, and later, in the *binary* stage, the #{--mirror-binary}# and #"
+"{--mirror-binary-security}# values are used, superceding any mirrors used in "
+"an earlier stage."
msgstr ""
#. type: Plain text
@@ -269,24 +271,24 @@ 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 #{--parent-mirror-bootstrap}#, #{--parent-"
-"mirror-chroot-security}# and #{--parent-mirror-chroot-backports}# as follows."
+"mirror, it is sufficient to set #{--mirror-bootstrap}#, #{--mirror-chroot-"
+"security}# and #{--mirror-chroot-backports}# as follows."
msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:44
#, no-wrap
msgid ""
-" $ 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"
+" $ lb config --mirror-bootstrap http://localhost/debian/ \\\n"
+" --mirror-chroot-security http://localhost/debian-security/ \\\n"
+"\t --mirror-chroot-backports http://localhost/debian-backports/\n"
msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:48
msgid ""
-"The chroot mirror, specified by #{--parent-mirror-chroot}#, defaults to the #"
-"{--parent-mirror-bootstrap}# value."
+"The chroot mirror, specified by #{--mirror-chroot}#, defaults to the #{--"
+"mirror-bootstrap}# value."
msgstr ""
#. type: Plain text
@@ -297,22 +299,22 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:52
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."
+"The #{--mirror-binary*}# options govern the distribution mirrors placed in "
+"the binary image. These may be used to install additional packages while "
+"running the live system. The defaults employ #{cdn.debian.net}#, a service "
+"that chooses a geographically close mirror based on the user's IP number. "
+"This is a suitable choice when you cannot predict which mirror will be best "
+"for all of your users. Or you may specify your own values as shown in the "
+"example below. An image built from this configuration would only be suitable "
+"for users on a network where \"#{mirror}#\" is reachable."
msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:57
#, no-wrap
msgid ""
-" $ lb config --parent-mirror-binary http://mirror/debian/ \\\n"
-" --parent-mirror-binary-security http://mirror/debian-security/\n"
+" $ lb config --mirror-binary http://mirror/debian/ \\\n"
+" --mirror-binary-security http://mirror/debian-security/\n"
msgstr ""
#. type: Plain text
@@ -328,9 +330,9 @@ msgid ""
"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."
+"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
diff --git a/manual/po/de/user_examples.ssi.po b/manual/po/de/user_examples.ssi.po
index 58d1d0a..b2a9535 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: 2012-01-15 20:48+0100\n"
+"POT-Creation-Date: 2012-01-18 18:00-0400\n"
"PO-Revision-Date: 2011-04-23 14:15+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -202,18 +202,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_PARENT_MIRROR_*}# variables to your "
-"preferred mirror. All other mirrors used in the build will be defaulted from "
-"these values. For example:"
+"and in it, set the corresponding #{LB_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_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"
+" LB_MIRROR_BOOTSTRAP=\"http://mirror/debian\"\n"
+" LB_MIRROR_CHROOT_SECURITY=\"http://mirror/debian-security\"\n"
+" LB_MIRROR_CHROOT_BACKPORTS=\"http://mirror/debian-updates\"\n"
msgstr ""
#. type: Plain text
diff --git a/manual/po/es/live-manual.ssm.po b/manual/po/es/live-manual.ssm.po
index 33124ee..c9eadd0 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: 2012-01-15 16:28+0100\n"
+"POT-Creation-Date: 2012-01-18 18:00-0400\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: 2012-01-15\n"
+" :published: 2012-01-18\n"
msgstr ""
#. type: Plain text
diff --git a/manual/po/es/user_customization-packages.ssi.po b/manual/po/es/user_customization-packages.ssi.po
index ecdb842..b93cd5a 100644
--- a/manual/po/es/user_customization-packages.ssi.po
+++ b/manual/po/es/user_customization-packages.ssi.po
@@ -9,7 +9,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-01-07 15:40+0100\n"
+"POT-Creation-Date: 2012-01-18 18:00-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"
@@ -41,6 +41,7 @@ msgstr ""
#: 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-binary.ssi:16 en/user_customization-binary.ssi:27
#: 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
@@ -106,6 +107,7 @@ msgstr "code{"
#: 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-binary.ssi:23 en/user_customization-binary.ssi:33
#: 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:38
@@ -296,18 +298,31 @@ msgstr "3~ Réplicas de Distribución Debian"
#. 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 #{--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."
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 #{--parent-mirror-*}# options governs which "
+"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 #{--parent-mirror-binary}"
-"# and #{--parent-mirror-binary-security}# values are used, superceding any "
-"mirrors used in an earlier stage."
+"those stages, and later, in the *binary* stage, the #{--mirror-binary}# and #"
+"{--mirror-binary-security}# values are used, superceding any mirrors used in "
+"an earlier stage."
msgstr ""
"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 "
@@ -335,10 +350,16 @@ 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 #{--parent-mirror-bootstrap}#, #{--parent-"
+#| "mirror-chroot-security}# and #{--parent-mirror-chroot-backports}# as "
+#| "follows."
msgid ""
"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."
+"mirror, it is sufficient to set #{--mirror-bootstrap}#, #{--mirror-chroot-"
+"security}# and #{--mirror-chroot-backports}# as follows."
msgstr ""
"Para indicar qué réplicas deben ser utilizadas en el momento de crear la "
"imagen es suficiente con utilizar las opciones #{--parent-mirror-bootstrap}"
@@ -347,11 +368,15 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:44
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| " $ 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"
msgid ""
-" $ 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"
+" $ lb config --mirror-bootstrap http://localhost/debian/ \\\n"
+" --mirror-chroot-security http://localhost/debian-security/ \\\n"
+"\t --mirror-chroot-backports http://localhost/debian-backports/\n"
msgstr ""
" $ lb config --parent-mirror-bootstrap http://localhost/debian/ \\\n"
" --parent-mirror-chroot-security http://localhost/debian-security/ \\\n"
@@ -359,9 +384,13 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:48
+#, fuzzy
+#| msgid ""
+#| "The chroot mirror, specified by #{--parent-mirror-chroot}#, defaults to "
+#| "the #{--parent-mirror-bootstrap}# value."
msgid ""
-"The chroot mirror, specified by #{--parent-mirror-chroot}#, defaults to the #"
-"{--parent-mirror-bootstrap}# value."
+"The chroot mirror, specified by #{--mirror-chroot}#, defaults to the #{--"
+"mirror-bootstrap}# value."
msgstr ""
"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."
@@ -373,15 +402,26 @@ msgstr "3~ Réplicas de distribución Debian utilizadas en la ejecución."
#. type: Plain text
#: en/user_customization-packages.ssi:52
-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."
+#, fuzzy
+#| 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."
+msgid ""
+"The #{--mirror-binary*}# options govern the distribution mirrors placed in "
+"the binary image. These may be used to install additional packages while "
+"running the live system. The defaults employ #{cdn.debian.net}#, a service "
+"that chooses a geographically close mirror based on the user's IP number. "
+"This is a suitable choice when you cannot predict which mirror will be best "
+"for all of your users. Or you may specify your own values as shown in the "
+"example below. An image built from this configuration would only be suitable "
+"for users on a network where \"#{mirror}#\" is reachable."
msgstr ""
"Las opciones #{--parent-mirror-binary*}# gobiernan las réplicas configuradas "
"en la imagen binaria que serán utilizadas para instalar paquetes adicionales "
@@ -395,10 +435,13 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:57
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| " $ lb config --parent-mirror-binary http://mirror/debian/ \\\n"
+#| " --parent-mirror-binary-security http://mirror/debian-security/\n"
msgid ""
-" $ lb config --parent-mirror-binary http://mirror/debian/ \\\n"
-" --parent-mirror-binary-security http://mirror/debian-security/\n"
+" $ lb config --mirror-binary http://mirror/debian/ \\\n"
+" --mirror-binary-security http://mirror/debian-security/\n"
msgstr ""
" $ lb config --parent-mirror-binary http://mirror/debian/ \\\n"
" --parent-mirror-binary-security http://mirror/debian-security/\n"
@@ -410,15 +453,25 @@ msgstr "3~additional-repositories Repositorios adicionales"
#. type: Plain text
#: 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/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."
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/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."
+"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 "
diff --git a/manual/po/es/user_examples.ssi.po b/manual/po/es/user_examples.ssi.po
index 457a452..c91e897 100644
--- a/manual/po/es/user_examples.ssi.po
+++ b/manual/po/es/user_examples.ssi.po
@@ -9,7 +9,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-01-15 20:48+0100\n"
+"POT-Creation-Date: 2012-01-18 18:00-0400\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"
@@ -209,6 +209,17 @@ 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_PARENT_MIRROR_*}# "
+#| "variables to your preferred mirror. All other mirrors used in the build "
+#| "will be defaulted from these values. 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 "
@@ -216,9 +227,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_PARENT_MIRROR_*}# variables to your "
-"preferred mirror. All other mirrors used in the build will be defaulted from "
-"these values. For example:"
+"and in it, set the corresponding #{LB_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 "
@@ -234,11 +245,15 @@ msgstr ""
#. type: Plain text
#: en/user_examples.ssi:18
-#, no-wrap
-msgid ""
-" 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"
+#, fuzzy, no-wrap
+#| msgid ""
+#| " 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"
+msgid ""
+" LB_MIRROR_BOOTSTRAP=\"http://mirror/debian\"\n"
+" LB_MIRROR_CHROOT_SECURITY=\"http://mirror/debian-security\"\n"
+" LB_MIRROR_CHROOT_BACKPORTS=\"http://mirror/debian-updates\"\n"
msgstr ""
" LB_PARENT_MIRROR_BOOTSTRAP=\"http://mirror/debian\"\n"
" LB_PARENT_MIRROR_CHROOT_SECURITY=\"http://mirror/debian-security\"\n"
diff --git a/manual/po/fr/live-manual.ssm.po b/manual/po/fr/live-manual.ssm.po
index d0571dc..f72aeee 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: 2012-01-15 16:28+0100\n"
+"POT-Creation-Date: 2012-01-18 18:00-0400\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: 2012-01-15\n"
+" :published: 2012-01-18\n"
msgstr ""
#. type: Plain text
diff --git a/manual/po/fr/user_customization-packages.ssi.po b/manual/po/fr/user_customization-packages.ssi.po
index c671d9f..03c99de 100644
--- a/manual/po/fr/user_customization-packages.ssi.po
+++ b/manual/po/fr/user_customization-packages.ssi.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-01-07 15:40+0100\n"
+"POT-Creation-Date: 2012-01-18 18:00-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"
@@ -35,6 +35,7 @@ msgstr ""
#: 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-binary.ssi:16 en/user_customization-binary.ssi:27
#: 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
@@ -100,6 +101,7 @@ msgstr "code{"
#: 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-binary.ssi:23 en/user_customization-binary.ssi:33
#: 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:38
@@ -287,18 +289,31 @@ msgstr "3~ Miroirs de distribution"
#. 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 #{--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."
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 #{--parent-mirror-*}# options governs which "
+"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 #{--parent-mirror-binary}"
-"# and #{--parent-mirror-binary-security}# values are used, superceding any "
-"mirrors used in an earlier stage."
+"those stages, and later, in the *binary* stage, the #{--mirror-binary}# and #"
+"{--mirror-binary-security}# values are used, superceding any mirrors used in "
+"an earlier stage."
msgstr ""
"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 "
@@ -324,10 +339,16 @@ 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 #{--parent-mirror-bootstrap}#, #{--parent-"
+#| "mirror-chroot-security}# and #{--parent-mirror-chroot-backports}# as "
+#| "follows."
msgid ""
"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."
+"mirror, it is sufficient to set #{--mirror-bootstrap}#, #{--mirror-chroot-"
+"security}# and #{--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 #{--parent-mirror-"
@@ -338,16 +359,20 @@ msgstr ""
#: en/user_customization-packages.ssi:44
#, no-wrap
msgid ""
-" $ 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"
+" $ lb config --mirror-bootstrap http://localhost/debian/ \\\n"
+" --mirror-chroot-security http://localhost/debian-security/ \\\n"
+"\t --mirror-chroot-backports http://localhost/debian-backports/\n"
msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:48
+#, fuzzy
+#| msgid ""
+#| "The chroot mirror, specified by #{--parent-mirror-chroot}#, defaults to "
+#| "the #{--parent-mirror-bootstrap}# value."
msgid ""
-"The chroot mirror, specified by #{--parent-mirror-chroot}#, defaults to the #"
-"{--parent-mirror-bootstrap}# value."
+"The chroot mirror, specified by #{--mirror-chroot}#, defaults to the #{--"
+"mirror-bootstrap}# value."
msgstr ""
"Le miroir chroot, spécifiée par #{--parent-mirror-chroot}#, par défaut, "
"c'est la valeur #{--parent-mirror-bootstrap}#."
@@ -359,15 +384,26 @@ msgstr "3~ Miroirs de distribution utilisés au moment de l'exécution"
#. type: Plain text
#: en/user_customization-packages.ssi:52
-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."
+#, fuzzy
+#| 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."
+msgid ""
+"The #{--mirror-binary*}# options govern the distribution mirrors placed in "
+"the binary image. These may be used to install additional packages while "
+"running the live system. The defaults employ #{cdn.debian.net}#, a service "
+"that chooses a geographically close mirror based on the user's IP number. "
+"This is a suitable choice when you cannot predict which mirror will be best "
+"for all of your users. Or you may specify your own values as shown in the "
+"example below. An image built from this configuration would only be suitable "
+"for users on a network where \"#{mirror}#\" is reachable."
msgstr ""
"Les options #{--parent-mirror-binary*}# régissent les miroirs de "
"distribution placés dans l'image binaire. Ils peuvent être utilisés pour "
@@ -384,8 +420,8 @@ msgstr ""
#: en/user_customization-packages.ssi:57
#, no-wrap
msgid ""
-" $ lb config --parent-mirror-binary http://mirror/debian/ \\\n"
-" --parent-mirror-binary-security http://mirror/debian-security/\n"
+" $ lb config --mirror-binary http://mirror/debian/ \\\n"
+" --mirror-binary-security http://mirror/debian-security/\n"
msgstr ""
#. type: Plain text
@@ -395,15 +431,25 @@ msgstr "3~additional-repositories Référentiels additionnels"
#. type: Plain text
#: 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/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."
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/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."
+"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 "
diff --git a/manual/po/fr/user_examples.ssi.po b/manual/po/fr/user_examples.ssi.po
index ead1ef5..42cee05 100644
--- a/manual/po/fr/user_examples.ssi.po
+++ b/manual/po/fr/user_examples.ssi.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-01-15 20:48+0100\n"
+"POT-Creation-Date: 2012-01-18 18:00-0400\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"
@@ -205,6 +205,17 @@ 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_PARENT_MIRROR_*}# "
+#| "variables to your preferred mirror. All other mirrors used in the build "
+#| "will be defaulted from these values. 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 "
@@ -212,9 +223,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_PARENT_MIRROR_*}# variables to your "
-"preferred mirror. All other mirrors used in the build will be defaulted from "
-"these values. For example:"
+"and in it, set the corresponding #{LB_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 "
@@ -232,9 +243,9 @@ msgstr ""
#: en/user_examples.ssi:18
#, no-wrap
msgid ""
-" 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"
+" LB_MIRROR_BOOTSTRAP=\"http://mirror/debian\"\n"
+" LB_MIRROR_CHROOT_SECURITY=\"http://mirror/debian-security\"\n"
+" LB_MIRROR_CHROOT_BACKPORTS=\"http://mirror/debian-updates\"\n"
msgstr ""
#. type: Plain text
diff --git a/manual/po/it/live-manual.ssm.po b/manual/po/it/live-manual.ssm.po
index 1727b88..ed80eea 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: 2012-01-15 16:28+0100\n"
+"POT-Creation-Date: 2012-01-18 18:00-0400\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: 2012-01-15\n"
+" :published: 2012-01-18\n"
msgstr ""
#. type: Plain text
diff --git a/manual/po/it/user_customization-packages.ssi.po b/manual/po/it/user_customization-packages.ssi.po
index 4633086..a62b1cb 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: 2012-01-07 15:40+0100\n"
+"POT-Creation-Date: 2012-01-18 18:00-0400\n"
"PO-Revision-Date: 2011-12-06 01:39+0100\n"
"Last-Translator: skizzhg <skizzhg at gmx.com>\n"
"Language-Team: Italian <tp at lists.linux.it>\n"
@@ -36,6 +36,7 @@ msgstr ""
#: 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-binary.ssi:16 en/user_customization-binary.ssi:27
#: 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
@@ -101,6 +102,7 @@ msgstr "code{"
#: 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-binary.ssi:23 en/user_customization-binary.ssi:33
#: 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:38
@@ -287,18 +289,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 #{--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."
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 #{--parent-mirror-*}# options governs which "
+"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 #{--parent-mirror-binary}"
-"# and #{--parent-mirror-binary-security}# values are used, superceding any "
-"mirrors used in an earlier stage."
+"those stages, and later, in the *binary* stage, the #{--mirror-binary}# and #"
+"{--mirror-binary-security}# values are used, superceding any mirrors used in "
+"an earlier stage."
msgstr ""
"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,10 +338,16 @@ 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 #{--parent-mirror-bootstrap}#, #{--parent-"
+#| "mirror-chroot-security}# and #{--parent-mirror-chroot-backports}# as "
+#| "follows."
msgid ""
"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."
+"mirror, it is sufficient to set #{--mirror-bootstrap}#, #{--mirror-chroot-"
+"security}# and #{--mirror-chroot-backports}# as follows."
msgstr ""
"Per impostare i mirror delle distribuzioni usati in fase di compilazione ad "
"uno locale, è sufficiente impostare #{--parent-mirror-bootstrap}#, #{--"
@@ -337,16 +358,20 @@ msgstr ""
#: en/user_customization-packages.ssi:44
#, no-wrap
msgid ""
-" $ 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"
+" $ lb config --mirror-bootstrap http://localhost/debian/ \\\n"
+" --mirror-chroot-security http://localhost/debian-security/ \\\n"
+"\t --mirror-chroot-backports http://localhost/debian-backports/\n"
msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:48
+#, fuzzy
+#| msgid ""
+#| "The chroot mirror, specified by #{--parent-mirror-chroot}#, defaults to "
+#| "the #{--parent-mirror-bootstrap}# value."
msgid ""
-"The chroot mirror, specified by #{--parent-mirror-chroot}#, defaults to the #"
-"{--parent-mirror-bootstrap}# value."
+"The chroot mirror, specified by #{--mirror-chroot}#, defaults to the #{--"
+"mirror-bootstrap}# value."
msgstr ""
"Il mirror chroot, specificato da #{--parent-mirror-chroot}#, è impostato al "
"valore di #{--parent-mirror-bootstrap}#."
@@ -358,15 +383,26 @@ msgstr "3~ Mirror delle distribuzioni usate durante l'esecuzione"
#. type: Plain text
#: en/user_customization-packages.ssi:52
-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."
+#, fuzzy
+#| 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."
+msgid ""
+"The #{--mirror-binary*}# options govern the distribution mirrors placed in "
+"the binary image. These may be used to install additional packages while "
+"running the live system. The defaults employ #{cdn.debian.net}#, a service "
+"that chooses a geographically close mirror based on the user's IP number. "
+"This is a suitable choice when you cannot predict which mirror will be best "
+"for all of your users. Or you may specify your own values as shown in the "
+"example below. An image built from this configuration would only be suitable "
+"for users on a network where \"#{mirror}#\" is reachable."
msgstr ""
"Le opzioni #{--parent-mirror-binary*}# determinano i mirror delle "
"distribuzioni inseriti nell'immagine binaria. Questi possono essere usati "
@@ -383,8 +419,8 @@ msgstr ""
#: en/user_customization-packages.ssi:57
#, no-wrap
msgid ""
-" $ lb config --parent-mirror-binary http://mirror/debian/ \\\n"
-" --parent-mirror-binary-security http://mirror/debian-security/\n"
+" $ lb config --mirror-binary http://mirror/debian/ \\\n"
+" --mirror-binary-security http://mirror/debian-security/\n"
msgstr ""
#. type: Plain text
@@ -394,15 +430,25 @@ msgstr "3~additional-repositories Repository addizionali"
#. type: Plain text
#: 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/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."
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/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."
+"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 "
diff --git a/manual/po/it/user_examples.ssi.po b/manual/po/it/user_examples.ssi.po
index 29199e0..84d34f6 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: 2012-01-15 20:48+0100\n"
+"POT-Creation-Date: 2012-01-18 18:00-0400\n"
"PO-Revision-Date: 2011-12-06 00:43+0100\n"
"Last-Translator: skizzhg <skizzhg at gmx.com>\n"
"Language-Team: Italian <tp at lists.linux.it>\n"
@@ -205,6 +205,17 @@ 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_PARENT_MIRROR_*}# "
+#| "variables to your preferred mirror. All other mirrors used in the build "
+#| "will be defaulted from these values. 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 "
@@ -212,9 +223,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_PARENT_MIRROR_*}# variables to your "
-"preferred mirror. All other mirrors used in the build will be defaulted from "
-"these values. For example:"
+"and in it, set the corresponding #{LB_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 "
@@ -231,9 +242,9 @@ msgstr ""
#: en/user_examples.ssi:18
#, no-wrap
msgid ""
-" 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"
+" LB_MIRROR_BOOTSTRAP=\"http://mirror/debian\"\n"
+" LB_MIRROR_CHROOT_SECURITY=\"http://mirror/debian-security\"\n"
+" LB_MIRROR_CHROOT_BACKPORTS=\"http://mirror/debian-updates\"\n"
msgstr ""
#. type: Plain text
diff --git a/manual/po/pt_BR/live-manual.ssm.po b/manual/po/pt_BR/live-manual.ssm.po
index 1039a8b..16cc212 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: 2012-01-15 16:28+0100\n"
+"POT-Creation-Date: 2012-01-18 18:00-0400\n"
"PO-Revision-Date: 2010-10-22 07:52-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -45,7 +45,7 @@ msgstr ""
#, no-wrap
msgid ""
"@date:\n"
-" :published: 2012-01-15\n"
+" :published: 2012-01-18\n"
msgstr ""
#. type: Plain text
diff --git a/manual/po/pt_BR/user_customization-packages.ssi.po b/manual/po/pt_BR/user_customization-packages.ssi.po
index b6ea3e8..78fff44 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: 2012-01-07 15:40+0100\n"
+"POT-Creation-Date: 2012-01-18 18:00-0400\n"
"PO-Revision-Date: 2010-10-22 08:58-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -34,6 +34,7 @@ msgstr ""
#: 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-binary.ssi:16 en/user_customization-binary.ssi:27
#: 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
@@ -99,6 +100,7 @@ msgstr "code{"
#: 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-binary.ssi:23 en/user_customization-binary.ssi:33
#: 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:38
@@ -248,15 +250,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 #{--parent-mirror-*}# options governs which "
+"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 #{--parent-mirror-binary}"
-"# and #{--parent-mirror-binary-security}# values are used, superceding any "
-"mirrors used in an earlier stage."
+"those stages, and later, in the *binary* stage, the #{--mirror-binary}# and #"
+"{--mirror-binary-security}# values are used, superceding any mirrors used in "
+"an earlier stage."
msgstr ""
#. type: Plain text
@@ -269,24 +271,24 @@ 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 #{--parent-mirror-bootstrap}#, #{--parent-"
-"mirror-chroot-security}# and #{--parent-mirror-chroot-backports}# as follows."
+"mirror, it is sufficient to set #{--mirror-bootstrap}#, #{--mirror-chroot-"
+"security}# and #{--mirror-chroot-backports}# as follows."
msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:44
#, no-wrap
msgid ""
-" $ 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"
+" $ lb config --mirror-bootstrap http://localhost/debian/ \\\n"
+" --mirror-chroot-security http://localhost/debian-security/ \\\n"
+"\t --mirror-chroot-backports http://localhost/debian-backports/\n"
msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:48
msgid ""
-"The chroot mirror, specified by #{--parent-mirror-chroot}#, defaults to the #"
-"{--parent-mirror-bootstrap}# value."
+"The chroot mirror, specified by #{--mirror-chroot}#, defaults to the #{--"
+"mirror-bootstrap}# value."
msgstr ""
#. type: Plain text
@@ -297,22 +299,22 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:52
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."
+"The #{--mirror-binary*}# options govern the distribution mirrors placed in "
+"the binary image. These may be used to install additional packages while "
+"running the live system. The defaults employ #{cdn.debian.net}#, a service "
+"that chooses a geographically close mirror based on the user's IP number. "
+"This is a suitable choice when you cannot predict which mirror will be best "
+"for all of your users. Or you may specify your own values as shown in the "
+"example below. An image built from this configuration would only be suitable "
+"for users on a network where \"#{mirror}#\" is reachable."
msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:57
#, no-wrap
msgid ""
-" $ lb config --parent-mirror-binary http://mirror/debian/ \\\n"
-" --parent-mirror-binary-security http://mirror/debian-security/\n"
+" $ lb config --mirror-binary http://mirror/debian/ \\\n"
+" --mirror-binary-security http://mirror/debian-security/\n"
msgstr ""
#. type: Plain text
@@ -328,9 +330,9 @@ msgid ""
"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."
+"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
diff --git a/manual/po/pt_BR/user_examples.ssi.po b/manual/po/pt_BR/user_examples.ssi.po
index 7f63cf9..fc4ec25 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: 2012-01-15 20:48+0100\n"
+"POT-Creation-Date: 2012-01-18 18:00-0400\n"
"PO-Revision-Date: 2010-11-04 16:34-0400\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -202,18 +202,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_PARENT_MIRROR_*}# variables to your "
-"preferred mirror. All other mirrors used in the build will be defaulted from "
-"these values. For example:"
+"and in it, set the corresponding #{LB_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_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"
+" LB_MIRROR_BOOTSTRAP=\"http://mirror/debian\"\n"
+" LB_MIRROR_CHROOT_SECURITY=\"http://mirror/debian-security\"\n"
+" LB_MIRROR_CHROOT_BACKPORTS=\"http://mirror/debian-updates\"\n"
msgstr ""
#. type: Plain text
diff --git a/manual/po/ro/live-manual.ssm.po b/manual/po/ro/live-manual.ssm.po
index 98afd2e..de1908e 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: 2012-01-15 16:28+0100\n"
+"POT-Creation-Date: 2012-01-18 18:00-0400\n"
"PO-Revision-Date: 2010-10-23 00:04+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -46,7 +46,7 @@ msgstr ""
#, no-wrap
msgid ""
"@date:\n"
-" :published: 2012-01-15\n"
+" :published: 2012-01-18\n"
msgstr ""
#. type: Plain text
diff --git a/manual/po/ro/user_customization-packages.ssi.po b/manual/po/ro/user_customization-packages.ssi.po
index a819347..841b5b1 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: 2012-01-07 15:40+0100\n"
+"POT-Creation-Date: 2012-01-18 18:00-0400\n"
"PO-Revision-Date: 2010-10-22 08:58-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -35,6 +35,7 @@ msgstr ""
#: 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-binary.ssi:16 en/user_customization-binary.ssi:27
#: 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
@@ -100,6 +101,7 @@ msgstr "code{"
#: 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-binary.ssi:23 en/user_customization-binary.ssi:33
#: 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:38
@@ -249,15 +251,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 #{--parent-mirror-*}# options governs which "
+"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 #{--parent-mirror-binary}"
-"# and #{--parent-mirror-binary-security}# values are used, superceding any "
-"mirrors used in an earlier stage."
+"those stages, and later, in the *binary* stage, the #{--mirror-binary}# and #"
+"{--mirror-binary-security}# values are used, superceding any mirrors used in "
+"an earlier stage."
msgstr ""
#. type: Plain text
@@ -270,24 +272,24 @@ 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 #{--parent-mirror-bootstrap}#, #{--parent-"
-"mirror-chroot-security}# and #{--parent-mirror-chroot-backports}# as follows."
+"mirror, it is sufficient to set #{--mirror-bootstrap}#, #{--mirror-chroot-"
+"security}# and #{--mirror-chroot-backports}# as follows."
msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:44
#, no-wrap
msgid ""
-" $ 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"
+" $ lb config --mirror-bootstrap http://localhost/debian/ \\\n"
+" --mirror-chroot-security http://localhost/debian-security/ \\\n"
+"\t --mirror-chroot-backports http://localhost/debian-backports/\n"
msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:48
msgid ""
-"The chroot mirror, specified by #{--parent-mirror-chroot}#, defaults to the #"
-"{--parent-mirror-bootstrap}# value."
+"The chroot mirror, specified by #{--mirror-chroot}#, defaults to the #{--"
+"mirror-bootstrap}# value."
msgstr ""
#. type: Plain text
@@ -298,22 +300,22 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:52
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."
+"The #{--mirror-binary*}# options govern the distribution mirrors placed in "
+"the binary image. These may be used to install additional packages while "
+"running the live system. The defaults employ #{cdn.debian.net}#, a service "
+"that chooses a geographically close mirror based on the user's IP number. "
+"This is a suitable choice when you cannot predict which mirror will be best "
+"for all of your users. Or you may specify your own values as shown in the "
+"example below. An image built from this configuration would only be suitable "
+"for users on a network where \"#{mirror}#\" is reachable."
msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:57
#, no-wrap
msgid ""
-" $ lb config --parent-mirror-binary http://mirror/debian/ \\\n"
-" --parent-mirror-binary-security http://mirror/debian-security/\n"
+" $ lb config --mirror-binary http://mirror/debian/ \\\n"
+" --mirror-binary-security http://mirror/debian-security/\n"
msgstr ""
#. type: Plain text
@@ -329,9 +331,9 @@ msgid ""
"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."
+"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
diff --git a/manual/po/ro/user_examples.ssi.po b/manual/po/ro/user_examples.ssi.po
index dc5127f..392faf8 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: 2012-01-15 20:48+0100\n"
+"POT-Creation-Date: 2012-01-18 18:00-0400\n"
"PO-Revision-Date: 2010-11-04 16:34-0400\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -203,18 +203,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_PARENT_MIRROR_*}# variables to your "
-"preferred mirror. All other mirrors used in the build will be defaulted from "
-"these values. For example:"
+"and in it, set the corresponding #{LB_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_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"
+" LB_MIRROR_BOOTSTRAP=\"http://mirror/debian\"\n"
+" LB_MIRROR_CHROOT_SECURITY=\"http://mirror/debian-security\"\n"
+" LB_MIRROR_CHROOT_BACKPORTS=\"http://mirror/debian-updates\"\n"
msgstr ""
#. type: Plain text
diff --git a/manual/pot/live-manual.ssm.pot b/manual/pot/live-manual.ssm.pot
index 76cfc73..04d1726 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: 2012-01-15 16:28+0100\n"
+"POT-Creation-Date: 2012-01-18 18:00-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -45,7 +45,7 @@ msgstr ""
#, no-wrap
msgid ""
"@date:\n"
-" :published: 2012-01-15\n"
+" :published: 2012-01-18\n"
msgstr ""
#. type: Plain text
diff --git a/manual/pot/user_customization-packages.ssi.pot b/manual/pot/user_customization-packages.ssi.pot
index 38c259b..4c7f56a 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: 2012-01-07 15:40+0100\n"
+"POT-Creation-Date: 2012-01-18 18:00-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"
@@ -34,6 +34,7 @@ msgstr ""
#: 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-binary.ssi:16 en/user_customization-binary.ssi:27
#: 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
@@ -99,6 +100,7 @@ msgstr ""
#: 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-binary.ssi:23 en/user_customization-binary.ssi:33
#: 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:38
@@ -248,15 +250,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 #{--parent-mirror-*}# options governs which "
+"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 #{--parent-mirror-binary}"
-"# and #{--parent-mirror-binary-security}# values are used, superceding any "
-"mirrors used in an earlier stage."
+"those stages, and later, in the *binary* stage, the #{--mirror-binary}# and #"
+"{--mirror-binary-security}# values are used, superceding any mirrors used in "
+"an earlier stage."
msgstr ""
#. type: Plain text
@@ -269,24 +271,24 @@ 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 #{--parent-mirror-bootstrap}#, #{--parent-"
-"mirror-chroot-security}# and #{--parent-mirror-chroot-backports}# as follows."
+"mirror, it is sufficient to set #{--mirror-bootstrap}#, #{--mirror-chroot-"
+"security}# and #{--mirror-chroot-backports}# as follows."
msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:44
#, no-wrap
msgid ""
-" $ 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"
+" $ lb config --mirror-bootstrap http://localhost/debian/ \\\n"
+" --mirror-chroot-security http://localhost/debian-security/ \\\n"
+"\t --mirror-chroot-backports http://localhost/debian-backports/\n"
msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:48
msgid ""
-"The chroot mirror, specified by #{--parent-mirror-chroot}#, defaults to the #"
-"{--parent-mirror-bootstrap}# value."
+"The chroot mirror, specified by #{--mirror-chroot}#, defaults to the #{--"
+"mirror-bootstrap}# value."
msgstr ""
#. type: Plain text
@@ -297,22 +299,22 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:52
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."
+"The #{--mirror-binary*}# options govern the distribution mirrors placed in "
+"the binary image. These may be used to install additional packages while "
+"running the live system. The defaults employ #{cdn.debian.net}#, a service "
+"that chooses a geographically close mirror based on the user's IP number. "
+"This is a suitable choice when you cannot predict which mirror will be best "
+"for all of your users. Or you may specify your own values as shown in the "
+"example below. An image built from this configuration would only be suitable "
+"for users on a network where \"#{mirror}#\" is reachable."
msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:57
#, no-wrap
msgid ""
-" $ lb config --parent-mirror-binary http://mirror/debian/ \\\n"
-" --parent-mirror-binary-security http://mirror/debian-security/\n"
+" $ lb config --mirror-binary http://mirror/debian/ \\\n"
+" --mirror-binary-security http://mirror/debian-security/\n"
msgstr ""
#. type: Plain text
@@ -328,9 +330,9 @@ msgid ""
"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."
+"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
diff --git a/manual/pot/user_examples.ssi.pot b/manual/pot/user_examples.ssi.pot
index 59c0215..b14bce3 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: 2012-01-15 20:48+0100\n"
+"POT-Creation-Date: 2012-01-18 18:00-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"
@@ -202,18 +202,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_PARENT_MIRROR_*}# variables to your "
-"preferred mirror. All other mirrors used in the build will be defaulted from "
-"these values. For example:"
+"and in it, set the corresponding #{LB_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_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"
+" LB_MIRROR_BOOTSTRAP=\"http://mirror/debian\"\n"
+" LB_MIRROR_CHROOT_SECURITY=\"http://mirror/debian-security\"\n"
+" LB_MIRROR_CHROOT_BACKPORTS=\"http://mirror/debian-updates\"\n"
msgstr ""
#. type: Plain text
diff --git a/manual/pt_BR/live-manual.ssm b/manual/pt_BR/live-manual.ssm
index 4705641..8742063 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: 2012-01-15
+ :published: 2012-01-18
@publisher: Debian Live Project <debian-live at lists.debian.org>
diff --git a/manual/pt_BR/user_customization-packages.ssi b/manual/pt_BR/user_customization-packages.ssi
index 03dcde7..01fd8c2 100644
--- a/manual/pt_BR/user_customization-packages.ssi
+++ b/manual/pt_BR/user_customization-packages.ssi
@@ -62,40 +62,39 @@ 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 #{--parent-mirror-*}# options governs which
+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
-#{--parent-mirror-binary}# and #{--parent-mirror-binary-security}# values
-are used, superceding any mirrors used in an earlier stage.
+those stages, and later, in the *binary* stage, the #{--mirror-binary}# and
+#{--mirror-binary-security}# values are used, superceding any mirrors used
+in an earlier stage.
3~distribution-mirrors-build-time Distribution mirrors used at build time
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.
+mirror, it is sufficient to set #{--mirror-bootstrap}#,
+#{--mirror-chroot-security}# and #{--mirror-chroot-backports}# as follows.
code{
- $ lb config --parent-mirror-bootstrap http://localhost/debian/ \
- --parent-mirror-chroot-security http://localhost/debian-security/ \
- --parent-mirror-chroot-backports http://localhost/debian-backports/
+ $ lb config --mirror-bootstrap http://localhost/debian/ \
+ --mirror-chroot-security http://localhost/debian-security/ \
+ --mirror-chroot-backports http://localhost/debian-backports/
}code
-The chroot mirror, specified by #{--parent-mirror-chroot}#, defaults to the
-#{--parent-mirror-bootstrap}# value.
+The chroot mirror, specified by #{--mirror-chroot}#, defaults to the
+#{--mirror-bootstrap}# value.
3~ Distribution mirrors used at run time
-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
+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
@@ -103,8 +102,8 @@ suitable for users on a network where "#{mirror}#" is reachable.
code{
- $ lb config --parent-mirror-binary http://mirror/debian/ \
- --parent-mirror-binary-security http://mirror/debian-security/
+ $ lb config --mirror-binary http://mirror/debian/ \
+ --mirror-binary-security http://mirror/debian-security/
}code
@@ -115,9 +114,9 @@ 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.
+#{--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/archives/live.list.chroot}# allows you to install
packages from the debian live snapshot repository at live system build time.
diff --git a/manual/pt_BR/user_examples.ssi b/manual/pt_BR/user_examples.ssi
index ad172f6..56c8726 100644
--- a/manual/pt_BR/user_examples.ssi
+++ b/manual/pt_BR/user_examples.ssi
@@ -19,15 +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_PARENT_MIRROR_*}# variables
-to your preferred mirror. All other mirrors used in the build will be
-defaulted from these values. For example:
+this file and in it, set the corresponding #{LB_MIRROR_*}# variables to your
+preferred mirror. All other mirrors used in the build will be defaulted from
+these values. For example:
code{
- 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"
+ LB_MIRROR_BOOTSTRAP="http://mirror/debian"
+ LB_MIRROR_CHROOT_SECURITY="http://mirror/debian-security"
+ LB_MIRROR_CHROOT_BACKPORTS="http://mirror/debian-updates"
}code
diff --git a/manual/ro/live-manual.ssm b/manual/ro/live-manual.ssm
index 4705641..8742063 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: 2012-01-15
+ :published: 2012-01-18
@publisher: Debian Live Project <debian-live at lists.debian.org>
diff --git a/manual/ro/user_customization-packages.ssi b/manual/ro/user_customization-packages.ssi
index 03dcde7..01fd8c2 100644
--- a/manual/ro/user_customization-packages.ssi
+++ b/manual/ro/user_customization-packages.ssi
@@ -62,40 +62,39 @@ 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 #{--parent-mirror-*}# options governs which
+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
-#{--parent-mirror-binary}# and #{--parent-mirror-binary-security}# values
-are used, superceding any mirrors used in an earlier stage.
+those stages, and later, in the *binary* stage, the #{--mirror-binary}# and
+#{--mirror-binary-security}# values are used, superceding any mirrors used
+in an earlier stage.
3~distribution-mirrors-build-time Distribution mirrors used at build time
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.
+mirror, it is sufficient to set #{--mirror-bootstrap}#,
+#{--mirror-chroot-security}# and #{--mirror-chroot-backports}# as follows.
code{
- $ lb config --parent-mirror-bootstrap http://localhost/debian/ \
- --parent-mirror-chroot-security http://localhost/debian-security/ \
- --parent-mirror-chroot-backports http://localhost/debian-backports/
+ $ lb config --mirror-bootstrap http://localhost/debian/ \
+ --mirror-chroot-security http://localhost/debian-security/ \
+ --mirror-chroot-backports http://localhost/debian-backports/
}code
-The chroot mirror, specified by #{--parent-mirror-chroot}#, defaults to the
-#{--parent-mirror-bootstrap}# value.
+The chroot mirror, specified by #{--mirror-chroot}#, defaults to the
+#{--mirror-bootstrap}# value.
3~ Distribution mirrors used at run time
-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
+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
@@ -103,8 +102,8 @@ suitable for users on a network where "#{mirror}#" is reachable.
code{
- $ lb config --parent-mirror-binary http://mirror/debian/ \
- --parent-mirror-binary-security http://mirror/debian-security/
+ $ lb config --mirror-binary http://mirror/debian/ \
+ --mirror-binary-security http://mirror/debian-security/
}code
@@ -115,9 +114,9 @@ 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.
+#{--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/archives/live.list.chroot}# allows you to install
packages from the debian live snapshot repository at live system build time.
diff --git a/manual/ro/user_examples.ssi b/manual/ro/user_examples.ssi
index ad172f6..56c8726 100644
--- a/manual/ro/user_examples.ssi
+++ b/manual/ro/user_examples.ssi
@@ -19,15 +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_PARENT_MIRROR_*}# variables
-to your preferred mirror. All other mirrors used in the build will be
-defaulted from these values. For example:
+this file and in it, set the corresponding #{LB_MIRROR_*}# variables to your
+preferred mirror. All other mirrors used in the build will be defaulted from
+these values. For example:
code{
- 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"
+ LB_MIRROR_BOOTSTRAP="http://mirror/debian"
+ LB_MIRROR_CHROOT_SECURITY="http://mirror/debian-security"
+ LB_MIRROR_CHROOT_BACKPORTS="http://mirror/debian-updates"
}code
--
live-manual
More information about the debian-live-changes
mailing list