|
 |
a5bd9f6 |
From 652031cd423e0c17b40fb63e6882809ee85167fc Mon Sep 17 00:00:00 2001
|
|
|
a5bd9f6 |
From: Andrey Borzenkov <arvidjaar@gmail.com>
|
|
|
a5bd9f6 |
Date: Sun, 20 Jan 2013 22:42:08 +0100
|
|
|
a5bd9f6 |
Subject: [PATCH 118/364] * docs/grub.texi (Simple configuration):
|
|
|
a5bd9f6 |
Clarify GRUB_HIDDEN_TIMEOUT is interrupted by ESC.
|
|
|
a5bd9f6 |
|
|
|
a5bd9f6 |
---
|
|
|
a5bd9f6 |
ChangeLog | 5 +++++
|
|
|
a5bd9f6 |
docs/grub.texi | 7 ++++---
|
|
|
a5bd9f6 |
2 files changed, 9 insertions(+), 3 deletions(-)
|
|
|
a5bd9f6 |
|
|
|
a5bd9f6 |
diff --git a/ChangeLog b/ChangeLog
|
|
|
a5bd9f6 |
index 8eab442..4d09825 100644
|
|
|
a5bd9f6 |
--- a/ChangeLog
|
|
|
a5bd9f6 |
+++ b/ChangeLog
|
|
|
a5bd9f6 |
@@ -1,3 +1,8 @@
|
|
|
a5bd9f6 |
+2013-01-20 Andrey Borzenkov <arvidjaar@gmail.com>
|
|
|
a5bd9f6 |
+
|
|
|
a5bd9f6 |
+ * docs/grub.texi (Simple configuration): Clarify GRUB_HIDDEN_TIMEOUT
|
|
|
a5bd9f6 |
+ is interrupted by ESC.
|
|
|
a5bd9f6 |
+
|
|
|
a5bd9f6 |
2013-01-20 Vladimir Serbinenko <phcoder@gmail.com>
|
|
|
a5bd9f6 |
|
|
|
a5bd9f6 |
* util/grub-script-check.c (main): Uniform the error message.
|
|
|
a5bd9f6 |
diff --git a/docs/grub.texi b/docs/grub.texi
|
|
|
a5bd9f6 |
index 2dc0cbe..fbbcfb9 100644
|
|
|
a5bd9f6 |
--- a/docs/grub.texi
|
|
|
a5bd9f6 |
+++ b/docs/grub.texi
|
|
|
a5bd9f6 |
@@ -1201,11 +1201,12 @@ immediately without displaying the menu, or to @samp{-1} to wait
|
|
|
a5bd9f6 |
indefinitely.
|
|
|
a5bd9f6 |
|
|
|
a5bd9f6 |
@item GRUB_HIDDEN_TIMEOUT
|
|
|
a5bd9f6 |
-Wait this many seconds for a key to be pressed before displaying the menu.
|
|
|
a5bd9f6 |
-If no key is pressed during that time, display the menu for the number of
|
|
|
a5bd9f6 |
+Wait this many seconds for @key{ESC} to be pressed before displaying the menu.
|
|
|
a5bd9f6 |
+If no @key{ESC} is pressed during that time, display the menu for the number of
|
|
|
a5bd9f6 |
seconds specified in GRUB_TIMEOUT before booting the default entry. We expect
|
|
|
a5bd9f6 |
that most people who use GRUB_HIDDEN_TIMEOUT will want to have GRUB_TIMEOUT set
|
|
|
a5bd9f6 |
-to @samp{0} so that the menu is not displayed at all unless a key is pressed.
|
|
|
a5bd9f6 |
+to @samp{0} so that the menu is not displayed at all unless @key{ESC} is
|
|
|
a5bd9f6 |
+pressed.
|
|
|
a5bd9f6 |
Unset by default.
|
|
|
a5bd9f6 |
|
|
|
a5bd9f6 |
@item GRUB_HIDDEN_TIMEOUT_QUIET
|
|
|
a5bd9f6 |
--
|
|
|
a5bd9f6 |
1.8.1.4
|
|
|
a5bd9f6 |
|