19 files changed, 78 insertions, 5 deletions

diff --git a/manual/configure_rockbox/system_options.tex b/manual/configure_rockbox/system_options.tex
index 16e0a32f55..006a2d24e9 100644
--- a/manual/configure_rockbox/system_options.tex
+++ b/manual/configure_rockbox/system_options.tex
@@ -88,12 +88,13 @@ 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 the \setting{Resume}
-    setting in the \setting{Playback Options} menu is set to \setting{Yes}, so 
+    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 
-    \ButtonLeft{} and \ButtonRight{} to adjust the minutes setting, \ButtonUp{}
-    and \ButtonDown{} to adjust the HOURS.
-    \ButtonPlay{} confirms the alarm and shuts your \dap{} down, and \ButtonOff
+    \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}.
diff --git a/manual/platform/e200.tex b/manual/platform/e200.tex
index 3be89c8c51..79649d2326 100644
--- a/manual/platform/e200.tex
+++ b/manual/platform/e200.tex
@@ -70,6 +70,10 @@
 %Button actions, YesNo context
 \newcommand{\ActionYesNoAccept}{\ButtonSelect}
 
+%Button actions, Setting context
+\newcommand{\ActionSettingInc}{\ButtonScrollUp}
+\newcommand{\ActionSettingDec}{\ButtonScrollDown}
+
 %Button actions, Virtual Keyboard Context
 \newcommand{\ActionKbdLeft}{\ButtonLeft}
 \newcommand{\ActionKbdRight}{\ButtonRight}
diff --git a/manual/platform/gigabeatf.tex b/manual/platform/gigabeatf.tex
index 00488ab131..8b2e8d49ed 100644
--- a/manual/platform/gigabeatf.tex
+++ b/manual/platform/gigabeatf.tex
@@ -69,6 +69,10 @@
 %Button actions, YesNo context
 \newcommand{\ActionYesNoAccept}{\ButtonSelect}
 
+%Button actions, Setting context
+\newcommand{\ActionSettingInc}{\ButtonUp}
+\newcommand{\ActionSettingDec}{\ButtonDown}
+
 %Button actions, Virtual Keyboard Context
 \newcommand{\ActionKbdLeft}{\ButtonLeft}
 \newcommand{\ActionKbdRight}{\ButtonRight}
diff --git a/manual/platform/h10.tex b/manual/platform/h10.tex
index 8b57e0dc1c..f5ec202ab2 100644
--- a/manual/platform/h10.tex
+++ b/manual/platform/h10.tex
@@ -67,6 +67,10 @@
 %Button actions, YesNo context
 \newcommand{\ActionYesNoAccept}{\ButtonRight}
 
+%Button actions, Setting context
+\newcommand{\ActionSettingInc}{\ButtonScrollUp}
+\newcommand{\ActionSettingDec}{\ButtonScrollDown}
+
 %Button actions, Virtual Keyboard Context
 \newcommand{\ActionKbdLeft}{\ButtonLeft}
 \newcommand{\ActionKbdRight}{\ButtonRight}
diff --git a/manual/platform/h10_5gb.tex b/manual/platform/h10_5gb.tex
index f4a34f625d..bf880db499 100644
--- a/manual/platform/h10_5gb.tex
+++ b/manual/platform/h10_5gb.tex
@@ -67,6 +67,10 @@
 %Button actions, YesNo context
 \newcommand{\ActionYesNoAccept}{\ButtonRight}
 
+%Button actions, Setting context
+\newcommand{\ActionSettingInc}{\ButtonScrollUp}
+\newcommand{\ActionSettingDec}{\ButtonScrollDown}
+
 %Button actions, Virtual Keyboard Context
 \newcommand{\ActionKbdLeft}{\ButtonLeft}
 \newcommand{\ActionKbdRight}{\ButtonRight}
diff --git a/manual/platform/h1xx.tex b/manual/platform/h1xx.tex
index 1285a02f22..69cbb35c41 100644
--- a/manual/platform/h1xx.tex
+++ b/manual/platform/h1xx.tex
@@ -70,6 +70,10 @@
 %Button actions, YesNo context
 \newcommand{\ActionYesNoAccept}{\ButtonSelect}
 
+%Button actions, Setting context
+\newcommand{\ActionSettingInc}{\ButtonUp}
+\newcommand{\ActionSettingDec}{\ButtonDown}
+
 %Button actions, Virtual Keyboard Context
 \newcommand{\ActionKbdLeft}{\ButtonLeft}
 \newcommand{\ActionKbdRight}{\ButtonRight}
diff --git a/manual/platform/h300.tex b/manual/platform/h300.tex
index 1ce2d86608..5b196e2460 100644
--- a/manual/platform/h300.tex
+++ b/manual/platform/h300.tex
@@ -72,6 +72,10 @@
 %Button actions, YesNo context
 \newcommand{\ActionYesNoAccept}{\ButtonSelect}
 
+%Button actions, Setting context
+\newcommand{\ActionSettingInc}{\ButtonUp}
+\newcommand{\ActionSettingDec}{\ButtonDown}
+
 %Button actions, Virtual Keyboard Context
 \newcommand{\ActionKbdLeft}{\ButtonLeft}
 \newcommand{\ActionKbdRight}{\ButtonRight}
diff --git a/manual/platform/ipod3g.tex b/manual/platform/ipod3g.tex
index ace87a857b..c294ee8960 100644
--- a/manual/platform/ipod3g.tex
+++ b/manual/platform/ipod3g.tex
@@ -64,6 +64,10 @@
 %Button actions, YesNo context
 \newcommand{\ActionYesNoAccept}{\ButtonPlay}
 
+%Button actions, Setting context
+\newcommand{\ActionSettingInc}{\ButtonScrollFwd}
+\newcommand{\ActionSettingDec}{\ButtonScrollBack}
+
 %Button actions, Virtual Keyboard Context
 \newcommand{\ActionKbdLeft}{\ButtonLeft}
 \newcommand{\ActionKbdRight}{\ButtonRight}
diff --git a/manual/platform/ipod4g.tex b/manual/platform/ipod4g.tex
index 782117a60d..91fc77196a 100644
--- a/manual/platform/ipod4g.tex
+++ b/manual/platform/ipod4g.tex
@@ -64,6 +64,10 @@
 %Button actions, YesNo context
 \newcommand{\ActionYesNoAccept}{\ButtonPlay}
 
+%Button actions, Setting context
+\newcommand{\ActionSettingInc}{\ButtonScrollFwd}
+\newcommand{\ActionSettingDec}{\ButtonScrollBack}
+
 %Button actions, Virtual Keyboard Context
 \newcommand{\ActionKbdLeft}{\ButtonLeft}
 \newcommand{\ActionKbdRight}{\ButtonRight}
diff --git a/manual/platform/ipodcolor.tex b/manual/platform/ipodcolor.tex
index 7ed7d64ea9..4179ca56c9 100644
--- a/manual/platform/ipodcolor.tex
+++ b/manual/platform/ipodcolor.tex
@@ -65,6 +65,10 @@
 %Button actions, YesNo context
 \newcommand{\ActionYesNoAccept}{\ButtonPlay}
 
+%Button actions, Setting context
+\newcommand{\ActionSettingInc}{\ButtonScrollFwd}
+\newcommand{\ActionSettingDec}{\ButtonScrollBack}
+
 %Button actions, Virtual Keyboard Context
 \newcommand{\ActionKbdLeft}{\ButtonLeft}
 \newcommand{\ActionKbdRight}{\ButtonRight}
diff --git a/manual/platform/ipodmini.tex b/manual/platform/ipodmini.tex
index 4237a292d0..5391c945c6 100644
--- a/manual/platform/ipodmini.tex
+++ b/manual/platform/ipodmini.tex
@@ -64,6 +64,10 @@
 %Button actions, YesNo context
 \newcommand{\ActionYesNoAccept}{\ButtonPlay}
 
+%Button actions, Setting context
+\newcommand{\ActionSettingInc}{\ButtonScrollFwd}
+\newcommand{\ActionSettingDec}{\ButtonScrollBack}
+
 %Button actions, Virtual Keyboard Context
 \newcommand{\ActionKbdLeft}{\ButtonLeft}
 \newcommand{\ActionKbdRight}{\ButtonRight}
diff --git a/manual/platform/ipodnano.tex b/manual/platform/ipodnano.tex
index b7ff61595a..ecb6a0dd2b 100644
--- a/manual/platform/ipodnano.tex
+++ b/manual/platform/ipodnano.tex
@@ -65,6 +65,10 @@
 %Button actions, YesNo context
 \newcommand{\ActionYesNoAccept}{\ButtonPlay}
 
+%Button actions, Setting context
+\newcommand{\ActionSettingInc}{\ButtonScrollFwd}
+\newcommand{\ActionSettingDec}{\ButtonScrollBack}
+
 %Button actions, Virtual Keyboard Context
 \newcommand{\ActionKbdLeft}{\ButtonLeft}
 \newcommand{\ActionKbdRight}{\ButtonRight}
diff --git a/manual/platform/ipodvideo.tex b/manual/platform/ipodvideo.tex
index 1eed11df2c..55de4c06d4 100644
--- a/manual/platform/ipodvideo.tex
+++ b/manual/platform/ipodvideo.tex
@@ -65,6 +65,10 @@
 %Button actions, YesNo context
 \newcommand{\ActionYesNoAccept}{\ButtonPlay}
 
+%Button actions, Setting context
+\newcommand{\ActionSettingInc}{\ButtonScrollFwd}
+\newcommand{\ActionSettingDec}{\ButtonScrollBack}
+
 %Button actions, Virtual Keyboard Context
 \newcommand{\ActionKbdLeft}{\ButtonLeft}
 \newcommand{\ActionKbdRight}{\ButtonRight}
diff --git a/manual/platform/ondiofm.tex b/manual/platform/ondiofm.tex
index b5aa978102..1bcfd924e4 100644
--- a/manual/platform/ondiofm.tex
+++ b/manual/platform/ondiofm.tex
@@ -60,6 +60,10 @@
 %Button actions, YesNo context
 \newcommand{\ActionYesNoAccept}{\ButtonRight}
 
+%Button actions, Setting context
+\newcommand{\ActionSettingInc}{\ButtonUp}
+\newcommand{\ActionSettingDec}{\ButtonDown}
+
 %Button actions, Pitch Screen context
 \newcommand{\ActionPsToggleMode}{Long \ButtonMenu}
 \newcommand{\ActionPsIncSmall}{\ButtonUp}
diff --git a/manual/platform/ondiosp.tex b/manual/platform/ondiosp.tex
index 9739e90b81..e984397ef7 100644
--- a/manual/platform/ondiosp.tex
+++ b/manual/platform/ondiosp.tex
@@ -57,6 +57,10 @@
 %Button actions, YesNo context
 \newcommand{\ActionYesNoAccept}{\ButtonRight}
 
+%Button actions, Setting context
+\newcommand{\ActionSettingInc}{\ButtonUp}
+\newcommand{\ActionSettingDec}{\ButtonDown}
+
 %Button actions, Pitch Screen context
 \newcommand{\ActionPsToggleMode}{Long \ButtonMenu}
 \newcommand{\ActionPsIncSmall}{\ButtonUp}
diff --git a/manual/platform/player.tex b/manual/platform/player.tex
index fb5b56e722..d42c2c1c70 100644
--- a/manual/platform/player.tex
+++ b/manual/platform/player.tex
@@ -56,3 +56,7 @@
 
 %Button actions, YesNo context
 \newcommand{\ActionYesNoAccept}{\ButtonPlay}
+
+%Button actions, Setting context
+\newcommand{\ActionSettingInc}{\ButtonRight}
+\newcommand{\ActionSettingDec}{\ButtonLeft}
diff --git a/manual/platform/recorder.tex b/manual/platform/recorder.tex
index 748d9caf24..b8da5faf28 100644
--- a/manual/platform/recorder.tex
+++ b/manual/platform/recorder.tex
@@ -67,6 +67,10 @@
 %Button actions, YesNo context
 \newcommand{\ActionYesNoAccept}{\ButtonPlay}
 
+%Button actions, Setting context
+\newcommand{\ActionSettingInc}{\ButtonUp}
+\newcommand{\ActionSettingDec}{\ButtonDown}
+
 %Button actions, Virtual Keyboard Context
 \newcommand{\ActionKbdLeft}{\ButtonLeft}
 \newcommand{\ActionKbdRight}{\ButtonRight}
diff --git a/manual/platform/recorderv2fm.tex b/manual/platform/recorderv2fm.tex
index d11bb3b9a1..7b93efbf37 100644
--- a/manual/platform/recorderv2fm.tex
+++ b/manual/platform/recorderv2fm.tex
@@ -68,6 +68,10 @@
 %Button actions, YesNo context
 \newcommand{\ActionYesNoAccept}{\ButtonPlay}
 
+%Button actions, Setting context
+\newcommand{\ActionSettingInc}{\ButtonUp}
+\newcommand{\ActionSettingDec}{\ButtonDown}
+
 %Button actions, Virtual Keyboard Context
 \newcommand{\ActionKbdLeft}{\ButtonLeft}
 \newcommand{\ActionKbdRight}{\ButtonRight}
diff --git a/manual/platform/x5.tex b/manual/platform/x5.tex
index dd78bdf9cf..2db46e48ac 100644
--- a/manual/platform/x5.tex
+++ b/manual/platform/x5.tex
@@ -66,6 +66,10 @@
 %Button actions, YesNo context
 \newcommand{\ActionYesNoAccept}{\ButtonSelect}
 
+%Button actions, Setting context
+\newcommand{\ActionSettingInc}{\ButtonUp}
+\newcommand{\ActionSettingDec}{\ButtonDown}
+
 %Button actions, Virtual Keyboard Context
 \newcommand{\ActionKbdLeft}{\ButtonLeft}
 \newcommand{\ActionKbdRight}{\ButtonRight}