summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Martitz <kugel@rockbox.org>2011-10-18 19:06:56 +0000
committerThomas Martitz <kugel@rockbox.org>2011-10-18 19:06:56 +0000
commit02395cf1a4c422d8884703ed9046b290f4503e2f (patch)
treecd87f6e9562f90c8fa3dfe016d63f1e2b20367ba
parented99b6eaffb253cd56e349e3ce68100647887b8c (diff)
downloadrockbox-02395cf1a4c422d8884703ed9046b290f4503e2f.zip
rockbox-02395cf1a4c422d8884703ed9046b290f4503e2f.tar.gz
rockbox-02395cf1a4c422d8884703ed9046b290f4503e2f.tar.bz2
rockbox-02395cf1a4c422d8884703ed9046b290f4503e2f.tar.xz
Reflect the time & date settings move in the manual.
Flyspray: FS#12339 Author: Nick Peskett git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30787 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--manual/configure_rockbox/main.tex11
-rw-r--r--manual/main_menu/main.tex40
2 files changed, 11 insertions, 40 deletions
diff --git a/manual/configure_rockbox/main.tex b/manual/configure_rockbox/main.tex
index 3176c93..6561bb6 100644
--- a/manual/configure_rockbox/main.tex
+++ b/manual/configure_rockbox/main.tex
@@ -21,6 +21,12 @@
\input{configure_rockbox/language.tex}
\input{configure_rockbox/voice.tex}
\input{configure_rockbox/hotkey_settings.tex}
+ \nopt{rtc}{
+ \section{\label{ref:sleep_timer}Sleep Timer}
+ \begin{description}
+ \input{configure_rockbox/sleep_timer.tex}
+ \end{description}
+ }
\chapter{Theme Settings}
\label{ref:configure_rockbox_themes}
@@ -31,3 +37,8 @@
\label{ref:Recordingsettings}
\input{configure_rockbox/recording_settings.tex}
}
+
+\opt{rtc}{
+\chapter{Time and Date}
+ \input{configure_rockbox/time_and_date.tex}
+}
diff --git a/manual/main_menu/main.tex b/manual/main_menu/main.tex
index b43cfb1..139d85f 100644
--- a/manual/main_menu/main.tex
+++ b/manual/main_menu/main.tex
@@ -195,35 +195,6 @@ utilities. A detailed description of the different plugins is to be found in
pages of information.}
\begin{description}
-\opt{rtc}{
- \item[Time and Date:]
- Time related menu options. Pressing \ActionStdContext{} will voice the current time if voice support is enabled
- \begin{description}
- \item[Set Time/Date:] Set current time and date.
- \item[Sleep Timer:]
- 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.
- While the \setting{Sleep Timer} is reset on boot, the value selected is
- retained and will be used as the default from then on.
- If the sleep timer is currently active, \setting{Off} will be highlighted,
- \opt{alarm}{
- \item[Wake-Up Alarm:]
- This option will make the \dap{} start up at the specified time.
- Use \ActionSettingInc{} and \ActionSettingDec{} to adjust the minutes setting,
- \ActionAlarmHoursDec{} and \ActionAlarmHoursInc{} to adjust the hours.
- \ActionAlarmSet{} confirms the alarm, and \ActionAlarmCancel{} cancels setting
- an alarm. If the \dap{} is turned on again before the alarm occurs, the alarm
- will be cancelled.
- \opt{recording,radio}{
- \item[Alarm Wake Up Screen:]
- This option controls what the \dap{} does when it is woken up by the alarm.
- }%\opt{recording,radio}
- }%\opt{alarm}
- \item[Start Sleep Timer On Boot:]
- If set, a \setting{Sleep Timer} will be initiated when the device starts.
- \item [Time Format:] Choose 12 or 24 hour clock.
- \end{description}
-}%\opt{rtc}
\item[Rockbox Info:]
Displays some basic system information. This is, from top to bottom,
the amount of memory Rockbox has available for storing music (the buffer).
@@ -240,17 +211,6 @@ pages of information.}
\item[Credits:]
Display the list of contributors.
-\nopt{rtc}{
- \item[Sleep Timer:]
- 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.
- While the \setting{Sleep Timer} is reset on boot, the value selected is
- retained and will be used as the default from then on.
- If the sleep timer is currently active, \setting{Off} will be highlighted,
- \item[Start Sleep Timer On Boot:]
- If set, a \setting{Sleep Timer} will be initiated when the device starts.
-}
-
\item[Running Time:]
Shows the runtime of your \dap{} in hours, minutes and seconds.
\begin{description}