summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Perrier <bubulle@debian.org>2011-04-11 20:04:07 +0000
committerChristian Perrier <bubulle@debian.org>2011-04-11 20:04:07 +0000
commit27d5b8c5375dc44d0650fdb2a5ca1563fc2a63c3 (patch)
tree962acf216c3806c1a99926c109867ad581e7dea4
parent535e7ead1b76c7b902c98eebdb7292f6a3198bb2 (diff)
downloadinstallation-guide-27d5b8c5375dc44d0650fdb2a5ca1563fc2a63c3.zip
Document preseed-md5 and keymap preseed aliases
Closes: #621825, #621824
-rw-r--r--debian/changelog4
-rw-r--r--en/appendix/preseed.xml8
2 files changed, 9 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog
index e1f3305e8..e237dc4b2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,10 @@ installation-guide (2011xxxx) UNRELEASED; urgency=low
* The text frontend is available on most default install media. Adjust
the Boot Parameters section to say so.
+ [ Christian Perrier ]
+ * Document preseed-md5 and keymap preseed aliases
+ Closes: #621825, #621824
+
-- Samuel Thibault <sthibault@debian.org> Sun, 20 Feb 2011 21:47:31 +0100
installation-guide (20110122) unstable; urgency=low
diff --git a/en/appendix/preseed.xml b/en/appendix/preseed.xml
index d548dbc04..8ef3e7713 100644
--- a/en/appendix/preseed.xml
+++ b/en/appendix/preseed.xml
@@ -299,8 +299,9 @@ Boot parameters to specify:
<para>
Note that <filename>preseed/url</filename> can be shortened to just
-<filename>url</filename> and <filename>preseed/file</filename> to just
-<filename>file</filename> when they are passed as boot parameters.
+<filename>url</filename>, <filename>preseed/file</filename> to just
+<filename>file</filename> and <filename>preseed/file/checksum</filename> to just
+<filename>preseed-md5</filename> when they are passed as boot parameters.
</para>
</sect2>
@@ -776,7 +777,8 @@ be known to the &d-i; for the selected keyboard architecture.
<informalexample role="example"><screen>
# Keyboard selection.
#d-i console-tools/archs select at
-d-i console-keymaps-at/keymap select us
+# keymap is an alias for console-keymaps-at
+d-i keymap select us
d-i keyboard-configuration/xkb-keymap select us
# Example for a different keyboard architecture
#d-i console-keymaps-usb/keymap select mac-usb-us