[SCM] live-manual branch, debian-next, updated. debian/3.0_a14-1-27-g2ed7c4a

[chals]

The following commit has been merged in the debian-next branch:
commit 2ed7c4ad5e680a198b9aa1ad073a93cfcb65584d
Author: chals <chals at altorricon.com>
Date:   Sun Aug 5 23:56:13 2012 +0200

    Removing the binary includes section since they were dropped.

diff --git a/manual/en/user_customization-contents.ssi b/manual/en/user_customization-contents.ssi
index 0b4546c..76ae268 100644
--- a/manual/en/user_customization-contents.ssi
+++ b/manual/en/user_customization-contents.ssi
@@ -6,14 +6,12 @@ This chapter discusses fine-tuning customization of the live system contents bey
 
 2~includes Includes
 
-While ideally a Debian live system would include files entirely provided by unmodified Debian packages, it is sometimes convenient to provide or modify some content by means of files. Using includes, it is possible to add (or replace) arbitrary files in your Debian Live image. live-build provides three mechanisms for using them:
+While ideally a Debian live system would include files entirely provided by unmodified Debian packages, it is sometimes convenient to provide or modify some content by means of files. Using includes, it is possible to add (or replace) arbitrary files in your Debian Live image. live-build provides two mechanisms for using them:
 
 _* Chroot local includes: These allow you to add or replace files to the chroot/Live filesystem. Please see {Live/chroot local includes}#live-chroot-local-includes for more information.
 
 _* Binary local includes: These allow you to add or replace files in the binary image. Please see {Binary local includes}#binary-local-includes for more information.
 
-_* 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 {Binary includes}#binary-includes for more information.
-
 Please see {Terms}#terms for more information about the distinction between the "Live" and "binary" images.
 
 3~live-chroot-local-includes Live/chroot local includes
@@ -58,18 +56,6 @@ code{
 
 These files will now appear in the root directory of the live media.
 
-3~binary-includes Binary includes
-
-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
-
-Otherwise, the material will be installed by live-build in #{/includes/}# by default on the media filesystem, or else you can specify an alternate path with #{--includes}#.
-
 2~hooks Hooks
 
 Hooks allow commands to be performed in the chroot and binary stages of the build in order to customize the image.

-- 
live-manual