[SCM] debian-live branch, master, updated. 1.0_a47-1-43-g30bafda

[Chris Lamb]

The following commit has been merged in the master branch:
commit 191746a47651be182600d8f42c712ef0af2421fd
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date:   Thu Jun 19 18:41:26 2008 +0100

    Adjust "lh_config --help" and lh_config(1) so that the -m option corresponds with --mirror-bootstrap isntead of --mirror-binary-security.
    
    Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>

diff --git a/helpers/lh_config b/helpers/lh_config
index 9142ade..520baaa 100755
--- a/helpers/lh_config
+++ b/helpers/lh_config
@@ -78,11 +78,11 @@ USAGE="${PROGRAM} [--apt apt|aptitude]\n\
 \t    [--linux-packages \"PACKAGES\"]\n\
 \t    [--losetup losetup|losetup.orig]\n\
 \t    [--memtest memtest86+|memtest86]\n\
-\t    [--mirror-bootstrap URL]\n\
+\t    [-m|--mirror-bootstrap URL]\n\
 \t    [--mirror-chroot URL]\n\
 \t    [--mirror-chroot-security URL]\n\
 \t    [--mirror-binary URL]\n\
-\t    [-m|--mirror-binary-security URL]\n\
+\t    [--mirror-binary-security URL]\n\
 \t    [--mode debian|debian-edu]\n\
 \t    [--net-root-filesystem nfs|cfs]\n\
 \t    [--net-root-mountoptions OPTIONS]\n\
diff --git a/manpages/lh_config.en.1 b/manpages/lh_config.en.1
index d7fd733..6c73786 100644
--- a/manpages/lh_config.en.1
+++ b/manpages/lh_config.en.1
@@ -108,13 +108,13 @@ lh_config \- create configuration for live\-helper
 .br
 	[\fB\-\-memtest\fR memtest86+|memtest86]
 .br
-	[\-m|\fB\-\-mirror\-binary\-security\fR \fIURL\fR]
+	[\fB\-\-mirror\-binary\-security\fR \fIURL\fR]
 .br
 	[\fB\-\-mirror\-binary\fR \fIURL\fR]
 .br
 	[\fB\-\-mirror\-bootstrap\-security\fR \fIURL\fR]
 .br
-	[\fB\-\-mirror\-bootstrap\fR \fIURL\fR]
+	[\-m|\fB\-\-mirror\-bootstrap\fR \fIURL\fR]
 .br
 	[\fB\-\-mode\fR debian|debian\-edu]
 .br

-- 
debian-live