3 files changed, 18 insertions, 36 deletions

diff --git a/manual/rockbox_interface/browsing_and_playing.tex b/manual/rockbox_interface/browsing_and_playing.tex
index e7bbc5c585..c087036a6b 100644
--- a/manual/rockbox_interface/browsing_and_playing.tex
+++ b/manual/rockbox_interface/browsing_and_playing.tex
@@ -137,11 +137,6 @@ 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):
 
@@ -167,11 +162,10 @@ each option pertains both to files and directories):
   not to directories. Rockbox will ask for confirmation before deleting a file.
   Press \ActionYesNoAccept{}
   to confirm deletion or any other key to cancel.
-  \opt{hotkey}{\setting{Hotkey}able (see \reference{ref:Hotkeys}).}
 \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! \opt{hotkey}{\setting{Hotkey}able (see \reference{ref:Hotkeys}).}
+  caution!
 \opt{lcd_non-mono}{
 \item [Set As Backdrop.]
   Set the selected \fname{bmp} file as background image. The bitmaps need to meet the
@@ -185,7 +179,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. \opt{hotkey}{\setting{Hotkey}able (see \reference{ref:Hotkeys}).}
+  for more details on viewers.
 \item [Create Directory.]
   Create a new directory in the current directory on the disk.
 \item [Properties.]
diff --git a/manual/rockbox_interface/hotkeys.tex b/manual/rockbox_interface/hotkeys.tex
index b1d1f23f0d..56dafa9589 100644
--- a/manual/rockbox_interface/hotkeys.tex
+++ b/manual/rockbox_interface/hotkeys.tex
@@ -1,26 +1,18 @@
 % $Id$ %
 \opt{hotkey}{
     \section{\label{ref:Hotkeys}Hotkeys}
-    Hotkeys are user-assignable shortcut keys to functions within the
-    \setting{File Browser} and \setting{WPS} context menus.  To use one,
-    press \ActionWpsHotkey{} within the \setting{File Browser} or
-    \setting{WPS} screens.  The assigned function will launch with
-    reference to the current file or directory, if applicable.  Each
-    screen has its own assignment.  If there is no assignment for
-    a given screen, the message ``No Hotkey Set'' appears briefly.
+    Hotkeys are shortcut keys for use in the \setting{File Browser}
+    and \setting{WPS} screens.  To use one, press \ActionWpsHotkey{}
+    within the \setting{File Browser} or \setting{WPS} screens.
+    The assigned function will launch with reference to the current
+    file or directory, if applicable.  Each screen has its own
+    assignment.  If there is no assignment for a given screen,
+    the hotkey is ignored.
     
-    There is no default assignment for the File Browser hotkey, but the WPS
-    hotkey defaults to ``View Playlist''.
+    The default assignment for the File Browser hotkey is
+    \setting{Off}, but the WPS hotkey defaults to
+    \setting{View Playlist}.
     
-    To change the assignment of a hotkey, go into the associated
-    context menu from the File Browser or WPS screen by pressing
-    \ActionWpsContext, then highlighting the function you wish to assign.
-    Press the hotkey (\ActionWpsHotkey) and if the function you've chosen
-    is assignable a confirmation dialog screen will appear.  Press
-    \ActionYesNoAccept{} to confirm the assignment or anything else to reject
-    it.  If accepted, you'll see a short message confirming your choice.
-    
-    You can view the current assignments and reset to the default assignments
-    from the Hotkey menu under \setting{General Settings}. See
-    \reference{ref:HotkeySettings} for details.
+    The hotkey assignments are changed in the Hotkey menu (see
+    \reference{ref:HotkeySettings}) under \setting{General Settings}.
 }
diff --git a/manual/rockbox_interface/wps.tex b/manual/rockbox_interface/wps.tex
index 4f4e5cc626..824370b0ab 100644
--- a/manual/rockbox_interface/wps.tex
+++ b/manual/rockbox_interface/wps.tex
@@ -209,9 +209,7 @@ your WPS (While Playing Screen).
 }
 \subsection{\label{sec:contextmenu}The WPS Context Menu}
 Like the context menu for the \setting{File Browser}, the \setting{WPS Context Menu} 
-allows you quick access to some often used functions. \opt{hotkey}{
-Some of these options can be set to the \setting{Hotkey} (see \reference{ref:Hotkeys})
-for that context by pressing \ActionWpsHotkey.}
+allows you quick access to some often used functions.
 
 \subsubsection{Playlist}
 The \setting{Playlist} submenu allows you to view, save, search and
@@ -268,8 +266,7 @@ 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. \opt{hotkey}{\setting{Hotkey}able from the \setting{WPS Context
-Menu} (see \reference{ref:Hotkeys}).} To access this screen, %
+album etc. 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. }%
@@ -283,20 +280,19 @@ Menu} (see \reference{ref:Hotkeys}).} 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}.
-\opt{hotkey}{\setting{Hotkey}able (see \reference{ref:Hotkeys}).}
 
 \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. \opt{hotkey}{\setting{Hotkey}able (see \reference{ref:Hotkeys}).}
+This may even be the whole track.
 
 \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.  \opt{hotkey}{\setting{Hotkey}able (see \reference{ref:Hotkeys}).}  The rate value can be adjusted
+  \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.