Merge "Playlist submenu" and "Adding music to playlists" as they are nearly identical. FS #6569 with adjustments by myself.

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

2 files changed, 36 insertions, 70 deletions

diff --git a/manual/rockbox_interface/playback.tex b/manual/rockbox_interface/playback.tex
index 3d345f73f9..59da7c1123 100644
--- a/manual/rockbox_interface/playback.tex
+++ b/manual/rockbox_interface/playback.tex
@@ -98,7 +98,7 @@ each option pertains both to files and directories):
 
 \begin{description}
 \item [Playlist.]
-  Enters the \setting{Playlist Submenu} (see below).
+  Enters the \setting{Playlist Submenu} (see \reference{ref:playlist_submenu}).
 \item [Rename.]
   This function lets the user modify the name of a file or directory.
 \item [Cut.]
@@ -136,63 +136,6 @@ each option pertains both to files and directories):
   directories in that directory will be shown, as well as the total size.
 \end{description}
 
-\subsection{\label{ref:Playlistsubmenu}Playlist Submenu}
-\screenshot{rockbox_interface/images/ss-playlist-menu}{The Playlist Submenu}{}
-The \setting{Playlist Submenu} allows you to put tracks into a ``dynamic
-playlist''. If there is no music currently playing, Rockbox will create a
-new dynamic playlist and put the selected track(s) into the playlist.
-If there is music currently playing, Rockbox will put the selected track(s)
-into the current playlist. The place in which
-the newly selected tracks are added to the playlist is determined by
-the following options:
-
-\begin{description}
-\item [Insert.]
-  Add track(s) to playlist. If no other tracks have been inserted then the
-  selected track will be added immediately after current playing track,
-  otherwise they will be added to end of insertion list.
-\item [Insert next.]
-  Add track(s) immediately after current playing track, no matter what else has
-  been inserted.
-\item [Insert last.]
-  Add track(s) to end of playlist.
-\item [Queue.]
-  Queue is the same as Insert except queued tracks are deleted immediately from
-  the playlist after they've been played. Also, queued tracks are not saved to
-  the playlist file (see \reference{ref:playlistoptions}).
-\item [Queue next.]
-  Queue track(s) immediately after current playing track.
-\item [Queue last.]
-  Queue track(s) at end of playlist.
-\end{description}
-
-The \setting{Playlist Submenu} can be used to add either single tracks or
-entire directories to a playlist. If the \setting{Playlist Submenu} is
-invoked on a single track, it will put only that track into the playlist.
-On the other hand, if the \setting{Playlist Submenu} is invoked on a
-directory, Rockbox adds all of the tracks in that directory to the playlist.
-
-\note{You can control whether or not Rockbox includes the contents of 
-  sub-directories when adding an entire directory to a playlists. Set the 
-  \setting{Main Menu $\rightarrow$ Playlist Options $\rightarrow$ Recursively
-    Insert Directories} setting to \setting{Yes} if you would like Rockbox to 
-  include tracks in sub-directories as well as tracks in the currently-selected 
-  directory.}
-
-If you want to have Rockbox create a playlist of a whole folder (to play an 
-entire album, for example), use the \setting{File Browser} to select the song. 
-When a single song is selected from the \setting{File Browser}, Rockbox will 
-automatically create a playlist with all songs in the current folder. However, 
-if you want to play only a single song and then stop, stop playback, navigate 
-to the song you want to play, and use the 
-\setting{Playlist $\rightarrow$ Insert} function to select the song.
-
-Dynamic playlists are saved so resume will restore them exactly as they were 
-before shutdown.
-
-\note{To view, save or reshuffle the current dynamic playlist, use the 
-\setting{Playlist Options} setting in the WPS Context Menu.}
-
 \subsection{\label{sec:virtual_keyboard}Virtual Keyboard}
 \screenshot{rockbox_interface/images/ss-virtual-keyboard}{The virtual keyboard}{}
 This is the virtual keyboard that is used when entering text in Rockbox, for
diff --git a/manual/working_with_playlists/main.tex b/manual/working_with_playlists/main.tex
index 4b1bc2ab7a..401fbd62a0 100644
--- a/manual/working_with_playlists/main.tex
+++ b/manual/working_with_playlists/main.tex
@@ -38,20 +38,23 @@ playlists:
 
 Rockbox can create playlists in four different ways.
 
-\subsubsection{By playing a song}
+\subsubsection{By selecting (``playing'') a song from the File Browser}
 Whenever a song is selected from the \setting{File Browser} with
 \ActionTreeEnter, Rockbox will automatically create a playlist containing
-all of the songs in the directory in which that song is located.
+all of the songs in that directory and start playback with the selected
+song.
 
-\note{If you already have already created a dynamic playlist, playing a new
-  song will \emph{erase} the current playlist and create a new one. If you
-  want to add a song to the current playlist rather than erasing the current
-  playlist, see the section below on ``Adding music to playlists.''}
+\note{If you already have created a dynamic playlist, playing a new
+  song will \emph{erase} the current dynamic playlist and create a new one.
+  If you want to add a song to the current playlist
+  rather than erasing the current
+  playlist, see the section below on how to add music to a playlist.}
 
 \subsubsection{By using Insert and Queue functions}
 If playback is stopped, the \setting{Insert} and \setting{Queue} functions
-can be used as described in the next section to create a new playlist instead
-of adding to an existing one.
+can be used as described in \ref{ref:playlist_submenu}
+to create a new playlist instead of adding to an existing one.
+This will \emph{erase} any dynamic playlist.
 
 \subsubsection{By using the Playlist catalog}
 The \setting{Playlist catalog} makes it possible to modify and create playlists
@@ -62,7 +65,7 @@ playlist and \setting{Add to a new playlist} creates a new playlist containing
 the selected track or directory.
 
 \note{All playlists in the \setting{Playlist catalog} are stored in the
-  \fname{Playlists} directory in the root of your \daps{} harddisk and
+  \fname{/Playlists} directory in the root of your \daps{} harddisk and
   playlists stored in other locations are not included in the catalog. It is
   however possible to move existing playlists there (see
   \reference{ref:Filemenu}).}
@@ -79,8 +82,8 @@ in the \setting{Main Menu}. The created playlist will be named
 \screenshot{rockbox_interface/images/ss-playlist-menu}{The Playlist Submenu}{}
 The \setting{Playlist Submenu} allows you to put tracks into a
 ``dynamic playlist''. If there is no music currently playing, Rockbox will
-create a new dynamic playlist and put the selected track(s) into the
-playlist. If there is music currently playing, Rockbox will put the
+create a new dynamic playlist and put the selected track(s) into it.
+If there is music currently playing, Rockbox will put the
 selected track(s) into the current playlist. The place in which the newly
 selected tracks are added to the playlist is determined by the following
 options:
@@ -89,7 +92,8 @@ options:
 \item [Insert.] Add track(s) immediately after any tracks added via the most
   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.
+  playing track. If playback is stopped a new dynamic playlist will get
+  created with the selected tracks.
   
 \item [Insert next.] Add track(s) immediately after current playing
   track, no matter what else has been inserted.
@@ -113,9 +117,19 @@ On the other hand, if the \setting{Playlist Submenu} is invoked on a
 directory, Rockbox adds all of the tracks in that directory to the
 playlist.
 
+\note{You can control whether or not Rockbox includes the contents of 
+  sub-directories when adding an entire directory to a playlists. Set the 
+  \setting{Main Menu $\rightarrow$ Playlist Options $\rightarrow$ Recursively
+    Insert Directories} setting to \setting{Yes} if you would like Rockbox to 
+  include tracks in sub-directories as well as tracks in the currently-selected 
+  directory.}
+
 Dynamic playlists are saved so resume will restore them exactly as they
 were before shutdown.
 
+\note{To view, save or reshuffle the current dynamic playlist use the
+  \setting{Playlist Options} in the WPS context menu.}
+
 \subsection{Saving playlists}
 To save the current playlist either enter the \setting{Playlist} submenu
 in the \setting{WPS Context Menu} (see \reference{sec:contextmenu}) and
@@ -127,6 +141,15 @@ Either method will bring you to the \setting{Virtual Keyboard} (see
 accept it and you're done.
 
 \subsection{Loading saved playlists}
+\subsubsection{Through the \setting{File Browser}}
+Playlist files, like regular music tracks, can be selected through the 
+\setting{File Browser}. When loading a playlist from disk it will replace
+the current dynamic playlist.
+
+\subsubsection{Through the \setting{Playlist catalog}}
+The \setting{Playlist catalog} offers a shortcut to all playlists in your
+\daps{} harddisk root folder called \fname{/Playlists}.
+It can be used like the \setting{File Browser}.
 
 \subsection{Helpful Hints}