[SCM] live-manual branch, debian-next, updated. debian/3.0_a16-1-8-g0e93a5f

[Ben Armstrong]

The following commit has been merged in the debian-next branch:
commit 0e93a5fa9464dc3417454a4b2655c9b62a44bfc8
Author: Ben Armstrong <synrg at debian.org>
Date:   Wed Sep 26 08:29:36 2012 -0300

    Expanding and clarifying kernel section further, splitting custom kernel into its own section.

diff --git a/manual/en/user_customization-packages.ssi b/manual/en/user_customization-packages.ssi
index 9ca1786..3b54597 100644
--- a/manual/en/user_customization-packages.ssi
+++ b/manual/en/user_customization-packages.ssi
@@ -211,7 +211,7 @@ code{
 
 3~kernel-flavour-and-version Kernel flavour and version
 
-Your choice of architecture determines the default flavour or flavours of kernel images included in the live system. Each flavour is suffixed to the default stub #{linux-image}# to form each metapackage name which in turn depends on an exact kernel package to be included in your image.
+One or more kernel flavours will be included in your image by default, depending on the architecture. You can choose different flavours via the #{--linux-flavours}# option. Each flavour is suffixed to the default stub #{linux-image}# to form each metapackage name which in turn depends on an exact kernel package to be included in your image.
 
 Thus by default, an #{amd64}# architecture image will include the #{linux-image-amd64}# flavour metapackage, and an #{i386}# architecture image will include the #{linux-image-486}# and #{linux-image-686-pae}# metapackages. At time of writing, these packages depend on #{linux-image-3.2.0-4-amd64}#, #{linux-image-3.2.0-4-486}# and #{linux-image-3.2.0-4-686-pae}#, respectively.
 
@@ -224,13 +224,23 @@ code{
 
 }code
 
-Please note that live-build directly supports only kernels that are integrated within the Debian package management system and does not support kernels not built as #{.deb}# packages.
+3~custom-kernels Custom kernels
 
-The proper and recommended way to deploy your own kernel packages is to follow the instructions in the #{kernel-handbook}#, bump the kernel ABI and include a complete build of the #{linux}# and matching #{linux-latest}# packages in your repository.
+You can build and include your own custom kernels, so long as they are integrated within the Debian package management system. The live-build system does not support kernels not built as #{.deb}# packages.
 
-When not using a full kernel build with matching metapackages, kernels without metapackages can be included in your configuration just the way you would any other package and specifying an appropriate #{--linux-packages}# stub.
+The proper and recommended way to deploy your own kernel packages is to follow the instructions in the #{kernel-handbook}#. Remember to modify the ABI and flavour suffixes appropriately, then include a complete build of the #{linux}# and matching #{linux-latest}# packages in your reposistory.
 
-Remember when building custom kernel configurations you must of course satisfy the minimum requirements for running a live environment, i.e. at least include any kernel modules needed to handle the live filesystem (usually aufs and squashfs) and don't forget to suffix the package names with the flavour (e.g. #{-amd64}#).
+If you opt to build the kernel packages without the matching metapackages, you need to specify an appropriate #{--linux-packages}# stub as discussed in {Kernel flavour and version}#kernel-flavour-and-version. As we explain in {Installing modified or third-party packages}#installing-modified-or-third-party-packages, it is best if you include your custom kernel packages in your own repository, though the alternatives discussed in that section work as well.
+
+It is beyond the scope of this document to give advice on how to customize your kernel. However, you must at least ensure your configuration satisfies these minimum requirements:
+
+_* Use an initial ramdisk.
+
+_* Include the union filesystem module (i.e. usually #{aufs}#).
+
+_* Include any other filesystem modules required by your configuration (i.e. usually #{squashfs}#).
+
+_* Suffix each kernel package name with the kernel flavour (e.g. #{-amd64}#).
 
 2~installing-modified-or-third-party-packages Installing modified or third-party packages
 

-- 
live-manual