summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2007-01-04 13:23:42 +0100
committerKlaus Schmidinger <vdr@tvdr.de>2007-01-04 13:23:42 +0100
commit50ff4d3b792efb259810348d5e92311c58fccc81 (patch)
tree911b4292ab936d5933e838f1f3ce4a00d65626cb
parentdcff08512e69a8eac5a6188c23fe56e8672fe5d4 (diff)
downloadvdr-50ff4d3b792efb259810348d5e92311c58fccc81.tar.gz
vdr-50ff4d3b792efb259810348d5e92311c58fccc81.tar.bz2
Fixed the INSTALL section on retrying shutdown later
-rw-r--r--CONTRIBUTORS1
-rw-r--r--HISTORY1
-rw-r--r--INSTALL5
3 files changed, 4 insertions, 3 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 628dd8a8..d02a7edf 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1478,6 +1478,7 @@ Udo Richter <udo_richter@gmx.de>
or fixing a possible segfault in cSkins::Message()
for some hints on how to improve handling cPluginManager::Active()
for fixing a possible segfault if VDR gets terminated while a message is displayed
+ for reporting an error in the INSTALL section on retrying shutdown later
Sven Kreiensen <svenk@kammer.uni-hannover.de>
for his help in keeping 'channels.conf.terr' up to date
diff --git a/HISTORY b/HISTORY
index ffcaf776..ca184382 100644
--- a/HISTORY
+++ b/HISTORY
@@ -5020,3 +5020,4 @@ Video Disk Recorder Revision History
- Fixed a possible segfault if VDR gets terminated while a message is displayed
(thanks to Udo Richter).
+- Fixed the INSTALL section on retrying shutdown later (reported by Udo Richter).
diff --git a/INSTALL b/INSTALL
index fef86017..21dfcfad 100644
--- a/INSTALL
+++ b/INSTALL
@@ -199,9 +199,8 @@ correspond to a time that is "Min. event timeout" minutes in the future.
Before the shutdown program is called, the user will be prompted to inform
him that the system is about to shut down. If any remote control key is
pressed while this prompt is visible, the shutdown will be cancelled (and
-tried again after another MinUserInactivity minutes). The shutdown prompt
-will be displayed for 5 minutes, which should be enough time for the user
-to react.
+tried again later). The shutdown prompt will be displayed for 5 minutes, which
+should be enough time for the user to react.
A sample shell script to be used with the '-s' option might look like this: