[SCM] live-manual branch, upstream, updated. upstream/2.0_a6-1-g16b4fed

Daniel Baumann daniel at debian.org
Sat Sep 18 23:27:53 UTC 2010 

The following commit has been merged in the upstream branch:
commit 16b4feda39a640052ccd47265c47f22eb39ef7a2
Author: Daniel Baumann <daniel at debian.org>
Date:   Sun Sep 19 01:25:06 2010 +0200

    Adding upstream version 2.0~a7.

diff --git a/VERSION b/VERSION
index a1d37aa..288a58c 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.0~a6
+2.0~a7
diff --git a/html/favicon.ico b/html/favicon.ico
deleted file mode 100644
index 8f4e75c..0000000
Binary files a/html/favicon.ico and /dev/null differ
diff --git a/html/image.png b/html/image.png
deleted file mode 100644
index d1321d8..0000000
Binary files a/html/image.png and /dev/null differ
diff --git a/html/index.html b/html/index.html
deleted file mode 100644
index c069d92..0000000
--- a/html/index.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-	<title>Debian Live Project</title>
-	<link type="text/css" rel="stylesheet" href="stylesheet.css" />
-</head>
-
-<body>
-
-<h1 id="title"><a href="/">Debian Live Project</a></h1>
-<h2 id="subtitle"><a href="/">Live Debian systems!</a></h2>
-
-<div id="body">
-
-<h2>Live Manual</h2>
-
-<dl>
-
-<dd>
-	<ul>
-		<li>&rsaquo; <a href="en"><b>English</b></a></li>
-		<li>&rsaquo; <a href="de">Deutsch (German)</a></li>
-	</ul>
-</dd>
-
-</dl>
-</div>
-
-<div class="footer">
-
-<p>
-	<a href="http://live.debian.net/">Debian Live</a> &lt;<a href="mailto:debian-live at lists.debian.org">debian-live at lists.debian.org</a>&gt; - <a href="http://live.debian.net/legal.html">Legal Notice</a>
-</p>
-
-</div>
-
-</body>
-</html>
diff --git a/html/stylesheet.css b/html/stylesheet.css
deleted file mode 100644
index a96e1c3..0000000
--- a/html/stylesheet.css
+++ /dev/null
@@ -1,202 +0,0 @@
-/*
- * Debian PTS stylesheet.
- * by:
- * - Dan Callahan <dan.callahan at gmail.com>
- * - Enrico Tassi <gareuselesinge at debian.org>
- * - Stefano Zacchiroli <zack at debian.org>
- */
-
-/* --- Whole-Page --- */
-body {
-    margin: 0;
-    padding: 0;
-    font-family: "DejaVu Sans", "Bitstream Vera Sans", sans-serif; /*Prefer Free Fonts*/
-    background: #fff url('image.png') no-repeat 10px 7px;
-    color: #000;
-    font-size: 100%;
-}
-
-a:link    { color: #0755d7; text-decoration: underline; }
-a:visited { color: #0755d7; text-decoration: underline; }
-a:hover   { color: #032a6b; text-decoration: underline; }
-a:active  { color: #f00;    text-decoration: underline; }
-a img { border: none; }
-
-.containertable { width: 100%; }
-
-/* --- Header --- */
-body > form { /* "Jump to package" */
-    margin: 0.3em;
-    font-size: 80%;
-    padding: 0.5em;
-    border: 1px solid #aaa;
-    background-color: #dfdfdf;
-}
-#quickforms { /* "Jump to package" */
-    margin: 0.3em;
-    font-size: 80%;
-    padding: 0.5em;
-    border: 1px solid #aaa;
-    background-color: #dfdfdf;
-}
-
-
-h1#title {
-    margin: 0 0 0 0;
-    padding: 20px 0 0 280px;
-    font-size: 150%;
-/*    min-height: 60px;
-    height: auto !important; /* "Min-Height Fast Hack" */
-/*    height: 60px; */
-}
-
-h1#title a {
-    color: black;
-    text-decoration: none;
-}
-
-h2#subtitle {
-    margin: -1em 0 1em 0;
-    padding: 20px 0 0 280px;
-    font-size: 80%;
-/*    min-height: 60px;
-    height: auto !important;
-    height: 60px;*/
-}
-
-h2#subtitle a {
-    color: black;
-    text-decoration: none;
-}
-
-/* --- Content Pane --- */
-div#body {
-    clear: both;
-    border-top: 2px solid #d70751;
-/*    background: #dfdfdf;*/
-    padding: 1em 1em; /* 0em 0em */
-}
-
-table.containertable {
-  padding: 0.5em 0.5em;
-}
-
-td.containercell { padding: 0.5em; }
-
-table.lefttable {
-    border-collapse: collapse;
-    border: 1px solid #999;
-    background: #fff;
-    width: 100%;
-}
-
-table.righttable {
-    border-collapse: collapse;
-    border: 1px solid #999;
-    background: #fff;
-    width: 100%;
-}
-
-td.titlecell {
-    padding: 0.2em 0.2em 0.1em 0.2em;
-    font-weight: bold;
-    font-size: 100%;
-    background: #d70751;
-    color: #fff;
-    border-top: 3px solid #999;
-    border-bottom: 1px solid #999;
-}
-td.titlecell a:link    { color: #ffffff; background: #d70751; text-decoration: underline; }
-td.titlecell a:visited { color: #ffffff; background: #d70751; text-decoration: underline; }
-td.titlecell a:hover   { color: #fff200; background: #d70751; text-decoration: underline; }
-td.titlecell a:active  { color: #295598; background: #d70751; text-decoration: underline; }
-
-th.titlecell {
-    padding: 0.2em 0.2em 0.1em 0.2em;
-    font-weight: bold;
-    font-size: 100%;
-    background: #d70751;
-    color: #fff;
-    border-top: 3px solid #999;
-    border-bottom: 1px solid #999;
-}
-th.titlecell a:link    { color: #ffffff; background: #d70751; text-decoration: underline; }
-th.titlecell a:visited { color: #ffffff; background: #d70751; text-decoration: underline; }
-th.titlecell a:hover   { color: #fff200; background: #d70751; text-decoration: underline; }
-th.titlecell a:active  { color: #295598; background: #d70751; text-decoration: underline; }
-
-
-
-td.labelcell {
-    font-weight: bold;
-    padding: 0.2em 0 0.2em 0.3em;
-    border-bottom: 1px dotted #999;
-}
-td.labelcell:after {
-    content: ":";
-}
-
-td.contentcell {
-    padding: 0.2em 0.3em 0.2em 0;
-    border-bottom: 1px dotted #999;
-}
-
-/* - Edge Tables - */
-tr#bugs_rc { font-size: 90%; }
-tr#bugs_in { font-size: 90%; }
-tr#bugs_mw { font-size: 90%; }
-tr#bugs_fp { font-size: 90%; }
-span.indented { padding-left: 1.5em; }
-
-td > form { margin: 0.4em 0 0.4em 0.4em; padding: 0; } /* PTS subscribe */
-
-td#src_files ul { padding: 0; }
-td#src_files li {
-    display: inline;
-    font-family: "DejaVu Sans Mono", "Bitstream Vera Sans Mono", monospace;
-}
-
-#news-list {
-    max-height: 30em;
-    overflow: auto;
-}
-
-/* - Central Table - */
-#problems { background: #0755d7; color: #ffffff; }
-#todo { background: #0755d7; color: #ffffff; }
-    
-/* --- Footer --- */
-div#body > hr { display: none; }
-
-div.footer {
-    padding: 1em 0;
-    background-color: #fff;
-    text-align: center;
-    border-top: 2px solid #d70751;
-    margin: 0 0 0 0;
-    border-bottom: 0;
-}
-
-tt { font-family: "DejaVu Sans Mono", "Bitstream Vera Sans Mono", monospace; }
-
-/* --- Misc --- */
-form > p { margin: 0; padding: 0; }
-
-a.feedlink { /* Little orange RSS button */
-    background: #f60                  !important;
-    color: #fff                       !important;
-    border: 1px solid                 !important;
-    border-color: #fc9 #630 #330 #f96 !important;
-    padding: 0 3px                    !important;
-    font-weight: bold                 !important;
-    font-size: 70%                    !important;
-    text-decoration: none             !important;
-    vertical-align: 0.2em             !important;
-    /* Without !important, inherets from td.titlecell a:* */
-}
-
-ul { list-style-type: none; padding: 0; }
-li { margin-top: 0.2em; }
-/*li { margin-top: 0.4em; }
-td > ul { padding-left: 1em; }
-a.none { color: #000 !important; text-decoration: none !important; }*/
diff --git a/manual/de/live-manual.ssm b/manual/de/live-manual.ssm
index 25cf154..4f4f5d7 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-19
 
 @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..4f4f5d7 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-19
 
 @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 72%
rename from manual/en/other_customization-contents.ssi
rename to manual/en/user_customization-contents.ssi
index 40f8567..68f1ed8 100644
--- a/manual/en/other_customization-contents.ssi
+++ b/manual/en/user_customization-contents.ssi
@@ -6,7 +6,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:
+Using includes, it is possible to add (or replace) arbitrary files in your 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 information.
 % FIXME: <xref linkend="chroot-local-includes"/>
@@ -52,32 +52,32 @@ Chroot local includes are installed after package installation so that files ins
 
 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 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.
+To run commands in the chroot stage, create a hook script containing the commands in the #{config/chroot_local-hooks}# directory. The hook will run in the chroot after the rest of your chroot configuration has been applied, so remember to ensure your configuration includes all packages and files your hook needs in order to run. See the example chroot hook scripts for various common chroot customization tasks provided in #{/usr/share/live/build/examples/hooks}# which you can copy or symlink to use them in your own configuration.
 
 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 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 use them in your own configuration.
+To run commands in the binary stage, create a hook script containing the commands in the #{config/binary_local-hooks}#. The hook will run after all other binary commands are run, but before binary_checksums, the very last binary commands The commands in your hook do not run in the chroot, so take care to not modify any files outside of the build tree, or you may damage your build system! See the example binary hook scripts for various common binary customization tasks provided in #{/usr/share/live/build/examples/hooks}# which you can copy or symlink to use them in your own configuration.
 
 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-set-selections}#.
+Files in the #{config/chroot_local-preseed}# directory are considered to be debconf preseed files and are installed by live-build using #{debconf-set-selections}#.
 
 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/po/de/live-manual.ssm.po b/manual/po/de/live-manual.ssm.po
index a9eb26b..5128cea 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-19 01:23+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-19\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..4d8c658 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-19 01:23+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-19\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