8 files changed, 31 insertions, 28 deletions

diff --git a/manual/appendix/config_file_options.tex b/manual/appendix/config_file_options.tex
index 709bc9b2ff..c4318692c4 100644
--- a/manual/appendix/config_file_options.tex
+++ b/manual/appendix/config_file_options.tex
@@ -251,6 +251,7 @@
       dircache      & on, off           & N/A\\
       tagcache\_ram & on, off           & N/A\\
       database path & path to a directory & N/A\\
+      default browser & files, database, playlists & N/A\\
 
     \opt{touchpad}{
       \opt{GIGABEAT_PAD}{
diff --git a/manual/configure_rockbox/file_view.tex b/manual/configure_rockbox/file_view.tex
index 8b86e71906..112aa4c06f 100644
--- a/manual/configure_rockbox/file_view.tex
+++ b/manual/configure_rockbox/file_view.tex
@@ -1,5 +1,5 @@
 % $Id$ %
-\section{File View}
+\section{\label{ref:FileView}File View}
 The File View menu deals with options relating to how the File Browser 
 displays files.
 %
@@ -90,4 +90,11 @@ displays files.
   \setting{Current Directory Only} or \setting{Full Path}, then the title of
   each menu will be displayed on the first line in the \setting{Database Browser}.
 
+\opt{hotkey}{
+  \nopt{touchscreen}{\item[File Browser Hotkey.]
+    Sets the hotkey function for the \setting{File Browser},
+      \setting{Database} and \setting{Playlist Viewer} (see \reference{ref:Hotkeys}).
+    The default is \setting{Off}.
+  }
+}
 \end{description}
diff --git a/manual/configure_rockbox/hotkey_settings.tex b/manual/configure_rockbox/hotkey_settings.tex
deleted file mode 100644
index de2b3a872a..0000000000
--- a/manual/configure_rockbox/hotkey_settings.tex
+++ /dev/null
@@ -1,15 +0,0 @@
-% $Id: hotkey_settings.tex 16765 2008-03-23 22:07:09Z nls $ %
-\opt{hotkey}{
-\section{\label{ref:HotkeySettings}Hotkey}
-
-  \begin{description}
-  \item[WPS Hotkey.] \opt{touchscreen}{This options sets the hotkey function for
-                         the WPS (see \reference{ref:Hotkeys}). The 
-                         default is \setting{View Playlist}.}
-  \nopt{touchscreen}{\item[File Browser Hotkey.]}
-   \end{description}
-
-  \nopt{touchscreen}{These options set the hotkey function for their respective
-  screens (see \reference{ref:Hotkeys}).  The default for the WPS is
-    \setting{View Playlist}.  The File Browser default is \setting{Off}.}
-}
diff --git a/manual/configure_rockbox/main.tex b/manual/configure_rockbox/main.tex
index b0711e5b71..b7d980d918 100644
--- a/manual/configure_rockbox/main.tex
+++ b/manual/configure_rockbox/main.tex
@@ -9,6 +9,7 @@
 \chapter{General Settings}
 \label{ref:configure_rockbox_general}
   \input{configure_rockbox/general_settings.tex}
+    \input{configure_rockbox/wps.tex}
     \input{configure_rockbox/playlist_options.tex}
     \input{configure_rockbox/file_view.tex}
     \input{configure_rockbox/database.tex}
@@ -21,8 +22,6 @@
 }
     \input{configure_rockbox/language.tex}
     \input{configure_rockbox/voice.tex}
-    \input{configure_rockbox/wps_context_plugin.tex}
-    \input{configure_rockbox/hotkey_settings.tex}
 
 \chapter{Theme Settings}
 \label{ref:configure_rockbox_themes}
diff --git a/manual/configure_rockbox/wps.tex b/manual/configure_rockbox/wps.tex
new file mode 100644
index 0000000000..dca27c056b
--- /dev/null
+++ b/manual/configure_rockbox/wps.tex
@@ -0,0 +1,16 @@
+
+\section{\label{ref:WPSSettings}What's Playing Screen}
+
+  \begin{description}
+  \item[Default Browser.]
+  Decide if you want the \setting{File Browser}, \setting{Database}, or
+  \setting{Playlist Catalogue} to launch after pressing \ActionWpsBrowse{}
+  on the WPS, when no other browser has recently been used.
+  \opt{hotkey}{
+    \item[WPS Hotkey.] Sets the hotkey function for
+                     the WPS (see \reference{ref:Hotkeys}). The
+                     default is \setting{View Playlist}.
+  }
+  \item[Set WPS Context Plugin.]
+  This option will allow you to run a Rockbox plugin from the WPS context menu.
+   \end{description}
diff --git a/manual/configure_rockbox/wps_context_plugin.tex b/manual/configure_rockbox/wps_context_plugin.tex
deleted file mode 100644
index 469a0e5ca2..0000000000
--- a/manual/configure_rockbox/wps_context_plugin.tex
+++ /dev/null
@@ -1,6 +0,0 @@
-\section{\label{ref:SetWPSContextPlugin}Set WPS Context Plugin}
-
-  \begin{description}
-  \item[Set WPS Context Plugin.]
-  This option will allow you to run a rockbox plugin from the WPS context menu
-   \end{description}
diff --git a/manual/rockbox_interface/hotkeys.tex b/manual/rockbox_interface/hotkeys.tex
index 28c8091a05..8fe07c5cf1 100644
--- a/manual/rockbox_interface/hotkeys.tex
+++ b/manual/rockbox_interface/hotkeys.tex
@@ -11,10 +11,11 @@
     assignment.} If there is no assignment for a given screen,
     the hotkey is ignored.
 
+    The hotkey assignments are changed for the What's Playing Screen (see
+    \reference{ref:WPSSettings}) and browsers (see \reference{ref:FileView})
+    separately.
+
     The default assignment for the \nopt{touchscreen}{File Browser hotkey is
     \setting{Off}, while the default for the }WPS hotkey is
     \setting{View Playlist}.
-
-    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 5f810261fa..c433b76608 100644
--- a/manual/rockbox_interface/wps.tex
+++ b/manual/rockbox_interface/wps.tex
@@ -61,7 +61,7 @@ your WPS (While Playing Screen).
       %
       \ActionWpsBrowse
       \opt{HAVEREMOTEKEYMAP}{& \ActionRCWpsBrowse}
-      & Return to the \setting{File Browser} / \setting{Database}.\\
+      & Return to the \setting{File Browser} / \setting{Database} / \setting{Playlist Catalogue}.\\
       %
       \ActionWpsContext
       \opt{HAVEREMOTEKEYMAP}{& \ActionRCWpsContext}