[SCM] UNNAMED PROJECT branch, master, updated. 20090201-1-45-g46c2aeb

Sun Feb 22 15:14:38 UTC 2009

The following commit has been merged in the master branch:
commit f33518b944948b902cb34b3044977657afa194eb
Author: Chris Lamb <lamby at debian.org>
Date:   Sun Feb 22 14:34:32 2009 +0000

    Replace instances of "live-helper" with &live-helper entity.

diff --git a/xml/chapters/coding-style.xml b/xml/chapters/coding-style.xml
index dc00c43..af1260b 100644
--- a/xml/chapters/coding-style.xml
+++ b/xml/chapters/coding-style.xml
@@ -6,7 +6,7 @@
 <chapter id="coding-style">
 <title>Coding Style</title>
 
-<para>This chapter documents the coding style used in live-helper.</para>
+<para>This chapter documents the coding style used in &live-helper; and (ideally) in &live-initramfs;.</para>
 
 <sect1 id="compatibilty">
 <title>Compatibility</title>
@@ -83,7 +83,7 @@ foo ()
 <itemizedlist>
 	<listitem>Variables are always in capital letters.</listitem>
 	<listitem>Variables that used in config always start with LH_ prefix.</listitem>
-	<listitem>Internal, live-helper controlling variables start with _LH_ prefix.</listitem>
+	<listitem>Internal temporary variables should start with the _LH_ prefix.</listitem>
 	<listitem>Local variables start with __LH_ prefix.</listitem>
 	<listitem>Use braces around variables; eg. write ${FOO} instead of $FOO.</listitem>
 	<listitem>Always protect variables with respect to potential whitespaces, write "${FOO}" not ${FOO}.</listitem>
diff --git a/xml/chapters/installation.xml b/xml/chapters/installation.xml
index 3e7d986..e21b90e 100644
--- a/xml/chapters/installation.xml
+++ b/xml/chapters/installation.xml
@@ -105,11 +105,11 @@
 <section>
 <title>Installing &live-helper; on etch</title>
 
-<para>It is not recommended that you use &live-helper; from backports.org as it is likely to be out of date. The live-helper package from &lenny; or &sid; can be installed on Etch (without upgrading other packages, such as libc6; it's just shell scripts).</para>
+<para>It is not recommended that you use &live-helper; from backports.org as it is likely to be out of date. The &live-helper; package from &lenny; or &sid; can be installed on Etch (without upgrading other packages, such as libc6; it's just shell scripts).</para>
 <orderedlist>
 <listitem><para>Install debootstrap or cdebootstrap from backports.org (as indicated above).</para></listitem>
 <listitem>
-<para>Install live-helper from testing or unstable</para>
+<para>Install &live-helper; from testing or unstable</para>
 <screen># apt-get install -t unstable live-helper</screen>
 </listitem>
 </orderedlist>
diff --git a/xml/chapters/overview.xml b/xml/chapters/overview.xml
index 98cb840..3464a79 100644
--- a/xml/chapters/overview.xml
+++ b/xml/chapters/overview.xml
@@ -34,7 +34,7 @@
 
 <para>&live-helper; respects environment variables which are present in the context of the shell it is running. If variables can be read from config files, then they override environment variables, and if command line options are used, they override values from config files. If no value for a given variable can be found (and is thus unset), &live-helper; will automatically set it to a default value.</para>
 
-<para>All config files are shell scripts which are sourced by a live-helper program. That means they have to follow the normal shell syntax. You can also put comments in these files; lines beginning with "#" are ignored.</para>
+<para>All config files are shell scripts which are sourced by a &live-helper; program. That means they have to follow the normal shell syntax. You can also put comments in these files; lines beginning with "#" are ignored.</para>
 
 <para>In some rare cases, you may want to have different versions of these files for different architectures or distributions. If files named <command>config/stage.arch</command> or <command>config/stage_helper.arch</command>, and <command>config/stage.dist</command> or <command>config/stage_helper.dist</command> exist (where "arch" is the same as the output of <command>dpkg --print-architecture</command> and "dist" is the same as the codename of the target distribution), then they will be used in preference to the other, more general files.</para>
 
diff --git a/xml/chapters/reporting-bugs.xml b/xml/chapters/reporting-bugs.xml
index ff06c47..53f5399 100644
--- a/xml/chapters/reporting-bugs.xml
+++ b/xml/chapters/reporting-bugs.xml
@@ -39,7 +39,7 @@
 <section id="collect-information">
 <title>Collect information</title>
 
-<para>Please provide enough information with your report. At a minimum, it should contain the exact version of live-helper version where the bug is encountered, and steps to reproduce it. Please use common sense and include other relevant information if you think that it might help in solving the problem.</para>
+<para>Please provide enough information with your report. At a minimum, it should contain the exact version of &live-helper; version where the bug is encountered, and steps to reproduce it. Please use common sense and include other relevant information if you think that it might help in solving the problem.</para>
 
 <para>To make the most out of your bug report, we require at least the following
 information:</para>
@@ -124,7 +124,7 @@ encountered.</para>
 
 <para>You should pay particular attention to the Debian Live mailing list, as well as the homepage, as these are likely to contain the most up-to-date information. If such information exists, always include the references to it in your bug report.</para>
 
-<para>In addition, you should check the <ulink url="http://bugs.debian.org/cgi-bin/pkgreport.cgi?src=live-helper">current bug list for live-helper</ulink> and the <ulink url="http://bugs.debian.org/cgi-bin/pkgreport.cgi?src=live-initramfs">current bug list for live-initramfs</ulink> to see whether something similar has been reported already.</para>
+<para>In addition, you should check the <ulink url="http://bugs.debian.org/cgi-bin/pkgreport.cgi?src=live-helper">current bug list for &live-helper;</ulink> and the <ulink url="http://bugs.debian.org/cgi-bin/pkgreport.cgi?src=live-initramfs">current bug list for live-initramfs</ulink> to see whether something similar has been reported already.</para>
 </section>
 
 <section id="where">

-- 
UNNAMED PROJECT

