From 0e8c38206d4928d774867831c55cd80a17b638a3 Mon Sep 17 00:00:00 2001 From: Chris Lamb Date: Wed, 16 Apr 2008 03:34:21 +0100 Subject: 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 --- helpers/lh_binary_syslinux | 1 - templates/syslinux/en/f2.txt.install | 4 ++-- templates/syslinux/en/f2.txt.live | 7 ++++--- templates/syslinux/en/f4.txt.live | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) 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 -- cgit v1.0