* Document booting d-i from grub2. Closes: #612165.

  * Mention preseeding as an alternative for accessibility.
  * Document that the text installer is selected by default.

3 files changed, 36 insertions, 5 deletions

diff --git a/debian/changelog b/debian/changelog
index 89bece007..470344829 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,11 +3,14 @@ installation-guide (2011xxxx) UNRELEASED; urgency=low
   [ Samuel Thibault ]
   * Reference the French translation of the brltty manual in fr.
   * Disable G-I on kfreebsd-*.
+  * Document booting d-i from grub2. Closes: #612165.
+  * Mention preseeding as an alternative for accessibility.
+  * Document that the text installer is selected by default.
 
   [ Joey Hess ]
   * Fix typo in example preseed. Closes: #612631
 
- -- Samuel Thibault <sthibault@debian.org>  Fri, 28 Jan 2011 00:07:55 +0100
+ -- Samuel Thibault <sthibault@debian.org>  Sun, 20 Feb 2011 20:51:10 +0100
 
 installation-guide (20110122) unstable; urgency=low
 
diff --git a/en/boot-installer/accessibility.xml b/en/boot-installer/accessibility.xml
index 671460729..1fab0d83e 100644
--- a/en/boot-installer/accessibility.xml
+++ b/en/boot-installer/accessibility.xml
@@ -109,4 +109,14 @@ theme that makes it more readable. To enable it, append the
 
 </para>
   </sect2>
+
+  <sect2><title>Preseeding</title>
+<para>
+
+Alternatively, &debian; can be installed completely automatically by using
+preseeding. This is documented in <xref linkend="appendix-preseed"/>.
+
+</para>
+  </sect2>
+
  </sect1>
diff --git a/en/boot-installer/x86.xml b/en/boot-installer/x86.xml
index f1251eff7..6d1f5221c 100644
--- a/en/boot-installer/x86.xml
+++ b/en/boot-installer/x86.xml
@@ -90,7 +90,8 @@ memory stick, you can run it manually by accessing the device and executing
 </para><para>
 
 After the program has been started, a few preliminary questions will be
-asked and the system will be prepared to start the &debian-gnu; installer.
+asked and the system will be prepared to reboot into the &debian-gnu;
+installer.
 
 </para>
   </sect2>
@@ -199,7 +200,7 @@ For more details, refer to the
 
 </para><para>
 
-The procedure for <command>GRUB</command> is quite similar. Locate your
+The procedure for <command>GRUB1</command> is quite similar. Locate your
 <filename>menu.lst</filename> in the <filename>/boot/grub/</filename>
 directory (or sometimes <filename>/boot/boot/grub/</filename>) and add an
 entry for the installer, for example (assuming <filename>/boot</filename>
@@ -214,6 +215,22 @@ initrd /boot/newinstall/initrd.gz
 
 </para><para>
 
+The procedure for <command>GRUB2</command> is very similar. The file is named
+<filename>grub.cfg</filename> instead of <filename>menu.lst</filename>. An entry
+for the installer would be for instance for example:
+
+<informalexample><screen>
+menuentry 'New Install' {
+insmod part_msdos
+insmod ext2
+set root='(hd0,msdos1)'
+linux /boot/newinstall/vmlinuz
+initrd /boot/newinstall/initrd.gz
+}
+</screen></informalexample>
+
+</para><para>
+
 From here on, there should be no difference between <command>GRUB</command>
 or <command>LILO</command>.
 
@@ -364,8 +381,9 @@ install</quote> option may not be available.
 
 For a normal installation, select either the <quote>Install</quote> or
 the <quote>Graphical install</quote> entry  &mdash; using either the
-arrow keys on your keyboard or by typing the first (highlighted) letter
-&mdash; and press &enterkey; to boot the installer.
+arrow keys on your keyboard or by typing the first (highlighted) letter, the
+<quote>Install</quote> entry is already selected by default &mdash; and press
+&enterkey; to boot the installer.
 
 </para><para>