[SCM] live-manual branch, debian-next, updated. debian/3.0_a15-1-28-g384bc75

chals chals at altorricon.com
Thu Aug 30 12:19:23 UTC 2012


The following commit has been merged in the debian-next branch:
commit 384bc75cb94a67f11e31484fe88fefb83946953b
Author: chals <chals at altorricon.com>
Date:   Thu Aug 30 14:17:42 2012 +0200

    Fixing formatting and making some other minor clarifications.

diff --git a/manual/en/about_manual.ssi b/manual/en/about_manual.ssi
index fdc633e..a413cac 100644
--- a/manual/en/about_manual.ssi
+++ b/manual/en/about_manual.ssi
@@ -20,7 +20,7 @@ We encourage you to return to more in-depth study of the manual, perhaps next re
 
 _* *{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-boot, live-build, live-config, and live-manual packages.
+_* *{Debian Live}*: The Debian sub-project which maintains, among others, 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}#).
 
diff --git a/manual/en/user_managing_a_configuration.ssi b/manual/en/user_managing_a_configuration.ssi
index 318b005..bc058f8 100644
--- a/manual/en/user_managing_a_configuration.ssi
+++ b/manual/en/user_managing_a_configuration.ssi
@@ -42,7 +42,7 @@ code{
 
 Now, each time you use #{lb config}#, #{auto/config}# will reset the configuration based on these options. When you want to make changes to them, edit the options in this file instead of passing them to #{lb config}#. When you use #{lb clean}#, #{auto/clean}# will clean up the #{config/*}# files along with any other build products. And finally, when you use #{lb build}#, a log of the build will be written by #{auto/build}# in #{build.log}#.
 
-Note: A special #{noauto}# parameter is used here to suppress another call to #{auto/config}#, thereby preventing infinite recursion. Make sure you don't accidentally remove it when making edits. Also, take care to ensure when you split the #{lb config}# command across multiple lines for readability, as shown in the example above, that you don't forget the backslash (\) at the end of each line that continues to the next.
+*{Note:}* A special #{noauto}# parameter is used here to suppress another call to #{auto/config}#, thereby preventing infinite recursion. Make sure you don't accidentally remove it when making edits. Also, take care to ensure when you split the #{lb config}# command across multiple lines for readability, as shown in the example above, that you don't forget the backslash (\) at the end of each line that continues to the next.
 
 2~ Clone a configuration published via Git
 
diff --git a/manual/en/user_overview.ssi b/manual/en/user_overview.ssi
index 38bf70e..6a3baca 100644
--- a/manual/en/user_overview.ssi
+++ b/manual/en/user_overview.ssi
@@ -71,7 +71,7 @@ It is the job of the #{lb clean}# command to remove various parts of a build so
 
 2~live-boot The live-boot package
 
-live-boot is a collection of scripts providing hooks for the initramfs-tools, used to generate an initramfs capable of booting live systems, such as those created by live-build. This includes the Debian Live ISOs, netboot tarballs, and USB stick images.
+live-boot is a collection of scripts providing hooks for the /{initramfs-tools}/, used to generate an initramfs capable of booting live systems, such as those created by live-build. This includes the Debian Live ISOs, netboot tarballs, and USB stick images.
 
 At boot time it will look for read-only media containing a #{/live/}# directory where a root filesystem (often a compressed filesystem image like squashfs) is stored. If found, it will create a writable environment, using aufs, for Debian like systems to boot from.
 

-- 
live-manual



More information about the debian-live-changes mailing list