2 files changed, 10 insertions, 10 deletions

diff --git a/manual/rockbox_interface/browsing_and_playing.tex b/manual/rockbox_interface/browsing_and_playing.tex
index b86625773d..7b06e34019 100644
--- a/manual/rockbox_interface/browsing_and_playing.tex
+++ b/manual/rockbox_interface/browsing_and_playing.tex
@@ -80,11 +80,9 @@ the \setting{Show Files} setting to all.
       \ActionStdMenu{}
       & Enter the \setting{Main Menu}\\
       %
-      \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,SANSA_E200_PAD,SANSA_C200_PAD%
-          ,GIGABEAT_PAD,MROBE100_PAD,IAUDIO_X5_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IRIVER_H10_PAD}{
+      \opt{quickscreen}{
         \ActionStdQuickScreen & Switches to the \setting{Quick Screen}
         (see \reference{ref:QuickScreen}) \\
-        %
       }
       \opt{RECORDER_PAD}{
         \ButtonFThree & Switches to the Display Quick Screen \\ 
diff --git a/manual/rockbox_interface/wps.tex b/manual/rockbox_interface/wps.tex
index fa66ced193..9d30d622db 100644
--- a/manual/rockbox_interface/wps.tex
+++ b/manual/rockbox_interface/wps.tex
@@ -81,23 +81,25 @@ your WPS (While Playing Screen).
       & Enter \setting{Main Menu}%
       \opt{ONDIO_PAD}{ via the \setting{WPS Context Menu}}.\\%
       %
-      \nopt{PLAYER_PAD,ONDIO_PAD}{%
+      \opt{quickscreen}{%
         \ActionWpsQuickScreen & Switches to the \setting{Quick Screen}.
-                (see \reference{ref:QuickScreen}) \\}%
+          (see \reference{ref:QuickScreen}) \\}%
       %
+      % software hold targets (currently Archos only)
+      \nopt{hold_button}{%
+          \opt{RECORDER_PAD}{\ButtonFOne+\ButtonDown}
+          \opt{PLAYER_PAD}{\ButtonMenu+\ButtonStop}
+          \opt{ONDIO_PAD}{\ButtonMenu+\ButtonDown}
+          & Key lock on/off.\\
+      }%
       %These actions need definitions for the other targets
       \opt{RECORDER_PAD}{%
         \ButtonFThree & Toggles Display quick screen.\\%
-        \ButtonFOne+\ButtonDown & Key lock on/off.\\%
         \ButtonFOne+\ButtonPlay & Mute on/off.\\%
       }%
       \opt{PLAYER_PAD}{%
-        \ButtonMenu+\ButtonStop & Key lock on/off.\\%
         \ButtonMenu+\ButtonPlay & Mute on/off.\\%
       }%
-      \opt{ONDIO_PAD}{%
-        Long \ButtonMenu+\ButtonDown & Key lock on/off.\\%
-      }%
       \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IRIVER_H10_PAD,MROBE100_PAD%
           ,GIGABEAT_PAD,GIGABEAT_S_PAD,SANSA_E200_PAD,SANSA_C200_PAD}{%
         \ActionWpsPitchScreen & Show \setting{Pitch Screen}