[SCM] live-manual branch, debian, updated. debian/2.0_a5-1-2-g059d4e1

[Daniel Baumann]

The following commit has been merged in the debian branch:
commit 059d4e1f92dd1af677be5666284715a37080a26b
Author: Daniel Baumann <daniel at debian.org>
Date:   Tue Sep 7 13:37:55 2010 +0200

    Updating about_manual for squeeze.

diff --git a/manual/en/about_manual.ssi b/manual/en/about_manual.ssi
index 2ea3cca..e1e362c 100644
--- a/manual/en/about_manual.ssi
+++ b/manual/en/about_manual.ssi
@@ -10,31 +10,35 @@ Some of the commands mentioned in the text must be executed with superuser privi
 
 _* *{Live system}*: An operating system that can boot without installation to a hard drive. Live systems do not alter local operating system(s) or file(s) already installed on the computer hard drive unless instructed to do so. Live systems are typically booted from media such as CDs/DVDs or USB sticks, some may also boot over the network.
 
-_* *{Debian Live}*: The Debian sub-project which maintains the live-helper, live-boot and live-config packages.
+_* *{Debian Live}*: The Debian sub-project which maintains the live-boot, live-build, live-config, and live-manual packages.
 
 _* *{Debian Live system}*: A live system that uses software from the Debian operating system that may be booted from CDs, DVDs, USB sticks, over the network (via netboot images), and over the internet (via boot parameter #{fetch=URL}#).
 
-_* *{Build system/host system}*: The environment used to create the live system.
+_* *{Host system}*: The environment used to create the live system.
 
-_* *{live-helper}*: A collection of scripts used to build customised Debian Live systems. live-helper was formerly know as live-package.
+_* *{Target system}*: The environment used to run the live system.
 
 _* *{live-boot}*: A collection of scripts used to boot live systems. live-boot was formerly a part of live-initramfs.
 
+_* *{live-build}*: A collection of scripts used to build customised Debian Live systems. live-build was formerly know as live-helper, and even earlier know as live-package.
+
 _* *{live-config}*: A collection of scripts used to configure a live systems during the boot process. live-config was formerly a part of live-initramfs.
 
+_* *{live-manual}*: This document is maintained in a package called live-manual.
+
 _* *{Debian Installer/(d-i)}*: The official installation system for the Debian distribution.
 
-_* *{Cheat codes}*: FIXME
+_* *{Boot parameters}*: Parameters that can be entered at the bootloader prompt to influence the kernel or live-config.
 
 _* *{chroot}*: The chroot program, chroot(8), enables us to run different instances of the GNU/Linux environment on a single system simultaneously without rebooting.
 
-_* *{binary image}*: On a live system, binary image refers to the binary filesystem and the respective extension, such as binary.iso or binary.img.
+_* *{Binary image}*: On a live system, binary image refers to the binary filesystem and the respective extension, such as binary.iso or binary.img.
 
 _* *{Target distribution}*: The distribution upon which your live system will be based. This can differ from the distribution of your Build System.
 
-_* *{lenny/squeeze/sid stable/testing/unstable}*: The stable distribution contains the latest officially released distribution of Debian. The testing distribution is the staging area for the next stable release. A major advantage of using this distribution is that it has more recent versions of software relative to the stable release. The unstable distribution is where active development of Debian occurs. Generally, this distribution is run by developers and those who like to live on the edge.
+_* *{squeeze/wheezy/sid stable/testing/unstable}*: The stable distribution contains the latest officially released distribution of Debian. The testing distribution is the staging area for the next stable release. A major advantage of using this distribution is that it has more recent versions of software relative to the stable release. The unstable distribution is where active development of Debian occurs. Generally, this distribution is run by developers and those who like to live on the edge.
 
-At the time of writing, lenny is the current stable release and squeeze is the current testing release. sid will always be a synonym for the unstable release.
+At the time of writing, squeeze is the current stable release and wheezy is the current testing release. sid will always be a synonym for the unstable release.
 
 2~ Authors
 
@@ -83,7 +87,7 @@ Prior to submission of your contribution, please preview your work. To preview t
 
 code{
 
-# apt-get install dblatex docbook2odf docbook-xml docbook-xsl libxml2-utils make po4a w3m
+# apt-get install sisu-complete
 
 }code
 

-- 
live-manual