[SCM] Debian Live build scripts branch, master, updated. 1.0.1-1-6-g70dea33

[Chris Lamb]

The following commit has been merged in the master branch:
commit 70dea33a11aa3b0e96870508655bff91e3c3dff6
Author: Chris Lamb <lamby at debian.org>
Date:   Wed Sep 24 20:56:33 2008 +0100

    Syncing options in lh_config(1) with lh_config, etc. Thanks to Luca Bruno.
    
    Signed-off-by: Chris Lamb <lamby at debian.org>

diff --git a/manpages/lh_config.en.1 b/manpages/lh_config.en.1
index 2e44bf6..61e1bd9 100644
--- a/manpages/lh_config.en.1
+++ b/manpages/lh_config.en.1
@@ -16,6 +16,10 @@ lh_config \- create configuration for live\-helper
 .br
 	[\fB\-\-apt\-pdiffs\fR enabled|disabled]
 .br
+	[--aptitude-options OPTION|"OPTIONS"]
+.br
+	[--apt-options OPTION|"OPTIONS"]
+.br
 	[\fB\-\-apt\-pipeline\fR \fIFIXME\fR]
 .br
 	[\fB\-\-apt\-recommends\fR enabled|disabled]
@@ -66,9 +70,11 @@ lh_config \- create configuration for live\-helper
 .br
 	[\fB\-\-debconf\-priority\fR low|medium|high|critical]
 .br
-	[\fB\-\-debian\-installer\fR enabled|disabled]
+	[\fB\-\-debian\-installer\fR enabled|cdrom|netinst|netboot|businesscard|live|disabled]
+.br
+	[\fB\-\-debian\-installer\-distribution\fR daily|\fICODENAME\fR]
 .br
-	[\fB\-\-debian\-installer\-distribution\fR daily|\fICODENAME\fR]]
+	[\fB\-\-debian\-installer\-preseedfile\fR \fIFILE\fR|\fIURL\fR]
 .br
 	[\-d|\fB\-\-distribution\fR \fICODENAME\fR]
 .br
@@ -98,6 +104,8 @@ lh_config \- create configuration for live\-helper
 .br
 	[\fB\-\-iso\-volume\fR \fINAME\fR]
 .br
+	[\fB\-\-jffs2\-eraseblock\fR \fISIZE\fR]
+.br
 	[\fB\-\-keyring\-packages\fR \fIPACKAGE\fI|\fI"PACKAGES"\fR]
 .br
 	[\-l|\fB\-\-language\fR \fILANGUAGE\fR]
@@ -118,6 +126,8 @@ lh_config \- create configuration for live\-helper
 .br
 	[\-m|\fB\-\-mirror\-bootstrap\fR \fIURL\fR]
 .br
+	[\fB\-\-mirror\-chroot\fR \fIURL\fR]
+.br
 	[\fB\-\-mode\fR debian|debian\-edu]
 .br
 	[\fB\-\-net\-root\-filesystem\fR nfs|cfs]

-- 
Debian Live build scripts