* docs/grub.texi (Simple configuration): Clarify GRUB_HIDDEN_TIMEOUT

	is interrupted by ESC.

diff --git a/ChangeLog b/ChangeLog
index 8eab442247a7563cd7c84019499342959ab39b73..4d09825e58f418e0e182ebd4d455f2a3f6447ae2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-01-20  Andrey Borzenkov <arvidjaar@gmail.com>
+
+       * docs/grub.texi (Simple configuration): Clarify GRUB_HIDDEN_TIMEOUT
+       is interrupted by ESC.
+
 2013-01-20  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * util/grub-script-check.c (main): Uniform the error message.

diff --git a/docs/grub.texi b/docs/grub.texi
index 2dc0cbeda3988bd306c88be6f02150c9cdbf049f..fbbcfb935537895f7f86baa4fa33660101e7c383 100644 (file)
--- a/docs/grub.texi
+++ b/docs/grub.texi
@@ -1201,11 +1201,12 @@ immediately without displaying the menu, or to @samp{-1} to wait
 indefinitely.
 
 @item GRUB_HIDDEN_TIMEOUT
-Wait this many seconds for a key to be pressed before displaying the menu.
-If no key is pressed during that time, display the menu for the number of
+Wait this many seconds for @key{ESC} to be pressed before displaying the menu.
+If no @key{ESC} is pressed during that time, display the menu for the number of
 seconds specified in GRUB_TIMEOUT before booting the default entry. We expect
 that most people who use GRUB_HIDDEN_TIMEOUT will want to have GRUB_TIMEOUT set 
-to @samp{0} so that the menu is not displayed at all unless a key is pressed.
+to @samp{0} so that the menu is not displayed at all unless @key{ESC} is
+pressed.
 Unset by default.
 
 @item GRUB_HIDDEN_TIMEOUT_QUIET