summaryrefslogtreecommitdiffstats
path: root/manual
diff options
context:
space:
mode:
authorTorne Wuff <torne@wolfpuppy.org.uk>2010-10-12 23:34:42 +0000
committerTorne Wuff <torne@wolfpuppy.org.uk>2010-10-12 23:34:42 +0000
commit5f8ad3c2a86387926eaf0f7573149e52607d074a (patch)
tree13ecdd7d67be21ed36b9ef383eec2bbdd19d9bef /manual
parenta5b17b45113bc023367b5b470d634fec66c8b374 (diff)
downloadrockbox-5f8ad3c2a86387926eaf0f7573149e52607d074a.tar.gz
rockbox-5f8ad3c2a86387926eaf0f7573149e52607d074a.tar.bz2
rockbox-5f8ad3c2a86387926eaf0f7573149e52607d074a.zip
FS#10910: Manual incorrectly claims that the sleep timer and wake-up alarm are mutually exclusive
The alarm works differently now; you can use sleep and alarm together as the alarm no longer powers the player off immediately. Updated manual to remove text stating this is not the case. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28263 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'manual')
-rw-r--r--manual/main_menu/main.tex2
1 files changed, 0 insertions, 2 deletions
diff --git a/manual/main_menu/main.tex b/manual/main_menu/main.tex
index 9940f020c6..51e30cafda 100644
--- a/manual/main_menu/main.tex
+++ b/manual/main_menu/main.tex
@@ -204,7 +204,6 @@ pages of information.}
The \setting{Sleep Timer} powers off your \dap{} after playing for a given
time. It can be set from \setting{Off} to 5 hours in 5 minute steps.
The \setting{Sleep Timer} is reset on boot.
- \opt{alarm}{Using this option disables the \setting{Wake up alarm}.}
\item [Time Format: ] Choose 12 or 24 hour clock.
\opt{alarm}{
\subsection{Wake-Up Alarm}
@@ -243,7 +242,6 @@ pages of information.}
The \setting{Sleep Timer} powers off your \dap{} after playing for a given
time. It can be set from \setting{Off} to 5 hours in 5 minute steps.
The \setting{Sleep Timer} is reset on boot.
- \opt{alarm}{Using this option disables the \setting{Wake up alarm}.}
}
\item[Debug (Keep Out!):]