[SCM] live-manual branch, debian, updated. debian/2.0_a6-1-2-g9c6e01b

[Daniel Baumann]

The following commit has been merged in the debian branch:
commit 7b64d2e813af73be62431f9225367d5106636c76
Author: Daniel Baumann <daniel at debian.org>
Date:   Sat Sep 18 11:14:12 2010 +0200

    Updating other_customization-contents for squeeze.

diff --git a/manual/en/other_customization-contents.ssi b/manual/en/other_customization-contents.ssi
index 40f8567..68f1ed8 100644
--- a/manual/en/other_customization-contents.ssi
+++ b/manual/en/other_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)

-- 
live-manual