Index: manual/platform/m5.tex
===================================================================
--- manual/platform/m5.tex	(revision 17098)
+++ manual/platform/m5.tex	(working copy)
@@ -96,3 +96,5 @@
 \newcommand{\ActionRecSettingsDec}{\ButtonLeft}
 \newcommand{\ActionRecMenu}{Long \ButtonRec}
 \newcommand{\ActionRecExit}{Long \ButtonPlay}
+
+\newcommand{\ActionQuickscreenExit}{\ButtonRec}
Index: manual/platform/ipodvideo.tex
===================================================================
--- manual/platform/ipodvideo.tex	(revision 17098)
+++ manual/platform/ipodvideo.tex	(working copy)
@@ -103,3 +103,5 @@
 \newcommand{\ActionRecMenu}{\fixme{fixme}}
 \newcommand{\ActionRecSettingsInc}{\ActionSettingInc}
 \newcommand{\ActionRecSettingsDec}{\ActionSettingDec}
+
+\newcommand{\ActionQuickscreenExit}{\ButtonMenu}
Index: manual/platform/mrobe100.tex
===================================================================
--- manual/platform/mrobe100.tex	(revision 17098)
+++ manual/platform/mrobe100.tex	(working copy)
@@ -101,3 +101,5 @@
 \newcommand{\ActionPsNudgeRight}{\ButtonRight}
 \newcommand{\ActionPsReset}{\ButtonDisplay}
 \newcommand{\ActionPsExit}{\ButtonPlay}
+
+\newcommand{\ActionQuickscreenExit}{\ButtonMenu}
Index: manual/platform/ipod3g.tex
===================================================================
--- manual/platform/ipod3g.tex	(revision 17098)
+++ manual/platform/ipod3g.tex	(working copy)
@@ -95,3 +95,5 @@
 \newcommand{\ActionPsNudgeRight}{\ButtonRight}
 \newcommand{\ActionPsReset}{\ButtonMenu}
 \newcommand{\ActionPsExit}{\ButtonSelect}
+
+\newcommand{\ActionQuickscreenExit}{\ButtonMenu}
Index: manual/platform/h10_5gb.tex
===================================================================
--- manual/platform/h10_5gb.tex	(revision 17098)
+++ manual/platform/h10_5gb.tex	(working copy)
@@ -123,3 +123,4 @@
 \newcommand{\ActionRecSettingsInc}{\ActionSettingInc}
 \newcommand{\ActionRecSettingsDec}{\ActionSettingDec}
 
+\newcommand{\ActionQuickscreenExit}{\ButtonLeft}
Index: manual/platform/ipod4g.tex
===================================================================
--- manual/platform/ipod4g.tex	(revision 17098)
+++ manual/platform/ipod4g.tex	(working copy)
@@ -103,3 +103,4 @@
 \newcommand{\ActionRecSettingsInc}{\ActionSettingInc}
 \newcommand{\ActionRecSettingsDec}{\ActionSettingDec}
 
+\newcommand{\ActionQuickscreenExit}{\ButtonMenu}
Index: manual/platform/h1xx.tex
===================================================================
--- manual/platform/h1xx.tex	(revision 17098)
+++ manual/platform/h1xx.tex	(working copy)
@@ -121,3 +121,4 @@
 \newcommand{\ActionFMPrev}{\ButtonLeft}
 \newcommand{\ActionFMNext}{\ButtonRight}
 
+\newcommand{\ActionQuickscreenExit}{\ButtonMode}
Index: manual/platform/h10.tex
===================================================================
--- manual/platform/h10.tex	(revision 17098)
+++ manual/platform/h10.tex	(working copy)
@@ -123,3 +123,4 @@
 \newcommand{\ActionRecSettingsInc}{\ActionSettingInc}
 \newcommand{\ActionRecSettingsDec}{\ActionSettingDec}
 
+\newcommand{\ActionQuickscreenExit}{\ButtonLeft}
Index: manual/platform/ipodcolor.tex
===================================================================
--- manual/platform/ipodcolor.tex	(revision 17098)
+++ manual/platform/ipodcolor.tex	(working copy)
@@ -103,3 +103,4 @@
 \newcommand{\ActionRecSettingsInc}{\ActionSettingInc}
 \newcommand{\ActionRecSettingsDec}{\ActionSettingDec}
 
+\newcommand{\ActionQuickscreenExit}{\ButtonMenu}
Index: manual/platform/x5.tex
===================================================================
--- manual/platform/x5.tex	(revision 17098)
+++ manual/platform/x5.tex	(working copy)
@@ -109,3 +109,4 @@
 \newcommand{\ActionFMPrev}{\ButtonLeft}
 \newcommand{\ActionFMNext}{\ButtonRight}
 
+\newcommand{\ActionQuickscreenExit}{\ButtonRec}
Index: manual/platform/recorderv2fm.tex
===================================================================
--- manual/platform/recorderv2fm.tex	(revision 17098)
+++ manual/platform/recorderv2fm.tex	(working copy)
@@ -125,3 +125,4 @@
 \newcommand{\ActionFMPrev}{\ButtonLeft}
 \newcommand{\ActionFMNext}{\ButtonRight}
 
+\newcommand{\ActionQuickscreenExit}{\ButtonPlay}
Index: manual/platform/c200.tex
===================================================================
--- manual/platform/c200.tex	(revision 17098)
+++ manual/platform/c200.tex	(working copy)
@@ -122,3 +122,4 @@
 \newcommand{\ActionFMPrev}{\ButtonLeft}
 \newcommand{\ActionFMNext}{\ButtonRight}
 
+\newcommand{\ActionQuickscreenExit}{\ButtonPower}
Index: manual/platform/recorder.tex
===================================================================
--- manual/platform/recorder.tex	(revision 17098)
+++ manual/platform/recorder.tex	(working copy)
@@ -108,3 +108,5 @@
 \newcommand{\ActionRecSettingsDec}{\ButtonLeft}
 \newcommand{\ActionRecMenu}{\ButtonFOne}
 \newcommand{\ActionRecExit}{\ButtonOff}
+
+\newcommand{\ActionQuickscreenExit}{\ButtonPlay}
Index: manual/platform/e200.tex
===================================================================
--- manual/platform/e200.tex	(revision 17098)
+++ manual/platform/e200.tex	(working copy)
@@ -120,3 +120,4 @@
 \newcommand{\ActionFMPrev}{\ActionRecSettingsInc}
 \newcommand{\ActionFMNext}{\ActionRecSettingsDec}
 
+\newcommand{\ActionQuickscreenExit}{\ButtonPower}
Index: manual/platform/ipodnano.tex
===================================================================
--- manual/platform/ipodnano.tex	(revision 17098)
+++ manual/platform/ipodnano.tex	(working copy)
@@ -102,3 +102,4 @@
 \newcommand{\ActionRecSettingsInc}{\ActionSettingInc}
 \newcommand{\ActionRecSettingsDec}{\ActionSettingDec}
 
+\newcommand{\ActionQuickscreenExit}{\ButtonMenu}
Index: manual/platform/ipodmini.tex
===================================================================
--- manual/platform/ipodmini.tex	(revision 17098)
+++ manual/platform/ipodmini.tex	(working copy)
@@ -95,3 +95,5 @@
 \newcommand{\ActionPsNudgeRight}{\ButtonRight}
 \newcommand{\ActionPsReset}{\ButtonMenu}
 \newcommand{\ActionPsExit}{\ButtonSelect}
+
+\newcommand{\ActionQuickscreenExit}{\ButtonMenu}
Index: manual/platform/gigabeatf.tex
===================================================================
--- manual/platform/gigabeatf.tex	(revision 17098)
+++ manual/platform/gigabeatf.tex	(working copy)
@@ -101,3 +101,5 @@
 \newcommand{\ActionPsNudgeRight}{\ButtonRight}
 \newcommand{\ActionPsReset}{\ButtonA}
 \newcommand{\ActionPsExit}{\ButtonPower}
+
+\newcommand{\ActionQuickscreenExit}{\ButtonMenu}
Index: manual/platform/h300.tex
===================================================================
--- manual/platform/h300.tex	(revision 17098)
+++ manual/platform/h300.tex	(working copy)
@@ -121,3 +121,4 @@
 \newcommand{\ActionFMPrev}{\ButtonLeft}
 \newcommand{\ActionFMNext}{\ButtonRight}
 
+\newcommand{\ActionQuickscreenExit}{\ButtonMode}
Index: manual/platform/ipod1g2g.tex
===================================================================
--- manual/platform/ipod1g2g.tex	(revision 17098)
+++ manual/platform/ipod1g2g.tex	(working copy)
@@ -95,3 +95,5 @@
 \newcommand{\ActionPsNudgeRight}{\ButtonRight}
 \newcommand{\ActionPsReset}{\ButtonMenu}
 \newcommand{\ActionPsExit}{\ButtonSelect}
+
+\newcommand{\ActionQuickscreenExit}{\ButtonMenu}
Index: manual/rockbox_interface/wps.tex
===================================================================
--- manual/rockbox_interface/wps.tex	(revision 17098)
+++ manual/rockbox_interface/wps.tex	(working copy)
@@ -85,9 +85,11 @@
       & Enter \setting{Main Menu}%
       \opt{ONDIO_PAD}{ via the \setting{WPS Context Menu}}.\\%
       %
-      \nopt{PLAYER_PAD,ONDIO_PAD}{%
-        \ActionWpsQuickScreen & Enter \setting{Quick Screen}.\\}%
-      %
+      \nopt{PLAYER_PAD,ONDIO_PAD} {
+        \ActionWpsQuickScreen & Switches to the \setting{Quick Menu}
+	(see \reference{ref:Quickmenu}) \\
+        %
+      }
       %These actions need definitions for the other targets
       \opt{RECORDER_PAD}{%
         \ButtonFThree & Toggles Display quick menu.\\%
Index: manual/rockbox_interface/browsing_and_playing.tex
===================================================================
--- manual/rockbox_interface/browsing_and_playing.tex	(revision 17098)
+++ manual/rockbox_interface/browsing_and_playing.tex	(working copy)
@@ -80,9 +80,12 @@
       \ActionStdMenu{}
       & Enter the \setting{Main Menu}\\
       %
+      \nopt{PLAYER_PAD,ONDIO_PAD} {
+        \ActionStdQuickScreen & Switches to the \setting{Quick Menu}
+	(see \reference{ref:Quickmenu}) \\
+        %
+      }
       \opt{RECORDER_PAD}{
-        \ButtonFTwo & Switches to the Browse/Play Quick Menu \\
-        %
         \ButtonFThree & Switches to the Display Quick Menu \\ 
         %
       }
Index: manual/main_menu/main.tex
===================================================================
--- manual/main_menu/main.tex	(revision 17098)
+++ manual/main_menu/main.tex	(working copy)
@@ -206,7 +206,7 @@
   a few of the more commonly used settings are available from the
   \setting{Quick Menu}.
   The \setting{Quick Menu} screen is accessed with \ActionStdQuickScreen{}
-  and exited with the same button.
+  and exited with \ActionQuickscreenExit .
   It allows rapid access to the \setting{Shuffle} and \setting{Repeat}
   modes (\reference{ref:PlaybackOptions}) and the \setting{Show Files}
   option (\reference{ref:ShowFiles}).