4 files changed, 48 insertions, 6 deletions

diff --git a/manual/appendix/config_file_options.tex b/manual/appendix/config_file_options.tex
index 87e8a2ab96..abf6cf7f96 100644
--- a/manual/appendix/config_file_options.tex
+++ b/manual/appendix/config_file_options.tex
@@ -143,6 +143,10 @@
                     & on, off           & N/A\\
     warn when erasing dynamic playlist
                     & on, off           & N/A\\
+    show shuffled adding options
+                    & off, on        & N/A\\
+    show queue options
+                    & off, on, in submenu & N/A\\
     cuesheet support
                     & on, off           & N/A\\
     folder navigation & off, on, random & N/A\\
diff --git a/manual/configure_rockbox/playlist_options.tex b/manual/configure_rockbox/playlist_options.tex
index 35a2648f70..bd493d6e4b 100644
--- a/manual/configure_rockbox/playlist_options.tex
+++ b/manual/configure_rockbox/playlist_options.tex
@@ -1,14 +1,46 @@
 % $Id:$ %
-\section{\label{ref:PlaylistOptions}Playlist}
-The \setting{Playlist} sub menu allows you to configure settings
+\section{\label{ref:PlaylistOptions}Playlists}
+
+The \setting{Playlists} submenu allows you to configure settings
 related to playlists.
+
+
 \begin{description}
+
+\item[Playlist Viewer Settings.]
+   This submenu contains settings related to the Playlist Viewer.
+   \begin{description}
+    \item[Show Icons.] This toggles display of the icon for the currently
+    selected playlist entry and the icon for moving a playlist entry
+    \item[Show Indices.] This toggles display of the line numbering for
+       the playlist
+    \item[Track Display.] This toggles between filename only and full path
+       for playlist entries
+  \end{description}
+
 \item[Recursively Insert Directories.]
-  If set to \setting{On}, then when a directory is inserted or queued into a 
+  If set to \setting{On}, then when a directory is inserted or queued into a
   dynamic playlist, all subdirectories will also be inserted. If set to \setting{Ask},
   Rockbox will prompt the user about whether to include sub-directories.
 
-\item[Warn When Erasing Dynamic Playlist.]
+\item[Current Playlist.]
+  This submenu contains settings related to the current dynamic playlist.
+  \begin{description}
+
+  \item[Warn When Erasing Dynamic Playlist.]
   If set to \setting{Yes}, Rockbox will provide a warning if the user attempts to
   take an action that will cause Rockbox to erase the current dynamic playlist.
+
+  \item[Show Shuffled Adding Options.]
+  If set to \setting{No}, Rockbox will not offer to add shuffled tracks
+  in the \setting{Current Playlist submenu}.
+
+  \item[Show Queue Options.]
+  If set to \setting{No}, Rockbox will not display the options to queue items in
+  the \setting{Current Playlist submenu}.
+  If set to \setting{In Submenu}, Rockbox will move the options into a
+  separate submenu.
+
+  \end{description}
+
 \end{description}
diff --git a/manual/main_menu/main.tex b/manual/main_menu/main.tex
index 7a83c61935..bdb422e10a 100644
--- a/manual/main_menu/main.tex
+++ b/manual/main_menu/main.tex
@@ -163,7 +163,7 @@ The details of this menu are covered in
   the \setting{Playlist} menu. Both automatically and manually created
   playlists can be edited using this menu.
 
-\subsection{The Playlist Catalogue Context Menu}
+\subsection{\label{ref:playlistcatalogue_contextmenu}The Playlist Catalogue Context Menu}
 
 \begin{description}
 \item[Create Playlist:]
diff --git a/manual/working_with_playlists/main.tex b/manual/working_with_playlists/main.tex
index 16995caf78..8bc233d346 100644
--- a/manual/working_with_playlists/main.tex
+++ b/manual/working_with_playlists/main.tex
@@ -71,7 +71,7 @@ the selected track or directory.
 \subsubsection{By using the Main Menu}
 To create a playlist containing some or all of the music on your \dap{}, you can use the
 \setting{Create Playlist} command in the \setting{Playlist Catalogue Context Menu}
-(see \reference{ref:Contextmenu}).
+(see \reference{ref:playlistcatalogue_contextmenu}).
 
 \subsection{Adding music to playlists}
 
@@ -116,6 +116,12 @@ to the playlist file (see \reference{ref:playlistoptions}).
 \item [Queue Last Shuffled.] Corresponds to \setting{Insert Last Shuffled}.
 \end{description}
 
+\note{You can hide the options to add shuffled tracks or to queue tracks, if you wish.
+The latter can also be put into its own submenu.  Simply go to
+\setting{Settings} $\rightarrow$ \setting{General Settings} $\rightarrow$ \setting{Playlists}
+$\rightarrow$ \setting{Current Playlist} and select either \setting{Show Shuffled Adding Options}
+or \setting{Show Queue Options} to customize the displayed set of options.}
+
 The \setting{Current Playlist Submenu}  can be used to add either single tracks or
 entire directories to a playlist. If the \setting{Current Playlist Submenu} is
 invoked on a single track, it will put only that track into the playlist.