[SCM] live-manual branch, debian, updated. debian/3.0_a8-1-65-gbaa1802

[Ben Armstrong]

The following commit has been merged in the debian branch:
commit 3e0b9bfdd1a765920c0ccf6535efa9691d9f7907
Author: Ben Armstrong <synrg at debian.org>
Date:   Mon Nov 7 07:39:45 2011 -0400

    Updating to 3.x, includes.

diff --git a/manual/en/user_customization-contents.ssi b/manual/en/user_customization-contents.ssi
index 4826bf0..540b172 100644
--- a/manual/en/user_customization-contents.ssi
+++ b/manual/en/user_customization-contents.ssi
@@ -20,12 +20,12 @@ Please see {Terms}#terms for more information about the distinction between the
 
 Chroot local includes can be used to add or replace files in the chroot/Live filesystem so that they may be used in the Live system. A typical use is to populate the skeleton user directory (#{/etc/skel}#) used by the Live system to create the live user's home directory. Another is to supply configuration files that can be simply added or replaced in the image without processing; see {Live/chroot local hooks}#live-chroot-local-hooks if processing is needed.
 
-To include files, simply add them to your #{config/chroot_local-includes}# directory. This directory corresponds to the root directory (#{/}#) of the live system. For example, to add a file #{/var/www/index.html}# in the live system, use:
+To include files, simply add them to your #{config/includes.chroot}# directory. This directory corresponds to the root directory (#{/}#) of the live system. For example, to add a file #{/var/www/index.html}# in the live system, use:
 
 code{
 
- $ mkdir -p config/chroot_local-includes/var/www
- $ cp /path/to/my/index.html config/chroot_local-includes/var/www
+ $ mkdir -p config/includes.chroot/var/www
+ $ cp /path/to/my/index.html config/includes.chroot/var/www
 
 }code
 
@@ -35,7 +35,7 @@ code{
 
  -- config
     [...]
-     |-- chroot_local-includes
+     |-- includes.chroot
      |   `-- var
      |       `-- www
      |           `-- index.html
@@ -48,11 +48,11 @@ Chroot local includes are installed after package installation so that files ins
 
 3~binary-local-includes Binary local includes
 
-To include material such as documentation or videos on the media filesystem so that it is accessible immediately upon insertion of the media without booting the Live system, you can use binary local includes. This works in a similar fashion to chroot local includes. For example, suppose the files #{~/video_demo.*}# are demo videos of the live system described by and linked to by an HTML index page. Simply copy the material to #{config/binary_local-includes/}# as follows:
+To include material such as documentation or videos on the media filesystem so that it is accessible immediately upon insertion of the media without booting the Live system, you can use binary local includes. This works in a similar fashion to chroot local includes. For example, suppose the files #{~/video_demo.*}# are demo videos of the live system described by and linked to by an HTML index page. Simply copy the material to #{config/includes.binary/}# as follows:
 
 code{
 
- $ cp ~/video_demo.* config/binary_local-includes/
+ $ cp ~/video_demo.* config/includes.binary/
 
 }code
 
@@ -80,7 +80,7 @@ To run commands in the chroot stage, create a hook script containing the command
 
 3~boot-time-hooks Boot-time hooks
 
-To execute commands at boot time, you can supply live-config hooks as explained in the "Customization" section of its man page. Examine live-config's own hooks provided in #{/lib/live/config/}#, noting the sequence numbers. Then provide your own hook prefixed with an appropriate sequence number, either as a chroot local include in #{config/chroot_local-includes/lib/live/config/}#, or as a custom package as discussed in {Installing modified or third-party packages}#installing-modified-or-third-party-packages.
+To execute commands at boot time, you can supply live-config hooks as explained in the "Customization" section of its man page. Examine live-config's own hooks provided in #{/lib/live/config/}#, noting the sequence numbers. Then provide your own hook prefixed with an appropriate sequence number, either as a chroot local include in #{config/includes.chroot/lib/live/config/}#, or as a custom package as discussed in {Installing modified or third-party packages}#installing-modified-or-third-party-packages.
 
 3~ Binary local hooks
 
diff --git a/manual/en/user_customization-packages.ssi b/manual/en/user_customization-packages.ssi
index 0c35b6b..0819049 100644
--- a/manual/en/user_customization-packages.ssi
+++ b/manual/en/user_customization-packages.ssi
@@ -308,7 +308,7 @@ If there is not an #{lb config}# option to alter APT's behaviour in the way you
 
 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/apt/preferences}#.
+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/includes.chroot/etc/apt/preferences}#.
 
 Let's say you are building a Squeeze live system but need all the live packages that end up in the binary image 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:
 
diff --git a/manual/en/user_customization-runtime.ssi b/manual/en/user_customization-runtime.ssi
index b425ace..f8b18f3 100644
--- a/manual/en/user_customization-runtime.ssi
+++ b/manual/en/user_customization-runtime.ssi
@@ -26,7 +26,7 @@ $ lb config --bootappend-live "username=live-user"
 
 }code
 
-One possible way of changing the default password is by means of a hook as described in {Boot-time hooks}#boot-time-hooks. In order to do that you can use the "passwd" hook from #{/usr/share/doc/live-config/examples/hooks}#, prefix it accordingly (e.g. 200-passwd) and add it to #{config/chroot_local-includes/lib/live/config/}#
+One possible way of changing the default password is by means of a hook as described in {Boot-time hooks}#boot-time-hooks. In order to do that you can use the "passwd" hook from #{/usr/share/doc/live-config/examples/hooks}#, prefix it accordingly (e.g. 200-passwd) and add it to #{config/includes.chroot/lib/live/config/}#
 
 2~customizing-locale-and-language Customizing locale and language
 
diff --git a/manual/en/user_examples.ssi b/manual/en/user_examples.ssi
index bf2fd26..3b73b7c 100644
--- a/manual/en/user_examples.ssi
+++ b/manual/en/user_examples.ssi
@@ -191,8 +191,8 @@ Create the directory #{/etc/skel}# and put a custom #{.xsession}# in it for the
 
 code{
 
- $ mkdir -p config/chroot_local-includes/etc/skel
- $ cat >config/chroot_local-includes/etc/skel/.xsession <<END
+ $ mkdir -p config/includes.chroot/etc/skel
+ $ cat >config/includes.chroot/etc/skel/.xsession <<END
  #!/bin/sh
 
  /usr/bin/metacity &

-- 
live-manual