[SCM] live-manual branch, debian, updated. debian/2.0_a6-1-2-g9c6e01b
Daniel Baumann
daniel at debian.org
Sat Sep 18 09:19:25 UTC 2010
The following commit has been merged in the debian branch:
commit 9c6e01bd699bc90803d317a0a969405c56f67e61
Author: Daniel Baumann <daniel at debian.org>
Date: Sat Sep 18 11:16:37 2010 +0200
Moving reviewed other_customization-contents to user section.
diff --git a/manual/de/live-manual.ssm b/manual/de/live-manual.ssm
index 25cf154..722d956 100644
--- a/manual/de/live-manual.ssm
+++ b/manual/de/live-manual.ssm
@@ -9,7 +9,7 @@
:license: This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.<br><br>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.<br><br>You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses/. <br><br>On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-3 file.
@date:
- :published: 2010-09-17
+ :published: 2010-09-18
@publisher: Debian Live Project <debian-live at lists.debian.org>
@@ -37,14 +37,14 @@
<< user_customization-packages.ssi
+<< user_customization-contents.ssi
+
:B~ Development ~#
:B~ Project ~#
:B~ Other ~#
-<< other_customization-contents.ssi
-
<< other_customization-internationalization.ssi
<< other_customization-bootup.ssi
diff --git a/manual/de/other_customization-contents.ssi b/manual/de/user_customization-contents.ssi
similarity index 81%
rename from manual/de/other_customization-contents.ssi
rename to manual/de/user_customization-contents.ssi
index 850f523..23a08aa 100644
--- a/manual/de/other_customization-contents.ssi
+++ b/manual/de/user_customization-contents.ssi
@@ -7,7 +7,7 @@ This chapter discusses further customisation of the live system.
2~ Includes
Using includes, it is possible to add (or replace) arbitrary files in your
-Debian Live image. live-helper provides three mechanisms for using them:
+Debian Live image. live-build provides three mechanisms for using them:
_* Chroot local includes: These allow you to add or replace files to the
chroot/Live filesystem. Please see chroot-local-includes for more
@@ -65,19 +65,25 @@ installed by packages are overwritten.
3~ Binary local includes
-FIXME
+The same way as chroot local includes work, there exists the corresponding
+mechanism to include files in the live media itself.
3~ Binary includes
-FIXME
+live-build has some standard files (like documentation) that gets included
+in the default configuration on every live media. This can be disabled with:
+
+code{
+
+$ lb config --includes none
+
+}code
2~ Hooks
Hooks allow commands to be performed in the chroot and binary stages of the
build in order to customize the image.
-Enabling hooks
-
3~ Live/chroot local hooks
To run commands in the chroot stage, create a hook script containing the
@@ -86,30 +92,26 @@ in the chroot after the rest of your chroot configuration has been applied,
so remember to ensure your configuration includes all packages and files
your hook needs in order to run. See the example chroot hook scripts for
various common chroot customization tasks provided in
-#{/usr/share/live-helper/examples/hooks}# which you can copy or symlink to
+#{/usr/share/live/build/examples/hooks}# which you can copy or symlink to
use them in your own configuration.
3~ Binary local hooks
To run commands in the binary stage, create a hook script containing the
commands in the #{config/binary_local-hooks}#. The hook will run after all
-other binary helpers are run, but before binary_checksums, the very last
-binary helper. The commands in your hook do not run in the chroot, so take
+other binary commands are run, but before binary_checksums, the very last
+binary commands The commands in your hook do not run in the chroot, so take
care to not modify any files outside of the build tree, or you may damage
your build system! See the example binary hook scripts for various common
binary customization tasks provided in
-#{/usr/share/live-helper/examples/hooks}# which you can copy or symlink to
+#{/usr/share/live/build/examples/hooks}# which you can copy or symlink to
use them in your own configuration.
2~ Preseeding Debconf questions
Files in the #{config/chroot_local-preseed}# directory are considered to be
-debconf preseed files and are installed by live-helper using
+debconf preseed files and are installed by live-build using
#{debconf-set-selections}#.
For more information about debconf, please see debconf(7) in the #{debconf}#
package.
-
-2~ Symlink conversion
-
-FIXME. (This is probably in the wrong section)
diff --git a/manual/en/live-manual.ssm b/manual/en/live-manual.ssm
index 25cf154..722d956 100644
--- a/manual/en/live-manual.ssm
+++ b/manual/en/live-manual.ssm
@@ -9,7 +9,7 @@
:license: This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.<br><br>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.<br><br>You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses/. <br><br>On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-3 file.
@date:
- :published: 2010-09-17
+ :published: 2010-09-18
@publisher: Debian Live Project <debian-live at lists.debian.org>
@@ -37,14 +37,14 @@
<< user_customization-packages.ssi
+<< user_customization-contents.ssi
+
:B~ Development ~#
:B~ Project ~#
:B~ Other ~#
-<< other_customization-contents.ssi
-
<< other_customization-internationalization.ssi
<< other_customization-bootup.ssi
diff --git a/manual/en/other_customization-contents.ssi b/manual/en/user_customization-contents.ssi
similarity index 100%
rename from manual/en/other_customization-contents.ssi
rename to manual/en/user_customization-contents.ssi
diff --git a/manual/po/de/live-manual.ssm.po b/manual/po/de/live-manual.ssm.po
index a9eb26b..ee9e415 100644
--- a/manual/po/de/live-manual.ssm.po
+++ b/manual/po/de/live-manual.ssm.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-09-17 23:43+0300\n"
+"POT-Creation-Date: 2010-09-18 11:15+0300\n"
"PO-Revision-Date: 2010-09-17 23:43+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -45,7 +45,7 @@ msgstr ""
#, no-wrap
msgid ""
"@date:\n"
-" :published: 2010-09-17\n"
+" :published: 2010-09-18\n"
msgstr ""
#. type: Plain text
@@ -111,22 +111,22 @@ msgstr ""
#. type: Plain text
#: en/live-manual.ssm:41
-msgid ":B~ Development ~#"
+msgid "<< user_customization-contents.ssi"
msgstr ""
#. type: Plain text
#: en/live-manual.ssm:43
-msgid ":B~ Project ~#"
+msgid ":B~ Development ~#"
msgstr ""
#. type: Plain text
#: en/live-manual.ssm:45
-msgid ":B~ Other ~#"
+msgid ":B~ Project ~#"
msgstr ""
#. type: Plain text
#: en/live-manual.ssm:47
-msgid "<< other_customization-contents.ssi"
+msgid ":B~ Other ~#"
msgstr ""
#. type: Plain text
diff --git a/manual/po/de/other_customization-contents.ssi.po b/manual/po/de/user_customization-contents.ssi.po
similarity index 78%
rename from manual/po/de/other_customization-contents.ssi.po
rename to manual/po/de/user_customization-contents.ssi.po
index e8661c5..518ec18 100644
--- a/manual/po/de/other_customization-contents.ssi.po
+++ b/manual/po/de/user_customization-contents.ssi.po
@@ -6,8 +6,8 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-09-17 23:43+0300\n"
-"PO-Revision-Date: 2010-09-17 23:43+0300\n"
+"POT-Creation-Date: 2010-09-18 11:15+0300\n"
+"PO-Revision-Date: 2010-09-18 11:15+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
"Language: de\n"
@@ -26,8 +26,6 @@ msgstr ""
#: 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_customization-contents.ssi:30
-#: en/other_customization-contents.ssi:39
#: en/other_customization-internationalization.ssi:10
#: en/other_customization-internationalization.ssi:18
#: en/other_customization-internationalization.ssi:26
@@ -55,10 +53,11 @@ msgstr ""
#: en/user_basics.ssi:157 en/user_basics.ssi:165 en/user_basics.ssi:179
#: en/user_basics.ssi:187 en/user_basics.ssi:197 en/user_basics.ssi:249
#: en/user_basics.ssi:265 en/user_basics.ssi:273 en/user_basics.ssi:293
-#: en/user_basics.ssi:318 en/user_customization-packages.ssi:16
-#: en/user_customization-packages.ssi:24 en/user_customization-packages.ssi:36
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:59
-#: en/user_customization-packages.ssi:73
+#: en/user_basics.ssi:318 en/user_customization-contents.ssi:30
+#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:62
+#: en/user_customization-packages.ssi:16 en/user_customization-packages.ssi:24
+#: en/user_customization-packages.ssi:36 en/user_customization-packages.ssi:45
+#: en/user_customization-packages.ssi:59 en/user_customization-packages.ssi:73
#: en/user_customization-packages.ssi:103
#: en/user_customization-packages.ssi:111
#: en/user_customization-packages.ssi:129
@@ -84,8 +83,6 @@ msgstr ""
#: 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_customization-contents.ssi:35
-#: en/other_customization-contents.ssi:50
#: en/other_customization-internationalization.ssi:14
#: en/other_customization-internationalization.ssi:22
#: en/other_customization-internationalization.ssi:30
@@ -113,10 +110,11 @@ msgstr ""
#: en/user_basics.ssi:161 en/user_basics.ssi:169 en/user_basics.ssi:183
#: en/user_basics.ssi:191 en/user_basics.ssi:201 en/user_basics.ssi:241
#: en/user_basics.ssi:269 en/user_basics.ssi:277 en/user_basics.ssi:304
-#: en/user_basics.ssi:343 en/user_customization-packages.ssi:20
-#: en/user_customization-packages.ssi:28 en/user_customization-packages.ssi:41
-#: en/user_customization-packages.ssi:49 en/user_customization-packages.ssi:63
-#: en/user_customization-packages.ssi:77
+#: en/user_basics.ssi:343 en/user_customization-contents.ssi:35
+#: en/user_customization-contents.ssi:50 en/user_customization-contents.ssi:66
+#: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
+#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
+#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
#: en/user_customization-packages.ssi:107
#: en/user_customization-packages.ssi:115
#: en/user_customization-packages.ssi:133
@@ -133,44 +131,34 @@ msgid "}code"
msgstr ""
#. type: Plain text
-#: en/other_customization-bootup.ssi:8 en/other_customization-bootup.ssi:14
-#: en/other_customization-bootup.ssi:56 en/other_customization-bootup.ssi:60
-#: en/other_customization-bootup.ssi:64 en/other_customization-bootup.ssi:68
-#: en/other_customization-contents.ssi:56
-#: en/other_customization-contents.ssi:60 en/other_live-environment.ssi:8
-#: en/other_resources.ssi:8 en/other_success-stories.ssi:7
-msgid "FIXME"
-msgstr ""
-
-#. type: Plain text
-#: en/other_customization-contents.ssi:2
+#: en/user_customization-contents.ssi:2
msgid "B~ Customising contents"
msgstr ""
#. type: Plain text
-#: en/other_customization-contents.ssi:4
+#: en/user_customization-contents.ssi:4
msgid "1~ Customising contents"
msgstr ""
#. type: Plain text
-#: en/other_customization-contents.ssi:6
+#: en/user_customization-contents.ssi:6
msgid "This chapter discusses further customisation of the live system."
msgstr ""
#. type: Plain text
-#: en/other_customization-contents.ssi:8
+#: en/user_customization-contents.ssi:8
msgid "2~ Includes"
msgstr ""
#. type: Plain text
-#: en/other_customization-contents.ssi:10
+#: en/user_customization-contents.ssi:10
msgid ""
"Using includes, it is possible to add (or replace) arbitrary files in your "
-"Debian Live image. live-helper provides three mechanisms for using them:"
+"Debian Live image. live-build provides three mechanisms for using them:"
msgstr ""
#. type: Plain text
-#: en/other_customization-contents.ssi:13
+#: en/user_customization-contents.ssi:13
msgid ""
"_* Chroot local includes: These allow you to add or replace files to the "
"chroot/Live filesystem. Please see chroot-local-includes for more "
@@ -178,7 +166,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/other_customization-contents.ssi:16
+#: en/user_customization-contents.ssi:16
msgid ""
"_* Binary local includes: These allow you to add or replace files in the "
"binary image. Please see binary-local-includes for more information. % "
@@ -186,7 +174,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/other_customization-contents.ssi:19
+#: en/user_customization-contents.ssi:19
msgid ""
"_* Binary includes: These allow you to add or replace Debian specific files "
"in the binary image, such as the templates and tools directories. Please see "
@@ -195,19 +183,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/other_customization-contents.ssi:22
+#: en/user_customization-contents.ssi:22
msgid ""
"Please see terms for more information about the distinction between the "
"\"Live\" and \"binary\" images. % FIXME: <xref linkend=\"terms\"/>"
msgstr ""
#. type: Plain text
-#: en/other_customization-contents.ssi:24
+#: en/user_customization-contents.ssi:24
msgid "3~ Live/chroot local includes"
msgstr ""
#. type: Plain text
-#: en/other_customization-contents.ssi:26
+#: en/user_customization-contents.ssi:26
msgid ""
"Chroot local includes can be used to add or replace files in the chroot/Live "
"filesystem so that they are visible when the Live system is booted. Typical "
@@ -217,7 +205,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/other_customization-contents.ssi:28
+#: en/user_customization-contents.ssi:28
msgid ""
"To include files, simply add them to your #{config/chroot_local-includes}# "
"directory. This directory corresponds to the root directory (#{/}#) of the "
@@ -226,19 +214,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/other_customization-contents.ssi:33
+#: en/user_customization-contents.ssi:33
msgid ""
"$ mkdir -p config/chroot_local-includes/var/www $ cp /path/to/my/index.html "
"config/chroot_local-includes/var/www"
msgstr ""
#. type: Plain text
-#: en/other_customization-contents.ssi:37
+#: en/user_customization-contents.ssi:37
msgid "Your configuration will then have the following layout:"
msgstr ""
#. type: Plain text
-#: en/other_customization-contents.ssi:48
+#: en/user_customization-contents.ssi:48
#, no-wrap
msgid ""
"-- config\n"
@@ -252,101 +240,105 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/other_customization-contents.ssi:52
+#: en/user_customization-contents.ssi:52
msgid ""
"Chroot local includes are installed after package installation so that files "
"installed by packages are overwritten."
msgstr ""
#. type: Plain text
-#: en/other_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:54
msgid "3~ Binary local includes"
msgstr ""
#. type: Plain text
-#: en/other_customization-contents.ssi:58
+#: en/user_customization-contents.ssi:56
+msgid ""
+"The same way as chroot local includes work, there exists the corresponding "
+"mechanism to include files in the live media itself."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-contents.ssi:58
msgid "3~ Binary includes"
msgstr ""
#. type: Plain text
-#: en/other_customization-contents.ssi:62
+#: en/user_customization-contents.ssi:60
+msgid ""
+"live-build has some standard files (like documentation) that gets included "
+"in the default configuration on every live media. This can be disabled with:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-contents.ssi:64
+msgid "$ lb config --includes none"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-contents.ssi:68
msgid "2~ Hooks"
msgstr ""
#. type: Plain text
-#: en/other_customization-contents.ssi:64
+#: en/user_customization-contents.ssi:70
msgid ""
"Hooks allow commands to be performed in the chroot and binary stages of the "
"build in order to customize the image."
msgstr ""
#. type: Plain text
-#: en/other_customization-contents.ssi:66
-msgid "Enabling hooks"
-msgstr ""
-
-#. type: Plain text
-#: en/other_customization-contents.ssi:68
+#: en/user_customization-contents.ssi:72
msgid "3~ Live/chroot local hooks"
msgstr ""
#. type: Plain text
-#: en/other_customization-contents.ssi:70
+#: en/user_customization-contents.ssi:74
msgid ""
"To run commands in the chroot stage, create a hook script containing the "
"commands in the #{config/chroot_local-hooks}# directory. The hook will run "
"in the chroot after the rest of your chroot configuration has been applied, "
"so remember to ensure your configuration includes all packages and files "
"your hook needs in order to run. See the example chroot hook scripts for "
-"various common chroot customization tasks provided in #{/usr/share/live-"
-"helper/examples/hooks}# which you can copy or symlink to use them in your "
-"own configuration."
+"various common chroot customization tasks provided in #{/usr/share/live/"
+"build/examples/hooks}# which you can copy or symlink to use them in your own "
+"configuration."
msgstr ""
#. type: Plain text
-#: en/other_customization-contents.ssi:72
+#: en/user_customization-contents.ssi:76
msgid "3~ Binary local hooks"
msgstr ""
#. type: Plain text
-#: en/other_customization-contents.ssi:74
+#: en/user_customization-contents.ssi:78
msgid ""
"To run commands in the binary stage, create a hook script containing the "
"commands in the #{config/binary_local-hooks}#. The hook will run after all "
-"other binary helpers are run, but before binary_checksums, the very last "
-"binary helper. The commands in your hook do not run in the chroot, so take "
+"other binary commands are run, but before binary_checksums, the very last "
+"binary commands The commands in your hook do not run in the chroot, so take "
"care to not modify any files outside of the build tree, or you may damage "
"your build system! See the example binary hook scripts for various common "
-"binary customization tasks provided in #{/usr/share/live-helper/examples/"
+"binary customization tasks provided in #{/usr/share/live/build/examples/"
"hooks}# which you can copy or symlink to use them in your own configuration."
msgstr ""
#. type: Plain text
-#: en/other_customization-contents.ssi:76
+#: en/user_customization-contents.ssi:80
msgid "2~ Preseeding Debconf questions"
msgstr ""
#. type: Plain text
-#: en/other_customization-contents.ssi:78
+#: en/user_customization-contents.ssi:82
msgid ""
"Files in the #{config/chroot_local-preseed}# directory are considered to be "
-"debconf preseed files and are installed by live-helper using #{debconf-set-"
+"debconf preseed files and are installed by live-build using #{debconf-set-"
"selections}#."
msgstr ""
#. type: Plain text
-#: en/other_customization-contents.ssi:80
+#: en/user_customization-contents.ssi:83
msgid ""
"For more information about debconf, please see debconf(7) in the #{debconf}# "
"package."
msgstr ""
-
-#. type: Plain text
-#: en/other_customization-contents.ssi:82
-msgid "2~ Symlink conversion"
-msgstr ""
-
-#. type: Plain text
-#: en/other_customization-contents.ssi:83
-msgid "FIXME. (This is probably in the wrong section)"
-msgstr ""
diff --git a/manual/po4a.cfg b/manual/po4a.cfg
index 7e749f7..b802f8a 100644
--- a/manual/po4a.cfg
+++ b/manual/po4a.cfg
@@ -10,7 +10,6 @@
[type: text] en/other_customization-backports.ssi $lang:$lang/other_customization-backports.ssi
[type: text] en/other_customization-binary.ssi $lang:$lang/other_customization-binary.ssi
[type: text] en/other_customization-bootup.ssi $lang:$lang/other_customization-bootup.ssi
-[type: text] en/other_customization-contents.ssi $lang:$lang/other_customization-contents.ssi
[type: text] en/other_customization-internationalization.ssi $lang:$lang/other_customization-internationalization.ssi
[type: text] en/other_faq.ssi $lang:$lang/other_faq.ssi
[type: text] en/other_howtos.ssi $lang:$lang/other_howtos.ssi
@@ -22,6 +21,7 @@
[type: text] en/other_troubleshooting.ssi $lang:$lang/other_troubleshooting.ssi
[type: text] en/other_use-cases.ssi $lang:$lang/other_use-cases.ssi
[type: text] en/user_basics.ssi $lang:$lang/user_basics.ssi
+[type: text] en/user_customization-contents.ssi $lang:$lang/user_customization-contents.ssi
[type: text] en/user_customization-packages.ssi $lang:$lang/user_customization-packages.ssi
[type: text] en/user_installation.ssi $lang:$lang/user_installation.ssi
[type: text] en/user_overview.ssi $lang:$lang/user_overview.ssi
diff --git a/manual/pot/live-manual.ssm.pot b/manual/pot/live-manual.ssm.pot
index 9646113..9af5427 100644
--- a/manual/pot/live-manual.ssm.pot
+++ b/manual/pot/live-manual.ssm.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-09-17 23:43+0300\n"
+"POT-Creation-Date: 2010-09-18 11:15+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -45,7 +45,7 @@ msgstr ""
#, no-wrap
msgid ""
"@date:\n"
-" :published: 2010-09-17\n"
+" :published: 2010-09-18\n"
msgstr ""
#. type: Plain text
@@ -111,22 +111,22 @@ msgstr ""
#. type: Plain text
#: en/live-manual.ssm:41
-msgid ":B~ Development ~#"
+msgid "<< user_customization-contents.ssi"
msgstr ""
#. type: Plain text
#: en/live-manual.ssm:43
-msgid ":B~ Project ~#"
+msgid ":B~ Development ~#"
msgstr ""
#. type: Plain text
#: en/live-manual.ssm:45
-msgid ":B~ Other ~#"
+msgid ":B~ Project ~#"
msgstr ""
#. type: Plain text
#: en/live-manual.ssm:47
-msgid "<< other_customization-contents.ssi"
+msgid ":B~ Other ~#"
msgstr ""
#. type: Plain text
diff --git a/manual/pot/other_customization-contents.ssi.pot b/manual/pot/user_customization-contents.ssi.pot
similarity index 78%
rename from manual/pot/other_customization-contents.ssi.pot
rename to manual/pot/user_customization-contents.ssi.pot
index 6e8a83b..bf1c149 100644
--- a/manual/pot/other_customization-contents.ssi.pot
+++ b/manual/pot/user_customization-contents.ssi.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-09-17 23:43+0300\n"
+"POT-Creation-Date: 2010-09-18 11:15+0300\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"
@@ -26,8 +26,6 @@ msgstr ""
#: 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_customization-contents.ssi:30
-#: en/other_customization-contents.ssi:39
#: en/other_customization-internationalization.ssi:10
#: en/other_customization-internationalization.ssi:18
#: en/other_customization-internationalization.ssi:26
@@ -55,10 +53,11 @@ msgstr ""
#: en/user_basics.ssi:157 en/user_basics.ssi:165 en/user_basics.ssi:179
#: en/user_basics.ssi:187 en/user_basics.ssi:197 en/user_basics.ssi:249
#: en/user_basics.ssi:265 en/user_basics.ssi:273 en/user_basics.ssi:293
-#: en/user_basics.ssi:318 en/user_customization-packages.ssi:16
-#: en/user_customization-packages.ssi:24 en/user_customization-packages.ssi:36
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:59
-#: en/user_customization-packages.ssi:73
+#: en/user_basics.ssi:318 en/user_customization-contents.ssi:30
+#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:62
+#: en/user_customization-packages.ssi:16 en/user_customization-packages.ssi:24
+#: en/user_customization-packages.ssi:36 en/user_customization-packages.ssi:45
+#: en/user_customization-packages.ssi:59 en/user_customization-packages.ssi:73
#: en/user_customization-packages.ssi:103
#: en/user_customization-packages.ssi:111
#: en/user_customization-packages.ssi:129
@@ -84,8 +83,6 @@ msgstr ""
#: 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_customization-contents.ssi:35
-#: en/other_customization-contents.ssi:50
#: en/other_customization-internationalization.ssi:14
#: en/other_customization-internationalization.ssi:22
#: en/other_customization-internationalization.ssi:30
@@ -113,10 +110,11 @@ msgstr ""
#: en/user_basics.ssi:161 en/user_basics.ssi:169 en/user_basics.ssi:183
#: en/user_basics.ssi:191 en/user_basics.ssi:201 en/user_basics.ssi:241
#: en/user_basics.ssi:269 en/user_basics.ssi:277 en/user_basics.ssi:304
-#: en/user_basics.ssi:343 en/user_customization-packages.ssi:20
-#: en/user_customization-packages.ssi:28 en/user_customization-packages.ssi:41
-#: en/user_customization-packages.ssi:49 en/user_customization-packages.ssi:63
-#: en/user_customization-packages.ssi:77
+#: en/user_basics.ssi:343 en/user_customization-contents.ssi:35
+#: en/user_customization-contents.ssi:50 en/user_customization-contents.ssi:66
+#: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
+#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
+#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
#: en/user_customization-packages.ssi:107
#: en/user_customization-packages.ssi:115
#: en/user_customization-packages.ssi:133
@@ -133,44 +131,34 @@ msgid "}code"
msgstr ""
#. type: Plain text
-#: en/other_customization-bootup.ssi:8 en/other_customization-bootup.ssi:14
-#: en/other_customization-bootup.ssi:56 en/other_customization-bootup.ssi:60
-#: en/other_customization-bootup.ssi:64 en/other_customization-bootup.ssi:68
-#: en/other_customization-contents.ssi:56
-#: en/other_customization-contents.ssi:60 en/other_live-environment.ssi:8
-#: en/other_resources.ssi:8 en/other_success-stories.ssi:7
-msgid "FIXME"
-msgstr ""
-
-#. type: Plain text
-#: en/other_customization-contents.ssi:2
+#: en/user_customization-contents.ssi:2
msgid "B~ Customising contents"
msgstr ""
#. type: Plain text
-#: en/other_customization-contents.ssi:4
+#: en/user_customization-contents.ssi:4
msgid "1~ Customising contents"
msgstr ""
#. type: Plain text
-#: en/other_customization-contents.ssi:6
+#: en/user_customization-contents.ssi:6
msgid "This chapter discusses further customisation of the live system."
msgstr ""
#. type: Plain text
-#: en/other_customization-contents.ssi:8
+#: en/user_customization-contents.ssi:8
msgid "2~ Includes"
msgstr ""
#. type: Plain text
-#: en/other_customization-contents.ssi:10
+#: en/user_customization-contents.ssi:10
msgid ""
"Using includes, it is possible to add (or replace) arbitrary files in your "
-"Debian Live image. live-helper provides three mechanisms for using them:"
+"Debian Live image. live-build provides three mechanisms for using them:"
msgstr ""
#. type: Plain text
-#: en/other_customization-contents.ssi:13
+#: en/user_customization-contents.ssi:13
msgid ""
"_* Chroot local includes: These allow you to add or replace files to the "
"chroot/Live filesystem. Please see chroot-local-includes for more "
@@ -178,7 +166,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/other_customization-contents.ssi:16
+#: en/user_customization-contents.ssi:16
msgid ""
"_* Binary local includes: These allow you to add or replace files in the "
"binary image. Please see binary-local-includes for more information. % "
@@ -186,7 +174,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/other_customization-contents.ssi:19
+#: en/user_customization-contents.ssi:19
msgid ""
"_* Binary includes: These allow you to add or replace Debian specific files "
"in the binary image, such as the templates and tools directories. Please see "
@@ -195,19 +183,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/other_customization-contents.ssi:22
+#: en/user_customization-contents.ssi:22
msgid ""
"Please see terms for more information about the distinction between the "
"\"Live\" and \"binary\" images. % FIXME: <xref linkend=\"terms\"/>"
msgstr ""
#. type: Plain text
-#: en/other_customization-contents.ssi:24
+#: en/user_customization-contents.ssi:24
msgid "3~ Live/chroot local includes"
msgstr ""
#. type: Plain text
-#: en/other_customization-contents.ssi:26
+#: en/user_customization-contents.ssi:26
msgid ""
"Chroot local includes can be used to add or replace files in the chroot/Live "
"filesystem so that they are visible when the Live system is booted. Typical "
@@ -217,7 +205,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/other_customization-contents.ssi:28
+#: en/user_customization-contents.ssi:28
msgid ""
"To include files, simply add them to your #{config/chroot_local-includes}# "
"directory. This directory corresponds to the root directory (#{/}#) of the "
@@ -226,19 +214,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/other_customization-contents.ssi:33
+#: en/user_customization-contents.ssi:33
msgid ""
"$ mkdir -p config/chroot_local-includes/var/www $ cp /path/to/my/index.html "
"config/chroot_local-includes/var/www"
msgstr ""
#. type: Plain text
-#: en/other_customization-contents.ssi:37
+#: en/user_customization-contents.ssi:37
msgid "Your configuration will then have the following layout:"
msgstr ""
#. type: Plain text
-#: en/other_customization-contents.ssi:48
+#: en/user_customization-contents.ssi:48
#, no-wrap
msgid ""
"-- config\n"
@@ -252,101 +240,105 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/other_customization-contents.ssi:52
+#: en/user_customization-contents.ssi:52
msgid ""
"Chroot local includes are installed after package installation so that files "
"installed by packages are overwritten."
msgstr ""
#. type: Plain text
-#: en/other_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:54
msgid "3~ Binary local includes"
msgstr ""
#. type: Plain text
-#: en/other_customization-contents.ssi:58
+#: en/user_customization-contents.ssi:56
+msgid ""
+"The same way as chroot local includes work, there exists the corresponding "
+"mechanism to include files in the live media itself."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-contents.ssi:58
msgid "3~ Binary includes"
msgstr ""
#. type: Plain text
-#: en/other_customization-contents.ssi:62
+#: en/user_customization-contents.ssi:60
+msgid ""
+"live-build has some standard files (like documentation) that gets included "
+"in the default configuration on every live media. This can be disabled with:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-contents.ssi:64
+msgid "$ lb config --includes none"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-contents.ssi:68
msgid "2~ Hooks"
msgstr ""
#. type: Plain text
-#: en/other_customization-contents.ssi:64
+#: en/user_customization-contents.ssi:70
msgid ""
"Hooks allow commands to be performed in the chroot and binary stages of the "
"build in order to customize the image."
msgstr ""
#. type: Plain text
-#: en/other_customization-contents.ssi:66
-msgid "Enabling hooks"
-msgstr ""
-
-#. type: Plain text
-#: en/other_customization-contents.ssi:68
+#: en/user_customization-contents.ssi:72
msgid "3~ Live/chroot local hooks"
msgstr ""
#. type: Plain text
-#: en/other_customization-contents.ssi:70
+#: en/user_customization-contents.ssi:74
msgid ""
"To run commands in the chroot stage, create a hook script containing the "
"commands in the #{config/chroot_local-hooks}# directory. The hook will run "
"in the chroot after the rest of your chroot configuration has been applied, "
"so remember to ensure your configuration includes all packages and files "
"your hook needs in order to run. See the example chroot hook scripts for "
-"various common chroot customization tasks provided in #{/usr/share/live-"
-"helper/examples/hooks}# which you can copy or symlink to use them in your "
-"own configuration."
+"various common chroot customization tasks provided in #{/usr/share/live/"
+"build/examples/hooks}# which you can copy or symlink to use them in your own "
+"configuration."
msgstr ""
#. type: Plain text
-#: en/other_customization-contents.ssi:72
+#: en/user_customization-contents.ssi:76
msgid "3~ Binary local hooks"
msgstr ""
#. type: Plain text
-#: en/other_customization-contents.ssi:74
+#: en/user_customization-contents.ssi:78
msgid ""
"To run commands in the binary stage, create a hook script containing the "
"commands in the #{config/binary_local-hooks}#. The hook will run after all "
-"other binary helpers are run, but before binary_checksums, the very last "
-"binary helper. The commands in your hook do not run in the chroot, so take "
+"other binary commands are run, but before binary_checksums, the very last "
+"binary commands The commands in your hook do not run in the chroot, so take "
"care to not modify any files outside of the build tree, or you may damage "
"your build system! See the example binary hook scripts for various common "
-"binary customization tasks provided in #{/usr/share/live-helper/examples/"
+"binary customization tasks provided in #{/usr/share/live/build/examples/"
"hooks}# which you can copy or symlink to use them in your own configuration."
msgstr ""
#. type: Plain text
-#: en/other_customization-contents.ssi:76
+#: en/user_customization-contents.ssi:80
msgid "2~ Preseeding Debconf questions"
msgstr ""
#. type: Plain text
-#: en/other_customization-contents.ssi:78
+#: en/user_customization-contents.ssi:82
msgid ""
"Files in the #{config/chroot_local-preseed}# directory are considered to be "
-"debconf preseed files and are installed by live-helper using #{debconf-set-"
+"debconf preseed files and are installed by live-build using #{debconf-set-"
"selections}#."
msgstr ""
#. type: Plain text
-#: en/other_customization-contents.ssi:80
+#: en/user_customization-contents.ssi:83
msgid ""
"For more information about debconf, please see debconf(7) in the #{debconf}# "
"package."
msgstr ""
-
-#. type: Plain text
-#: en/other_customization-contents.ssi:82
-msgid "2~ Symlink conversion"
-msgstr ""
-
-#. type: Plain text
-#: en/other_customization-contents.ssi:83
-msgid "FIXME. (This is probably in the wrong section)"
-msgstr ""
--
live-manual
More information about the debian-live-changes
mailing list