2 files changed, 10 insertions, 1 deletions

diff --git a/manual/configure_rockbox/playlist_options.tex b/manual/configure_rockbox/playlist_options.tex
index 4f6024127e..b29842ceed 100644
--- a/manual/configure_rockbox/playlist_options.tex
+++ b/manual/configure_rockbox/playlist_options.tex
@@ -31,6 +31,12 @@ related to playlists.
   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[Keep Current Track When Replacing Playlist.]
+  If set to \setting{Yes}, then \setting{Play} and \setting{Play Shuffled} in
+  the \setting{Current Playlist submenu} will allow the current track to finish
+  playing before the new tracks play. If set to \setting{No}, the current
+  track will be interrupted and new tracks will start playing immediately.
+
   \item[Show Shuffled Adding Options.]
   If set to \setting{No}, Rockbox will not offer to add shuffled tracks
   in the \setting{Current Playlist submenu}.
diff --git a/manual/working_with_playlists/main.tex b/manual/working_with_playlists/main.tex
index 0d1ab7ef04..8571aac61c 100644
--- a/manual/working_with_playlists/main.tex
+++ b/manual/working_with_playlists/main.tex
@@ -118,7 +118,10 @@ following two options will achieve that effect.
 
 \begin{description}
 \item [Play.] Replace all entries in the dynamic playlist with the selected
-  tracks and start playing the new playlist immediately.
+  tracks. If \setting{Keep Current Track When Replacing Playlist} is set to
+  \setting{Yes}, the new tracks will play after the current track finishes
+  playing; if no track is playing or the setting is \setting{No}, the new
+  tracks will begin playing immediately.
 
 \item [Play Shuffled.] Similar, except the tracks will be added to the new
   playlist in random order.