Add new action descriptions for the alarm screen, correct the buttons for ipods and add a short description of the 'alarm wake up screen'.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15017 a1c6a512-1295-4272-9138-f99709370657

9 files changed, 44 insertions, 12 deletions

diff --git a/manual/configure_rockbox/system_options.tex b/manual/configure_rockbox/system_options.tex
index de3be467c8..5017436c0b 100644
--- a/manual/configure_rockbox/system_options.tex
+++ b/manual/configure_rockbox/system_options.tex
@@ -86,18 +86,18 @@ minutes in 1 minute steps. Then \setting{15,30,45} and \setting{60} minutes are
 available.
 
 \opt{HAVE_RTC_ALARM}{
-\subsection{Wake Up alarm}
-    This option turns the \dap{} off and then starts it up again at the 
-    specified time. This is most useful when combined with
-    \setting{Start Screen} set to \setting{Resume Playback}, so 
-    that the \dap{} wakes up and immediately starts playing music. Use 
-    \ActionSettingInc{} and \ActionSettingDec to adjust the minutes setting,
-    \ButtonLeft{} and \ButtonRight{} to adjust the HOURS.
-    \ButtonPlay{} confirms the alarm and shuts your \dap{} down, and
-    \opt{RECORDER_PAD}{\ButtonOff}\opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu}
-    cancels setting an alarm. If the \dap{} is turned on again before the alarm
-    occurs, the alarm will be cancelled. Using this option disables the 
-    \setting{Sleep Timer}.
+\subsection{Wake-Up Alarm}
+    This option turns the \dap{} off and then starts it up again at the
+    specified time. Use \ActionSettingInc{} and \ActionSettingDec{} to adjust
+    the minutes setting, \ButtonLeft{} and \ButtonRight{} to adjust the hours.
+    \ActionAlarmSet{} confirms the alarm and shuts the \dap{} down, and
+    \ActionAlarmCancel{} cancels setting an alarm. If the \dap{} is turned on
+    again before the alarm occurs, the alarm will be cancelled. Using this
+    option disables the \setting{Sleep Timer}.
+
+    \subsection{Alarm Wake up Screen}
+    This option controls what the \dap{} does when it is woken up by the alarm.
+    
 }
 
 \subsection{Limits}
diff --git a/manual/platform/ipod1g2g.tex b/manual/platform/ipod1g2g.tex
index 6721d36880..ea6db7dc81 100644
--- a/manual/platform/ipod1g2g.tex
+++ b/manual/platform/ipod1g2g.tex
@@ -70,6 +70,10 @@
 \newcommand{\ActionSettingInc}{\ButtonScrollFwd}
 \newcommand{\ActionSettingDec}{\ButtonScrollBack}
 
+%Button actions, Alarm screen
+\newcommand{\ActionAlarmSet}{\ButtonSelect}
+\newcommand{\ActionAlarmCancel}{\ButtonMenu}
+
 %Button actions, Virtual Keyboard Context
 \newcommand{\ActionKbdLeft}{\ButtonLeft}
 \newcommand{\ActionKbdRight}{\ButtonRight}
diff --git a/manual/platform/ipod3g.tex b/manual/platform/ipod3g.tex
index daf8c5dbfd..ac3300442f 100644
--- a/manual/platform/ipod3g.tex
+++ b/manual/platform/ipod3g.tex
@@ -70,6 +70,10 @@
 \newcommand{\ActionSettingInc}{\ButtonScrollFwd}
 \newcommand{\ActionSettingDec}{\ButtonScrollBack}
 
+%Button actions, Alarm screen
+\newcommand{\ActionAlarmSet}{\ButtonSelect}
+\newcommand{\ActionAlarmCancel}{\ButtonMenu}
+
 %Button actions, Virtual Keyboard Context
 \newcommand{\ActionKbdLeft}{\ButtonLeft}
 \newcommand{\ActionKbdRight}{\ButtonRight}
diff --git a/manual/platform/ipod4g.tex b/manual/platform/ipod4g.tex
index 7311161bce..840228814d 100644
--- a/manual/platform/ipod4g.tex
+++ b/manual/platform/ipod4g.tex
@@ -70,6 +70,10 @@
 \newcommand{\ActionSettingInc}{\ButtonScrollFwd}
 \newcommand{\ActionSettingDec}{\ButtonScrollBack}
 
+%Button actions, Alarm screen
+\newcommand{\ActionAlarmSet}{\ButtonSelect}
+\newcommand{\ActionAlarmCancel}{\ButtonMenu}
+
 %Button actions, Virtual Keyboard Context
 \newcommand{\ActionKbdLeft}{\ButtonLeft}
 \newcommand{\ActionKbdRight}{\ButtonRight}
diff --git a/manual/platform/ipodcolor.tex b/manual/platform/ipodcolor.tex
index e8ca47cf65..5aa3727e4e 100644
--- a/manual/platform/ipodcolor.tex
+++ b/manual/platform/ipodcolor.tex
@@ -71,6 +71,10 @@
 \newcommand{\ActionSettingInc}{\ButtonScrollFwd}
 \newcommand{\ActionSettingDec}{\ButtonScrollBack}
 
+%Button actions, Alarm screen
+\newcommand{\ActionAlarmSet}{\ButtonSelect}
+\newcommand{\ActionAlarmCancel}{\ButtonMenu}
+
 %Button actions, Virtual Keyboard Context
 \newcommand{\ActionKbdLeft}{\ButtonLeft}
 \newcommand{\ActionKbdRight}{\ButtonRight}
diff --git a/manual/platform/ipodmini.tex b/manual/platform/ipodmini.tex
index 0c23a1de61..dcb0e83af2 100644
--- a/manual/platform/ipodmini.tex
+++ b/manual/platform/ipodmini.tex
@@ -70,6 +70,10 @@
 \newcommand{\ActionSettingInc}{\ButtonScrollFwd}
 \newcommand{\ActionSettingDec}{\ButtonScrollBack}
 
+%Button actions, Alarm screen
+\newcommand{\ActionAlarmSet}{\ButtonSelect}
+\newcommand{\ActionAlarmCancel}{\ButtonMenu}
+
 %Button actions, Virtual Keyboard Context
 \newcommand{\ActionKbdLeft}{\ButtonLeft}
 \newcommand{\ActionKbdRight}{\ButtonRight}
diff --git a/manual/platform/ipodnano.tex b/manual/platform/ipodnano.tex
index 437c354d4b..fe9645fbd2 100644
--- a/manual/platform/ipodnano.tex
+++ b/manual/platform/ipodnano.tex
@@ -71,6 +71,10 @@
 \newcommand{\ActionSettingInc}{\ButtonScrollFwd}
 \newcommand{\ActionSettingDec}{\ButtonScrollBack}
 
+%Button actions, Alarm screen
+\newcommand{\ActionAlarmSet}{\ButtonSelect}
+\newcommand{\ActionAlarmCancel}{\ButtonMenu}
+
 %Button actions, Virtual Keyboard Context
 \newcommand{\ActionKbdLeft}{\ButtonLeft}
 \newcommand{\ActionKbdRight}{\ButtonRight}
diff --git a/manual/platform/ipodvideo.tex b/manual/platform/ipodvideo.tex
index fc5ec28839..dc1314b41d 100644
--- a/manual/platform/ipodvideo.tex
+++ b/manual/platform/ipodvideo.tex
@@ -71,6 +71,10 @@
 \newcommand{\ActionSettingInc}{\ButtonScrollFwd}
 \newcommand{\ActionSettingDec}{\ButtonScrollBack}
 
+%Button actions, Alarm screen
+\newcommand{\ActionAlarmSet}{\ButtonSelect}
+\newcommand{\ActionAlarmCancel}{\ButtonMenu}
+
 %Button actions, Virtual Keyboard Context
 \newcommand{\ActionKbdLeft}{\ButtonLeft}
 \newcommand{\ActionKbdRight}{\ButtonRight}
diff --git a/manual/platform/recorderv2fm.tex b/manual/platform/recorderv2fm.tex
index 3d8ede9ecf..d652056794 100644
--- a/manual/platform/recorderv2fm.tex
+++ b/manual/platform/recorderv2fm.tex
@@ -77,6 +77,10 @@
 \newcommand{\ActionSettingInc}{\ButtonUp}
 \newcommand{\ActionSettingDec}{\ButtonDown}
 
+%Button actions, Alarm screen
+\newcommand{\ActionAlarmSet}{\ButtonPlay}
+\newcommand{\ActionAlarmCancel}{\ButtonOff}
+
 %Button actions, Virtual Keyboard Context
 \newcommand{\ActionKbdLeft}{\ButtonLeft}
 \newcommand{\ActionKbdRight}{\ButtonRight}