[SCM] debian-live/live-helper branch, master, updated. 1.0_a43-1-15-gfe152b4

[Chris Lamb]

The following commit has been merged in the master branch:
commit 9e272993ccdbc087b10b3e58fb580548d528b039
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date:   Wed Apr 16 03:34:21 2008 +0100

    Fix a number of issues with Syslinux templates (Closes: #476204)
    
    This fixes:
    
     * The ugly "toboot" and "to\nboot" problems
     * Mistitled F4 page
     * Ugly line-breaking of Debian Live URL
    
    Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>

diff --git a/helpers/lh_binary_syslinux b/helpers/lh_binary_syslinux
index 8b8fc3f..da3952b 100755
--- a/helpers/lh_binary_syslinux
+++ b/helpers/lh_binary_syslinux
@@ -270,7 +270,6 @@ Configure_syslinux_templates ()
 		       -e "s|{\$LH_MEDIA}|${MEDIA}|" \
 		       -e "s|{\$LH_VERSION}|${VERSION}|" \
 		       -e "s|{\$LH_SYSLINUX_TIMEOUT}|${LH_SYSLINUX_TIMEOUT}0|" \
-		       -e 's|\ $||g' \
 		$template_file
 	done
 
diff --git a/templates/syslinux/en/f2.txt.install b/templates/syslinux/en/f2.txt.install
index e4f2208..5989b29 100644
--- a/templates/syslinux/en/f2.txt.install
+++ b/templates/syslinux/en/f2.txt.install
@@ -2,8 +2,8 @@
 
 You must have at least 64 megabytes of RAM to run this Debian Live system.
 
-See the Live Manual or the FAQ for more information; both
-documents are available at the Debian Live web site, 0fhttp://debian-live.alioth.debian.org/07
+See the Live Manual or the FAQ for more information; both documents are
+available at the Debian Live web site, 0fhttp://debian-live.alioth.debian.org/07
 
 
 You must have at least 32 megabytes of RAM to use the Debian installer.
diff --git a/templates/syslinux/en/f2.txt.live b/templates/syslinux/en/f2.txt.live
index f79062a..ec2430e 100644
--- a/templates/syslinux/en/f2.txt.live
+++ b/templates/syslinux/en/f2.txt.live
@@ -2,8 +2,8 @@
 
 You must have at least 64 megabytes of RAM to run this Debian Live system.
 
-See the Live Manual or the FAQ for more information; both
-documents are available at the Debian Live web site, 0fhttp://debian-live.alioth.debian.org/07
+See the Live Manual or the FAQ for more information; both documents are
+available at the Debian Live web site, 0fhttp://debian-live.alioth.debian.org/07
 
 Thank you for choosing Debian!
 
@@ -20,4 +20,5 @@ Thank you for choosing Debian!
 
 
 
-Press F1control and F then 1 for the help index, or ENTER to 
+
+Press F1control and F then 1 for the help index, or ENTER to 
\ No newline at end of file
diff --git a/templates/syslinux/en/f4.txt.live b/templates/syslinux/en/f4.txt.live
index 52f5e8d..be53488 100644
--- a/templates/syslinux/en/f4.txt.live
+++ b/templates/syslinux/en/f4.txt.live
@@ -1,4 +1,4 @@
-0fADDITIONAL BOOT METHODS07                                                       09F307
+0fADDITIONAL BOOT METHODS07                                                       09F407
 
 0fAvailable boot methods:07
 

-- 
debian-live/live-helper