* docs/grub.texi (Simple configuration): Explain that

GRUB_DISABLE_LINUX_RECOVERY and GRUB_DISABLE_NETBSD_RECOVERY must be
set to `true' to disable their respective recovery entries, not
merely set.

diff --git a/ChangeLog b/ChangeLog
index 52b37640f2bf5633e7a9287b3963bde750d1380c..d76683823df3bdbfb8ac0aaee53ce671c8d04c56 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-06-26  Colin Watson  <cjwatson@ubuntu.com>
+
+       * docs/grub.texi (Simple configuration): Explain that
+       GRUB_DISABLE_LINUX_RECOVERY and GRUB_DISABLE_NETBSD_RECOVERY must be
+       set to `true' to disable their respective recovery entries, not
+       merely set.
+
 2010-06-26  Colin Watson  <cjwatson@ubuntu.com>
 
        Make the `source' command slightly faster.

diff --git a/docs/grub.texi b/docs/grub.texi
index 822849777e027229d93c0a26c61c998452038d14..98d3c5f00acb8132b6c9300f50da0ddead2d2001 100644 (file)
--- a/docs/grub.texi
+++ b/docs/grub.texi
@@ -911,10 +911,11 @@ A command to configure the serial port when using the serial console.
 Command-line arguments to add to menu entries for the Linux kernel.
 
 @item GRUB_CMDLINE_LINUX_DEFAULT
-Unless @samp{GRUB_DISABLE_LINUX_RECOVERY} is set, two menu entries will be
-generated for each Linux kernel: one default entry and one entry for
-recovery mode.  This option lists command-line arguments to add only to the
-default menu entry, after those listed in @samp{GRUB_CMDLINE_LINUX}.
+Unless @samp{GRUB_DISABLE_LINUX_RECOVERY} is set to @samp{true}, two menu
+entries will be generated for each Linux kernel: one default entry and one
+entry for recovery mode.  This option lists command-line arguments to add
+only to the default menu entry, after those listed in
+@samp{GRUB_CMDLINE_LINUX}.
 
 @item GRUB_CMDLINE_NETBSD
 @itemx GRUB_CMDLINE_NETBSD_DEFAULT
@@ -929,10 +930,12 @@ usually more reliable, but in some cases it may not be appropriate.  To
 disable the use of UUIDs, set this option to @samp{true}.
 
 @item GRUB_DISABLE_LINUX_RECOVERY
-Disable the generation of recovery mode menu entries for Linux.
+If this option is set to @samp{true}, disable the generation of recovery
+mode menu entries for Linux.
 
 @item GRUB_DISABLE_NETBSD_RECOVERY
-Disable the generation of recovery mode menu entries for NetBSD.
+If this option is set to @samp{true}, disable the generation of recovery
+mode menu entries for NetBSD.
 
 @item GRUB_VIDEO_BACKEND
 If graphical video support is required, either because the @samp{gfxterm}