diff options
| author | Samuel Thibault <sthibault@debian.org> | 2014-12-03 22:35:23 +0000 |
|---|---|---|
| committer | Samuel Thibault <sthibault@debian.org> | 2014-12-03 22:35:23 +0000 |
| commit | 615fcaa11aa37bfd5b6295d02a9e642e5d2e2f48 (patch) | |
| tree | 2eab15fa4f2fed6cb3094542bd2bba5f82770769 | |
| parent | a24f491fcebed43a268fc249080849ebbead8d40 (diff) | |
| download | installation-guide-615fcaa11aa37bfd5b6295d02a9e642e5d2e2f48.zip | |
Fix documentation for --- boot parameter marker
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | en/appendix/preseed.xml | 4 | ||||
| -rw-r--r-- | en/boot-installer/parameters.xml | 4 |
3 files changed, 7 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog index c7bd290ca..082a739b2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -22,6 +22,8 @@ installation-guide (201409xx) UNRELEASED; urgency=medium * Update tasks installation sizes. * It is now possible to choose the installed desktop, and the default is now Gnome on x86. Closes: #764026. + * Fix documentation for -- after it was turned into --- for fixing #764675. + * Explicit that console=ttyS0,something has to be put after ---. -- Samuel Thibault <sthibault@debian.org> Tue, 16 Sep 2014 13:24:16 +0200 diff --git a/en/appendix/preseed.xml b/en/appendix/preseed.xml index 64bfda9cb..cfbf9706e 100644 --- a/en/appendix/preseed.xml +++ b/en/appendix/preseed.xml @@ -365,8 +365,8 @@ alias, which translates to <literal>tasksel:tasksel/first</literal>. </para><para> -A <quote>--</quote> in the boot options has special meaning. Kernel -parameters that appear after the last <quote>--</quote> may be copied +A <quote>---</quote> in the boot options has special meaning. Kernel +parameters that appear after the last <quote>---</quote> may be copied into the bootloader configuration for the installed system (if supported by the installer for the bootloader). The installer will automatically filter out any options (like preconfiguration options) that it recognizes. diff --git a/en/boot-installer/parameters.xml b/en/boot-installer/parameters.xml index 53217ed39..9705329eb 100644 --- a/en/boot-installer/parameters.xml +++ b/en/boot-installer/parameters.xml @@ -46,7 +46,9 @@ your serial device, which is usually something like You may need to specify parameters for the serial port, such as speed and parity, for instance <userinput>console=ttyS0,9600n8</userinput>; other typical -speeds may be 57600 or 115200. +speeds may be 57600 or 115200. Be sure to specify this option after +<quote>---</quote>, so that it is copied into the bootloader configuration for +the installed system (if supported by the installer for the bootloader). </para><para> |