Exchange some references to certain players or pads with a feature in some parts of the manual where the feature is actually the determing factor (uses the automatic parsing of features.txt to options). In the WPS button table this helps rearranging one line a bit to keep the code together in a better way. (Also convert 2 tabs to spaces while at it.)

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

3 files changed, 14 insertions, 14 deletions

diff --git a/manual/main_menu/main.tex b/manual/main_menu/main.tex
index f526193..8c443cf 100644
--- a/manual/main_menu/main.tex
+++ b/manual/main_menu/main.tex
@@ -249,15 +249,15 @@ pages of information.}
   for more details.
 }
 
-\nopt{PLAYER_PAD,ONDIO_PAD}
+\opt{quickscreen}
 {
 \section{\label{ref:QuickScreen}Quick Screen}
   Although the \setting{Quick Screen} is accessible from nearly everywhere,
   not just the \setting{Main Menu}, it is worth mentioning here.  It allows
   rapid access to your three favourite settings.  The default settings are
-  \setting{Shuffle} (\reference{ref:PlaybackSettings}), 
-  \setting{Repeat} (\reference{ref:PlaybackSettings}) and the 
-  \setting{Show Files} (\reference{ref:ShowFiles}) options, but almost all 
+  \setting{Shuffle} (\reference{ref:PlaybackSettings}),
+  \setting{Repeat} (\reference{ref:PlaybackSettings}) and the
+  \setting{Show Files} (\reference{ref:ShowFiles}) options, but almost all
   configurable options in Rockbox can be placed on this screen.  To change the
   options, navigate through the menus to the setting you want to add and press
   \ActionStdContext.  In the menu which appears you will be given options
diff --git a/manual/rockbox_interface/browsing_and_playing.tex b/manual/rockbox_interface/browsing_and_playing.tex
index b866257..7b06e34 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 fa66ced..9d30d62 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}