Manual update for keymaps, hotkeys

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

19 files changed, 71 insertions, 24 deletions

diff --git a/apps/keymaps/keymap-player.c b/apps/keymaps/keymap-player.c
index 193413e473..bcfb4869df 100644
--- a/apps/keymaps/keymap-player.c
+++ b/apps/keymaps/keymap-player.c
@@ -61,7 +61,6 @@ static const struct button_mapping button_context_wps[]  = {
     { ACTION_WPS_BROWSE,    BUTTON_ON|BUTTON_REL,       BUTTON_ON },
     { ACTION_WPS_MENU,      BUTTON_MENU|BUTTON_REL,     BUTTON_MENU },
     { ACTION_WPS_CONTEXT,   BUTTON_PLAY|BUTTON_REPEAT,  BUTTON_PLAY },
-    { ACTION_WPS_ID3SCREEN, BUTTON_MENU|BUTTON_ON,      BUTTON_NONE },
     { ACTION_STD_KEYLOCK,   BUTTON_MENU|BUTTON_STOP,    BUTTON_NONE },
     { ACTION_WPS_HOTKEY,    BUTTON_MENU|BUTTON_ON,      BUTTON_NONE },
 
diff --git a/manual/platform/keymap-archosplayer.tex b/manual/platform/keymap-archosplayer.tex
index 651239b4d9..0571fc0092 100644
--- a/manual/platform/keymap-archosplayer.tex
+++ b/manual/platform/keymap-archosplayer.tex
@@ -31,12 +31,13 @@
 \newcommand{\ActionWpsMenu}{\ButtonMenu}
 \newcommand{\ActionWpsContext}{Long \ButtonPlay}
 \newcommand{\ActionWpsBrowse}{\ButtonOn}
-\newcommand{\ActionWpsIdThreeScreen}{\ButtonMenu{} + \ButtonOn}
+\newcommand{\ActionWpsHotkey}{\ButtonMenu{} + \ButtonOn}
 
 %Button actions, tree context
 \newcommand{\ActionTreeWps}{\ButtonOn}
 \newcommand{\ActionTreeEnter}{\ButtonPlay}
 \newcommand{\ActionTreeParentDirectory}{\ButtonStop}
+\newcommand{\ActionTreeHotkey}{\ButtonMenu{} + \ButtonOn}
 
 %Button actions, YesNo context
 \newcommand{\ActionYesNoAccept}{\ButtonPlay}
diff --git a/manual/platform/keymap-archosrecorder.tex b/manual/platform/keymap-archosrecorder.tex
index f9a03078d8..2f0664306c 100644
--- a/manual/platform/keymap-archosrecorder.tex
+++ b/manual/platform/keymap-archosrecorder.tex
@@ -34,11 +34,12 @@
 \newcommand{\ActionWpsVolDown}{\ButtonDown}
 \newcommand{\ActionWpsVolUp}{\ButtonUp}
 \newcommand{\ActionWpsPitchScreen}{\ButtonOn{} + \ButtonUp/\ButtonDown}
-\newcommand{\ActionWpsQuickScreen}{\ButtonFTwo}
+\newcommand{\ActionWpsQuickScreen}{Long \ButtonFTwo}
 \newcommand{\ActionWpsMenu}{\ButtonFOne}
 \newcommand{\ActionWpsContext}{Long \ButtonPlay}
 \newcommand{\ActionWpsBrowse}{\ButtonOn}
 \newcommand{\ActionWpsIdThreeScreen}{\ButtonFOne{} + \ButtonOn}
+\newcommand{\ActionWpsHotkey}{\ButtonFTwo}
 
 \newcommand{\ActionWpsAbSetBNextDir}{\ButtonOn{} + \ButtonLeft}
 \newcommand{\ActionWpsAbSetAPrevDir}{\ButtonOn{} + \ButtonRight}
@@ -49,6 +50,7 @@
 \newcommand{\ActionTreeStop}{\ButtonOff}
 \newcommand{\ActionTreeEnter}{\ButtonRight}
 \newcommand{\ActionTreeParentDirectory}{\ButtonLeft}
+\newcommand{\ActionTreeHotkey}{\ButtonFTwo}
 
 %Button actions, YesNo context
 \newcommand{\ActionYesNoAccept}{\ButtonPlay}
diff --git a/manual/platform/keymap-gigabeatfx.tex b/manual/platform/keymap-gigabeatfx.tex
index 39d51b0dd5..f2715f08d3 100644
--- a/manual/platform/keymap-gigabeatfx.tex
+++ b/manual/platform/keymap-gigabeatfx.tex
@@ -42,13 +42,15 @@
 \newcommand{\ActionWpsContext}{Long \ButtonSelect}
 \newcommand{\ActionWpsBrowse}{\ButtonSelect}
 \newcommand{\ActionWpsAbReset}{\ButtonA{} + \ButtonSelect}
-\newcommand{\ActionWpsIdThreeScreen}{\ButtonA{} + \ButtonMenu}
+\newcommand{\ActionWpsPlaylist}{\ButtonA{} + \ButtonDown}
+\newcommand{\ActionWpsHotkey}{\ButtonA{} + \ButtonMenu}
 
 %Button actions, tree context
 \newcommand{\ActionTreeWps}{\ButtonA}
 \newcommand{\ActionTreeStop}{\ButtonPower}
 \newcommand{\ActionTreeEnter}{\ButtonSelect{} or \ButtonRight}
 \newcommand{\ActionTreeParentDirectory}{\ButtonLeft}
+\newcommand{\ActionTreeHotkey}{\ButtonA{} + \ButtonMenu}
 
 %Button actions, YesNo context
 \newcommand{\ActionYesNoAccept}{\ButtonSelect}
diff --git a/manual/platform/keymap-gigabeats.tex b/manual/platform/keymap-gigabeats.tex
index 004f5ad426..149eb1b877 100644
--- a/manual/platform/keymap-gigabeats.tex
+++ b/manual/platform/keymap-gigabeats.tex
@@ -45,13 +45,15 @@
 \newcommand{\ActionWpsContext}{Long \ButtonSelect}
 \newcommand{\ActionWpsBrowse}{\ButtonSelect}
 \newcommand{\ActionWpsAbReset}{\ButtonBack{}}
-\newcommand{\ActionWpsIdThreeScreen}{\ButtonBack{} + \ButtonMenu}
+\newcommand{\ActionWpsPlaylist}{\ButtonBack{} + \ButtonDown}
+\newcommand{\ActionWpsHotkey}{\ButtonBack{} + \ButtonMenu}
 
 %Button actions, tree context
 \newcommand{\ActionTreeWps}{\ButtonPlay}
 \newcommand{\ActionTreeStop}{\ButtonPower}
 \newcommand{\ActionTreeEnter}{\ButtonSelect{} or \ButtonRight}
 \newcommand{\ActionTreeParentDirectory}{\ButtonLeft}
+\newcommand{\ActionTreeHotkey}{\ButtonBack{} + \ButtonMenu}
 
 %Button actions, YesNo context
 \newcommand{\ActionYesNoAccept}{\ButtonSelect}
diff --git a/manual/platform/keymap-iaudiom3.tex b/manual/platform/keymap-iaudiom3.tex
index 098422b21d..91b2f6c5ad 100644
--- a/manual/platform/keymap-iaudiom3.tex
+++ b/manual/platform/keymap-iaudiom3.tex
@@ -33,12 +33,14 @@
 \newcommand{\ActionWpsMenu}{\ButtonRec}
 \newcommand{\ActionWpsContext}{Long \ButtonMode}
 \newcommand{\ActionWpsBrowse}{\ButtonMode}
+\newcommand{\ActionWpsHotkey}{\ButtonRec + \ButtonMode}
 
 %Button actions, tree context
 \newcommand{\ActionTreeWps}{\ButtonPlay}
 \newcommand{\ActionTreeStop}{Long \ButtonPlay}
 \newcommand{\ActionTreeEnter}{\ButtonPlay{} or \ButtonRight}
 \newcommand{\ActionTreeParentDirectory}{\ButtonLeft}
+\newcommand{\ActionTreeHotkey}{\ButtonRec + \ButtonMode}
 
 %Button actions, YesNo context
 \newcommand{\ActionYesNoAccept}{\ButtonPlay}
diff --git a/manual/platform/keymap-ipod1g2g.tex b/manual/platform/keymap-ipod1g2g.tex
index f3735cffbb..1b6a1dba20 100644
--- a/manual/platform/keymap-ipod1g2g.tex
+++ b/manual/platform/keymap-ipod1g2g.tex
@@ -36,12 +36,14 @@
 \newcommand{\ActionWpsMenu}{\ButtonMenu}
 \newcommand{\ActionWpsContext}{Long \ButtonSelect}
 \newcommand{\ActionWpsBrowse}{\ButtonSelect}
+\newcommand{\ActionWpsHotkey}{\ButtonSelect + \ButtonPlay}
 
 %Button actions, tree context
 \newcommand{\ActionTreeWps}{\ButtonPlay}
 \newcommand{\ActionTreeStop}{Long \ButtonPlay}
 \newcommand{\ActionTreeEnter}{\ButtonSelect{} or \ButtonRight}
 \newcommand{\ActionTreeParentDirectory}{\ButtonLeft}
+\newcommand{\ActionTreeHotkey}{\ButtonSelect + \ButtonPlay}
 
 %Button actions, YesNo context
 \newcommand{\ActionYesNoAccept}{\ButtonPlay}
diff --git a/manual/platform/keymap-ipod3g.tex b/manual/platform/keymap-ipod3g.tex
index f3735cffbb..1b6a1dba20 100644
--- a/manual/platform/keymap-ipod3g.tex
+++ b/manual/platform/keymap-ipod3g.tex
@@ -36,12 +36,14 @@
 \newcommand{\ActionWpsMenu}{\ButtonMenu}
 \newcommand{\ActionWpsContext}{Long \ButtonSelect}
 \newcommand{\ActionWpsBrowse}{\ButtonSelect}
+\newcommand{\ActionWpsHotkey}{\ButtonSelect + \ButtonPlay}
 
 %Button actions, tree context
 \newcommand{\ActionTreeWps}{\ButtonPlay}
 \newcommand{\ActionTreeStop}{Long \ButtonPlay}
 \newcommand{\ActionTreeEnter}{\ButtonSelect{} or \ButtonRight}
 \newcommand{\ActionTreeParentDirectory}{\ButtonLeft}
+\newcommand{\ActionTreeHotkey}{\ButtonSelect + \ButtonPlay}
 
 %Button actions, YesNo context
 \newcommand{\ActionYesNoAccept}{\ButtonPlay}
diff --git a/manual/platform/keymap-ipod4g.tex b/manual/platform/keymap-ipod4g.tex
index c0e841596a..c659e9e327 100644
--- a/manual/platform/keymap-ipod4g.tex
+++ b/manual/platform/keymap-ipod4g.tex
@@ -37,12 +37,14 @@
 \newcommand{\ActionWpsMenu}{\ButtonMenu}
 \newcommand{\ActionWpsContext}{Long \ButtonSelect}
 \newcommand{\ActionWpsBrowse}{\ButtonSelect}
+\newcommand{\ActionWpsHotkey}{\ButtonSelect + \ButtonPlay}
 
 %Button actions, tree context
 \newcommand{\ActionTreeWps}{\ButtonPlay}
 \newcommand{\ActionTreeStop}{Long \ButtonPlay}
 \newcommand{\ActionTreeEnter}{\ButtonSelect{} or \ButtonRight}
 \newcommand{\ActionTreeParentDirectory}{\ButtonLeft}
+\newcommand{\ActionTreeHotkey}{\ButtonSelect + \ButtonPlay}
 
 %Button actions, YesNo context
 \newcommand{\ActionYesNoAccept}{\ButtonPlay}
diff --git a/manual/platform/keymap-iriverh10.tex b/manual/platform/keymap-iriverh10.tex
index 364504fcd7..74a62b1538 100644
--- a/manual/platform/keymap-iriverh10.tex
+++ b/manual/platform/keymap-iriverh10.tex
@@ -40,6 +40,7 @@
 \newcommand{\ActionWpsBrowse}{\ButtonLeft}
 \newcommand{\ActionWpsPitchScreen}{\ButtonPlay+\ButtonLeft}
 \newcommand{\ActionWpsIdThreeScreen}{\ButtonPlay+\ButtonRight}
+\newcommand{\ActionWpsHotkey}{\ButtonPower + \ButtonPlay}
 
 \newcommand{\ActionWpsAbSetBNextDir}{\ButtonPower{} + \ButtonFF}
 \newcommand{\ActionWpsAbSetAPrevDir}{\ButtonPower{} + \ButtonRew}
@@ -50,6 +51,7 @@
 \newcommand{\ActionTreeStop}{Long \ButtonPlay}
 \newcommand{\ActionTreeEnter}{\ButtonRight}
 \newcommand{\ActionTreeParentDirectory}{\ButtonLeft}
+\newcommand{\ActionTreeHotkey}{\ButtonPower + \ButtonPlay}
 
 %Button actions, YesNo context
 \newcommand{\ActionYesNoAccept}{\ButtonRight}
diff --git a/manual/platform/keymap-iriverh100_h300.tex b/manual/platform/keymap-iriverh100_h300.tex
index 419dc0bfcf..ec2984b562 100644
--- a/manual/platform/keymap-iriverh100_h300.tex
+++ b/manual/platform/keymap-iriverh100_h300.tex
@@ -43,12 +43,14 @@
 \newcommand{\ActionWpsBrowse}{\ButtonSelect}
 \newcommand{\ActionWpsAbReset}{\ButtonOn{} + \ButtonSelect}
 \newcommand{\ActionWpsIdThreeScreen}{\ButtonOn{} + \ButtonMode}
+\newcommand{\ActionWpsHotkey}{\ButtonRec}
 
 %Button actions, tree context
 \newcommand{\ActionTreeWps}{\ButtonOn}
 \newcommand{\ActionTreeStop}{\ButtonOff}
 \newcommand{\ActionTreeEnter}{\ButtonSelect{} or \ButtonRight}
 \newcommand{\ActionTreeParentDirectory}{\ButtonLeft}
+\newcommand{\ActionTreeHotkey}{\ButtonRec}
 
 %Button actions, YesNo context
 \newcommand{\ActionYesNoAccept}{\ButtonSelect}
diff --git a/manual/platform/keymap-mrobe100.tex b/manual/platform/keymap-mrobe100.tex
index 106c2fa0d2..4c94fa25ce 100644
--- a/manual/platform/keymap-mrobe100.tex
+++ b/manual/platform/keymap-mrobe100.tex
@@ -43,13 +43,15 @@
 \newcommand{\ActionWpsContext}{Long \ButtonSelect}
 \newcommand{\ActionWpsBrowse}{\ButtonSelect}
 \newcommand{\ActionWpsAbReset}{\ButtonDisplay{} + \ButtonSelect}
-\newcommand{\ActionWpsIdThreeScreen}{\ButtonDisplay{} + \ButtonMenu}
+\newcommand{\ActionWpsPlaylist}{\ButtonDisplay{} + \ButtonDown}
+\newcommand{\ActionWpsHotkey}{\ButtonDisplay{} + \ButtonMenu}
 
 %Button actions, tree context
 \newcommand{\ActionTreeWps}{\ButtonDisplay}
 \newcommand{\ActionTreeStop}{\ButtonPower{} or Long \ButtonPlay}
 \newcommand{\ActionTreeEnter}{\ButtonSelect{} or \ButtonRight}
 \newcommand{\ActionTreeParentDirectory}{\ButtonLeft}
+\newcommand{\ActionTreeHotkey}{\ButtonDisplay{} + \ButtonMenu}
 
 %Button actions, YesNo context
 \newcommand{\ActionYesNoAccept}{\ButtonSelect}
diff --git a/manual/platform/keymap-sansac200.tex b/manual/platform/keymap-sansac200.tex
index 8fbed84de3..c9cd86d551 100644
--- a/manual/platform/keymap-sansac200.tex
+++ b/manual/platform/keymap-sansac200.tex
@@ -43,11 +43,13 @@
 \newcommand{\ActionWpsAbSetBNextDir}{\ButtonPower{} + \ButtonRight}
 \newcommand{\ActionWpsAbSetAPrevDir}{\ButtonPower{} + \ButtonLeft}
 \newcommand{\ActionWpsAbReset}{\ButtonPower{} + \ButtonUp}
+\newcommand{\ActionWpsHotkey}{\ButtonRec}
 
 %Button actions, tree context
 \newcommand{\ActionTreeWps}{Long \ButtonRight}
 \newcommand{\ActionTreeEnter}{\ButtonSelect{} or \ButtonRight}
 \newcommand{\ActionTreeParentDirectory}{\ButtonLeft}
+\newcommand{\ActionTreeHotkey}{\ButtonRec}
 
 %Button actions, YesNo context
 \newcommand{\ActionYesNoAccept}{\ButtonSelect}
diff --git a/manual/platform/keymap-sansaclip.tex b/manual/platform/keymap-sansaclip.tex
index 58a44afc3c..c1be5e6ab9 100644
--- a/manual/platform/keymap-sansaclip.tex
+++ b/manual/platform/keymap-sansaclip.tex
@@ -40,6 +40,7 @@
 \newcommand{\ActionWpsContext}{Long \ButtonSelect}
 \newcommand{\ActionWpsBrowse}{\ButtonSelect}
 \newcommand{\ActionWpsPitchScreen}{\ButtonSelect{} + \ButtonUp}
+\newcommand{\ActionWpsPlaylist}{Long \ButtonDown}
 \newcommand{\ActionWpsIdThreeScreen}{\ButtonSelect{} + \ButtonDown}
 
 \newcommand{\ActionWpsAbSetBNextDir}{\ButtonPower{} + \ButtonRight}
diff --git a/manual/platform/keymap-sansae200.tex b/manual/platform/keymap-sansae200.tex
index 81f1ab5568..eb0a704538 100644
--- a/manual/platform/keymap-sansae200.tex
+++ b/manual/platform/keymap-sansae200.tex
@@ -42,6 +42,7 @@
 \newcommand{\ActionWpsBrowse}{\ButtonSelect}
 \newcommand{\ActionWpsPitchScreen}{\ButtonSelect{} + \ButtonUp}
 \newcommand{\ActionWpsIdThreeScreen}{\ButtonSelect{} + \ButtonDown}
+\newcommand{\ActionWpsHotkey}{\ButtonRec}
 
 \newcommand{\ActionWpsAbSetBNextDir}{\ButtonPower{} + \ButtonRight}
 \newcommand{\ActionWpsAbSetAPrevDir}{\ButtonPower{} + \ButtonLeft}
@@ -52,6 +53,7 @@
 \newcommand{\ActionTreeStop}{\ButtonPower}
 \newcommand{\ActionTreeEnter}{\ButtonSelect{} or \ButtonRight}
 \newcommand{\ActionTreeParentDirectory}{\ButtonLeft}
+\newcommand{\ActionTreeHotkey}{\ButtonRec}
 
 %Button actions, YesNo context
 \newcommand{\ActionYesNoAccept}{\ButtonSelect}
diff --git a/manual/platform/keymap-sansafuze.tex b/manual/platform/keymap-sansafuze.tex
index 6051faf9c0..8d2a9ce819 100644
--- a/manual/platform/keymap-sansafuze.tex
+++ b/manual/platform/keymap-sansafuze.tex
@@ -41,6 +41,7 @@
 \newcommand{\ActionWpsBrowse}{\ButtonSelect}
 \newcommand{\ActionWpsPitchScreen}{\ButtonSelect{} + \ButtonUp}
 \newcommand{\ActionWpsIdThreeScreen}{\ButtonSelect{} + \ButtonDown}
+\newcommand{\ActionWpsHotkey}{\ButtonHome}
 
 \newcommand{\ActionWpsAbSetBNextDir}{\ButtonHome{} + \ButtonRight}
 \newcommand{\ActionWpsAbSetAPrevDir}{\ButtonHome{} + \ButtonLeft}
@@ -48,9 +49,10 @@
 
 %Button actions, tree context
 \newcommand{\ActionTreeWps}{\ButtonUp}
-\newcommand{\ActionTreeStop}{\ButtonHome}
+\newcommand{\ActionTreeStop}{Long \ButtonHome}
 \newcommand{\ActionTreeEnter}{\ButtonSelect{} or \ButtonRight}
 \newcommand{\ActionTreeParentDirectory}{\ButtonLeft}
+\newcommand{\ActionTreeHotkey}{\ButtonHome}
 
 %Button actions, YesNo context
 \newcommand{\ActionYesNoAccept}{\ButtonSelect}
diff --git a/manual/rockbox_interface/browsing_and_playing.tex b/manual/rockbox_interface/browsing_and_playing.tex
index 002ff36abb..a84926004b 100644
--- a/manual/rockbox_interface/browsing_and_playing.tex
+++ b/manual/rockbox_interface/browsing_and_playing.tex
@@ -108,6 +108,11 @@ the \setting{Show Files} setting to all.
         \ActionStdRec & Switch to the \setting{Recording Screen}.\\
       %
       }
+      \opt{hotkey}{
+        \ActionTreeHotkey & Activate the \setting{Hotkey} function
+        (see \reference{ref:Hotkeys}).\\
+      %
+      }
     \end{btnmap}
 \end{table}
 
@@ -128,6 +133,11 @@ or directory and access the context menu with \ActionStdContext{}.\\
 for files.  If the \setting{Context Menu} is invoked on a directory, 
 it will display options for directories.\\}
 
+\opt{hotkey}{
+Some of these options can be set to the \setting{Hotkey} (see \reference{ref:Hotkeys})
+for that context by pressing \ActionWpsHotkey.\\
+}
+
 The \setting{Context Menu} contains the following options (unless otherwise noted, 
 each option pertains both to files and directories):
 
@@ -152,11 +162,11 @@ each option pertains both to files and directories):
   Deletes the currently selected file. This option applies only to files, and
   not to directories. Rockbox will ask for confirmation before deleting a file.
   Press \ActionYesNoAccept{}
-  to confirm deletion or any other key to cancel.
+  to confirm deletion or any other key to cancel. \opt{hotkey}{\setting{Hotkey}able.}
 \item [Delete Directory.]
   Deletes the currently selected directory and all of the files and subdirectories
   it may contain. Deleted directories cannot be recovered. Use this feature with
-  caution!
+  caution! \opt{hotkey}{\setting{Hotkey}able.}
 \opt{lcd_non-mono}{
 \item [Set As Backdrop.]
   Set the selected \fname{bmp} file as background image. The bitmaps need to meet the
@@ -170,7 +180,7 @@ each option pertains both to files and directories):
   For example, this function can be used to view a text file
   even if the file has a non-standard extension (i.e., the file has an extension
   of something other than \fname{.txt}). See \reference{ref:Viewersplugins}
-  for more details on viewers.
+  for more details on viewers. \opt{hotkey}{\setting{Hotkey}able.}
 \item [Create Directory.]
   Create a new directory in the current directory on the disk.
 \item [Properties.]
@@ -337,3 +347,4 @@ example when renaming a file or creating a new directory.
 
 %Include playlist section
 \input{working_with_playlists/main.tex}
+\input{rockbox_interface/hotkeys.tex}
diff --git a/manual/rockbox_interface/wps.tex b/manual/rockbox_interface/wps.tex
index a18a2c540e..521eff15b9 100644
--- a/manual/rockbox_interface/wps.tex
+++ b/manual/rockbox_interface/wps.tex
@@ -130,12 +130,20 @@ your WPS (While Playing Screen).
         \opt{HAVEREMOTEKEYMAP}{& \ActionRCWpsPitchScreen}
          & Show \setting{Pitch Screen} (see \reference{sec:pitchscreen}).\\%
       }%
-      \opt{PLAYER_PAD,RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IRIVER_H10_PAD%
-          ,MROBE100_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,SANSA_E200_PAD,SANSA_C200_PAD}{%
+      \opt{GIGABEAT_PAD,GIGABEAT_S_PAD,SANSA_CLIP_PAD,MROBE100_PAD}{%
+        \ActionWpsPlaylist 
+          & Show current \setting{Playlist}.\\%
+      }%
+      \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IRIVER_H10_PAD%
+          ,SANSA_E200_PAD,SANSA_C200_PAD}{%
         \ActionWpsIdThreeScreen 
           \opt{HAVEREMOTEKEYMAP}{& \ActionRCWpsIdThreeScreen}
           & Enter \setting{ID3 Viewer}.\\%
       }%
+      \opt{hotkey}{%
+        \ActionWpsHotkey & Activate the \setting{Hotkey} function
+        (see \reference{ref:Hotkeys}).\\
+      }
       \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}{%
          \ActionWpsAbSetBNextDir{} or }%
@@ -258,12 +266,13 @@ This allows you to create a bookmark in the currently-playing track.
 This screen is accessible from the WPS screen, and provides a detailed view of
 all the identity information about the current track. This info is known as
 meta data and is stored in audio file formats to keep information on artist,
-album etc. To access this screen, % 
-\opt{PLAYER_PAD,RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IRIVER_H10_PAD,%
-      MROBE100_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD,%
-      GIGABEAT_PAD,GIGABEAT_S_PAD}{
+album etc. \opt{hotkey}{\setting{Hotkey}able from the \setting{WPS Context
+Menu}.} To access this screen, % 
+\opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IRIVER_H10_PAD,%
+      SANSA_C200_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD}{
   press \ActionWpsIdThreeScreen. }%
-\opt{ONDIO_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD,IAUDIO_M3_PAD}{press
+\opt{PLAYER_PAD,ONDIO_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD,IAUDIO_M3_PAD,%
+      GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD,SANSA_CLIP_PAD}{press
   \ActionWpsContext{} to access the \setting{WPS Context Menu} and select
   \setting{Show Track Info}. }%
 \opt{RECORDER_PAD,PLAYER_PAD,ONDIO_PAD}{Use \ButtonLeft\ and \ButtonRight\
@@ -271,23 +280,23 @@ album etc. To access this screen, %
 
 \subsubsection{Open With...}
 This \setting{Open With} function is the same as the \setting{Open With} 
-function in the file browser's \setting{Context Menu}.
+function in the file browser's \setting{Context Menu}. \opt{hotkey}{\setting{Hotkey}able.}
 
 \subsubsection{Delete}
 Delete the currently playing file. The file will be deleted but the playback
 of the file will not stop immediately. Instead, the part of the file that
 has already been buffered (i.e. read into the \daps\ memory) will be played.
-This may even be the whole track.
+This may even be the whole track. \opt{hotkey}{\setting{Hotkey}able.}
 
 \opt{pitchscreen}{
   \subsubsection{\label{sec:pitchscreen}Pitch}
   
   The \setting{Pitch Screen} allows you to change the rate of playback
   (i.e. the playback speed and at the same time the pitch) of your
-  \dap. The rate value can be adjusted between 50\% and 200\%. 50\%
-  means half the normal playback speed and a pitch that is an octave
-  lower than the normal pitch. 200\% means double playback speed and a
-  pitch that is an octave higher than the normal pitch.
+  \dap.  \opt{hotkey}{\setting{Hotkey}able.}  The rate value can be adjusted
+  between 50\% and 200\%. 50\% means half the normal playback speed and a
+  pitch that is an octave lower than the normal pitch. 200\% means double
+  playback speed and a pitch that is an octave higher than the normal pitch.
 
   The rate can be changed in two modes: procentual and semitone.
   Initially, procentual mode is active.
diff --git a/manual/working_with_playlists/main.tex b/manual/working_with_playlists/main.tex
index 311aa86071..6f84f715ee 100644
--- a/manual/working_with_playlists/main.tex
+++ b/manual/working_with_playlists/main.tex
@@ -92,7 +92,7 @@ options:
   recent \setting{Insert} operation. If no tracks have yet been added via an
   \setting{Insert}, new tracks will be added immediately after the current
   playing track. If playback is stopped a new dynamic playlist will get
-  created with the selected tracks.
+  created with the selected tracks. \opt{hotkey}{\setting{Hotkey}able.}
   
 \item [Insert Next.] Add track(s) immediately after current playing
   track, no matter what else has been inserted.