summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog8
-rw-r--r--en/appendix/preseed.xml13
2 files changed, 18 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog
index 330008e4f..750ad92c6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+installation-guide (201304XX) UNRELEASED; urgency=low
+
+ [ Vincent McIntyre ]
+ * Clearly distinguish between auto boot label and auto=true kernel
+ parameter.
+
+ -- Samuel Thibault <sthibault@debian.org> Fri, 12 Apr 2013 13:12:35 +0200
+
installation-guide (20130408) unstable; urgency=low
[ Samuel Thibault ]
diff --git a/en/appendix/preseed.xml b/en/appendix/preseed.xml
index 67f8feef4..d728c0265 100644
--- a/en/appendix/preseed.xml
+++ b/en/appendix/preseed.xml
@@ -397,7 +397,14 @@ parameters, even if you delimit them with quotes.
There are several features of &debian; Installer that combine to allow
fairly simple command lines at the boot prompt to result in
-arbitrarily complex customized automatic installs. To illustrate
+arbitrarily complex customized automatic installs. <footnote>
+<para>
+Note that in this section the 'auto' part of the examples is a
+syslinux <emphasis>boot label</emphasis>
+which adds the kernel parameters <literal>auto=true priority=critical</literal>
+to the <literal>append</literal> command for the boot label.
+</para>
+</footnote> To illustrate
this, here are some examples that can be used at the boot prompt:
<informalexample><screen>
@@ -488,10 +495,10 @@ for you.
</para><para>
-The <literal>auto</literal> boot label is not yet defined everywhere.
+The <literal>auto</literal> boot label is not yet defined on all arches.
The same effect may be achieved by simply adding the two
parameters <literal>auto=true priority=critical</literal> to the kernel
-command line. The <literal>auto</literal> parameter is an alias for
+command line. The <literal>auto</literal> kernel parameter is an alias for
<literal>auto-install/enable</literal> and setting it to
<literal>true</literal> delays the
locale and keyboard questions until after there has been a chance to