[SCM] live-manual branch, debian, updated. debian/2.0_a11-1-17-gf1ab6bb
Ben Armstrong
synrg at debian.org
Wed Dec 1 11:10:42 UTC 2010
The following commit has been merged in the debian branch:
commit f1ab6bb17e65bfa36052e44847e96ef1f85c1ac9
Author: Ben Armstrong <synrg at debian.org>
Date: Wed Dec 1 07:00:08 2010 -0400
Catching up language strings.
diff --git a/manual/de/user_customization-packages.ssi b/manual/de/user_customization-packages.ssi
index bd1a027..8ea25a6 100644
--- a/manual/de/user_customization-packages.ssi
+++ b/manual/de/user_customization-packages.ssi
@@ -64,7 +64,7 @@ $ lb config --mirror-binary http://mirror/debian/ \
}code
-3~ Additional repositories
+3~additional-repositories Additional repositories
To add more repositories (e.g. backports, experimental or custom packages,
etc.), create #{config/chroot_sources/your-repository.{chroot,binary}}#
@@ -380,10 +380,8 @@ install the package with the higher version number.
Because of this, you may wish to increment the version number in your custom
packages' #{debian/changelog}# files to ensure that your modified version is
installed over one in the official Debian repositories. This may also be
-achieved by altering the live system's APT pinning preferences - see
-apt-preferences for more information.
-
-% FIXME: <xref linkend="apt-preferences"/>
+achieved by altering the live system's APT pinning preferences - see {APT
+pinning}#apt-pinning for more information.
2~ Configuring APT at build time
@@ -446,7 +444,7 @@ much, you may disable that default option of APT with:
code{
-$ lb config -apt-recommends false
+$ lb config --apt-recommends false
}code
@@ -465,7 +463,26 @@ you need, use #{--apt-options}# or #{--aptitude-options}# to pass any
options through to your configured APT tool. See the man pages for #{apt}#
and #{aptitude}# for details.
-3~ APT pinning
+3~apt-pinning APT pinning
+
+For background, please first read the #{apt_preferences(5)}# man page. APT
+pinning can be configured either for build time, or else for run time. For
+the former, create #{config/chroot_apt/preferences}#. For the latter, create
+#{config/chroot_local-includes/etc/preferences}#.
+
+Let's say you are building a Squeeze live system but need all #{live-*}#
+packages to be installed from Sid at build time. You need to add Sid to your
+APT sources and pin it so that only the packages you want are installed from
+it at build time and all others are taken from the target system
+distribution, Squeeze. The following will accomplish this:
+
+code{
+
+$ echo "deb http://mirror/debian sid main" >
+config/chroot_sources/sid.chroot $ cat >>config/chroot_apt/preferences <<END
+Package: live-* Pin: release n=sid Pin-Priority: 600
-% FIXME: needs content
+Package: * Pin: release n=sid Pin-Priority: 1 END
+
+}code
diff --git a/manual/de/user_installation.ssi b/manual/de/user_installation.ssi
index adcc91b..e59dc91 100644
--- a/manual/de/user_installation.ssi
+++ b/manual/de/user_installation.ssi
@@ -128,15 +128,16 @@ should name it without dashes '-', e.g: call it "99new_feature" and not
_* Build a live-boot .deb
-% FIXME: not strictly true? building sid on squeeze is usually OK. also,
-building lenny on squeeze or sid is fine. clarify.
-
You must build either on your target distribution or in a chroot containing
your target platform: this means if your target is Squeeze then you should
-build against Squeeze. You can use a personal builder such as /{pbuilder}/
-or /{sbuild}/ to automate building packages in chroot. To build directly on
-the target platform, use #{dpkg-buildpackage}# (provided by the /{dpkg-dev}/
-package):
+build against Squeeze. Y
+
+Use a personal builder such as /{pbuilder}/ or /{sbuild}/ if you need to
+build #{live-boot}# for a target distribution that differs from your build
+system. For example, for Squeeze live images, build #{live-boot}# in a
+Squeeze chroot. If your target distribution happens to match your build
+system distribution, you may build directly on the build system using
+#{dpkg-buildpackage}# (provided by the /{dpkg-dev}/ package):
code{
@@ -148,12 +149,10 @@ _* Use the generated live-boot .deb
As live-boot is installed by live-build system, installing the package in
the host system is not sufficient: you should treat the generated .deb like
-another custom package. Please see custom-packages for more information. You
-should pay particular attention to custom-packages-apt.
-
-% FIXME: <xref linkend="custom-packages"/> <xref
-linkend="custom-packages-apt"/> % Ben> What is the latter reference for? I
-can't see the relevance.
+another custom package. Please see {Customizing package
+installation}#customizing-package-installation for more information. You
+should pay particular attention to {Additional
+repositories}#additional-repositories.
3~ Using live-boot snapshots
diff --git a/manual/fr/user_customization-packages.ssi b/manual/fr/user_customization-packages.ssi
index bd1a027..8ea25a6 100644
--- a/manual/fr/user_customization-packages.ssi
+++ b/manual/fr/user_customization-packages.ssi
@@ -64,7 +64,7 @@ $ lb config --mirror-binary http://mirror/debian/ \
}code
-3~ Additional repositories
+3~additional-repositories Additional repositories
To add more repositories (e.g. backports, experimental or custom packages,
etc.), create #{config/chroot_sources/your-repository.{chroot,binary}}#
@@ -380,10 +380,8 @@ install the package with the higher version number.
Because of this, you may wish to increment the version number in your custom
packages' #{debian/changelog}# files to ensure that your modified version is
installed over one in the official Debian repositories. This may also be
-achieved by altering the live system's APT pinning preferences - see
-apt-preferences for more information.
-
-% FIXME: <xref linkend="apt-preferences"/>
+achieved by altering the live system's APT pinning preferences - see {APT
+pinning}#apt-pinning for more information.
2~ Configuring APT at build time
@@ -446,7 +444,7 @@ much, you may disable that default option of APT with:
code{
-$ lb config -apt-recommends false
+$ lb config --apt-recommends false
}code
@@ -465,7 +463,26 @@ you need, use #{--apt-options}# or #{--aptitude-options}# to pass any
options through to your configured APT tool. See the man pages for #{apt}#
and #{aptitude}# for details.
-3~ APT pinning
+3~apt-pinning APT pinning
+
+For background, please first read the #{apt_preferences(5)}# man page. APT
+pinning can be configured either for build time, or else for run time. For
+the former, create #{config/chroot_apt/preferences}#. For the latter, create
+#{config/chroot_local-includes/etc/preferences}#.
+
+Let's say you are building a Squeeze live system but need all #{live-*}#
+packages to be installed from Sid at build time. You need to add Sid to your
+APT sources and pin it so that only the packages you want are installed from
+it at build time and all others are taken from the target system
+distribution, Squeeze. The following will accomplish this:
+
+code{
+
+$ echo "deb http://mirror/debian sid main" >
+config/chroot_sources/sid.chroot $ cat >>config/chroot_apt/preferences <<END
+Package: live-* Pin: release n=sid Pin-Priority: 600
-% FIXME: needs content
+Package: * Pin: release n=sid Pin-Priority: 1 END
+
+}code
diff --git a/manual/fr/user_installation.ssi b/manual/fr/user_installation.ssi
index adcc91b..e59dc91 100644
--- a/manual/fr/user_installation.ssi
+++ b/manual/fr/user_installation.ssi
@@ -128,15 +128,16 @@ should name it without dashes '-', e.g: call it "99new_feature" and not
_* Build a live-boot .deb
-% FIXME: not strictly true? building sid on squeeze is usually OK. also,
-building lenny on squeeze or sid is fine. clarify.
-
You must build either on your target distribution or in a chroot containing
your target platform: this means if your target is Squeeze then you should
-build against Squeeze. You can use a personal builder such as /{pbuilder}/
-or /{sbuild}/ to automate building packages in chroot. To build directly on
-the target platform, use #{dpkg-buildpackage}# (provided by the /{dpkg-dev}/
-package):
+build against Squeeze. Y
+
+Use a personal builder such as /{pbuilder}/ or /{sbuild}/ if you need to
+build #{live-boot}# for a target distribution that differs from your build
+system. For example, for Squeeze live images, build #{live-boot}# in a
+Squeeze chroot. If your target distribution happens to match your build
+system distribution, you may build directly on the build system using
+#{dpkg-buildpackage}# (provided by the /{dpkg-dev}/ package):
code{
@@ -148,12 +149,10 @@ _* Use the generated live-boot .deb
As live-boot is installed by live-build system, installing the package in
the host system is not sufficient: you should treat the generated .deb like
-another custom package. Please see custom-packages for more information. You
-should pay particular attention to custom-packages-apt.
-
-% FIXME: <xref linkend="custom-packages"/> <xref
-linkend="custom-packages-apt"/> % Ben> What is the latter reference for? I
-can't see the relevance.
+another custom package. Please see {Customizing package
+installation}#customizing-package-installation for more information. You
+should pay particular attention to {Additional
+repositories}#additional-repositories.
3~ Using live-boot snapshots
diff --git a/manual/po/de/user_customization-packages.ssi.po b/manual/po/de/user_customization-packages.ssi.po
index 411bfc0..b8ce97b 100644
--- a/manual/po/de/user_customization-packages.ssi.po
+++ b/manual/po/de/user_customization-packages.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-11-28 08:44-0400\n"
+"POT-Creation-Date: 2010-12-01 06:49-0400\n"
"PO-Revision-Date: 2010-10-03 20:30+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -20,27 +20,19 @@ msgstr ""
#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
-#: en/about_manual.ssi:170 en/other_coding-style.ssi:28
-#: en/other_coding-style.ssi:38 en/other_coding-style.ssi:51
-#: en/other_coding-style.ssi:61 en/other_coding-style.ssi:88
-#: en/other_coding-style.ssi:96 en/other_coding-style.ssi:106
-#: en/other_coding-style.ssi:117 en/other_common-tasks.ssi:32
-#: en/other_customization-backports.ssi:8 en/other_customization-bootup.ssi:30
-#: en/other_customization-bootup.ssi:39 en/other_faq.ssi:41
-#: en/other_faq.ssi:83 en/other_faq.ssi:103 en/other_faq.ssi:117
-#: en/other_faq.ssi:137 en/other_faq.ssi:151 en/other_faq.ssi:198
-#: en/other_faq.ssi:245 en/other_faq.ssi:261 en/other_faq.ssi:287
-#: en/other_faq.ssi:299 en/other_faq.ssi:314 en/other_faq.ssi:333
-#: en/other_faq.ssi:345 en/other_faq.ssi:353 en/other_faq.ssi:364
-#: en/other_faq.ssi:374 en/other_howtos.ssi:16 en/other_howtos.ssi:43
-#: en/other_live-environment.ssi:14 en/other_live-environment.ssi:30
-#: en/other_live-environment.ssi:51 en/other_live-environment.ssi:61
-#: en/other_live-environment.ssi:69 en/other_live-environment.ssi:77
-#: en/other_live-environment.ssi:85 en/other_live-environment.ssi:93
-#: en/other_live-environment.ssi:116 en/other_live-environment.ssi:124
-#: en/other_live-environment.ssi:133 en/other_procedures.ssi:12
-#: en/other_procedures.ssi:46 en/other_procedures.ssi:58
-#: en/project_bugs.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/about_manual.ssi:170 en/other_faq.ssi:41 en/other_faq.ssi:83
+#: en/other_faq.ssi:103 en/other_faq.ssi:117 en/other_faq.ssi:137
+#: en/other_faq.ssi:151 en/other_faq.ssi:198 en/other_faq.ssi:245
+#: en/other_faq.ssi:261 en/other_faq.ssi:287 en/other_faq.ssi:299
+#: en/other_faq.ssi:314 en/other_faq.ssi:333 en/other_faq.ssi:345
+#: en/other_faq.ssi:353 en/other_faq.ssi:364 en/other_faq.ssi:374
+#: en/other_howtos.ssi:16 en/other_howtos.ssi:43 en/project_bugs.ssi:58
+#: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
+#: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
+#: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
+#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
+#: en/project_procedures.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
#: en/user_basics.ssi:54 en/user_basics.ssi:66 en/user_basics.ssi:78
#: en/user_basics.ssi:88 en/user_basics.ssi:102 en/user_basics.ssi:110
#: en/user_basics.ssi:118 en/user_basics.ssi:128 en/user_basics.ssi:142
@@ -64,21 +56,28 @@ msgstr ""
#: en/user_customization-packages.ssi:163
#: en/user_customization-packages.ssi:177
#: en/user_customization-packages.ssi:193
-#: en/user_customization-packages.ssi:261
-#: en/user_customization-packages.ssi:273
-#: en/user_customization-packages.ssi:283 en/user_examples.ssi:14
-#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
-#: en/user_examples.ssi:64 en/user_examples.ssi:80 en/user_examples.ssi:90
-#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:131
-#: en/user_examples.ssi:139 en/user_examples.ssi:154 en/user_examples.ssi:162
-#: en/user_examples.ssi:188 en/user_examples.ssi:209 en/user_examples.ssi:217
-#: en/user_installation.ssi:38 en/user_installation.ssi:46
-#: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi:76 en/user_installation.ssi:84
-#: en/user_installation.ssi:104 en/user_installation.ssi:118
-#: en/user_installation.ssi:135 en/user_managing_a_configuration.ssi:24
+#: en/user_customization-packages.ssi:259
+#: en/user_customization-packages.ssi:271
+#: en/user_customization-packages.ssi:281
+#: en/user_customization-packages.ssi:299 en/user_customization-runtime.ssi:12
+#: en/user_customization-runtime.ssi:30 en/user_customization-runtime.ssi:40
+#: en/user_customization-runtime.ssi:48 en/user_customization-runtime.ssi:56
+#: en/user_customization-runtime.ssi:64 en/user_customization-runtime.ssi:84
+#: en/user_customization-runtime.ssi:92 en/user_customization-runtime.ssi:101
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
+#: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
+#: en/user_examples.ssi:162 en/user_examples.ssi:188 en/user_examples.ssi:209
+#: en/user_examples.ssi:217 en/user_installation.ssi:38
+#: en/user_installation.ssi:46 en/user_installation.ssi:56
+#: en/user_installation.ssi:64 en/user_installation.ssi:76
+#: en/user_installation.ssi:84 en/user_installation.ssi:108
+#: en/user_installation.ssi:126 en/user_installation.ssi:141
+#: en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
-#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:36
+#: en/user_managing_a_configuration.ssi:47
+#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
#: en/user_overview.ssi:80 en/user_overview.ssi:88
msgid "code{"
msgstr ""
@@ -87,27 +86,19 @@ msgstr ""
#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:166
-#: en/about_manual.ssi:173 en/other_coding-style.ssi:34
-#: en/other_coding-style.ssi:45 en/other_coding-style.ssi:57
-#: en/other_coding-style.ssi:68 en/other_coding-style.ssi:92
-#: en/other_coding-style.ssi:100 en/other_coding-style.ssi:113
-#: en/other_coding-style.ssi:124 en/other_common-tasks.ssi:36
-#: en/other_customization-backports.ssi:16
-#: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: en/other_faq.ssi:37 en/other_faq.ssi:46 en/other_faq.ssi:92
-#: en/other_faq.ssi:108 en/other_faq.ssi:141 en/other_faq.ssi:155
-#: en/other_faq.ssi:207 en/other_faq.ssi:256 en/other_faq.ssi:292
-#: en/other_faq.ssi:307 en/other_faq.ssi:319 en/other_faq.ssi:337
-#: en/other_faq.ssi:349 en/other_faq.ssi:358 en/other_faq.ssi:370
-#: en/other_faq.ssi:381 en/other_howtos.ssi:20 en/other_howtos.ssi:47
-#: en/other_live-environment.ssi:18 en/other_live-environment.ssi:34
-#: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
-#: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
-#: en/other_live-environment.ssi:89 en/other_live-environment.ssi:97
-#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
-#: en/other_live-environment.ssi:138 en/other_procedures.ssi:16
-#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
-#: en/project_bugs.ssi:62 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/about_manual.ssi:173 en/other_faq.ssi:37 en/other_faq.ssi:46
+#: en/other_faq.ssi:92 en/other_faq.ssi:108 en/other_faq.ssi:141
+#: en/other_faq.ssi:155 en/other_faq.ssi:207 en/other_faq.ssi:256
+#: en/other_faq.ssi:292 en/other_faq.ssi:307 en/other_faq.ssi:319
+#: en/other_faq.ssi:337 en/other_faq.ssi:349 en/other_faq.ssi:358
+#: en/other_faq.ssi:370 en/other_faq.ssi:381 en/other_howtos.ssi:20
+#: en/other_howtos.ssi:47 en/project_bugs.ssi:62
+#: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
+#: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
+#: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
+#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
+#: en/project_procedures.ssi:131 en/user_basics.ssi:36 en/user_basics.ssi:46
#: en/user_basics.ssi:60 en/user_basics.ssi:72 en/user_basics.ssi:82
#: en/user_basics.ssi:94 en/user_basics.ssi:106 en/user_basics.ssi:114
#: en/user_basics.ssi:122 en/user_basics.ssi:132 en/user_basics.ssi:148
@@ -131,21 +122,28 @@ msgstr ""
#: en/user_customization-packages.ssi:169
#: en/user_customization-packages.ssi:181
#: en/user_customization-packages.ssi:197
-#: en/user_customization-packages.ssi:265
-#: en/user_customization-packages.ssi:277
-#: en/user_customization-packages.ssi:287 en/user_examples.ssi:20
-#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:58
-#: en/user_examples.ssi:68 en/user_examples.ssi:86 en/user_examples.ssi:101
-#: en/user_examples.ssi:111 en/user_examples.ssi:123 en/user_examples.ssi:135
-#: en/user_examples.ssi:150 en/user_examples.ssi:158 en/user_examples.ssi:166
-#: en/user_examples.ssi:197 en/user_examples.ssi:213 en/user_examples.ssi:221
-#: en/user_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi:72
-#: en/user_installation.ssi:80 en/user_installation.ssi:88
-#: en/user_installation.ssi:108 en/user_installation.ssi:123
-#: en/user_installation.ssi:138 en/user_managing_a_configuration.ssi:31
+#: en/user_customization-packages.ssi:263
+#: en/user_customization-packages.ssi:275
+#: en/user_customization-packages.ssi:285
+#: en/user_customization-packages.ssi:312 en/user_customization-runtime.ssi:16
+#: en/user_customization-runtime.ssi:34 en/user_customization-runtime.ssi:44
+#: en/user_customization-runtime.ssi:52 en/user_customization-runtime.ssi:60
+#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:88
+#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:106
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
+#: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
+#: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
+#: en/user_examples.ssi:166 en/user_examples.ssi:197 en/user_examples.ssi:213
+#: en/user_examples.ssi:221 en/user_installation.ssi:42
+#: en/user_installation.ssi:50 en/user_installation.ssi:60
+#: en/user_installation.ssi:72 en/user_installation.ssi:80
+#: en/user_installation.ssi:88 en/user_installation.ssi:112
+#: en/user_installation.ssi:131 en/user_installation.ssi:144
+#: en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
-#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:74
+#: en/user_managing_a_configuration.ssi:52
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
#: en/user_overview.ssi:84 en/user_overview.ssi:92
msgid "}code"
msgstr ""
@@ -258,7 +256,7 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:38
-msgid "3~ Additional repositories"
+msgid "3~additional-repositories Additional repositories"
msgstr ""
#. type: Plain text
@@ -797,22 +795,17 @@ msgid ""
"Because of this, you may wish to increment the version number in your custom "
"packages' #{debian/changelog}# files to ensure that your modified version is "
"installed over one in the official Debian repositories. This may also be "
-"achieved by altering the live system's APT pinning preferences - see apt-"
-"preferences for more information."
+"achieved by altering the live system's APT pinning preferences - see {APT "
+"pinning}#apt-pinning for more information."
msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:243
-msgid "% FIXME: <xref linkend=\"apt-preferences\"/>"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:245
msgid "2~ Configuring APT at build time"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:247
+#: en/user_customization-packages.ssi:245
msgid ""
"You can configure APT through a number of options applied only at build "
"time. (APT configuration used in the running live system may be configured "
@@ -823,12 +816,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:249
+#: en/user_customization-packages.ssi:247
msgid "3~choosing-apt-or-aptitude Choosing apt or aptitude"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:251
+#: en/user_customization-packages.ssi:249
msgid ""
"You can elect to use either #{apt}# or #{aptitude}# when installing packages "
"at build time. Which utility is used is governed by the #{--apt}# argument "
@@ -838,26 +831,26 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:253
+#: en/user_customization-packages.ssi:251
msgid ""
"_* #{apt}#: With this method, if a missing package is specified, the package "
"installation will fail. This is the default setting."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:255
+#: en/user_customization-packages.ssi:253
msgid ""
"_* #{aptitude}#: With this method, if a missing package is specified, the "
"package installation will succeed."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:257
+#: en/user_customization-packages.ssi:255
msgid "3~ Using a proxy with APT"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:259
+#: en/user_customization-packages.ssi:257
msgid ""
"One commonly required APT configuration is to deal with building an image "
"behind a proxy. You may specify your APT proxy with the #{--apt-ftp-proxy}# "
@@ -865,17 +858,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:263
+#: en/user_customization-packages.ssi:261
msgid "lb config --apt-http-proxy http://proxy/"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:267
+#: en/user_customization-packages.ssi:265
msgid "3~ Tweaking APT to save space"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:269
+#: en/user_customization-packages.ssi:267
msgid ""
"You may find yourself needing to save some space on the image media, in "
"which case one or the other or both of the following options may be of "
@@ -883,19 +876,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:271
+#: en/user_customization-packages.ssi:269
msgid ""
"If you don't want to include APT indices in the image, you can omit those "
"with:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:275
+#: en/user_customization-packages.ssi:273
msgid "$ lb config --binary-indices false"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:279
+#: en/user_customization-packages.ssi:277
msgid ""
"This will not influence the entries in /etc/apt/sources.list, but merely "
"whether /var/lib/apt contains the indices files or not. The tradeoff is that "
@@ -905,19 +898,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:281
+#: en/user_customization-packages.ssi:279
msgid ""
"If you find the installation of recommended packages bloats your image too "
"much, you may disable that default option of APT with:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:285
-msgid "$ lb config -apt-recommends false"
+#: en/user_customization-packages.ssi:283
+msgid "$ lb config --apt-recommends false"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:289
+#: en/user_customization-packages.ssi:287
msgid ""
"The tradeoff here is that recommended packages are defined as \"packages "
"that would be found together with this one in all but unusual installations"
@@ -929,12 +922,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:291
+#: en/user_customization-packages.ssi:289
msgid "3~ Passing options to apt or aptitude"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:293
+#: en/user_customization-packages.ssi:291
msgid ""
"If there is not an #{lb config}# option to alter APT's behaviour in the way "
"you need, use #{--apt-options}# or #{--aptitude-options}# to pass any "
@@ -943,11 +936,38 @@ msgid ""
msgstr ""
#. type: Plain text
+#: en/user_customization-packages.ssi:293
+msgid "3~apt-pinning APT pinning"
+msgstr ""
+
+#. type: Plain text
#: en/user_customization-packages.ssi:295
-msgid "3~ APT pinning"
+msgid ""
+"For background, please first read the #{apt_preferences(5)}# man page. APT "
+"pinning can be configured either for build time, or else for run time. For "
+"the former, create #{config/chroot_apt/preferences}#. For the latter, create "
+"#{config/chroot_local-includes/etc/preferences}#."
msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:297
-msgid "% FIXME: needs content"
+msgid ""
+"Let's say you are building a Squeeze live system but need all #{live-*}# "
+"packages to be installed from Sid at build time. You need to add Sid to your "
+"APT sources and pin it so that only the packages you want are installed from "
+"it at build time and all others are taken from the target system "
+"distribution, Squeeze. The following will accomplish this:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:305
+msgid ""
+"$ echo \"deb http://mirror/debian sid main\" > config/chroot_sources/sid."
+"chroot $ cat >>config/chroot_apt/preferences <<END Package: live-* Pin: "
+"release n=sid Pin-Priority: 600"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:310
+msgid "Package: * Pin: release n=sid Pin-Priority: 1 END"
msgstr ""
diff --git a/manual/po/de/user_installation.ssi.po b/manual/po/de/user_installation.ssi.po
index 798a589..878ed25 100644
--- a/manual/po/de/user_installation.ssi.po
+++ b/manual/po/de/user_installation.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-11-29 14:16-0400\n"
+"POT-Creation-Date: 2010-12-01 06:49-0400\n"
"PO-Revision-Date: 2010-10-03 20:30+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -20,27 +20,19 @@ msgstr ""
#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
-#: en/about_manual.ssi:170 en/other_coding-style.ssi:28
-#: en/other_coding-style.ssi:38 en/other_coding-style.ssi:51
-#: en/other_coding-style.ssi:61 en/other_coding-style.ssi:88
-#: en/other_coding-style.ssi:96 en/other_coding-style.ssi:106
-#: en/other_coding-style.ssi:117 en/other_common-tasks.ssi:32
-#: en/other_customization-backports.ssi:8 en/other_customization-bootup.ssi:30
-#: en/other_customization-bootup.ssi:39 en/other_faq.ssi:41
-#: en/other_faq.ssi:83 en/other_faq.ssi:103 en/other_faq.ssi:117
-#: en/other_faq.ssi:137 en/other_faq.ssi:151 en/other_faq.ssi:198
-#: en/other_faq.ssi:245 en/other_faq.ssi:261 en/other_faq.ssi:287
-#: en/other_faq.ssi:299 en/other_faq.ssi:314 en/other_faq.ssi:333
-#: en/other_faq.ssi:345 en/other_faq.ssi:353 en/other_faq.ssi:364
-#: en/other_faq.ssi:374 en/other_howtos.ssi:16 en/other_howtos.ssi:43
-#: en/other_live-environment.ssi:14 en/other_live-environment.ssi:30
-#: en/other_live-environment.ssi:51 en/other_live-environment.ssi:61
-#: en/other_live-environment.ssi:69 en/other_live-environment.ssi:77
-#: en/other_live-environment.ssi:85 en/other_live-environment.ssi:93
-#: en/other_live-environment.ssi:116 en/other_live-environment.ssi:124
-#: en/other_live-environment.ssi:133 en/other_procedures.ssi:12
-#: en/other_procedures.ssi:46 en/other_procedures.ssi:58
-#: en/project_bugs.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/about_manual.ssi:170 en/other_faq.ssi:41 en/other_faq.ssi:83
+#: en/other_faq.ssi:103 en/other_faq.ssi:117 en/other_faq.ssi:137
+#: en/other_faq.ssi:151 en/other_faq.ssi:198 en/other_faq.ssi:245
+#: en/other_faq.ssi:261 en/other_faq.ssi:287 en/other_faq.ssi:299
+#: en/other_faq.ssi:314 en/other_faq.ssi:333 en/other_faq.ssi:345
+#: en/other_faq.ssi:353 en/other_faq.ssi:364 en/other_faq.ssi:374
+#: en/other_howtos.ssi:16 en/other_howtos.ssi:43 en/project_bugs.ssi:58
+#: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
+#: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
+#: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
+#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
+#: en/project_procedures.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
#: en/user_basics.ssi:54 en/user_basics.ssi:66 en/user_basics.ssi:78
#: en/user_basics.ssi:88 en/user_basics.ssi:102 en/user_basics.ssi:110
#: en/user_basics.ssi:118 en/user_basics.ssi:128 en/user_basics.ssi:142
@@ -64,21 +56,28 @@ msgstr ""
#: en/user_customization-packages.ssi:163
#: en/user_customization-packages.ssi:177
#: en/user_customization-packages.ssi:193
-#: en/user_customization-packages.ssi:261
-#: en/user_customization-packages.ssi:273
-#: en/user_customization-packages.ssi:283 en/user_examples.ssi:14
-#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
-#: en/user_examples.ssi:64 en/user_examples.ssi:80 en/user_examples.ssi:90
-#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:131
-#: en/user_examples.ssi:139 en/user_examples.ssi:154 en/user_examples.ssi:162
-#: en/user_examples.ssi:188 en/user_examples.ssi:209 en/user_examples.ssi:217
-#: en/user_installation.ssi:38 en/user_installation.ssi:46
-#: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi:76 en/user_installation.ssi:84
-#: en/user_installation.ssi:108 en/user_installation.ssi:126
-#: en/user_installation.ssi:144 en/user_managing_a_configuration.ssi:24
+#: en/user_customization-packages.ssi:259
+#: en/user_customization-packages.ssi:271
+#: en/user_customization-packages.ssi:281
+#: en/user_customization-packages.ssi:299 en/user_customization-runtime.ssi:12
+#: en/user_customization-runtime.ssi:30 en/user_customization-runtime.ssi:40
+#: en/user_customization-runtime.ssi:48 en/user_customization-runtime.ssi:56
+#: en/user_customization-runtime.ssi:64 en/user_customization-runtime.ssi:84
+#: en/user_customization-runtime.ssi:92 en/user_customization-runtime.ssi:101
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
+#: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
+#: en/user_examples.ssi:162 en/user_examples.ssi:188 en/user_examples.ssi:209
+#: en/user_examples.ssi:217 en/user_installation.ssi:38
+#: en/user_installation.ssi:46 en/user_installation.ssi:56
+#: en/user_installation.ssi:64 en/user_installation.ssi:76
+#: en/user_installation.ssi:84 en/user_installation.ssi:108
+#: en/user_installation.ssi:126 en/user_installation.ssi:141
+#: en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
-#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:36
+#: en/user_managing_a_configuration.ssi:47
+#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
#: en/user_overview.ssi:80 en/user_overview.ssi:88
msgid "code{"
msgstr ""
@@ -87,27 +86,19 @@ msgstr ""
#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:166
-#: en/about_manual.ssi:173 en/other_coding-style.ssi:34
-#: en/other_coding-style.ssi:45 en/other_coding-style.ssi:57
-#: en/other_coding-style.ssi:68 en/other_coding-style.ssi:92
-#: en/other_coding-style.ssi:100 en/other_coding-style.ssi:113
-#: en/other_coding-style.ssi:124 en/other_common-tasks.ssi:36
-#: en/other_customization-backports.ssi:16
-#: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: en/other_faq.ssi:37 en/other_faq.ssi:46 en/other_faq.ssi:92
-#: en/other_faq.ssi:108 en/other_faq.ssi:141 en/other_faq.ssi:155
-#: en/other_faq.ssi:207 en/other_faq.ssi:256 en/other_faq.ssi:292
-#: en/other_faq.ssi:307 en/other_faq.ssi:319 en/other_faq.ssi:337
-#: en/other_faq.ssi:349 en/other_faq.ssi:358 en/other_faq.ssi:370
-#: en/other_faq.ssi:381 en/other_howtos.ssi:20 en/other_howtos.ssi:47
-#: en/other_live-environment.ssi:18 en/other_live-environment.ssi:34
-#: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
-#: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
-#: en/other_live-environment.ssi:89 en/other_live-environment.ssi:97
-#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
-#: en/other_live-environment.ssi:138 en/other_procedures.ssi:16
-#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
-#: en/project_bugs.ssi:62 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/about_manual.ssi:173 en/other_faq.ssi:37 en/other_faq.ssi:46
+#: en/other_faq.ssi:92 en/other_faq.ssi:108 en/other_faq.ssi:141
+#: en/other_faq.ssi:155 en/other_faq.ssi:207 en/other_faq.ssi:256
+#: en/other_faq.ssi:292 en/other_faq.ssi:307 en/other_faq.ssi:319
+#: en/other_faq.ssi:337 en/other_faq.ssi:349 en/other_faq.ssi:358
+#: en/other_faq.ssi:370 en/other_faq.ssi:381 en/other_howtos.ssi:20
+#: en/other_howtos.ssi:47 en/project_bugs.ssi:62
+#: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
+#: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
+#: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
+#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
+#: en/project_procedures.ssi:131 en/user_basics.ssi:36 en/user_basics.ssi:46
#: en/user_basics.ssi:60 en/user_basics.ssi:72 en/user_basics.ssi:82
#: en/user_basics.ssi:94 en/user_basics.ssi:106 en/user_basics.ssi:114
#: en/user_basics.ssi:122 en/user_basics.ssi:132 en/user_basics.ssi:148
@@ -131,21 +122,28 @@ msgstr ""
#: en/user_customization-packages.ssi:169
#: en/user_customization-packages.ssi:181
#: en/user_customization-packages.ssi:197
-#: en/user_customization-packages.ssi:265
-#: en/user_customization-packages.ssi:277
-#: en/user_customization-packages.ssi:287 en/user_examples.ssi:20
-#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:58
-#: en/user_examples.ssi:68 en/user_examples.ssi:86 en/user_examples.ssi:101
-#: en/user_examples.ssi:111 en/user_examples.ssi:123 en/user_examples.ssi:135
-#: en/user_examples.ssi:150 en/user_examples.ssi:158 en/user_examples.ssi:166
-#: en/user_examples.ssi:197 en/user_examples.ssi:213 en/user_examples.ssi:221
-#: en/user_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi:72
-#: en/user_installation.ssi:80 en/user_installation.ssi:88
-#: en/user_installation.ssi:112 en/user_installation.ssi:131
-#: en/user_installation.ssi:147 en/user_managing_a_configuration.ssi:31
+#: en/user_customization-packages.ssi:263
+#: en/user_customization-packages.ssi:275
+#: en/user_customization-packages.ssi:285
+#: en/user_customization-packages.ssi:312 en/user_customization-runtime.ssi:16
+#: en/user_customization-runtime.ssi:34 en/user_customization-runtime.ssi:44
+#: en/user_customization-runtime.ssi:52 en/user_customization-runtime.ssi:60
+#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:88
+#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:106
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
+#: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
+#: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
+#: en/user_examples.ssi:166 en/user_examples.ssi:197 en/user_examples.ssi:213
+#: en/user_examples.ssi:221 en/user_installation.ssi:42
+#: en/user_installation.ssi:50 en/user_installation.ssi:60
+#: en/user_installation.ssi:72 en/user_installation.ssi:80
+#: en/user_installation.ssi:88 en/user_installation.ssi:112
+#: en/user_installation.ssi:131 en/user_installation.ssi:144
+#: en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
-#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:74
+#: en/user_managing_a_configuration.ssi:52
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
#: en/user_overview.ssi:84 en/user_overview.ssi:92
msgid "}code"
msgstr ""
@@ -399,19 +397,20 @@ msgstr ""
#. type: Plain text
#: en/user_installation.ssi:122
msgid ""
-"% FIXME: not strictly true? building sid on squeeze is usually OK. also, "
-"building lenny on squeeze or sid is fine. clarify."
+"You must build either on your target distribution or in a chroot containing "
+"your target platform: this means if your target is Squeeze then you should "
+"build against Squeeze. Y"
msgstr ""
#. type: Plain text
#: en/user_installation.ssi:124
msgid ""
-"You must build either on your target distribution or in a chroot containing "
-"your target platform: this means if your target is Squeeze then you should "
-"build against Squeeze. You can use a personal builder such as /{pbuilder}/ "
-"or /{sbuild}/ to automate building packages in chroot. To build directly on "
-"the target platform, use #{dpkg-buildpackage}# (provided by the /{dpkg-dev}/ "
-"package):"
+"Use a personal builder such as /{pbuilder}/ or /{sbuild}/ if you need to "
+"build #{live-boot}# for a target distribution that differs from your build "
+"system. For example, for Squeeze live images, build #{live-boot}# in a "
+"Squeeze chroot. If your target distribution happens to match your build "
+"system distribution, you may build directly on the build system using #{dpkg-"
+"buildpackage}# (provided by the /{dpkg-dev}/ package):"
msgstr ""
#. type: Plain text
@@ -429,24 +428,18 @@ msgstr ""
msgid ""
"As live-boot is installed by live-build system, installing the package in "
"the host system is not sufficient: you should treat the generated .deb like "
-"another custom package. Please see custom-packages for more information. You "
-"should pay particular attention to custom-packages-apt."
-msgstr ""
-
-#. type: Plain text
-#: en/user_installation.ssi:138
-msgid ""
-"% FIXME: <xref linkend=\"custom-packages\"/> <xref linkend=\"custom-packages-"
-"apt\"/> % Ben> What is the latter reference for? I can't see the relevance."
+"another custom package. Please see {Customizing package installation}"
+"#customizing-package-installation for more information. You should pay "
+"particular attention to {Additional repositories}#additional-repositories."
msgstr ""
#. type: Plain text
-#: en/user_installation.ssi:140
+#: en/user_installation.ssi:137
msgid "3~ Using live-boot snapshots"
msgstr ""
#. type: Plain text
-#: en/user_installation.ssi:142
+#: en/user_installation.ssi:139
msgid ""
"You can let live-build automatically use the latest snapshot of live-boot by "
"configuring a third-party repository in your live-build configuration "
@@ -455,6 +448,6 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_installation.ssi:146
+#: en/user_installation.ssi:143
msgid "lb config --repository live.debian.net"
msgstr ""
diff --git a/manual/po/fr/user_customization-packages.ssi.po b/manual/po/fr/user_customization-packages.ssi.po
index 9802b34..ef4183a 100644
--- a/manual/po/fr/user_customization-packages.ssi.po
+++ b/manual/po/fr/user_customization-packages.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-11-28 08:44-0400\n"
+"POT-Creation-Date: 2010-12-01 06:49-0400\n"
"PO-Revision-Date: 2010-10-16 14:45-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -20,27 +20,19 @@ msgstr ""
#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
-#: en/about_manual.ssi:170 en/other_coding-style.ssi:28
-#: en/other_coding-style.ssi:38 en/other_coding-style.ssi:51
-#: en/other_coding-style.ssi:61 en/other_coding-style.ssi:88
-#: en/other_coding-style.ssi:96 en/other_coding-style.ssi:106
-#: en/other_coding-style.ssi:117 en/other_common-tasks.ssi:32
-#: en/other_customization-backports.ssi:8 en/other_customization-bootup.ssi:30
-#: en/other_customization-bootup.ssi:39 en/other_faq.ssi:41
-#: en/other_faq.ssi:83 en/other_faq.ssi:103 en/other_faq.ssi:117
-#: en/other_faq.ssi:137 en/other_faq.ssi:151 en/other_faq.ssi:198
-#: en/other_faq.ssi:245 en/other_faq.ssi:261 en/other_faq.ssi:287
-#: en/other_faq.ssi:299 en/other_faq.ssi:314 en/other_faq.ssi:333
-#: en/other_faq.ssi:345 en/other_faq.ssi:353 en/other_faq.ssi:364
-#: en/other_faq.ssi:374 en/other_howtos.ssi:16 en/other_howtos.ssi:43
-#: en/other_live-environment.ssi:14 en/other_live-environment.ssi:30
-#: en/other_live-environment.ssi:51 en/other_live-environment.ssi:61
-#: en/other_live-environment.ssi:69 en/other_live-environment.ssi:77
-#: en/other_live-environment.ssi:85 en/other_live-environment.ssi:93
-#: en/other_live-environment.ssi:116 en/other_live-environment.ssi:124
-#: en/other_live-environment.ssi:133 en/other_procedures.ssi:12
-#: en/other_procedures.ssi:46 en/other_procedures.ssi:58
-#: en/project_bugs.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/about_manual.ssi:170 en/other_faq.ssi:41 en/other_faq.ssi:83
+#: en/other_faq.ssi:103 en/other_faq.ssi:117 en/other_faq.ssi:137
+#: en/other_faq.ssi:151 en/other_faq.ssi:198 en/other_faq.ssi:245
+#: en/other_faq.ssi:261 en/other_faq.ssi:287 en/other_faq.ssi:299
+#: en/other_faq.ssi:314 en/other_faq.ssi:333 en/other_faq.ssi:345
+#: en/other_faq.ssi:353 en/other_faq.ssi:364 en/other_faq.ssi:374
+#: en/other_howtos.ssi:16 en/other_howtos.ssi:43 en/project_bugs.ssi:58
+#: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
+#: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
+#: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
+#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
+#: en/project_procedures.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
#: en/user_basics.ssi:54 en/user_basics.ssi:66 en/user_basics.ssi:78
#: en/user_basics.ssi:88 en/user_basics.ssi:102 en/user_basics.ssi:110
#: en/user_basics.ssi:118 en/user_basics.ssi:128 en/user_basics.ssi:142
@@ -64,21 +56,28 @@ msgstr ""
#: en/user_customization-packages.ssi:163
#: en/user_customization-packages.ssi:177
#: en/user_customization-packages.ssi:193
-#: en/user_customization-packages.ssi:261
-#: en/user_customization-packages.ssi:273
-#: en/user_customization-packages.ssi:283 en/user_examples.ssi:14
-#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
-#: en/user_examples.ssi:64 en/user_examples.ssi:80 en/user_examples.ssi:90
-#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:131
-#: en/user_examples.ssi:139 en/user_examples.ssi:154 en/user_examples.ssi:162
-#: en/user_examples.ssi:188 en/user_examples.ssi:209 en/user_examples.ssi:217
-#: en/user_installation.ssi:38 en/user_installation.ssi:46
-#: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi:76 en/user_installation.ssi:84
-#: en/user_installation.ssi:104 en/user_installation.ssi:118
-#: en/user_installation.ssi:135 en/user_managing_a_configuration.ssi:24
+#: en/user_customization-packages.ssi:259
+#: en/user_customization-packages.ssi:271
+#: en/user_customization-packages.ssi:281
+#: en/user_customization-packages.ssi:299 en/user_customization-runtime.ssi:12
+#: en/user_customization-runtime.ssi:30 en/user_customization-runtime.ssi:40
+#: en/user_customization-runtime.ssi:48 en/user_customization-runtime.ssi:56
+#: en/user_customization-runtime.ssi:64 en/user_customization-runtime.ssi:84
+#: en/user_customization-runtime.ssi:92 en/user_customization-runtime.ssi:101
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
+#: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
+#: en/user_examples.ssi:162 en/user_examples.ssi:188 en/user_examples.ssi:209
+#: en/user_examples.ssi:217 en/user_installation.ssi:38
+#: en/user_installation.ssi:46 en/user_installation.ssi:56
+#: en/user_installation.ssi:64 en/user_installation.ssi:76
+#: en/user_installation.ssi:84 en/user_installation.ssi:108
+#: en/user_installation.ssi:126 en/user_installation.ssi:141
+#: en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
-#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:36
+#: en/user_managing_a_configuration.ssi:47
+#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
#: en/user_overview.ssi:80 en/user_overview.ssi:88
msgid "code{"
msgstr "code{"
@@ -87,27 +86,19 @@ msgstr "code{"
#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:166
-#: en/about_manual.ssi:173 en/other_coding-style.ssi:34
-#: en/other_coding-style.ssi:45 en/other_coding-style.ssi:57
-#: en/other_coding-style.ssi:68 en/other_coding-style.ssi:92
-#: en/other_coding-style.ssi:100 en/other_coding-style.ssi:113
-#: en/other_coding-style.ssi:124 en/other_common-tasks.ssi:36
-#: en/other_customization-backports.ssi:16
-#: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: en/other_faq.ssi:37 en/other_faq.ssi:46 en/other_faq.ssi:92
-#: en/other_faq.ssi:108 en/other_faq.ssi:141 en/other_faq.ssi:155
-#: en/other_faq.ssi:207 en/other_faq.ssi:256 en/other_faq.ssi:292
-#: en/other_faq.ssi:307 en/other_faq.ssi:319 en/other_faq.ssi:337
-#: en/other_faq.ssi:349 en/other_faq.ssi:358 en/other_faq.ssi:370
-#: en/other_faq.ssi:381 en/other_howtos.ssi:20 en/other_howtos.ssi:47
-#: en/other_live-environment.ssi:18 en/other_live-environment.ssi:34
-#: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
-#: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
-#: en/other_live-environment.ssi:89 en/other_live-environment.ssi:97
-#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
-#: en/other_live-environment.ssi:138 en/other_procedures.ssi:16
-#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
-#: en/project_bugs.ssi:62 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/about_manual.ssi:173 en/other_faq.ssi:37 en/other_faq.ssi:46
+#: en/other_faq.ssi:92 en/other_faq.ssi:108 en/other_faq.ssi:141
+#: en/other_faq.ssi:155 en/other_faq.ssi:207 en/other_faq.ssi:256
+#: en/other_faq.ssi:292 en/other_faq.ssi:307 en/other_faq.ssi:319
+#: en/other_faq.ssi:337 en/other_faq.ssi:349 en/other_faq.ssi:358
+#: en/other_faq.ssi:370 en/other_faq.ssi:381 en/other_howtos.ssi:20
+#: en/other_howtos.ssi:47 en/project_bugs.ssi:62
+#: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
+#: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
+#: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
+#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
+#: en/project_procedures.ssi:131 en/user_basics.ssi:36 en/user_basics.ssi:46
#: en/user_basics.ssi:60 en/user_basics.ssi:72 en/user_basics.ssi:82
#: en/user_basics.ssi:94 en/user_basics.ssi:106 en/user_basics.ssi:114
#: en/user_basics.ssi:122 en/user_basics.ssi:132 en/user_basics.ssi:148
@@ -131,21 +122,28 @@ msgstr "code{"
#: en/user_customization-packages.ssi:169
#: en/user_customization-packages.ssi:181
#: en/user_customization-packages.ssi:197
-#: en/user_customization-packages.ssi:265
-#: en/user_customization-packages.ssi:277
-#: en/user_customization-packages.ssi:287 en/user_examples.ssi:20
-#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:58
-#: en/user_examples.ssi:68 en/user_examples.ssi:86 en/user_examples.ssi:101
-#: en/user_examples.ssi:111 en/user_examples.ssi:123 en/user_examples.ssi:135
-#: en/user_examples.ssi:150 en/user_examples.ssi:158 en/user_examples.ssi:166
-#: en/user_examples.ssi:197 en/user_examples.ssi:213 en/user_examples.ssi:221
-#: en/user_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi:72
-#: en/user_installation.ssi:80 en/user_installation.ssi:88
-#: en/user_installation.ssi:108 en/user_installation.ssi:123
-#: en/user_installation.ssi:138 en/user_managing_a_configuration.ssi:31
+#: en/user_customization-packages.ssi:263
+#: en/user_customization-packages.ssi:275
+#: en/user_customization-packages.ssi:285
+#: en/user_customization-packages.ssi:312 en/user_customization-runtime.ssi:16
+#: en/user_customization-runtime.ssi:34 en/user_customization-runtime.ssi:44
+#: en/user_customization-runtime.ssi:52 en/user_customization-runtime.ssi:60
+#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:88
+#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:106
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
+#: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
+#: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
+#: en/user_examples.ssi:166 en/user_examples.ssi:197 en/user_examples.ssi:213
+#: en/user_examples.ssi:221 en/user_installation.ssi:42
+#: en/user_installation.ssi:50 en/user_installation.ssi:60
+#: en/user_installation.ssi:72 en/user_installation.ssi:80
+#: en/user_installation.ssi:88 en/user_installation.ssi:112
+#: en/user_installation.ssi:131 en/user_installation.ssi:144
+#: en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
-#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:74
+#: en/user_managing_a_configuration.ssi:52
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
#: en/user_overview.ssi:84 en/user_overview.ssi:92
msgid "}code"
msgstr "}code"
@@ -258,7 +256,7 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:38
-msgid "3~ Additional repositories"
+msgid "3~additional-repositories Additional repositories"
msgstr ""
#. type: Plain text
@@ -797,22 +795,17 @@ msgid ""
"Because of this, you may wish to increment the version number in your custom "
"packages' #{debian/changelog}# files to ensure that your modified version is "
"installed over one in the official Debian repositories. This may also be "
-"achieved by altering the live system's APT pinning preferences - see apt-"
-"preferences for more information."
+"achieved by altering the live system's APT pinning preferences - see {APT "
+"pinning}#apt-pinning for more information."
msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:243
-msgid "% FIXME: <xref linkend=\"apt-preferences\"/>"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:245
msgid "2~ Configuring APT at build time"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:247
+#: en/user_customization-packages.ssi:245
msgid ""
"You can configure APT through a number of options applied only at build "
"time. (APT configuration used in the running live system may be configured "
@@ -823,12 +816,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:249
+#: en/user_customization-packages.ssi:247
msgid "3~choosing-apt-or-aptitude Choosing apt or aptitude"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:251
+#: en/user_customization-packages.ssi:249
msgid ""
"You can elect to use either #{apt}# or #{aptitude}# when installing packages "
"at build time. Which utility is used is governed by the #{--apt}# argument "
@@ -838,26 +831,26 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:253
+#: en/user_customization-packages.ssi:251
msgid ""
"_* #{apt}#: With this method, if a missing package is specified, the package "
"installation will fail. This is the default setting."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:255
+#: en/user_customization-packages.ssi:253
msgid ""
"_* #{aptitude}#: With this method, if a missing package is specified, the "
"package installation will succeed."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:257
+#: en/user_customization-packages.ssi:255
msgid "3~ Using a proxy with APT"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:259
+#: en/user_customization-packages.ssi:257
msgid ""
"One commonly required APT configuration is to deal with building an image "
"behind a proxy. You may specify your APT proxy with the #{--apt-ftp-proxy}# "
@@ -865,17 +858,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:263
+#: en/user_customization-packages.ssi:261
msgid "lb config --apt-http-proxy http://proxy/"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:267
+#: en/user_customization-packages.ssi:265
msgid "3~ Tweaking APT to save space"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:269
+#: en/user_customization-packages.ssi:267
msgid ""
"You may find yourself needing to save some space on the image media, in "
"which case one or the other or both of the following options may be of "
@@ -883,19 +876,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:271
+#: en/user_customization-packages.ssi:269
msgid ""
"If you don't want to include APT indices in the image, you can omit those "
"with:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:275
+#: en/user_customization-packages.ssi:273
msgid "$ lb config --binary-indices false"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:279
+#: en/user_customization-packages.ssi:277
msgid ""
"This will not influence the entries in /etc/apt/sources.list, but merely "
"whether /var/lib/apt contains the indices files or not. The tradeoff is that "
@@ -905,19 +898,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:281
+#: en/user_customization-packages.ssi:279
msgid ""
"If you find the installation of recommended packages bloats your image too "
"much, you may disable that default option of APT with:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:285
-msgid "$ lb config -apt-recommends false"
+#: en/user_customization-packages.ssi:283
+msgid "$ lb config --apt-recommends false"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:289
+#: en/user_customization-packages.ssi:287
msgid ""
"The tradeoff here is that recommended packages are defined as \"packages "
"that would be found together with this one in all but unusual installations"
@@ -929,12 +922,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:291
+#: en/user_customization-packages.ssi:289
msgid "3~ Passing options to apt or aptitude"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:293
+#: en/user_customization-packages.ssi:291
msgid ""
"If there is not an #{lb config}# option to alter APT's behaviour in the way "
"you need, use #{--apt-options}# or #{--aptitude-options}# to pass any "
@@ -943,11 +936,38 @@ msgid ""
msgstr ""
#. type: Plain text
+#: en/user_customization-packages.ssi:293
+msgid "3~apt-pinning APT pinning"
+msgstr ""
+
+#. type: Plain text
#: en/user_customization-packages.ssi:295
-msgid "3~ APT pinning"
+msgid ""
+"For background, please first read the #{apt_preferences(5)}# man page. APT "
+"pinning can be configured either for build time, or else for run time. For "
+"the former, create #{config/chroot_apt/preferences}#. For the latter, create "
+"#{config/chroot_local-includes/etc/preferences}#."
msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:297
-msgid "% FIXME: needs content"
+msgid ""
+"Let's say you are building a Squeeze live system but need all #{live-*}# "
+"packages to be installed from Sid at build time. You need to add Sid to your "
+"APT sources and pin it so that only the packages you want are installed from "
+"it at build time and all others are taken from the target system "
+"distribution, Squeeze. The following will accomplish this:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:305
+msgid ""
+"$ echo \"deb http://mirror/debian sid main\" > config/chroot_sources/sid."
+"chroot $ cat >>config/chroot_apt/preferences <<END Package: live-* Pin: "
+"release n=sid Pin-Priority: 600"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:310
+msgid "Package: * Pin: release n=sid Pin-Priority: 1 END"
msgstr ""
diff --git a/manual/po/fr/user_installation.ssi.po b/manual/po/fr/user_installation.ssi.po
index 8ac11ce..45de157 100644
--- a/manual/po/fr/user_installation.ssi.po
+++ b/manual/po/fr/user_installation.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-11-29 14:16-0400\n"
+"POT-Creation-Date: 2010-12-01 06:49-0400\n"
"PO-Revision-Date: 2010-10-16 20:36-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -20,27 +20,19 @@ msgstr ""
#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
-#: en/about_manual.ssi:170 en/other_coding-style.ssi:28
-#: en/other_coding-style.ssi:38 en/other_coding-style.ssi:51
-#: en/other_coding-style.ssi:61 en/other_coding-style.ssi:88
-#: en/other_coding-style.ssi:96 en/other_coding-style.ssi:106
-#: en/other_coding-style.ssi:117 en/other_common-tasks.ssi:32
-#: en/other_customization-backports.ssi:8 en/other_customization-bootup.ssi:30
-#: en/other_customization-bootup.ssi:39 en/other_faq.ssi:41
-#: en/other_faq.ssi:83 en/other_faq.ssi:103 en/other_faq.ssi:117
-#: en/other_faq.ssi:137 en/other_faq.ssi:151 en/other_faq.ssi:198
-#: en/other_faq.ssi:245 en/other_faq.ssi:261 en/other_faq.ssi:287
-#: en/other_faq.ssi:299 en/other_faq.ssi:314 en/other_faq.ssi:333
-#: en/other_faq.ssi:345 en/other_faq.ssi:353 en/other_faq.ssi:364
-#: en/other_faq.ssi:374 en/other_howtos.ssi:16 en/other_howtos.ssi:43
-#: en/other_live-environment.ssi:14 en/other_live-environment.ssi:30
-#: en/other_live-environment.ssi:51 en/other_live-environment.ssi:61
-#: en/other_live-environment.ssi:69 en/other_live-environment.ssi:77
-#: en/other_live-environment.ssi:85 en/other_live-environment.ssi:93
-#: en/other_live-environment.ssi:116 en/other_live-environment.ssi:124
-#: en/other_live-environment.ssi:133 en/other_procedures.ssi:12
-#: en/other_procedures.ssi:46 en/other_procedures.ssi:58
-#: en/project_bugs.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/about_manual.ssi:170 en/other_faq.ssi:41 en/other_faq.ssi:83
+#: en/other_faq.ssi:103 en/other_faq.ssi:117 en/other_faq.ssi:137
+#: en/other_faq.ssi:151 en/other_faq.ssi:198 en/other_faq.ssi:245
+#: en/other_faq.ssi:261 en/other_faq.ssi:287 en/other_faq.ssi:299
+#: en/other_faq.ssi:314 en/other_faq.ssi:333 en/other_faq.ssi:345
+#: en/other_faq.ssi:353 en/other_faq.ssi:364 en/other_faq.ssi:374
+#: en/other_howtos.ssi:16 en/other_howtos.ssi:43 en/project_bugs.ssi:58
+#: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
+#: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
+#: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
+#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
+#: en/project_procedures.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
#: en/user_basics.ssi:54 en/user_basics.ssi:66 en/user_basics.ssi:78
#: en/user_basics.ssi:88 en/user_basics.ssi:102 en/user_basics.ssi:110
#: en/user_basics.ssi:118 en/user_basics.ssi:128 en/user_basics.ssi:142
@@ -64,21 +56,28 @@ msgstr ""
#: en/user_customization-packages.ssi:163
#: en/user_customization-packages.ssi:177
#: en/user_customization-packages.ssi:193
-#: en/user_customization-packages.ssi:261
-#: en/user_customization-packages.ssi:273
-#: en/user_customization-packages.ssi:283 en/user_examples.ssi:14
-#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
-#: en/user_examples.ssi:64 en/user_examples.ssi:80 en/user_examples.ssi:90
-#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:131
-#: en/user_examples.ssi:139 en/user_examples.ssi:154 en/user_examples.ssi:162
-#: en/user_examples.ssi:188 en/user_examples.ssi:209 en/user_examples.ssi:217
-#: en/user_installation.ssi:38 en/user_installation.ssi:46
-#: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi:76 en/user_installation.ssi:84
-#: en/user_installation.ssi:108 en/user_installation.ssi:126
-#: en/user_installation.ssi:144 en/user_managing_a_configuration.ssi:24
+#: en/user_customization-packages.ssi:259
+#: en/user_customization-packages.ssi:271
+#: en/user_customization-packages.ssi:281
+#: en/user_customization-packages.ssi:299 en/user_customization-runtime.ssi:12
+#: en/user_customization-runtime.ssi:30 en/user_customization-runtime.ssi:40
+#: en/user_customization-runtime.ssi:48 en/user_customization-runtime.ssi:56
+#: en/user_customization-runtime.ssi:64 en/user_customization-runtime.ssi:84
+#: en/user_customization-runtime.ssi:92 en/user_customization-runtime.ssi:101
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
+#: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
+#: en/user_examples.ssi:162 en/user_examples.ssi:188 en/user_examples.ssi:209
+#: en/user_examples.ssi:217 en/user_installation.ssi:38
+#: en/user_installation.ssi:46 en/user_installation.ssi:56
+#: en/user_installation.ssi:64 en/user_installation.ssi:76
+#: en/user_installation.ssi:84 en/user_installation.ssi:108
+#: en/user_installation.ssi:126 en/user_installation.ssi:141
+#: en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
-#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:36
+#: en/user_managing_a_configuration.ssi:47
+#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
#: en/user_overview.ssi:80 en/user_overview.ssi:88
msgid "code{"
msgstr "code{"
@@ -87,27 +86,19 @@ msgstr "code{"
#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:166
-#: en/about_manual.ssi:173 en/other_coding-style.ssi:34
-#: en/other_coding-style.ssi:45 en/other_coding-style.ssi:57
-#: en/other_coding-style.ssi:68 en/other_coding-style.ssi:92
-#: en/other_coding-style.ssi:100 en/other_coding-style.ssi:113
-#: en/other_coding-style.ssi:124 en/other_common-tasks.ssi:36
-#: en/other_customization-backports.ssi:16
-#: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: en/other_faq.ssi:37 en/other_faq.ssi:46 en/other_faq.ssi:92
-#: en/other_faq.ssi:108 en/other_faq.ssi:141 en/other_faq.ssi:155
-#: en/other_faq.ssi:207 en/other_faq.ssi:256 en/other_faq.ssi:292
-#: en/other_faq.ssi:307 en/other_faq.ssi:319 en/other_faq.ssi:337
-#: en/other_faq.ssi:349 en/other_faq.ssi:358 en/other_faq.ssi:370
-#: en/other_faq.ssi:381 en/other_howtos.ssi:20 en/other_howtos.ssi:47
-#: en/other_live-environment.ssi:18 en/other_live-environment.ssi:34
-#: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
-#: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
-#: en/other_live-environment.ssi:89 en/other_live-environment.ssi:97
-#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
-#: en/other_live-environment.ssi:138 en/other_procedures.ssi:16
-#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
-#: en/project_bugs.ssi:62 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/about_manual.ssi:173 en/other_faq.ssi:37 en/other_faq.ssi:46
+#: en/other_faq.ssi:92 en/other_faq.ssi:108 en/other_faq.ssi:141
+#: en/other_faq.ssi:155 en/other_faq.ssi:207 en/other_faq.ssi:256
+#: en/other_faq.ssi:292 en/other_faq.ssi:307 en/other_faq.ssi:319
+#: en/other_faq.ssi:337 en/other_faq.ssi:349 en/other_faq.ssi:358
+#: en/other_faq.ssi:370 en/other_faq.ssi:381 en/other_howtos.ssi:20
+#: en/other_howtos.ssi:47 en/project_bugs.ssi:62
+#: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
+#: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
+#: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
+#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
+#: en/project_procedures.ssi:131 en/user_basics.ssi:36 en/user_basics.ssi:46
#: en/user_basics.ssi:60 en/user_basics.ssi:72 en/user_basics.ssi:82
#: en/user_basics.ssi:94 en/user_basics.ssi:106 en/user_basics.ssi:114
#: en/user_basics.ssi:122 en/user_basics.ssi:132 en/user_basics.ssi:148
@@ -131,21 +122,28 @@ msgstr "code{"
#: en/user_customization-packages.ssi:169
#: en/user_customization-packages.ssi:181
#: en/user_customization-packages.ssi:197
-#: en/user_customization-packages.ssi:265
-#: en/user_customization-packages.ssi:277
-#: en/user_customization-packages.ssi:287 en/user_examples.ssi:20
-#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:58
-#: en/user_examples.ssi:68 en/user_examples.ssi:86 en/user_examples.ssi:101
-#: en/user_examples.ssi:111 en/user_examples.ssi:123 en/user_examples.ssi:135
-#: en/user_examples.ssi:150 en/user_examples.ssi:158 en/user_examples.ssi:166
-#: en/user_examples.ssi:197 en/user_examples.ssi:213 en/user_examples.ssi:221
-#: en/user_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi:72
-#: en/user_installation.ssi:80 en/user_installation.ssi:88
-#: en/user_installation.ssi:112 en/user_installation.ssi:131
-#: en/user_installation.ssi:147 en/user_managing_a_configuration.ssi:31
+#: en/user_customization-packages.ssi:263
+#: en/user_customization-packages.ssi:275
+#: en/user_customization-packages.ssi:285
+#: en/user_customization-packages.ssi:312 en/user_customization-runtime.ssi:16
+#: en/user_customization-runtime.ssi:34 en/user_customization-runtime.ssi:44
+#: en/user_customization-runtime.ssi:52 en/user_customization-runtime.ssi:60
+#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:88
+#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:106
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
+#: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
+#: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
+#: en/user_examples.ssi:166 en/user_examples.ssi:197 en/user_examples.ssi:213
+#: en/user_examples.ssi:221 en/user_installation.ssi:42
+#: en/user_installation.ssi:50 en/user_installation.ssi:60
+#: en/user_installation.ssi:72 en/user_installation.ssi:80
+#: en/user_installation.ssi:88 en/user_installation.ssi:112
+#: en/user_installation.ssi:131 en/user_installation.ssi:144
+#: en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
-#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:74
+#: en/user_managing_a_configuration.ssi:52
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
#: en/user_overview.ssi:84 en/user_overview.ssi:92
msgid "}code"
msgstr "}code"
@@ -399,19 +397,20 @@ msgstr ""
#. type: Plain text
#: en/user_installation.ssi:122
msgid ""
-"% FIXME: not strictly true? building sid on squeeze is usually OK. also, "
-"building lenny on squeeze or sid is fine. clarify."
+"You must build either on your target distribution or in a chroot containing "
+"your target platform: this means if your target is Squeeze then you should "
+"build against Squeeze. Y"
msgstr ""
#. type: Plain text
#: en/user_installation.ssi:124
msgid ""
-"You must build either on your target distribution or in a chroot containing "
-"your target platform: this means if your target is Squeeze then you should "
-"build against Squeeze. You can use a personal builder such as /{pbuilder}/ "
-"or /{sbuild}/ to automate building packages in chroot. To build directly on "
-"the target platform, use #{dpkg-buildpackage}# (provided by the /{dpkg-dev}/ "
-"package):"
+"Use a personal builder such as /{pbuilder}/ or /{sbuild}/ if you need to "
+"build #{live-boot}# for a target distribution that differs from your build "
+"system. For example, for Squeeze live images, build #{live-boot}# in a "
+"Squeeze chroot. If your target distribution happens to match your build "
+"system distribution, you may build directly on the build system using #{dpkg-"
+"buildpackage}# (provided by the /{dpkg-dev}/ package):"
msgstr ""
#. type: Plain text
@@ -429,24 +428,18 @@ msgstr ""
msgid ""
"As live-boot is installed by live-build system, installing the package in "
"the host system is not sufficient: you should treat the generated .deb like "
-"another custom package. Please see custom-packages for more information. You "
-"should pay particular attention to custom-packages-apt."
-msgstr ""
-
-#. type: Plain text
-#: en/user_installation.ssi:138
-msgid ""
-"% FIXME: <xref linkend=\"custom-packages\"/> <xref linkend=\"custom-packages-"
-"apt\"/> % Ben> What is the latter reference for? I can't see the relevance."
+"another custom package. Please see {Customizing package installation}"
+"#customizing-package-installation for more information. You should pay "
+"particular attention to {Additional repositories}#additional-repositories."
msgstr ""
#. type: Plain text
-#: en/user_installation.ssi:140
+#: en/user_installation.ssi:137
msgid "3~ Using live-boot snapshots"
msgstr ""
#. type: Plain text
-#: en/user_installation.ssi:142
+#: en/user_installation.ssi:139
msgid ""
"You can let live-build automatically use the latest snapshot of live-boot by "
"configuring a third-party repository in your live-build configuration "
@@ -455,6 +448,6 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_installation.ssi:146
+#: en/user_installation.ssi:143
msgid "lb config --repository live.debian.net"
msgstr ""
diff --git a/manual/po/pt_BR/user_customization-packages.ssi.po b/manual/po/pt_BR/user_customization-packages.ssi.po
index 2f32f60..6b3ab61 100644
--- a/manual/po/pt_BR/user_customization-packages.ssi.po
+++ b/manual/po/pt_BR/user_customization-packages.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-11-28 08:44-0400\n"
+"POT-Creation-Date: 2010-12-01 06:49-0400\n"
"PO-Revision-Date: 2010-10-22 08:58-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -20,27 +20,19 @@ msgstr ""
#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
-#: en/about_manual.ssi:170 en/other_coding-style.ssi:28
-#: en/other_coding-style.ssi:38 en/other_coding-style.ssi:51
-#: en/other_coding-style.ssi:61 en/other_coding-style.ssi:88
-#: en/other_coding-style.ssi:96 en/other_coding-style.ssi:106
-#: en/other_coding-style.ssi:117 en/other_common-tasks.ssi:32
-#: en/other_customization-backports.ssi:8 en/other_customization-bootup.ssi:30
-#: en/other_customization-bootup.ssi:39 en/other_faq.ssi:41
-#: en/other_faq.ssi:83 en/other_faq.ssi:103 en/other_faq.ssi:117
-#: en/other_faq.ssi:137 en/other_faq.ssi:151 en/other_faq.ssi:198
-#: en/other_faq.ssi:245 en/other_faq.ssi:261 en/other_faq.ssi:287
-#: en/other_faq.ssi:299 en/other_faq.ssi:314 en/other_faq.ssi:333
-#: en/other_faq.ssi:345 en/other_faq.ssi:353 en/other_faq.ssi:364
-#: en/other_faq.ssi:374 en/other_howtos.ssi:16 en/other_howtos.ssi:43
-#: en/other_live-environment.ssi:14 en/other_live-environment.ssi:30
-#: en/other_live-environment.ssi:51 en/other_live-environment.ssi:61
-#: en/other_live-environment.ssi:69 en/other_live-environment.ssi:77
-#: en/other_live-environment.ssi:85 en/other_live-environment.ssi:93
-#: en/other_live-environment.ssi:116 en/other_live-environment.ssi:124
-#: en/other_live-environment.ssi:133 en/other_procedures.ssi:12
-#: en/other_procedures.ssi:46 en/other_procedures.ssi:58
-#: en/project_bugs.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/about_manual.ssi:170 en/other_faq.ssi:41 en/other_faq.ssi:83
+#: en/other_faq.ssi:103 en/other_faq.ssi:117 en/other_faq.ssi:137
+#: en/other_faq.ssi:151 en/other_faq.ssi:198 en/other_faq.ssi:245
+#: en/other_faq.ssi:261 en/other_faq.ssi:287 en/other_faq.ssi:299
+#: en/other_faq.ssi:314 en/other_faq.ssi:333 en/other_faq.ssi:345
+#: en/other_faq.ssi:353 en/other_faq.ssi:364 en/other_faq.ssi:374
+#: en/other_howtos.ssi:16 en/other_howtos.ssi:43 en/project_bugs.ssi:58
+#: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
+#: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
+#: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
+#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
+#: en/project_procedures.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
#: en/user_basics.ssi:54 en/user_basics.ssi:66 en/user_basics.ssi:78
#: en/user_basics.ssi:88 en/user_basics.ssi:102 en/user_basics.ssi:110
#: en/user_basics.ssi:118 en/user_basics.ssi:128 en/user_basics.ssi:142
@@ -64,21 +56,28 @@ msgstr ""
#: en/user_customization-packages.ssi:163
#: en/user_customization-packages.ssi:177
#: en/user_customization-packages.ssi:193
-#: en/user_customization-packages.ssi:261
-#: en/user_customization-packages.ssi:273
-#: en/user_customization-packages.ssi:283 en/user_examples.ssi:14
-#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
-#: en/user_examples.ssi:64 en/user_examples.ssi:80 en/user_examples.ssi:90
-#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:131
-#: en/user_examples.ssi:139 en/user_examples.ssi:154 en/user_examples.ssi:162
-#: en/user_examples.ssi:188 en/user_examples.ssi:209 en/user_examples.ssi:217
-#: en/user_installation.ssi:38 en/user_installation.ssi:46
-#: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi:76 en/user_installation.ssi:84
-#: en/user_installation.ssi:104 en/user_installation.ssi:118
-#: en/user_installation.ssi:135 en/user_managing_a_configuration.ssi:24
+#: en/user_customization-packages.ssi:259
+#: en/user_customization-packages.ssi:271
+#: en/user_customization-packages.ssi:281
+#: en/user_customization-packages.ssi:299 en/user_customization-runtime.ssi:12
+#: en/user_customization-runtime.ssi:30 en/user_customization-runtime.ssi:40
+#: en/user_customization-runtime.ssi:48 en/user_customization-runtime.ssi:56
+#: en/user_customization-runtime.ssi:64 en/user_customization-runtime.ssi:84
+#: en/user_customization-runtime.ssi:92 en/user_customization-runtime.ssi:101
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
+#: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
+#: en/user_examples.ssi:162 en/user_examples.ssi:188 en/user_examples.ssi:209
+#: en/user_examples.ssi:217 en/user_installation.ssi:38
+#: en/user_installation.ssi:46 en/user_installation.ssi:56
+#: en/user_installation.ssi:64 en/user_installation.ssi:76
+#: en/user_installation.ssi:84 en/user_installation.ssi:108
+#: en/user_installation.ssi:126 en/user_installation.ssi:141
+#: en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
-#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:36
+#: en/user_managing_a_configuration.ssi:47
+#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
#: en/user_overview.ssi:80 en/user_overview.ssi:88
msgid "code{"
msgstr "code{"
@@ -87,27 +86,19 @@ msgstr "code{"
#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:166
-#: en/about_manual.ssi:173 en/other_coding-style.ssi:34
-#: en/other_coding-style.ssi:45 en/other_coding-style.ssi:57
-#: en/other_coding-style.ssi:68 en/other_coding-style.ssi:92
-#: en/other_coding-style.ssi:100 en/other_coding-style.ssi:113
-#: en/other_coding-style.ssi:124 en/other_common-tasks.ssi:36
-#: en/other_customization-backports.ssi:16
-#: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: en/other_faq.ssi:37 en/other_faq.ssi:46 en/other_faq.ssi:92
-#: en/other_faq.ssi:108 en/other_faq.ssi:141 en/other_faq.ssi:155
-#: en/other_faq.ssi:207 en/other_faq.ssi:256 en/other_faq.ssi:292
-#: en/other_faq.ssi:307 en/other_faq.ssi:319 en/other_faq.ssi:337
-#: en/other_faq.ssi:349 en/other_faq.ssi:358 en/other_faq.ssi:370
-#: en/other_faq.ssi:381 en/other_howtos.ssi:20 en/other_howtos.ssi:47
-#: en/other_live-environment.ssi:18 en/other_live-environment.ssi:34
-#: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
-#: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
-#: en/other_live-environment.ssi:89 en/other_live-environment.ssi:97
-#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
-#: en/other_live-environment.ssi:138 en/other_procedures.ssi:16
-#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
-#: en/project_bugs.ssi:62 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/about_manual.ssi:173 en/other_faq.ssi:37 en/other_faq.ssi:46
+#: en/other_faq.ssi:92 en/other_faq.ssi:108 en/other_faq.ssi:141
+#: en/other_faq.ssi:155 en/other_faq.ssi:207 en/other_faq.ssi:256
+#: en/other_faq.ssi:292 en/other_faq.ssi:307 en/other_faq.ssi:319
+#: en/other_faq.ssi:337 en/other_faq.ssi:349 en/other_faq.ssi:358
+#: en/other_faq.ssi:370 en/other_faq.ssi:381 en/other_howtos.ssi:20
+#: en/other_howtos.ssi:47 en/project_bugs.ssi:62
+#: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
+#: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
+#: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
+#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
+#: en/project_procedures.ssi:131 en/user_basics.ssi:36 en/user_basics.ssi:46
#: en/user_basics.ssi:60 en/user_basics.ssi:72 en/user_basics.ssi:82
#: en/user_basics.ssi:94 en/user_basics.ssi:106 en/user_basics.ssi:114
#: en/user_basics.ssi:122 en/user_basics.ssi:132 en/user_basics.ssi:148
@@ -131,21 +122,28 @@ msgstr "code{"
#: en/user_customization-packages.ssi:169
#: en/user_customization-packages.ssi:181
#: en/user_customization-packages.ssi:197
-#: en/user_customization-packages.ssi:265
-#: en/user_customization-packages.ssi:277
-#: en/user_customization-packages.ssi:287 en/user_examples.ssi:20
-#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:58
-#: en/user_examples.ssi:68 en/user_examples.ssi:86 en/user_examples.ssi:101
-#: en/user_examples.ssi:111 en/user_examples.ssi:123 en/user_examples.ssi:135
-#: en/user_examples.ssi:150 en/user_examples.ssi:158 en/user_examples.ssi:166
-#: en/user_examples.ssi:197 en/user_examples.ssi:213 en/user_examples.ssi:221
-#: en/user_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi:72
-#: en/user_installation.ssi:80 en/user_installation.ssi:88
-#: en/user_installation.ssi:108 en/user_installation.ssi:123
-#: en/user_installation.ssi:138 en/user_managing_a_configuration.ssi:31
+#: en/user_customization-packages.ssi:263
+#: en/user_customization-packages.ssi:275
+#: en/user_customization-packages.ssi:285
+#: en/user_customization-packages.ssi:312 en/user_customization-runtime.ssi:16
+#: en/user_customization-runtime.ssi:34 en/user_customization-runtime.ssi:44
+#: en/user_customization-runtime.ssi:52 en/user_customization-runtime.ssi:60
+#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:88
+#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:106
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
+#: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
+#: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
+#: en/user_examples.ssi:166 en/user_examples.ssi:197 en/user_examples.ssi:213
+#: en/user_examples.ssi:221 en/user_installation.ssi:42
+#: en/user_installation.ssi:50 en/user_installation.ssi:60
+#: en/user_installation.ssi:72 en/user_installation.ssi:80
+#: en/user_installation.ssi:88 en/user_installation.ssi:112
+#: en/user_installation.ssi:131 en/user_installation.ssi:144
+#: en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
-#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:74
+#: en/user_managing_a_configuration.ssi:52
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
#: en/user_overview.ssi:84 en/user_overview.ssi:92
msgid "}code"
msgstr "}code"
@@ -258,7 +256,7 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:38
-msgid "3~ Additional repositories"
+msgid "3~additional-repositories Additional repositories"
msgstr ""
#. type: Plain text
@@ -797,22 +795,17 @@ msgid ""
"Because of this, you may wish to increment the version number in your custom "
"packages' #{debian/changelog}# files to ensure that your modified version is "
"installed over one in the official Debian repositories. This may also be "
-"achieved by altering the live system's APT pinning preferences - see apt-"
-"preferences for more information."
+"achieved by altering the live system's APT pinning preferences - see {APT "
+"pinning}#apt-pinning for more information."
msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:243
-msgid "% FIXME: <xref linkend=\"apt-preferences\"/>"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:245
msgid "2~ Configuring APT at build time"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:247
+#: en/user_customization-packages.ssi:245
msgid ""
"You can configure APT through a number of options applied only at build "
"time. (APT configuration used in the running live system may be configured "
@@ -823,12 +816,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:249
+#: en/user_customization-packages.ssi:247
msgid "3~choosing-apt-or-aptitude Choosing apt or aptitude"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:251
+#: en/user_customization-packages.ssi:249
msgid ""
"You can elect to use either #{apt}# or #{aptitude}# when installing packages "
"at build time. Which utility is used is governed by the #{--apt}# argument "
@@ -838,26 +831,26 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:253
+#: en/user_customization-packages.ssi:251
msgid ""
"_* #{apt}#: With this method, if a missing package is specified, the package "
"installation will fail. This is the default setting."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:255
+#: en/user_customization-packages.ssi:253
msgid ""
"_* #{aptitude}#: With this method, if a missing package is specified, the "
"package installation will succeed."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:257
+#: en/user_customization-packages.ssi:255
msgid "3~ Using a proxy with APT"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:259
+#: en/user_customization-packages.ssi:257
msgid ""
"One commonly required APT configuration is to deal with building an image "
"behind a proxy. You may specify your APT proxy with the #{--apt-ftp-proxy}# "
@@ -865,17 +858,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:263
+#: en/user_customization-packages.ssi:261
msgid "lb config --apt-http-proxy http://proxy/"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:267
+#: en/user_customization-packages.ssi:265
msgid "3~ Tweaking APT to save space"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:269
+#: en/user_customization-packages.ssi:267
msgid ""
"You may find yourself needing to save some space on the image media, in "
"which case one or the other or both of the following options may be of "
@@ -883,19 +876,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:271
+#: en/user_customization-packages.ssi:269
msgid ""
"If you don't want to include APT indices in the image, you can omit those "
"with:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:275
+#: en/user_customization-packages.ssi:273
msgid "$ lb config --binary-indices false"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:279
+#: en/user_customization-packages.ssi:277
msgid ""
"This will not influence the entries in /etc/apt/sources.list, but merely "
"whether /var/lib/apt contains the indices files or not. The tradeoff is that "
@@ -905,19 +898,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:281
+#: en/user_customization-packages.ssi:279
msgid ""
"If you find the installation of recommended packages bloats your image too "
"much, you may disable that default option of APT with:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:285
-msgid "$ lb config -apt-recommends false"
+#: en/user_customization-packages.ssi:283
+msgid "$ lb config --apt-recommends false"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:289
+#: en/user_customization-packages.ssi:287
msgid ""
"The tradeoff here is that recommended packages are defined as \"packages "
"that would be found together with this one in all but unusual installations"
@@ -929,12 +922,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:291
+#: en/user_customization-packages.ssi:289
msgid "3~ Passing options to apt or aptitude"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:293
+#: en/user_customization-packages.ssi:291
msgid ""
"If there is not an #{lb config}# option to alter APT's behaviour in the way "
"you need, use #{--apt-options}# or #{--aptitude-options}# to pass any "
@@ -943,11 +936,38 @@ msgid ""
msgstr ""
#. type: Plain text
+#: en/user_customization-packages.ssi:293
+msgid "3~apt-pinning APT pinning"
+msgstr ""
+
+#. type: Plain text
#: en/user_customization-packages.ssi:295
-msgid "3~ APT pinning"
+msgid ""
+"For background, please first read the #{apt_preferences(5)}# man page. APT "
+"pinning can be configured either for build time, or else for run time. For "
+"the former, create #{config/chroot_apt/preferences}#. For the latter, create "
+"#{config/chroot_local-includes/etc/preferences}#."
msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:297
-msgid "% FIXME: needs content"
+msgid ""
+"Let's say you are building a Squeeze live system but need all #{live-*}# "
+"packages to be installed from Sid at build time. You need to add Sid to your "
+"APT sources and pin it so that only the packages you want are installed from "
+"it at build time and all others are taken from the target system "
+"distribution, Squeeze. The following will accomplish this:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:305
+msgid ""
+"$ echo \"deb http://mirror/debian sid main\" > config/chroot_sources/sid."
+"chroot $ cat >>config/chroot_apt/preferences <<END Package: live-* Pin: "
+"release n=sid Pin-Priority: 600"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:310
+msgid "Package: * Pin: release n=sid Pin-Priority: 1 END"
msgstr ""
diff --git a/manual/po/pt_BR/user_installation.ssi.po b/manual/po/pt_BR/user_installation.ssi.po
index e4a2dd2..3f3bb2e 100644
--- a/manual/po/pt_BR/user_installation.ssi.po
+++ b/manual/po/pt_BR/user_installation.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-11-29 14:16-0400\n"
+"POT-Creation-Date: 2010-12-01 06:49-0400\n"
"PO-Revision-Date: 2010-10-16 20:36-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -20,27 +20,19 @@ msgstr ""
#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
-#: en/about_manual.ssi:170 en/other_coding-style.ssi:28
-#: en/other_coding-style.ssi:38 en/other_coding-style.ssi:51
-#: en/other_coding-style.ssi:61 en/other_coding-style.ssi:88
-#: en/other_coding-style.ssi:96 en/other_coding-style.ssi:106
-#: en/other_coding-style.ssi:117 en/other_common-tasks.ssi:32
-#: en/other_customization-backports.ssi:8 en/other_customization-bootup.ssi:30
-#: en/other_customization-bootup.ssi:39 en/other_faq.ssi:41
-#: en/other_faq.ssi:83 en/other_faq.ssi:103 en/other_faq.ssi:117
-#: en/other_faq.ssi:137 en/other_faq.ssi:151 en/other_faq.ssi:198
-#: en/other_faq.ssi:245 en/other_faq.ssi:261 en/other_faq.ssi:287
-#: en/other_faq.ssi:299 en/other_faq.ssi:314 en/other_faq.ssi:333
-#: en/other_faq.ssi:345 en/other_faq.ssi:353 en/other_faq.ssi:364
-#: en/other_faq.ssi:374 en/other_howtos.ssi:16 en/other_howtos.ssi:43
-#: en/other_live-environment.ssi:14 en/other_live-environment.ssi:30
-#: en/other_live-environment.ssi:51 en/other_live-environment.ssi:61
-#: en/other_live-environment.ssi:69 en/other_live-environment.ssi:77
-#: en/other_live-environment.ssi:85 en/other_live-environment.ssi:93
-#: en/other_live-environment.ssi:116 en/other_live-environment.ssi:124
-#: en/other_live-environment.ssi:133 en/other_procedures.ssi:12
-#: en/other_procedures.ssi:46 en/other_procedures.ssi:58
-#: en/project_bugs.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/about_manual.ssi:170 en/other_faq.ssi:41 en/other_faq.ssi:83
+#: en/other_faq.ssi:103 en/other_faq.ssi:117 en/other_faq.ssi:137
+#: en/other_faq.ssi:151 en/other_faq.ssi:198 en/other_faq.ssi:245
+#: en/other_faq.ssi:261 en/other_faq.ssi:287 en/other_faq.ssi:299
+#: en/other_faq.ssi:314 en/other_faq.ssi:333 en/other_faq.ssi:345
+#: en/other_faq.ssi:353 en/other_faq.ssi:364 en/other_faq.ssi:374
+#: en/other_howtos.ssi:16 en/other_howtos.ssi:43 en/project_bugs.ssi:58
+#: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
+#: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
+#: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
+#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
+#: en/project_procedures.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
#: en/user_basics.ssi:54 en/user_basics.ssi:66 en/user_basics.ssi:78
#: en/user_basics.ssi:88 en/user_basics.ssi:102 en/user_basics.ssi:110
#: en/user_basics.ssi:118 en/user_basics.ssi:128 en/user_basics.ssi:142
@@ -64,21 +56,28 @@ msgstr ""
#: en/user_customization-packages.ssi:163
#: en/user_customization-packages.ssi:177
#: en/user_customization-packages.ssi:193
-#: en/user_customization-packages.ssi:261
-#: en/user_customization-packages.ssi:273
-#: en/user_customization-packages.ssi:283 en/user_examples.ssi:14
-#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
-#: en/user_examples.ssi:64 en/user_examples.ssi:80 en/user_examples.ssi:90
-#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:131
-#: en/user_examples.ssi:139 en/user_examples.ssi:154 en/user_examples.ssi:162
-#: en/user_examples.ssi:188 en/user_examples.ssi:209 en/user_examples.ssi:217
-#: en/user_installation.ssi:38 en/user_installation.ssi:46
-#: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi:76 en/user_installation.ssi:84
-#: en/user_installation.ssi:108 en/user_installation.ssi:126
-#: en/user_installation.ssi:144 en/user_managing_a_configuration.ssi:24
+#: en/user_customization-packages.ssi:259
+#: en/user_customization-packages.ssi:271
+#: en/user_customization-packages.ssi:281
+#: en/user_customization-packages.ssi:299 en/user_customization-runtime.ssi:12
+#: en/user_customization-runtime.ssi:30 en/user_customization-runtime.ssi:40
+#: en/user_customization-runtime.ssi:48 en/user_customization-runtime.ssi:56
+#: en/user_customization-runtime.ssi:64 en/user_customization-runtime.ssi:84
+#: en/user_customization-runtime.ssi:92 en/user_customization-runtime.ssi:101
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
+#: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
+#: en/user_examples.ssi:162 en/user_examples.ssi:188 en/user_examples.ssi:209
+#: en/user_examples.ssi:217 en/user_installation.ssi:38
+#: en/user_installation.ssi:46 en/user_installation.ssi:56
+#: en/user_installation.ssi:64 en/user_installation.ssi:76
+#: en/user_installation.ssi:84 en/user_installation.ssi:108
+#: en/user_installation.ssi:126 en/user_installation.ssi:141
+#: en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
-#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:36
+#: en/user_managing_a_configuration.ssi:47
+#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
#: en/user_overview.ssi:80 en/user_overview.ssi:88
msgid "code{"
msgstr "code{"
@@ -87,27 +86,19 @@ msgstr "code{"
#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:166
-#: en/about_manual.ssi:173 en/other_coding-style.ssi:34
-#: en/other_coding-style.ssi:45 en/other_coding-style.ssi:57
-#: en/other_coding-style.ssi:68 en/other_coding-style.ssi:92
-#: en/other_coding-style.ssi:100 en/other_coding-style.ssi:113
-#: en/other_coding-style.ssi:124 en/other_common-tasks.ssi:36
-#: en/other_customization-backports.ssi:16
-#: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: en/other_faq.ssi:37 en/other_faq.ssi:46 en/other_faq.ssi:92
-#: en/other_faq.ssi:108 en/other_faq.ssi:141 en/other_faq.ssi:155
-#: en/other_faq.ssi:207 en/other_faq.ssi:256 en/other_faq.ssi:292
-#: en/other_faq.ssi:307 en/other_faq.ssi:319 en/other_faq.ssi:337
-#: en/other_faq.ssi:349 en/other_faq.ssi:358 en/other_faq.ssi:370
-#: en/other_faq.ssi:381 en/other_howtos.ssi:20 en/other_howtos.ssi:47
-#: en/other_live-environment.ssi:18 en/other_live-environment.ssi:34
-#: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
-#: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
-#: en/other_live-environment.ssi:89 en/other_live-environment.ssi:97
-#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
-#: en/other_live-environment.ssi:138 en/other_procedures.ssi:16
-#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
-#: en/project_bugs.ssi:62 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/about_manual.ssi:173 en/other_faq.ssi:37 en/other_faq.ssi:46
+#: en/other_faq.ssi:92 en/other_faq.ssi:108 en/other_faq.ssi:141
+#: en/other_faq.ssi:155 en/other_faq.ssi:207 en/other_faq.ssi:256
+#: en/other_faq.ssi:292 en/other_faq.ssi:307 en/other_faq.ssi:319
+#: en/other_faq.ssi:337 en/other_faq.ssi:349 en/other_faq.ssi:358
+#: en/other_faq.ssi:370 en/other_faq.ssi:381 en/other_howtos.ssi:20
+#: en/other_howtos.ssi:47 en/project_bugs.ssi:62
+#: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
+#: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
+#: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
+#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
+#: en/project_procedures.ssi:131 en/user_basics.ssi:36 en/user_basics.ssi:46
#: en/user_basics.ssi:60 en/user_basics.ssi:72 en/user_basics.ssi:82
#: en/user_basics.ssi:94 en/user_basics.ssi:106 en/user_basics.ssi:114
#: en/user_basics.ssi:122 en/user_basics.ssi:132 en/user_basics.ssi:148
@@ -131,21 +122,28 @@ msgstr "code{"
#: en/user_customization-packages.ssi:169
#: en/user_customization-packages.ssi:181
#: en/user_customization-packages.ssi:197
-#: en/user_customization-packages.ssi:265
-#: en/user_customization-packages.ssi:277
-#: en/user_customization-packages.ssi:287 en/user_examples.ssi:20
-#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:58
-#: en/user_examples.ssi:68 en/user_examples.ssi:86 en/user_examples.ssi:101
-#: en/user_examples.ssi:111 en/user_examples.ssi:123 en/user_examples.ssi:135
-#: en/user_examples.ssi:150 en/user_examples.ssi:158 en/user_examples.ssi:166
-#: en/user_examples.ssi:197 en/user_examples.ssi:213 en/user_examples.ssi:221
-#: en/user_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi:72
-#: en/user_installation.ssi:80 en/user_installation.ssi:88
-#: en/user_installation.ssi:112 en/user_installation.ssi:131
-#: en/user_installation.ssi:147 en/user_managing_a_configuration.ssi:31
+#: en/user_customization-packages.ssi:263
+#: en/user_customization-packages.ssi:275
+#: en/user_customization-packages.ssi:285
+#: en/user_customization-packages.ssi:312 en/user_customization-runtime.ssi:16
+#: en/user_customization-runtime.ssi:34 en/user_customization-runtime.ssi:44
+#: en/user_customization-runtime.ssi:52 en/user_customization-runtime.ssi:60
+#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:88
+#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:106
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
+#: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
+#: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
+#: en/user_examples.ssi:166 en/user_examples.ssi:197 en/user_examples.ssi:213
+#: en/user_examples.ssi:221 en/user_installation.ssi:42
+#: en/user_installation.ssi:50 en/user_installation.ssi:60
+#: en/user_installation.ssi:72 en/user_installation.ssi:80
+#: en/user_installation.ssi:88 en/user_installation.ssi:112
+#: en/user_installation.ssi:131 en/user_installation.ssi:144
+#: en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
-#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:74
+#: en/user_managing_a_configuration.ssi:52
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
#: en/user_overview.ssi:84 en/user_overview.ssi:92
msgid "}code"
msgstr "}code"
@@ -399,19 +397,20 @@ msgstr ""
#. type: Plain text
#: en/user_installation.ssi:122
msgid ""
-"% FIXME: not strictly true? building sid on squeeze is usually OK. also, "
-"building lenny on squeeze or sid is fine. clarify."
+"You must build either on your target distribution or in a chroot containing "
+"your target platform: this means if your target is Squeeze then you should "
+"build against Squeeze. Y"
msgstr ""
#. type: Plain text
#: en/user_installation.ssi:124
msgid ""
-"You must build either on your target distribution or in a chroot containing "
-"your target platform: this means if your target is Squeeze then you should "
-"build against Squeeze. You can use a personal builder such as /{pbuilder}/ "
-"or /{sbuild}/ to automate building packages in chroot. To build directly on "
-"the target platform, use #{dpkg-buildpackage}# (provided by the /{dpkg-dev}/ "
-"package):"
+"Use a personal builder such as /{pbuilder}/ or /{sbuild}/ if you need to "
+"build #{live-boot}# for a target distribution that differs from your build "
+"system. For example, for Squeeze live images, build #{live-boot}# in a "
+"Squeeze chroot. If your target distribution happens to match your build "
+"system distribution, you may build directly on the build system using #{dpkg-"
+"buildpackage}# (provided by the /{dpkg-dev}/ package):"
msgstr ""
#. type: Plain text
@@ -429,24 +428,18 @@ msgstr ""
msgid ""
"As live-boot is installed by live-build system, installing the package in "
"the host system is not sufficient: you should treat the generated .deb like "
-"another custom package. Please see custom-packages for more information. You "
-"should pay particular attention to custom-packages-apt."
-msgstr ""
-
-#. type: Plain text
-#: en/user_installation.ssi:138
-msgid ""
-"% FIXME: <xref linkend=\"custom-packages\"/> <xref linkend=\"custom-packages-"
-"apt\"/> % Ben> What is the latter reference for? I can't see the relevance."
+"another custom package. Please see {Customizing package installation}"
+"#customizing-package-installation for more information. You should pay "
+"particular attention to {Additional repositories}#additional-repositories."
msgstr ""
#. type: Plain text
-#: en/user_installation.ssi:140
+#: en/user_installation.ssi:137
msgid "3~ Using live-boot snapshots"
msgstr ""
#. type: Plain text
-#: en/user_installation.ssi:142
+#: en/user_installation.ssi:139
msgid ""
"You can let live-build automatically use the latest snapshot of live-boot by "
"configuring a third-party repository in your live-build configuration "
@@ -455,6 +448,6 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_installation.ssi:146
+#: en/user_installation.ssi:143
msgid "lb config --repository live.debian.net"
msgstr ""
diff --git a/manual/po/ro/user_customization-packages.ssi.po b/manual/po/ro/user_customization-packages.ssi.po
index 9c7203a..c386b18 100644
--- a/manual/po/ro/user_customization-packages.ssi.po
+++ b/manual/po/ro/user_customization-packages.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-11-28 08:44-0400\n"
+"POT-Creation-Date: 2010-12-01 06:49-0400\n"
"PO-Revision-Date: 2010-10-22 08:58-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -21,27 +21,19 @@ msgstr ""
#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
-#: en/about_manual.ssi:170 en/other_coding-style.ssi:28
-#: en/other_coding-style.ssi:38 en/other_coding-style.ssi:51
-#: en/other_coding-style.ssi:61 en/other_coding-style.ssi:88
-#: en/other_coding-style.ssi:96 en/other_coding-style.ssi:106
-#: en/other_coding-style.ssi:117 en/other_common-tasks.ssi:32
-#: en/other_customization-backports.ssi:8 en/other_customization-bootup.ssi:30
-#: en/other_customization-bootup.ssi:39 en/other_faq.ssi:41
-#: en/other_faq.ssi:83 en/other_faq.ssi:103 en/other_faq.ssi:117
-#: en/other_faq.ssi:137 en/other_faq.ssi:151 en/other_faq.ssi:198
-#: en/other_faq.ssi:245 en/other_faq.ssi:261 en/other_faq.ssi:287
-#: en/other_faq.ssi:299 en/other_faq.ssi:314 en/other_faq.ssi:333
-#: en/other_faq.ssi:345 en/other_faq.ssi:353 en/other_faq.ssi:364
-#: en/other_faq.ssi:374 en/other_howtos.ssi:16 en/other_howtos.ssi:43
-#: en/other_live-environment.ssi:14 en/other_live-environment.ssi:30
-#: en/other_live-environment.ssi:51 en/other_live-environment.ssi:61
-#: en/other_live-environment.ssi:69 en/other_live-environment.ssi:77
-#: en/other_live-environment.ssi:85 en/other_live-environment.ssi:93
-#: en/other_live-environment.ssi:116 en/other_live-environment.ssi:124
-#: en/other_live-environment.ssi:133 en/other_procedures.ssi:12
-#: en/other_procedures.ssi:46 en/other_procedures.ssi:58
-#: en/project_bugs.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/about_manual.ssi:170 en/other_faq.ssi:41 en/other_faq.ssi:83
+#: en/other_faq.ssi:103 en/other_faq.ssi:117 en/other_faq.ssi:137
+#: en/other_faq.ssi:151 en/other_faq.ssi:198 en/other_faq.ssi:245
+#: en/other_faq.ssi:261 en/other_faq.ssi:287 en/other_faq.ssi:299
+#: en/other_faq.ssi:314 en/other_faq.ssi:333 en/other_faq.ssi:345
+#: en/other_faq.ssi:353 en/other_faq.ssi:364 en/other_faq.ssi:374
+#: en/other_howtos.ssi:16 en/other_howtos.ssi:43 en/project_bugs.ssi:58
+#: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
+#: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
+#: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
+#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
+#: en/project_procedures.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
#: en/user_basics.ssi:54 en/user_basics.ssi:66 en/user_basics.ssi:78
#: en/user_basics.ssi:88 en/user_basics.ssi:102 en/user_basics.ssi:110
#: en/user_basics.ssi:118 en/user_basics.ssi:128 en/user_basics.ssi:142
@@ -65,21 +57,28 @@ msgstr ""
#: en/user_customization-packages.ssi:163
#: en/user_customization-packages.ssi:177
#: en/user_customization-packages.ssi:193
-#: en/user_customization-packages.ssi:261
-#: en/user_customization-packages.ssi:273
-#: en/user_customization-packages.ssi:283 en/user_examples.ssi:14
-#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
-#: en/user_examples.ssi:64 en/user_examples.ssi:80 en/user_examples.ssi:90
-#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:131
-#: en/user_examples.ssi:139 en/user_examples.ssi:154 en/user_examples.ssi:162
-#: en/user_examples.ssi:188 en/user_examples.ssi:209 en/user_examples.ssi:217
-#: en/user_installation.ssi:38 en/user_installation.ssi:46
-#: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi:76 en/user_installation.ssi:84
-#: en/user_installation.ssi:104 en/user_installation.ssi:118
-#: en/user_installation.ssi:135 en/user_managing_a_configuration.ssi:24
+#: en/user_customization-packages.ssi:259
+#: en/user_customization-packages.ssi:271
+#: en/user_customization-packages.ssi:281
+#: en/user_customization-packages.ssi:299 en/user_customization-runtime.ssi:12
+#: en/user_customization-runtime.ssi:30 en/user_customization-runtime.ssi:40
+#: en/user_customization-runtime.ssi:48 en/user_customization-runtime.ssi:56
+#: en/user_customization-runtime.ssi:64 en/user_customization-runtime.ssi:84
+#: en/user_customization-runtime.ssi:92 en/user_customization-runtime.ssi:101
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
+#: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
+#: en/user_examples.ssi:162 en/user_examples.ssi:188 en/user_examples.ssi:209
+#: en/user_examples.ssi:217 en/user_installation.ssi:38
+#: en/user_installation.ssi:46 en/user_installation.ssi:56
+#: en/user_installation.ssi:64 en/user_installation.ssi:76
+#: en/user_installation.ssi:84 en/user_installation.ssi:108
+#: en/user_installation.ssi:126 en/user_installation.ssi:141
+#: en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
-#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:36
+#: en/user_managing_a_configuration.ssi:47
+#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
#: en/user_overview.ssi:80 en/user_overview.ssi:88
msgid "code{"
msgstr "code{"
@@ -88,27 +87,19 @@ msgstr "code{"
#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:166
-#: en/about_manual.ssi:173 en/other_coding-style.ssi:34
-#: en/other_coding-style.ssi:45 en/other_coding-style.ssi:57
-#: en/other_coding-style.ssi:68 en/other_coding-style.ssi:92
-#: en/other_coding-style.ssi:100 en/other_coding-style.ssi:113
-#: en/other_coding-style.ssi:124 en/other_common-tasks.ssi:36
-#: en/other_customization-backports.ssi:16
-#: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: en/other_faq.ssi:37 en/other_faq.ssi:46 en/other_faq.ssi:92
-#: en/other_faq.ssi:108 en/other_faq.ssi:141 en/other_faq.ssi:155
-#: en/other_faq.ssi:207 en/other_faq.ssi:256 en/other_faq.ssi:292
-#: en/other_faq.ssi:307 en/other_faq.ssi:319 en/other_faq.ssi:337
-#: en/other_faq.ssi:349 en/other_faq.ssi:358 en/other_faq.ssi:370
-#: en/other_faq.ssi:381 en/other_howtos.ssi:20 en/other_howtos.ssi:47
-#: en/other_live-environment.ssi:18 en/other_live-environment.ssi:34
-#: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
-#: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
-#: en/other_live-environment.ssi:89 en/other_live-environment.ssi:97
-#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
-#: en/other_live-environment.ssi:138 en/other_procedures.ssi:16
-#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
-#: en/project_bugs.ssi:62 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/about_manual.ssi:173 en/other_faq.ssi:37 en/other_faq.ssi:46
+#: en/other_faq.ssi:92 en/other_faq.ssi:108 en/other_faq.ssi:141
+#: en/other_faq.ssi:155 en/other_faq.ssi:207 en/other_faq.ssi:256
+#: en/other_faq.ssi:292 en/other_faq.ssi:307 en/other_faq.ssi:319
+#: en/other_faq.ssi:337 en/other_faq.ssi:349 en/other_faq.ssi:358
+#: en/other_faq.ssi:370 en/other_faq.ssi:381 en/other_howtos.ssi:20
+#: en/other_howtos.ssi:47 en/project_bugs.ssi:62
+#: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
+#: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
+#: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
+#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
+#: en/project_procedures.ssi:131 en/user_basics.ssi:36 en/user_basics.ssi:46
#: en/user_basics.ssi:60 en/user_basics.ssi:72 en/user_basics.ssi:82
#: en/user_basics.ssi:94 en/user_basics.ssi:106 en/user_basics.ssi:114
#: en/user_basics.ssi:122 en/user_basics.ssi:132 en/user_basics.ssi:148
@@ -132,21 +123,28 @@ msgstr "code{"
#: en/user_customization-packages.ssi:169
#: en/user_customization-packages.ssi:181
#: en/user_customization-packages.ssi:197
-#: en/user_customization-packages.ssi:265
-#: en/user_customization-packages.ssi:277
-#: en/user_customization-packages.ssi:287 en/user_examples.ssi:20
-#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:58
-#: en/user_examples.ssi:68 en/user_examples.ssi:86 en/user_examples.ssi:101
-#: en/user_examples.ssi:111 en/user_examples.ssi:123 en/user_examples.ssi:135
-#: en/user_examples.ssi:150 en/user_examples.ssi:158 en/user_examples.ssi:166
-#: en/user_examples.ssi:197 en/user_examples.ssi:213 en/user_examples.ssi:221
-#: en/user_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi:72
-#: en/user_installation.ssi:80 en/user_installation.ssi:88
-#: en/user_installation.ssi:108 en/user_installation.ssi:123
-#: en/user_installation.ssi:138 en/user_managing_a_configuration.ssi:31
+#: en/user_customization-packages.ssi:263
+#: en/user_customization-packages.ssi:275
+#: en/user_customization-packages.ssi:285
+#: en/user_customization-packages.ssi:312 en/user_customization-runtime.ssi:16
+#: en/user_customization-runtime.ssi:34 en/user_customization-runtime.ssi:44
+#: en/user_customization-runtime.ssi:52 en/user_customization-runtime.ssi:60
+#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:88
+#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:106
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
+#: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
+#: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
+#: en/user_examples.ssi:166 en/user_examples.ssi:197 en/user_examples.ssi:213
+#: en/user_examples.ssi:221 en/user_installation.ssi:42
+#: en/user_installation.ssi:50 en/user_installation.ssi:60
+#: en/user_installation.ssi:72 en/user_installation.ssi:80
+#: en/user_installation.ssi:88 en/user_installation.ssi:112
+#: en/user_installation.ssi:131 en/user_installation.ssi:144
+#: en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
-#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:74
+#: en/user_managing_a_configuration.ssi:52
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
#: en/user_overview.ssi:84 en/user_overview.ssi:92
msgid "}code"
msgstr "}code"
@@ -259,7 +257,7 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:38
-msgid "3~ Additional repositories"
+msgid "3~additional-repositories Additional repositories"
msgstr ""
#. type: Plain text
@@ -798,22 +796,17 @@ msgid ""
"Because of this, you may wish to increment the version number in your custom "
"packages' #{debian/changelog}# files to ensure that your modified version is "
"installed over one in the official Debian repositories. This may also be "
-"achieved by altering the live system's APT pinning preferences - see apt-"
-"preferences for more information."
+"achieved by altering the live system's APT pinning preferences - see {APT "
+"pinning}#apt-pinning for more information."
msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:243
-msgid "% FIXME: <xref linkend=\"apt-preferences\"/>"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:245
msgid "2~ Configuring APT at build time"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:247
+#: en/user_customization-packages.ssi:245
msgid ""
"You can configure APT through a number of options applied only at build "
"time. (APT configuration used in the running live system may be configured "
@@ -824,12 +817,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:249
+#: en/user_customization-packages.ssi:247
msgid "3~choosing-apt-or-aptitude Choosing apt or aptitude"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:251
+#: en/user_customization-packages.ssi:249
msgid ""
"You can elect to use either #{apt}# or #{aptitude}# when installing packages "
"at build time. Which utility is used is governed by the #{--apt}# argument "
@@ -839,26 +832,26 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:253
+#: en/user_customization-packages.ssi:251
msgid ""
"_* #{apt}#: With this method, if a missing package is specified, the package "
"installation will fail. This is the default setting."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:255
+#: en/user_customization-packages.ssi:253
msgid ""
"_* #{aptitude}#: With this method, if a missing package is specified, the "
"package installation will succeed."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:257
+#: en/user_customization-packages.ssi:255
msgid "3~ Using a proxy with APT"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:259
+#: en/user_customization-packages.ssi:257
msgid ""
"One commonly required APT configuration is to deal with building an image "
"behind a proxy. You may specify your APT proxy with the #{--apt-ftp-proxy}# "
@@ -866,17 +859,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:263
+#: en/user_customization-packages.ssi:261
msgid "lb config --apt-http-proxy http://proxy/"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:267
+#: en/user_customization-packages.ssi:265
msgid "3~ Tweaking APT to save space"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:269
+#: en/user_customization-packages.ssi:267
msgid ""
"You may find yourself needing to save some space on the image media, in "
"which case one or the other or both of the following options may be of "
@@ -884,19 +877,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:271
+#: en/user_customization-packages.ssi:269
msgid ""
"If you don't want to include APT indices in the image, you can omit those "
"with:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:275
+#: en/user_customization-packages.ssi:273
msgid "$ lb config --binary-indices false"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:279
+#: en/user_customization-packages.ssi:277
msgid ""
"This will not influence the entries in /etc/apt/sources.list, but merely "
"whether /var/lib/apt contains the indices files or not. The tradeoff is that "
@@ -906,19 +899,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:281
+#: en/user_customization-packages.ssi:279
msgid ""
"If you find the installation of recommended packages bloats your image too "
"much, you may disable that default option of APT with:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:285
-msgid "$ lb config -apt-recommends false"
+#: en/user_customization-packages.ssi:283
+msgid "$ lb config --apt-recommends false"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:289
+#: en/user_customization-packages.ssi:287
msgid ""
"The tradeoff here is that recommended packages are defined as \"packages "
"that would be found together with this one in all but unusual installations"
@@ -930,12 +923,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:291
+#: en/user_customization-packages.ssi:289
msgid "3~ Passing options to apt or aptitude"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:293
+#: en/user_customization-packages.ssi:291
msgid ""
"If there is not an #{lb config}# option to alter APT's behaviour in the way "
"you need, use #{--apt-options}# or #{--aptitude-options}# to pass any "
@@ -944,11 +937,38 @@ msgid ""
msgstr ""
#. type: Plain text
+#: en/user_customization-packages.ssi:293
+msgid "3~apt-pinning APT pinning"
+msgstr ""
+
+#. type: Plain text
#: en/user_customization-packages.ssi:295
-msgid "3~ APT pinning"
+msgid ""
+"For background, please first read the #{apt_preferences(5)}# man page. APT "
+"pinning can be configured either for build time, or else for run time. For "
+"the former, create #{config/chroot_apt/preferences}#. For the latter, create "
+"#{config/chroot_local-includes/etc/preferences}#."
msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:297
-msgid "% FIXME: needs content"
+msgid ""
+"Let's say you are building a Squeeze live system but need all #{live-*}# "
+"packages to be installed from Sid at build time. You need to add Sid to your "
+"APT sources and pin it so that only the packages you want are installed from "
+"it at build time and all others are taken from the target system "
+"distribution, Squeeze. The following will accomplish this:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:305
+msgid ""
+"$ echo \"deb http://mirror/debian sid main\" > config/chroot_sources/sid."
+"chroot $ cat >>config/chroot_apt/preferences <<END Package: live-* Pin: "
+"release n=sid Pin-Priority: 600"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:310
+msgid "Package: * Pin: release n=sid Pin-Priority: 1 END"
msgstr ""
diff --git a/manual/po/ro/user_installation.ssi.po b/manual/po/ro/user_installation.ssi.po
index 15c2044..242cbd8 100644
--- a/manual/po/ro/user_installation.ssi.po
+++ b/manual/po/ro/user_installation.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-11-29 14:16-0400\n"
+"POT-Creation-Date: 2010-12-01 06:49-0400\n"
"PO-Revision-Date: 2010-10-23 16:43+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -21,27 +21,19 @@ msgstr ""
#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
-#: en/about_manual.ssi:170 en/other_coding-style.ssi:28
-#: en/other_coding-style.ssi:38 en/other_coding-style.ssi:51
-#: en/other_coding-style.ssi:61 en/other_coding-style.ssi:88
-#: en/other_coding-style.ssi:96 en/other_coding-style.ssi:106
-#: en/other_coding-style.ssi:117 en/other_common-tasks.ssi:32
-#: en/other_customization-backports.ssi:8 en/other_customization-bootup.ssi:30
-#: en/other_customization-bootup.ssi:39 en/other_faq.ssi:41
-#: en/other_faq.ssi:83 en/other_faq.ssi:103 en/other_faq.ssi:117
-#: en/other_faq.ssi:137 en/other_faq.ssi:151 en/other_faq.ssi:198
-#: en/other_faq.ssi:245 en/other_faq.ssi:261 en/other_faq.ssi:287
-#: en/other_faq.ssi:299 en/other_faq.ssi:314 en/other_faq.ssi:333
-#: en/other_faq.ssi:345 en/other_faq.ssi:353 en/other_faq.ssi:364
-#: en/other_faq.ssi:374 en/other_howtos.ssi:16 en/other_howtos.ssi:43
-#: en/other_live-environment.ssi:14 en/other_live-environment.ssi:30
-#: en/other_live-environment.ssi:51 en/other_live-environment.ssi:61
-#: en/other_live-environment.ssi:69 en/other_live-environment.ssi:77
-#: en/other_live-environment.ssi:85 en/other_live-environment.ssi:93
-#: en/other_live-environment.ssi:116 en/other_live-environment.ssi:124
-#: en/other_live-environment.ssi:133 en/other_procedures.ssi:12
-#: en/other_procedures.ssi:46 en/other_procedures.ssi:58
-#: en/project_bugs.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/about_manual.ssi:170 en/other_faq.ssi:41 en/other_faq.ssi:83
+#: en/other_faq.ssi:103 en/other_faq.ssi:117 en/other_faq.ssi:137
+#: en/other_faq.ssi:151 en/other_faq.ssi:198 en/other_faq.ssi:245
+#: en/other_faq.ssi:261 en/other_faq.ssi:287 en/other_faq.ssi:299
+#: en/other_faq.ssi:314 en/other_faq.ssi:333 en/other_faq.ssi:345
+#: en/other_faq.ssi:353 en/other_faq.ssi:364 en/other_faq.ssi:374
+#: en/other_howtos.ssi:16 en/other_howtos.ssi:43 en/project_bugs.ssi:58
+#: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
+#: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
+#: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
+#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
+#: en/project_procedures.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
#: en/user_basics.ssi:54 en/user_basics.ssi:66 en/user_basics.ssi:78
#: en/user_basics.ssi:88 en/user_basics.ssi:102 en/user_basics.ssi:110
#: en/user_basics.ssi:118 en/user_basics.ssi:128 en/user_basics.ssi:142
@@ -65,21 +57,28 @@ msgstr ""
#: en/user_customization-packages.ssi:163
#: en/user_customization-packages.ssi:177
#: en/user_customization-packages.ssi:193
-#: en/user_customization-packages.ssi:261
-#: en/user_customization-packages.ssi:273
-#: en/user_customization-packages.ssi:283 en/user_examples.ssi:14
-#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
-#: en/user_examples.ssi:64 en/user_examples.ssi:80 en/user_examples.ssi:90
-#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:131
-#: en/user_examples.ssi:139 en/user_examples.ssi:154 en/user_examples.ssi:162
-#: en/user_examples.ssi:188 en/user_examples.ssi:209 en/user_examples.ssi:217
-#: en/user_installation.ssi:38 en/user_installation.ssi:46
-#: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi:76 en/user_installation.ssi:84
-#: en/user_installation.ssi:108 en/user_installation.ssi:126
-#: en/user_installation.ssi:144 en/user_managing_a_configuration.ssi:24
+#: en/user_customization-packages.ssi:259
+#: en/user_customization-packages.ssi:271
+#: en/user_customization-packages.ssi:281
+#: en/user_customization-packages.ssi:299 en/user_customization-runtime.ssi:12
+#: en/user_customization-runtime.ssi:30 en/user_customization-runtime.ssi:40
+#: en/user_customization-runtime.ssi:48 en/user_customization-runtime.ssi:56
+#: en/user_customization-runtime.ssi:64 en/user_customization-runtime.ssi:84
+#: en/user_customization-runtime.ssi:92 en/user_customization-runtime.ssi:101
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
+#: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
+#: en/user_examples.ssi:162 en/user_examples.ssi:188 en/user_examples.ssi:209
+#: en/user_examples.ssi:217 en/user_installation.ssi:38
+#: en/user_installation.ssi:46 en/user_installation.ssi:56
+#: en/user_installation.ssi:64 en/user_installation.ssi:76
+#: en/user_installation.ssi:84 en/user_installation.ssi:108
+#: en/user_installation.ssi:126 en/user_installation.ssi:141
+#: en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
-#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:36
+#: en/user_managing_a_configuration.ssi:47
+#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
#: en/user_overview.ssi:80 en/user_overview.ssi:88
msgid "code{"
msgstr "code{"
@@ -88,27 +87,19 @@ msgstr "code{"
#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:166
-#: en/about_manual.ssi:173 en/other_coding-style.ssi:34
-#: en/other_coding-style.ssi:45 en/other_coding-style.ssi:57
-#: en/other_coding-style.ssi:68 en/other_coding-style.ssi:92
-#: en/other_coding-style.ssi:100 en/other_coding-style.ssi:113
-#: en/other_coding-style.ssi:124 en/other_common-tasks.ssi:36
-#: en/other_customization-backports.ssi:16
-#: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: en/other_faq.ssi:37 en/other_faq.ssi:46 en/other_faq.ssi:92
-#: en/other_faq.ssi:108 en/other_faq.ssi:141 en/other_faq.ssi:155
-#: en/other_faq.ssi:207 en/other_faq.ssi:256 en/other_faq.ssi:292
-#: en/other_faq.ssi:307 en/other_faq.ssi:319 en/other_faq.ssi:337
-#: en/other_faq.ssi:349 en/other_faq.ssi:358 en/other_faq.ssi:370
-#: en/other_faq.ssi:381 en/other_howtos.ssi:20 en/other_howtos.ssi:47
-#: en/other_live-environment.ssi:18 en/other_live-environment.ssi:34
-#: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
-#: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
-#: en/other_live-environment.ssi:89 en/other_live-environment.ssi:97
-#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
-#: en/other_live-environment.ssi:138 en/other_procedures.ssi:16
-#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
-#: en/project_bugs.ssi:62 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/about_manual.ssi:173 en/other_faq.ssi:37 en/other_faq.ssi:46
+#: en/other_faq.ssi:92 en/other_faq.ssi:108 en/other_faq.ssi:141
+#: en/other_faq.ssi:155 en/other_faq.ssi:207 en/other_faq.ssi:256
+#: en/other_faq.ssi:292 en/other_faq.ssi:307 en/other_faq.ssi:319
+#: en/other_faq.ssi:337 en/other_faq.ssi:349 en/other_faq.ssi:358
+#: en/other_faq.ssi:370 en/other_faq.ssi:381 en/other_howtos.ssi:20
+#: en/other_howtos.ssi:47 en/project_bugs.ssi:62
+#: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
+#: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
+#: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
+#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
+#: en/project_procedures.ssi:131 en/user_basics.ssi:36 en/user_basics.ssi:46
#: en/user_basics.ssi:60 en/user_basics.ssi:72 en/user_basics.ssi:82
#: en/user_basics.ssi:94 en/user_basics.ssi:106 en/user_basics.ssi:114
#: en/user_basics.ssi:122 en/user_basics.ssi:132 en/user_basics.ssi:148
@@ -132,21 +123,28 @@ msgstr "code{"
#: en/user_customization-packages.ssi:169
#: en/user_customization-packages.ssi:181
#: en/user_customization-packages.ssi:197
-#: en/user_customization-packages.ssi:265
-#: en/user_customization-packages.ssi:277
-#: en/user_customization-packages.ssi:287 en/user_examples.ssi:20
-#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:58
-#: en/user_examples.ssi:68 en/user_examples.ssi:86 en/user_examples.ssi:101
-#: en/user_examples.ssi:111 en/user_examples.ssi:123 en/user_examples.ssi:135
-#: en/user_examples.ssi:150 en/user_examples.ssi:158 en/user_examples.ssi:166
-#: en/user_examples.ssi:197 en/user_examples.ssi:213 en/user_examples.ssi:221
-#: en/user_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi:72
-#: en/user_installation.ssi:80 en/user_installation.ssi:88
-#: en/user_installation.ssi:112 en/user_installation.ssi:131
-#: en/user_installation.ssi:147 en/user_managing_a_configuration.ssi:31
+#: en/user_customization-packages.ssi:263
+#: en/user_customization-packages.ssi:275
+#: en/user_customization-packages.ssi:285
+#: en/user_customization-packages.ssi:312 en/user_customization-runtime.ssi:16
+#: en/user_customization-runtime.ssi:34 en/user_customization-runtime.ssi:44
+#: en/user_customization-runtime.ssi:52 en/user_customization-runtime.ssi:60
+#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:88
+#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:106
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
+#: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
+#: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
+#: en/user_examples.ssi:166 en/user_examples.ssi:197 en/user_examples.ssi:213
+#: en/user_examples.ssi:221 en/user_installation.ssi:42
+#: en/user_installation.ssi:50 en/user_installation.ssi:60
+#: en/user_installation.ssi:72 en/user_installation.ssi:80
+#: en/user_installation.ssi:88 en/user_installation.ssi:112
+#: en/user_installation.ssi:131 en/user_installation.ssi:144
+#: en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
-#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:74
+#: en/user_managing_a_configuration.ssi:52
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
#: en/user_overview.ssi:84 en/user_overview.ssi:92
msgid "}code"
msgstr "}code"
@@ -400,19 +398,20 @@ msgstr ""
#. type: Plain text
#: en/user_installation.ssi:122
msgid ""
-"% FIXME: not strictly true? building sid on squeeze is usually OK. also, "
-"building lenny on squeeze or sid is fine. clarify."
+"You must build either on your target distribution or in a chroot containing "
+"your target platform: this means if your target is Squeeze then you should "
+"build against Squeeze. Y"
msgstr ""
#. type: Plain text
#: en/user_installation.ssi:124
msgid ""
-"You must build either on your target distribution or in a chroot containing "
-"your target platform: this means if your target is Squeeze then you should "
-"build against Squeeze. You can use a personal builder such as /{pbuilder}/ "
-"or /{sbuild}/ to automate building packages in chroot. To build directly on "
-"the target platform, use #{dpkg-buildpackage}# (provided by the /{dpkg-dev}/ "
-"package):"
+"Use a personal builder such as /{pbuilder}/ or /{sbuild}/ if you need to "
+"build #{live-boot}# for a target distribution that differs from your build "
+"system. For example, for Squeeze live images, build #{live-boot}# in a "
+"Squeeze chroot. If your target distribution happens to match your build "
+"system distribution, you may build directly on the build system using #{dpkg-"
+"buildpackage}# (provided by the /{dpkg-dev}/ package):"
msgstr ""
#. type: Plain text
@@ -430,24 +429,18 @@ msgstr ""
msgid ""
"As live-boot is installed by live-build system, installing the package in "
"the host system is not sufficient: you should treat the generated .deb like "
-"another custom package. Please see custom-packages for more information. You "
-"should pay particular attention to custom-packages-apt."
-msgstr ""
-
-#. type: Plain text
-#: en/user_installation.ssi:138
-msgid ""
-"% FIXME: <xref linkend=\"custom-packages\"/> <xref linkend=\"custom-packages-"
-"apt\"/> % Ben> What is the latter reference for? I can't see the relevance."
+"another custom package. Please see {Customizing package installation}"
+"#customizing-package-installation for more information. You should pay "
+"particular attention to {Additional repositories}#additional-repositories."
msgstr ""
#. type: Plain text
-#: en/user_installation.ssi:140
+#: en/user_installation.ssi:137
msgid "3~ Using live-boot snapshots"
msgstr ""
#. type: Plain text
-#: en/user_installation.ssi:142
+#: en/user_installation.ssi:139
msgid ""
"You can let live-build automatically use the latest snapshot of live-boot by "
"configuring a third-party repository in your live-build configuration "
@@ -456,6 +449,6 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_installation.ssi:146
+#: en/user_installation.ssi:143
msgid "lb config --repository live.debian.net"
msgstr ""
diff --git a/manual/pot/user_customization-packages.ssi.pot b/manual/pot/user_customization-packages.ssi.pot
index 85f7dd2..e0cb41e 100644
--- a/manual/pot/user_customization-packages.ssi.pot
+++ b/manual/pot/user_customization-packages.ssi.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-11-28 08:44-0400\n"
+"POT-Creation-Date: 2010-12-01 06:49-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"
@@ -20,27 +20,19 @@ msgstr ""
#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
-#: en/about_manual.ssi:170 en/other_coding-style.ssi:28
-#: en/other_coding-style.ssi:38 en/other_coding-style.ssi:51
-#: en/other_coding-style.ssi:61 en/other_coding-style.ssi:88
-#: en/other_coding-style.ssi:96 en/other_coding-style.ssi:106
-#: en/other_coding-style.ssi:117 en/other_common-tasks.ssi:32
-#: en/other_customization-backports.ssi:8 en/other_customization-bootup.ssi:30
-#: en/other_customization-bootup.ssi:39 en/other_faq.ssi:41
-#: en/other_faq.ssi:83 en/other_faq.ssi:103 en/other_faq.ssi:117
-#: en/other_faq.ssi:137 en/other_faq.ssi:151 en/other_faq.ssi:198
-#: en/other_faq.ssi:245 en/other_faq.ssi:261 en/other_faq.ssi:287
-#: en/other_faq.ssi:299 en/other_faq.ssi:314 en/other_faq.ssi:333
-#: en/other_faq.ssi:345 en/other_faq.ssi:353 en/other_faq.ssi:364
-#: en/other_faq.ssi:374 en/other_howtos.ssi:16 en/other_howtos.ssi:43
-#: en/other_live-environment.ssi:14 en/other_live-environment.ssi:30
-#: en/other_live-environment.ssi:51 en/other_live-environment.ssi:61
-#: en/other_live-environment.ssi:69 en/other_live-environment.ssi:77
-#: en/other_live-environment.ssi:85 en/other_live-environment.ssi:93
-#: en/other_live-environment.ssi:116 en/other_live-environment.ssi:124
-#: en/other_live-environment.ssi:133 en/other_procedures.ssi:12
-#: en/other_procedures.ssi:46 en/other_procedures.ssi:58
-#: en/project_bugs.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/about_manual.ssi:170 en/other_faq.ssi:41 en/other_faq.ssi:83
+#: en/other_faq.ssi:103 en/other_faq.ssi:117 en/other_faq.ssi:137
+#: en/other_faq.ssi:151 en/other_faq.ssi:198 en/other_faq.ssi:245
+#: en/other_faq.ssi:261 en/other_faq.ssi:287 en/other_faq.ssi:299
+#: en/other_faq.ssi:314 en/other_faq.ssi:333 en/other_faq.ssi:345
+#: en/other_faq.ssi:353 en/other_faq.ssi:364 en/other_faq.ssi:374
+#: en/other_howtos.ssi:16 en/other_howtos.ssi:43 en/project_bugs.ssi:58
+#: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
+#: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
+#: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
+#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
+#: en/project_procedures.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
#: en/user_basics.ssi:54 en/user_basics.ssi:66 en/user_basics.ssi:78
#: en/user_basics.ssi:88 en/user_basics.ssi:102 en/user_basics.ssi:110
#: en/user_basics.ssi:118 en/user_basics.ssi:128 en/user_basics.ssi:142
@@ -64,21 +56,28 @@ msgstr ""
#: en/user_customization-packages.ssi:163
#: en/user_customization-packages.ssi:177
#: en/user_customization-packages.ssi:193
-#: en/user_customization-packages.ssi:261
-#: en/user_customization-packages.ssi:273
-#: en/user_customization-packages.ssi:283 en/user_examples.ssi:14
-#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
-#: en/user_examples.ssi:64 en/user_examples.ssi:80 en/user_examples.ssi:90
-#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:131
-#: en/user_examples.ssi:139 en/user_examples.ssi:154 en/user_examples.ssi:162
-#: en/user_examples.ssi:188 en/user_examples.ssi:209 en/user_examples.ssi:217
-#: en/user_installation.ssi:38 en/user_installation.ssi:46
-#: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi:76 en/user_installation.ssi:84
-#: en/user_installation.ssi:104 en/user_installation.ssi:118
-#: en/user_installation.ssi:135 en/user_managing_a_configuration.ssi:24
+#: en/user_customization-packages.ssi:259
+#: en/user_customization-packages.ssi:271
+#: en/user_customization-packages.ssi:281
+#: en/user_customization-packages.ssi:299 en/user_customization-runtime.ssi:12
+#: en/user_customization-runtime.ssi:30 en/user_customization-runtime.ssi:40
+#: en/user_customization-runtime.ssi:48 en/user_customization-runtime.ssi:56
+#: en/user_customization-runtime.ssi:64 en/user_customization-runtime.ssi:84
+#: en/user_customization-runtime.ssi:92 en/user_customization-runtime.ssi:101
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
+#: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
+#: en/user_examples.ssi:162 en/user_examples.ssi:188 en/user_examples.ssi:209
+#: en/user_examples.ssi:217 en/user_installation.ssi:38
+#: en/user_installation.ssi:46 en/user_installation.ssi:56
+#: en/user_installation.ssi:64 en/user_installation.ssi:76
+#: en/user_installation.ssi:84 en/user_installation.ssi:108
+#: en/user_installation.ssi:126 en/user_installation.ssi:141
+#: en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
-#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:36
+#: en/user_managing_a_configuration.ssi:47
+#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
#: en/user_overview.ssi:80 en/user_overview.ssi:88
msgid "code{"
msgstr ""
@@ -87,27 +86,19 @@ msgstr ""
#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:166
-#: en/about_manual.ssi:173 en/other_coding-style.ssi:34
-#: en/other_coding-style.ssi:45 en/other_coding-style.ssi:57
-#: en/other_coding-style.ssi:68 en/other_coding-style.ssi:92
-#: en/other_coding-style.ssi:100 en/other_coding-style.ssi:113
-#: en/other_coding-style.ssi:124 en/other_common-tasks.ssi:36
-#: en/other_customization-backports.ssi:16
-#: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: en/other_faq.ssi:37 en/other_faq.ssi:46 en/other_faq.ssi:92
-#: en/other_faq.ssi:108 en/other_faq.ssi:141 en/other_faq.ssi:155
-#: en/other_faq.ssi:207 en/other_faq.ssi:256 en/other_faq.ssi:292
-#: en/other_faq.ssi:307 en/other_faq.ssi:319 en/other_faq.ssi:337
-#: en/other_faq.ssi:349 en/other_faq.ssi:358 en/other_faq.ssi:370
-#: en/other_faq.ssi:381 en/other_howtos.ssi:20 en/other_howtos.ssi:47
-#: en/other_live-environment.ssi:18 en/other_live-environment.ssi:34
-#: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
-#: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
-#: en/other_live-environment.ssi:89 en/other_live-environment.ssi:97
-#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
-#: en/other_live-environment.ssi:138 en/other_procedures.ssi:16
-#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
-#: en/project_bugs.ssi:62 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/about_manual.ssi:173 en/other_faq.ssi:37 en/other_faq.ssi:46
+#: en/other_faq.ssi:92 en/other_faq.ssi:108 en/other_faq.ssi:141
+#: en/other_faq.ssi:155 en/other_faq.ssi:207 en/other_faq.ssi:256
+#: en/other_faq.ssi:292 en/other_faq.ssi:307 en/other_faq.ssi:319
+#: en/other_faq.ssi:337 en/other_faq.ssi:349 en/other_faq.ssi:358
+#: en/other_faq.ssi:370 en/other_faq.ssi:381 en/other_howtos.ssi:20
+#: en/other_howtos.ssi:47 en/project_bugs.ssi:62
+#: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
+#: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
+#: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
+#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
+#: en/project_procedures.ssi:131 en/user_basics.ssi:36 en/user_basics.ssi:46
#: en/user_basics.ssi:60 en/user_basics.ssi:72 en/user_basics.ssi:82
#: en/user_basics.ssi:94 en/user_basics.ssi:106 en/user_basics.ssi:114
#: en/user_basics.ssi:122 en/user_basics.ssi:132 en/user_basics.ssi:148
@@ -131,21 +122,28 @@ msgstr ""
#: en/user_customization-packages.ssi:169
#: en/user_customization-packages.ssi:181
#: en/user_customization-packages.ssi:197
-#: en/user_customization-packages.ssi:265
-#: en/user_customization-packages.ssi:277
-#: en/user_customization-packages.ssi:287 en/user_examples.ssi:20
-#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:58
-#: en/user_examples.ssi:68 en/user_examples.ssi:86 en/user_examples.ssi:101
-#: en/user_examples.ssi:111 en/user_examples.ssi:123 en/user_examples.ssi:135
-#: en/user_examples.ssi:150 en/user_examples.ssi:158 en/user_examples.ssi:166
-#: en/user_examples.ssi:197 en/user_examples.ssi:213 en/user_examples.ssi:221
-#: en/user_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi:72
-#: en/user_installation.ssi:80 en/user_installation.ssi:88
-#: en/user_installation.ssi:108 en/user_installation.ssi:123
-#: en/user_installation.ssi:138 en/user_managing_a_configuration.ssi:31
+#: en/user_customization-packages.ssi:263
+#: en/user_customization-packages.ssi:275
+#: en/user_customization-packages.ssi:285
+#: en/user_customization-packages.ssi:312 en/user_customization-runtime.ssi:16
+#: en/user_customization-runtime.ssi:34 en/user_customization-runtime.ssi:44
+#: en/user_customization-runtime.ssi:52 en/user_customization-runtime.ssi:60
+#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:88
+#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:106
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
+#: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
+#: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
+#: en/user_examples.ssi:166 en/user_examples.ssi:197 en/user_examples.ssi:213
+#: en/user_examples.ssi:221 en/user_installation.ssi:42
+#: en/user_installation.ssi:50 en/user_installation.ssi:60
+#: en/user_installation.ssi:72 en/user_installation.ssi:80
+#: en/user_installation.ssi:88 en/user_installation.ssi:112
+#: en/user_installation.ssi:131 en/user_installation.ssi:144
+#: en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
-#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:74
+#: en/user_managing_a_configuration.ssi:52
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
#: en/user_overview.ssi:84 en/user_overview.ssi:92
msgid "}code"
msgstr ""
@@ -258,7 +256,7 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:38
-msgid "3~ Additional repositories"
+msgid "3~additional-repositories Additional repositories"
msgstr ""
#. type: Plain text
@@ -797,22 +795,17 @@ msgid ""
"Because of this, you may wish to increment the version number in your custom "
"packages' #{debian/changelog}# files to ensure that your modified version is "
"installed over one in the official Debian repositories. This may also be "
-"achieved by altering the live system's APT pinning preferences - see apt-"
-"preferences for more information."
+"achieved by altering the live system's APT pinning preferences - see {APT "
+"pinning}#apt-pinning for more information."
msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:243
-msgid "% FIXME: <xref linkend=\"apt-preferences\"/>"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:245
msgid "2~ Configuring APT at build time"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:247
+#: en/user_customization-packages.ssi:245
msgid ""
"You can configure APT through a number of options applied only at build "
"time. (APT configuration used in the running live system may be configured "
@@ -823,12 +816,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:249
+#: en/user_customization-packages.ssi:247
msgid "3~choosing-apt-or-aptitude Choosing apt or aptitude"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:251
+#: en/user_customization-packages.ssi:249
msgid ""
"You can elect to use either #{apt}# or #{aptitude}# when installing packages "
"at build time. Which utility is used is governed by the #{--apt}# argument "
@@ -838,26 +831,26 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:253
+#: en/user_customization-packages.ssi:251
msgid ""
"_* #{apt}#: With this method, if a missing package is specified, the package "
"installation will fail. This is the default setting."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:255
+#: en/user_customization-packages.ssi:253
msgid ""
"_* #{aptitude}#: With this method, if a missing package is specified, the "
"package installation will succeed."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:257
+#: en/user_customization-packages.ssi:255
msgid "3~ Using a proxy with APT"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:259
+#: en/user_customization-packages.ssi:257
msgid ""
"One commonly required APT configuration is to deal with building an image "
"behind a proxy. You may specify your APT proxy with the #{--apt-ftp-proxy}# "
@@ -865,17 +858,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:263
+#: en/user_customization-packages.ssi:261
msgid "lb config --apt-http-proxy http://proxy/"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:267
+#: en/user_customization-packages.ssi:265
msgid "3~ Tweaking APT to save space"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:269
+#: en/user_customization-packages.ssi:267
msgid ""
"You may find yourself needing to save some space on the image media, in "
"which case one or the other or both of the following options may be of "
@@ -883,19 +876,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:271
+#: en/user_customization-packages.ssi:269
msgid ""
"If you don't want to include APT indices in the image, you can omit those "
"with:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:275
+#: en/user_customization-packages.ssi:273
msgid "$ lb config --binary-indices false"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:279
+#: en/user_customization-packages.ssi:277
msgid ""
"This will not influence the entries in /etc/apt/sources.list, but merely "
"whether /var/lib/apt contains the indices files or not. The tradeoff is that "
@@ -905,19 +898,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:281
+#: en/user_customization-packages.ssi:279
msgid ""
"If you find the installation of recommended packages bloats your image too "
"much, you may disable that default option of APT with:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:285
-msgid "$ lb config -apt-recommends false"
+#: en/user_customization-packages.ssi:283
+msgid "$ lb config --apt-recommends false"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:289
+#: en/user_customization-packages.ssi:287
msgid ""
"The tradeoff here is that recommended packages are defined as \"packages "
"that would be found together with this one in all but unusual installations"
@@ -929,12 +922,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:291
+#: en/user_customization-packages.ssi:289
msgid "3~ Passing options to apt or aptitude"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:293
+#: en/user_customization-packages.ssi:291
msgid ""
"If there is not an #{lb config}# option to alter APT's behaviour in the way "
"you need, use #{--apt-options}# or #{--aptitude-options}# to pass any "
@@ -943,11 +936,38 @@ msgid ""
msgstr ""
#. type: Plain text
+#: en/user_customization-packages.ssi:293
+msgid "3~apt-pinning APT pinning"
+msgstr ""
+
+#. type: Plain text
#: en/user_customization-packages.ssi:295
-msgid "3~ APT pinning"
+msgid ""
+"For background, please first read the #{apt_preferences(5)}# man page. APT "
+"pinning can be configured either for build time, or else for run time. For "
+"the former, create #{config/chroot_apt/preferences}#. For the latter, create "
+"#{config/chroot_local-includes/etc/preferences}#."
msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:297
-msgid "% FIXME: needs content"
+msgid ""
+"Let's say you are building a Squeeze live system but need all #{live-*}# "
+"packages to be installed from Sid at build time. You need to add Sid to your "
+"APT sources and pin it so that only the packages you want are installed from "
+"it at build time and all others are taken from the target system "
+"distribution, Squeeze. The following will accomplish this:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:305
+msgid ""
+"$ echo \"deb http://mirror/debian sid main\" > config/chroot_sources/sid."
+"chroot $ cat >>config/chroot_apt/preferences <<END Package: live-* Pin: "
+"release n=sid Pin-Priority: 600"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:310
+msgid "Package: * Pin: release n=sid Pin-Priority: 1 END"
msgstr ""
diff --git a/manual/pot/user_installation.ssi.pot b/manual/pot/user_installation.ssi.pot
index b562d76..f7a0c9c 100644
--- a/manual/pot/user_installation.ssi.pot
+++ b/manual/pot/user_installation.ssi.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-11-29 14:16-0400\n"
+"POT-Creation-Date: 2010-12-01 06:49-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"
@@ -20,27 +20,19 @@ msgstr ""
#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
-#: en/about_manual.ssi:170 en/other_coding-style.ssi:28
-#: en/other_coding-style.ssi:38 en/other_coding-style.ssi:51
-#: en/other_coding-style.ssi:61 en/other_coding-style.ssi:88
-#: en/other_coding-style.ssi:96 en/other_coding-style.ssi:106
-#: en/other_coding-style.ssi:117 en/other_common-tasks.ssi:32
-#: en/other_customization-backports.ssi:8 en/other_customization-bootup.ssi:30
-#: en/other_customization-bootup.ssi:39 en/other_faq.ssi:41
-#: en/other_faq.ssi:83 en/other_faq.ssi:103 en/other_faq.ssi:117
-#: en/other_faq.ssi:137 en/other_faq.ssi:151 en/other_faq.ssi:198
-#: en/other_faq.ssi:245 en/other_faq.ssi:261 en/other_faq.ssi:287
-#: en/other_faq.ssi:299 en/other_faq.ssi:314 en/other_faq.ssi:333
-#: en/other_faq.ssi:345 en/other_faq.ssi:353 en/other_faq.ssi:364
-#: en/other_faq.ssi:374 en/other_howtos.ssi:16 en/other_howtos.ssi:43
-#: en/other_live-environment.ssi:14 en/other_live-environment.ssi:30
-#: en/other_live-environment.ssi:51 en/other_live-environment.ssi:61
-#: en/other_live-environment.ssi:69 en/other_live-environment.ssi:77
-#: en/other_live-environment.ssi:85 en/other_live-environment.ssi:93
-#: en/other_live-environment.ssi:116 en/other_live-environment.ssi:124
-#: en/other_live-environment.ssi:133 en/other_procedures.ssi:12
-#: en/other_procedures.ssi:46 en/other_procedures.ssi:58
-#: en/project_bugs.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/about_manual.ssi:170 en/other_faq.ssi:41 en/other_faq.ssi:83
+#: en/other_faq.ssi:103 en/other_faq.ssi:117 en/other_faq.ssi:137
+#: en/other_faq.ssi:151 en/other_faq.ssi:198 en/other_faq.ssi:245
+#: en/other_faq.ssi:261 en/other_faq.ssi:287 en/other_faq.ssi:299
+#: en/other_faq.ssi:314 en/other_faq.ssi:333 en/other_faq.ssi:345
+#: en/other_faq.ssi:353 en/other_faq.ssi:364 en/other_faq.ssi:374
+#: en/other_howtos.ssi:16 en/other_howtos.ssi:43 en/project_bugs.ssi:58
+#: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
+#: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
+#: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
+#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
+#: en/project_procedures.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
#: en/user_basics.ssi:54 en/user_basics.ssi:66 en/user_basics.ssi:78
#: en/user_basics.ssi:88 en/user_basics.ssi:102 en/user_basics.ssi:110
#: en/user_basics.ssi:118 en/user_basics.ssi:128 en/user_basics.ssi:142
@@ -64,21 +56,28 @@ msgstr ""
#: en/user_customization-packages.ssi:163
#: en/user_customization-packages.ssi:177
#: en/user_customization-packages.ssi:193
-#: en/user_customization-packages.ssi:261
-#: en/user_customization-packages.ssi:273
-#: en/user_customization-packages.ssi:283 en/user_examples.ssi:14
-#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
-#: en/user_examples.ssi:64 en/user_examples.ssi:80 en/user_examples.ssi:90
-#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:131
-#: en/user_examples.ssi:139 en/user_examples.ssi:154 en/user_examples.ssi:162
-#: en/user_examples.ssi:188 en/user_examples.ssi:209 en/user_examples.ssi:217
-#: en/user_installation.ssi:38 en/user_installation.ssi:46
-#: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi:76 en/user_installation.ssi:84
-#: en/user_installation.ssi:108 en/user_installation.ssi:126
-#: en/user_installation.ssi:144 en/user_managing_a_configuration.ssi:24
+#: en/user_customization-packages.ssi:259
+#: en/user_customization-packages.ssi:271
+#: en/user_customization-packages.ssi:281
+#: en/user_customization-packages.ssi:299 en/user_customization-runtime.ssi:12
+#: en/user_customization-runtime.ssi:30 en/user_customization-runtime.ssi:40
+#: en/user_customization-runtime.ssi:48 en/user_customization-runtime.ssi:56
+#: en/user_customization-runtime.ssi:64 en/user_customization-runtime.ssi:84
+#: en/user_customization-runtime.ssi:92 en/user_customization-runtime.ssi:101
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
+#: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
+#: en/user_examples.ssi:162 en/user_examples.ssi:188 en/user_examples.ssi:209
+#: en/user_examples.ssi:217 en/user_installation.ssi:38
+#: en/user_installation.ssi:46 en/user_installation.ssi:56
+#: en/user_installation.ssi:64 en/user_installation.ssi:76
+#: en/user_installation.ssi:84 en/user_installation.ssi:108
+#: en/user_installation.ssi:126 en/user_installation.ssi:141
+#: en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
-#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:36
+#: en/user_managing_a_configuration.ssi:47
+#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
#: en/user_overview.ssi:80 en/user_overview.ssi:88
msgid "code{"
msgstr ""
@@ -87,27 +86,19 @@ msgstr ""
#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:166
-#: en/about_manual.ssi:173 en/other_coding-style.ssi:34
-#: en/other_coding-style.ssi:45 en/other_coding-style.ssi:57
-#: en/other_coding-style.ssi:68 en/other_coding-style.ssi:92
-#: en/other_coding-style.ssi:100 en/other_coding-style.ssi:113
-#: en/other_coding-style.ssi:124 en/other_common-tasks.ssi:36
-#: en/other_customization-backports.ssi:16
-#: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: en/other_faq.ssi:37 en/other_faq.ssi:46 en/other_faq.ssi:92
-#: en/other_faq.ssi:108 en/other_faq.ssi:141 en/other_faq.ssi:155
-#: en/other_faq.ssi:207 en/other_faq.ssi:256 en/other_faq.ssi:292
-#: en/other_faq.ssi:307 en/other_faq.ssi:319 en/other_faq.ssi:337
-#: en/other_faq.ssi:349 en/other_faq.ssi:358 en/other_faq.ssi:370
-#: en/other_faq.ssi:381 en/other_howtos.ssi:20 en/other_howtos.ssi:47
-#: en/other_live-environment.ssi:18 en/other_live-environment.ssi:34
-#: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
-#: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
-#: en/other_live-environment.ssi:89 en/other_live-environment.ssi:97
-#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
-#: en/other_live-environment.ssi:138 en/other_procedures.ssi:16
-#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
-#: en/project_bugs.ssi:62 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/about_manual.ssi:173 en/other_faq.ssi:37 en/other_faq.ssi:46
+#: en/other_faq.ssi:92 en/other_faq.ssi:108 en/other_faq.ssi:141
+#: en/other_faq.ssi:155 en/other_faq.ssi:207 en/other_faq.ssi:256
+#: en/other_faq.ssi:292 en/other_faq.ssi:307 en/other_faq.ssi:319
+#: en/other_faq.ssi:337 en/other_faq.ssi:349 en/other_faq.ssi:358
+#: en/other_faq.ssi:370 en/other_faq.ssi:381 en/other_howtos.ssi:20
+#: en/other_howtos.ssi:47 en/project_bugs.ssi:62
+#: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
+#: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
+#: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
+#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
+#: en/project_procedures.ssi:131 en/user_basics.ssi:36 en/user_basics.ssi:46
#: en/user_basics.ssi:60 en/user_basics.ssi:72 en/user_basics.ssi:82
#: en/user_basics.ssi:94 en/user_basics.ssi:106 en/user_basics.ssi:114
#: en/user_basics.ssi:122 en/user_basics.ssi:132 en/user_basics.ssi:148
@@ -131,21 +122,28 @@ msgstr ""
#: en/user_customization-packages.ssi:169
#: en/user_customization-packages.ssi:181
#: en/user_customization-packages.ssi:197
-#: en/user_customization-packages.ssi:265
-#: en/user_customization-packages.ssi:277
-#: en/user_customization-packages.ssi:287 en/user_examples.ssi:20
-#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:58
-#: en/user_examples.ssi:68 en/user_examples.ssi:86 en/user_examples.ssi:101
-#: en/user_examples.ssi:111 en/user_examples.ssi:123 en/user_examples.ssi:135
-#: en/user_examples.ssi:150 en/user_examples.ssi:158 en/user_examples.ssi:166
-#: en/user_examples.ssi:197 en/user_examples.ssi:213 en/user_examples.ssi:221
-#: en/user_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi:72
-#: en/user_installation.ssi:80 en/user_installation.ssi:88
-#: en/user_installation.ssi:112 en/user_installation.ssi:131
-#: en/user_installation.ssi:147 en/user_managing_a_configuration.ssi:31
+#: en/user_customization-packages.ssi:263
+#: en/user_customization-packages.ssi:275
+#: en/user_customization-packages.ssi:285
+#: en/user_customization-packages.ssi:312 en/user_customization-runtime.ssi:16
+#: en/user_customization-runtime.ssi:34 en/user_customization-runtime.ssi:44
+#: en/user_customization-runtime.ssi:52 en/user_customization-runtime.ssi:60
+#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:88
+#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:106
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
+#: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
+#: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
+#: en/user_examples.ssi:166 en/user_examples.ssi:197 en/user_examples.ssi:213
+#: en/user_examples.ssi:221 en/user_installation.ssi:42
+#: en/user_installation.ssi:50 en/user_installation.ssi:60
+#: en/user_installation.ssi:72 en/user_installation.ssi:80
+#: en/user_installation.ssi:88 en/user_installation.ssi:112
+#: en/user_installation.ssi:131 en/user_installation.ssi:144
+#: en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
-#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:74
+#: en/user_managing_a_configuration.ssi:52
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
#: en/user_overview.ssi:84 en/user_overview.ssi:92
msgid "}code"
msgstr ""
@@ -399,19 +397,20 @@ msgstr ""
#. type: Plain text
#: en/user_installation.ssi:122
msgid ""
-"% FIXME: not strictly true? building sid on squeeze is usually OK. also, "
-"building lenny on squeeze or sid is fine. clarify."
+"You must build either on your target distribution or in a chroot containing "
+"your target platform: this means if your target is Squeeze then you should "
+"build against Squeeze. Y"
msgstr ""
#. type: Plain text
#: en/user_installation.ssi:124
msgid ""
-"You must build either on your target distribution or in a chroot containing "
-"your target platform: this means if your target is Squeeze then you should "
-"build against Squeeze. You can use a personal builder such as /{pbuilder}/ "
-"or /{sbuild}/ to automate building packages in chroot. To build directly on "
-"the target platform, use #{dpkg-buildpackage}# (provided by the /{dpkg-dev}/ "
-"package):"
+"Use a personal builder such as /{pbuilder}/ or /{sbuild}/ if you need to "
+"build #{live-boot}# for a target distribution that differs from your build "
+"system. For example, for Squeeze live images, build #{live-boot}# in a "
+"Squeeze chroot. If your target distribution happens to match your build "
+"system distribution, you may build directly on the build system using #{dpkg-"
+"buildpackage}# (provided by the /{dpkg-dev}/ package):"
msgstr ""
#. type: Plain text
@@ -429,24 +428,18 @@ msgstr ""
msgid ""
"As live-boot is installed by live-build system, installing the package in "
"the host system is not sufficient: you should treat the generated .deb like "
-"another custom package. Please see custom-packages for more information. You "
-"should pay particular attention to custom-packages-apt."
-msgstr ""
-
-#. type: Plain text
-#: en/user_installation.ssi:138
-msgid ""
-"% FIXME: <xref linkend=\"custom-packages\"/> <xref linkend=\"custom-packages-"
-"apt\"/> % Ben> What is the latter reference for? I can't see the relevance."
+"another custom package. Please see {Customizing package installation}"
+"#customizing-package-installation for more information. You should pay "
+"particular attention to {Additional repositories}#additional-repositories."
msgstr ""
#. type: Plain text
-#: en/user_installation.ssi:140
+#: en/user_installation.ssi:137
msgid "3~ Using live-boot snapshots"
msgstr ""
#. type: Plain text
-#: en/user_installation.ssi:142
+#: en/user_installation.ssi:139
msgid ""
"You can let live-build automatically use the latest snapshot of live-boot by "
"configuring a third-party repository in your live-build configuration "
@@ -455,6 +448,6 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_installation.ssi:146
+#: en/user_installation.ssi:143
msgid "lb config --repository live.debian.net"
msgstr ""
diff --git a/manual/pt_BR/user_customization-packages.ssi b/manual/pt_BR/user_customization-packages.ssi
index bd1a027..8ea25a6 100644
--- a/manual/pt_BR/user_customization-packages.ssi
+++ b/manual/pt_BR/user_customization-packages.ssi
@@ -64,7 +64,7 @@ $ lb config --mirror-binary http://mirror/debian/ \
}code
-3~ Additional repositories
+3~additional-repositories Additional repositories
To add more repositories (e.g. backports, experimental or custom packages,
etc.), create #{config/chroot_sources/your-repository.{chroot,binary}}#
@@ -380,10 +380,8 @@ install the package with the higher version number.
Because of this, you may wish to increment the version number in your custom
packages' #{debian/changelog}# files to ensure that your modified version is
installed over one in the official Debian repositories. This may also be
-achieved by altering the live system's APT pinning preferences - see
-apt-preferences for more information.
-
-% FIXME: <xref linkend="apt-preferences"/>
+achieved by altering the live system's APT pinning preferences - see {APT
+pinning}#apt-pinning for more information.
2~ Configuring APT at build time
@@ -446,7 +444,7 @@ much, you may disable that default option of APT with:
code{
-$ lb config -apt-recommends false
+$ lb config --apt-recommends false
}code
@@ -465,7 +463,26 @@ you need, use #{--apt-options}# or #{--aptitude-options}# to pass any
options through to your configured APT tool. See the man pages for #{apt}#
and #{aptitude}# for details.
-3~ APT pinning
+3~apt-pinning APT pinning
+
+For background, please first read the #{apt_preferences(5)}# man page. APT
+pinning can be configured either for build time, or else for run time. For
+the former, create #{config/chroot_apt/preferences}#. For the latter, create
+#{config/chroot_local-includes/etc/preferences}#.
+
+Let's say you are building a Squeeze live system but need all #{live-*}#
+packages to be installed from Sid at build time. You need to add Sid to your
+APT sources and pin it so that only the packages you want are installed from
+it at build time and all others are taken from the target system
+distribution, Squeeze. The following will accomplish this:
+
+code{
+
+$ echo "deb http://mirror/debian sid main" >
+config/chroot_sources/sid.chroot $ cat >>config/chroot_apt/preferences <<END
+Package: live-* Pin: release n=sid Pin-Priority: 600
-% FIXME: needs content
+Package: * Pin: release n=sid Pin-Priority: 1 END
+
+}code
diff --git a/manual/pt_BR/user_installation.ssi b/manual/pt_BR/user_installation.ssi
index adcc91b..e59dc91 100644
--- a/manual/pt_BR/user_installation.ssi
+++ b/manual/pt_BR/user_installation.ssi
@@ -128,15 +128,16 @@ should name it without dashes '-', e.g: call it "99new_feature" and not
_* Build a live-boot .deb
-% FIXME: not strictly true? building sid on squeeze is usually OK. also,
-building lenny on squeeze or sid is fine. clarify.
-
You must build either on your target distribution or in a chroot containing
your target platform: this means if your target is Squeeze then you should
-build against Squeeze. You can use a personal builder such as /{pbuilder}/
-or /{sbuild}/ to automate building packages in chroot. To build directly on
-the target platform, use #{dpkg-buildpackage}# (provided by the /{dpkg-dev}/
-package):
+build against Squeeze. Y
+
+Use a personal builder such as /{pbuilder}/ or /{sbuild}/ if you need to
+build #{live-boot}# for a target distribution that differs from your build
+system. For example, for Squeeze live images, build #{live-boot}# in a
+Squeeze chroot. If your target distribution happens to match your build
+system distribution, you may build directly on the build system using
+#{dpkg-buildpackage}# (provided by the /{dpkg-dev}/ package):
code{
@@ -148,12 +149,10 @@ _* Use the generated live-boot .deb
As live-boot is installed by live-build system, installing the package in
the host system is not sufficient: you should treat the generated .deb like
-another custom package. Please see custom-packages for more information. You
-should pay particular attention to custom-packages-apt.
-
-% FIXME: <xref linkend="custom-packages"/> <xref
-linkend="custom-packages-apt"/> % Ben> What is the latter reference for? I
-can't see the relevance.
+another custom package. Please see {Customizing package
+installation}#customizing-package-installation for more information. You
+should pay particular attention to {Additional
+repositories}#additional-repositories.
3~ Using live-boot snapshots
diff --git a/manual/ro/user_customization-packages.ssi b/manual/ro/user_customization-packages.ssi
index bd1a027..8ea25a6 100644
--- a/manual/ro/user_customization-packages.ssi
+++ b/manual/ro/user_customization-packages.ssi
@@ -64,7 +64,7 @@ $ lb config --mirror-binary http://mirror/debian/ \
}code
-3~ Additional repositories
+3~additional-repositories Additional repositories
To add more repositories (e.g. backports, experimental or custom packages,
etc.), create #{config/chroot_sources/your-repository.{chroot,binary}}#
@@ -380,10 +380,8 @@ install the package with the higher version number.
Because of this, you may wish to increment the version number in your custom
packages' #{debian/changelog}# files to ensure that your modified version is
installed over one in the official Debian repositories. This may also be
-achieved by altering the live system's APT pinning preferences - see
-apt-preferences for more information.
-
-% FIXME: <xref linkend="apt-preferences"/>
+achieved by altering the live system's APT pinning preferences - see {APT
+pinning}#apt-pinning for more information.
2~ Configuring APT at build time
@@ -446,7 +444,7 @@ much, you may disable that default option of APT with:
code{
-$ lb config -apt-recommends false
+$ lb config --apt-recommends false
}code
@@ -465,7 +463,26 @@ you need, use #{--apt-options}# or #{--aptitude-options}# to pass any
options through to your configured APT tool. See the man pages for #{apt}#
and #{aptitude}# for details.
-3~ APT pinning
+3~apt-pinning APT pinning
+
+For background, please first read the #{apt_preferences(5)}# man page. APT
+pinning can be configured either for build time, or else for run time. For
+the former, create #{config/chroot_apt/preferences}#. For the latter, create
+#{config/chroot_local-includes/etc/preferences}#.
+
+Let's say you are building a Squeeze live system but need all #{live-*}#
+packages to be installed from Sid at build time. You need to add Sid to your
+APT sources and pin it so that only the packages you want are installed from
+it at build time and all others are taken from the target system
+distribution, Squeeze. The following will accomplish this:
+
+code{
+
+$ echo "deb http://mirror/debian sid main" >
+config/chroot_sources/sid.chroot $ cat >>config/chroot_apt/preferences <<END
+Package: live-* Pin: release n=sid Pin-Priority: 600
-% FIXME: needs content
+Package: * Pin: release n=sid Pin-Priority: 1 END
+
+}code
diff --git a/manual/ro/user_installation.ssi b/manual/ro/user_installation.ssi
index adcc91b..e59dc91 100644
--- a/manual/ro/user_installation.ssi
+++ b/manual/ro/user_installation.ssi
@@ -128,15 +128,16 @@ should name it without dashes '-', e.g: call it "99new_feature" and not
_* Build a live-boot .deb
-% FIXME: not strictly true? building sid on squeeze is usually OK. also,
-building lenny on squeeze or sid is fine. clarify.
-
You must build either on your target distribution or in a chroot containing
your target platform: this means if your target is Squeeze then you should
-build against Squeeze. You can use a personal builder such as /{pbuilder}/
-or /{sbuild}/ to automate building packages in chroot. To build directly on
-the target platform, use #{dpkg-buildpackage}# (provided by the /{dpkg-dev}/
-package):
+build against Squeeze. Y
+
+Use a personal builder such as /{pbuilder}/ or /{sbuild}/ if you need to
+build #{live-boot}# for a target distribution that differs from your build
+system. For example, for Squeeze live images, build #{live-boot}# in a
+Squeeze chroot. If your target distribution happens to match your build
+system distribution, you may build directly on the build system using
+#{dpkg-buildpackage}# (provided by the /{dpkg-dev}/ package):
code{
@@ -148,12 +149,10 @@ _* Use the generated live-boot .deb
As live-boot is installed by live-build system, installing the package in
the host system is not sufficient: you should treat the generated .deb like
-another custom package. Please see custom-packages for more information. You
-should pay particular attention to custom-packages-apt.
-
-% FIXME: <xref linkend="custom-packages"/> <xref
-linkend="custom-packages-apt"/> % Ben> What is the latter reference for? I
-can't see the relevance.
+another custom package. Please see {Customizing package
+installation}#customizing-package-installation for more information. You
+should pay particular attention to {Additional
+repositories}#additional-repositories.
3~ Using live-boot snapshots
--
live-manual
More information about the debian-live-changes
mailing list