summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Thibault <sthibault@debian.org>2015-11-01 21:12:18 +0000
committerSamuel Thibault <sthibault@debian.org>2015-11-01 21:12:18 +0000
commitc6f4ad1dae80d6bc67a9b9eba3b96773aae77b58 (patch)
tree39f1da00f40fa6ca700d2cdd06e853b0a8444a4f
parentbe1fae2fe2b3c9abb03df250fdb65e0d8ec2036a (diff)
downloadinstallation-guide-c6f4ad1dae80d6bc67a9b9eba3b96773aae77b58.zip
Fix Instructions for creating syslinux.cfg according to syslinux 5.00 change.
-rw-r--r--debian/changelog4
-rw-r--r--en/install-methods/usb-setup/x86.xml7
2 files changed, 7 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog
index 358a96912..1e2aeeaf8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,10 @@ installation-guide (20150528) UNRELEASED; urgency=medium
[ Samuel Thibault ]
* Document the fourth bootline parameter of brltty.
+ [ Matt Kraai ]
+ * Fix Instructions for creating syslinux.cfg according to syslinux 5.00
+ change. Closes: #803267.
+
-- Martin Michlmayr <tbm@cyrius.com> Sun, 14 Jun 2015 19:13:39 -0400
installation-guide (20150528) unstable; urgency=medium
diff --git a/en/install-methods/usb-setup/x86.xml b/en/install-methods/usb-setup/x86.xml
index afa3de1d4..102574876 100644
--- a/en/install-methods/usb-setup/x86.xml
+++ b/en/install-methods/usb-setup/x86.xml
@@ -93,17 +93,16 @@ subdirectory. If you want to rename the files, please note that
</para><para>
Next you should create a <filename>syslinux.cfg</filename> configuration
-file, which at a bare minimum should contain the following two lines (change
+file, which at a bare minimum should contain the following line (change
the name of the kernel binary to <quote><filename>linux</filename></quote>
if you used a <filename>netboot</filename> image):
<informalexample><screen>
-default vmlinuz
-append initrd=initrd.gz
+default vmlinuz initrd=initrd.gz
</screen></informalexample>
For the graphical installer you should add <userinput>vga=788</userinput> to the
-second line. Other parameters can be appended as desired.
+line. Other parameters can be appended as desired.
</para><para>