3 files changed, 44 insertions, 0 deletions

diff --git a/manual/configure_rockbox/hotkey_settings.tex b/manual/configure_rockbox/hotkey_settings.tex
new file mode 100755
index 0000000000..eac606716f
--- /dev/null
+++ b/manual/configure_rockbox/hotkey_settings.tex
@@ -0,0 +1,17 @@
+% $Id: hotkey_settings.tex 16765 2008-03-23 22:07:09Z nls $ %
+\opt{hotkey}{
+\section{\label{ref:HotkeySettings}Hotkey}
+
+  \begin{description}
+  \item[View Hotkey Settings.]
+    This option brings up a screen listing the current assignment associated
+    with each hotkey.
+
+  \item[Reset Settings.]
+    This option sets all hotkeys to their default assignments.  The default
+    for the WPS screen is View Playlist.  The File Browser hotkey has no
+    default assignment.
+
+  \end{description}
+
+}
diff --git a/manual/configure_rockbox/main.tex b/manual/configure_rockbox/main.tex
index 5412d77ccc..ef26c7c23f 100644
--- a/manual/configure_rockbox/main.tex
+++ b/manual/configure_rockbox/main.tex
@@ -17,6 +17,7 @@
     \input{configure_rockbox/bookmarking.tex}
     \input{configure_rockbox/language.tex}
     \input{configure_rockbox/voice.tex}
+    \input{configure_rockbox/hotkey_settings.tex}
 
 \chapter{Theme Settings}
 \label{ref:configure_rockbox_themes}
diff --git a/manual/rockbox_interface/hotkeys.tex b/manual/rockbox_interface/hotkeys.tex
new file mode 100755
index 0000000000..262356f2be
--- /dev/null
+++ b/manual/rockbox_interface/hotkeys.tex
@@ -0,0 +1,26 @@
+% $Id: hotkeys.tex 24792 2010-02-20 19:06:44Z kugel $ %
+\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.
+    
+    There is no default assignment for the File Browser hotkey, but the WPS
+    hotkey defaults to View Playlist.
+    
+    To change the assignment of a hotkey, go into the associated
+    \setting{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 General Settings. See \reference{ref:HotkeySettings}
+    for details.
+}