grub2/0118-docs-grub.texi-Simple-configuration-Clarify-GRUB_HID.patch
2013-05-02 16:54:52 -04:00

48 lines
1.7 KiB
Diff

From 652031cd423e0c17b40fb63e6882809ee85167fc Mon Sep 17 00:00:00 2001
From: Andrey Borzenkov <arvidjaar@gmail.com>
Date: Sun, 20 Jan 2013 22:42:08 +0100
Subject: [PATCH 118/364] * docs/grub.texi (Simple configuration):
Clarify GRUB_HIDDEN_TIMEOUT is interrupted by ESC.
---
ChangeLog | 5 +++++
docs/grub.texi | 7 ++++---
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 8eab442..4d09825 100644
--- 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 2dc0cbe..fbbcfb9 100644
--- 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
--
1.8.1.4