6 files changed, 56 insertions, 33 deletions

diff --git a/manual/appendix/wps_tags.tex b/manual/appendix/wps_tags.tex
index 94b61e9534..ecdae6c0b9 100644
--- a/manual/appendix/wps_tags.tex
+++ b/manual/appendix/wps_tags.tex
@@ -587,9 +587,9 @@ display cycling round the defined sublines. See
     \item It should match the \config{Source:} line in the language file.
   \end{itemize}
 
-  \note{checkwps cannot verify that the string is correct, so please check on
-    either the simulator or on target.}
-
+  \note{\fname{checkwps} can be used to verify that the translated strings
+        used in a theme are valid for a specific \dap{}. In the UI,
+        invalid strings will be replaced with a blank/empty string.}
 
 \opt{touchscreen}{
   \section{Touchscreen Areas}
diff --git a/manual/configure_rockbox/bookmarking.tex b/manual/configure_rockbox/bookmarking.tex
index d87b5ad8a7..a0a047e190 100644
--- a/manual/configure_rockbox/bookmarking.tex
+++ b/manual/configure_rockbox/bookmarking.tex
@@ -14,11 +14,9 @@
   the bookmark to load. There are other ways to load a bookmarks mentioned
   below.
 
-  \note{Bookmarking does not work with dynamic (i.e. modified but not saved)
-        playlists, such as when playing tracks from the \setting{Database} instead of
-        the \setting{File Browser}.
-        If you do not see the option to create a bookmark in the \setting{WPS Context Menu},
-        try saving the current playlist first.
+  \note{If the current playlist has been modified or is unsaved, such as when
+        playing tracks from the \setting{Database}, Rockbox will automatically
+        offer to save the playlist to a file when you attempt to create a bookmark. 
         Queued tracks (see \reference{ref:queuing}) do not get saved to the playlist file.
         You're asked to confirm their removal when saving, so that the current playlist
         can be bookmarked. }
diff --git a/manual/configure_rockbox/sound_settings.tex b/manual/configure_rockbox/sound_settings.tex
index 951eded31c..fd69d63317 100644
--- a/manual/configure_rockbox/sound_settings.tex
+++ b/manual/configure_rockbox/sound_settings.tex
@@ -193,6 +193,24 @@ change to customise your listening experience.
   the effect of widening the stereo field. A value of 100\% will leave the
   stereo field unaltered.
 
+\opt{erosqnative}{
+  \section{Stereo Switch Mode}
+  The Eros Q and related devices contain a stereo switch in the audio path.
+  This may be connected differently depending on the hardware revision. This
+  setting allows the behavior of the stereo switch to be changed if one of
+  the two outputs (Headphones or Line Out) is not working. There are four modes:
+  \begin{description}
+    \item[Normal.]
+      Headphones output uses a value of 0, and Line Out uses a value of 1.
+    \item[Reverse.]
+      Headphones output uses a value of 1, and Line Out uses a value of 0.
+    \item[Always 0.]
+      Both outputs use a value of 0.
+    \item[Always 1.]
+      Both outputs use a value of 1.
+  \end{description}
+}
+
 \opt{dac_power_mode}{
   \opt{fiiom3k}{
   \section{DAC Power Mode}
diff --git a/manual/main_menu/main.tex b/manual/main_menu/main.tex
index 9a75689940..f09cc448cb 100644
--- a/manual/main_menu/main.tex
+++ b/manual/main_menu/main.tex
@@ -53,9 +53,9 @@ If the \setting{Save a list of recently created bookmarks} option is enabled
 then you can view a list of several recent bookmarks here and select one to 
 jump straight to that track.\\*
 
- \note{A track launched from the file browser can be bookmarked as is. If
-       tracks are launched via the database, or the current playlist has been modified,
-       creating a bookmark requires that you save the playlist first.\\*} 
+ \note{A track launched from the file browser can be bookmarked as-is. For
+       tracks launched via the database, or for modified playlists, you're
+       asked to save the playlist to a file when creating a bookmark.\\*} 
 
   \begin{btnmap}
     \ActionStdNext
@@ -284,7 +284,7 @@ settings. With a shortcut,
         a \fname{.cfg} loaded)
   \item The file browser can be opened with the cursor positioned at
         a specified file or folder
-  \item A file's or folder's ``Current Playlist'' context menu item can
+  \item A file's or folder's ``Playing Next...'' context menu item can
         be displayed
   \item A setting can be configured (any which can be added to the
         \setting{Quick Screen})
@@ -293,7 +293,7 @@ settings. With a shortcut,
   \item The current time can be spoken
 }
   \item The sleep timer can be configured
-  \item The \dap{} can be turned off
+  \item The \dap{} can be turned off or rebooted
 \end{itemize}
 
 \note{Shortcuts into the database are not possible}
@@ -307,7 +307,7 @@ each item to be displayed. Each shortcut looks like the following:
     data: <what the shortcut actually links to>
     name: <what the shortcut should be displayed as>
     icon: <number of the theme icon to use (see \wikilink{CustomIcons})>
-    talkclip: <filename of a talk clip to speak when voice menus are enabled>
+    talkclip: <full path to a talk clip to speak when voice menus are enabled> (example: \fname{/.rockbox/filename.talk})
 \end{example}
 
 Only ``type'' and ``data'' are required (except if type is ``separator'' in which case
@@ -325,9 +325,12 @@ Available types are:
 \item[separator] \config{data} is ignored; \config{name} can be used to display text,
   or left blank to make the list more accessible with visual gaps
 \item[time] \config{data} needs to be \opt{rtc}{either ``talk'' to talk the time, or }``sleep X''
-  where X is the number of minutes to run the sleep timer for (0 to disable). \config{name}
-  is required for this shortcut type.
+  where X can, optionally, be the number of minutes to run the sleep timer for (0 to disable).
+  If ``sleep'' is not followed by a number, the sleep timer can be stopped, if running,
+  or started using the default duration; \config{name} will be ignored in that case. Otherwise
+  \config{name} is required for this shortcut type.
 \item[shutdown] \config{data} is ignored; \config{name} can be used to display text
+\item[reboot] \config{data} is ignored; \config{name} can be used to display text
 \end{description}
 
 If the name/icon items are not specified, a sensible default will be used.
diff --git a/manual/rockbox_interface/tagcache.tex b/manual/rockbox_interface/tagcache.tex
index 91c0255750..3c3e6d2df8 100644
--- a/manual/rockbox_interface/tagcache.tex
+++ b/manual/rockbox_interface/tagcache.tex
@@ -47,30 +47,34 @@ with logging
   \item[Load To RAM]
     The database can either be kept on \disk{} (to save memory), or
     loaded into RAM (for fast browsing). Setting this to \setting{Yes} loads
-    the database to RAM, allowing faster browsing and searching. Setting this
-    option to \setting{No} keeps the database on the \disk{}, meaning slower 
-    browsing but it does not use extra RAM and saves some battery on boot up. 
-    
+    the database to RAM, beginning with the next reboot, allowing faster browsing and
+    searching. Setting this option to \setting{No} keeps the database on the \disk{},
+    meaning slower browsing but it does not use extra RAM and saves some battery on
+    boot up.
+
     \opt{HAVE_DISK_STORAGE}{
       If you browse your music frequently using the database, you should
       load to RAM, as this will reduce the overall battery consumption because
       the disk will not need to spin on each search.
     }
 
-    \note{When Load to RAM is turned on, and the directory cache is enabled as well,
-    it may take an unexpectedly long amount of time for disk activity to
-    wind down after booting, depending on your library size and player.
+    \note{When Load to RAM is turned on, and the directory cache (see
+    \reference{ref:dircache}) is enabled as well, it may take an unexpectedly long amount
+    of time for disk activity to wind down after booting, depending on your library size
+    and player.
 
     This can be mitigated by choosing the \setting{Quick} option instead, which causes
-    the database to ignore cached file references. In that case, you may notice brief
-    moments of disk activity once the path for a database entry has to be retrieved.
-
-    Set to \setting{On}, if you plan to take advantage the database's Update function,
-    or use a WPS that displays multiple upcoming tracks from the current playlist.
-    Otherwise, you may notice file names instead of metadata being displayed for those
-    tracks.}
+    the database to ignore cached file references. In that case, you should expect brief
+    moments of disk activity whenever the path for a database entry has to be retrieved.
+
+    Setting this to \setting{On} may be preferable for reducing disk accesses if you plan to
+    take advantage of \setting{Auto Update}, have enabled \setting{Gather Runtime Data}
+    (see below for both), enabled \setting{Automatic resume} (see
+    \reference{ref:Autoresumeconfigactual}), or use a WPS that displays multiple upcoming
+    tracks from the current playlist. In the latter case, metadata will not be displayed
+    for those tracks otherwise.}
   }
-  
+
 \item[Auto Update]
   If \setting{Auto update} is set to \setting{on}, each time the \dap{}
   boots, the database will automatically be updated.
diff --git a/manual/rockbox_interface/wps.tex b/manual/rockbox_interface/wps.tex
index 839392b054..b00d066525 100644
--- a/manual/rockbox_interface/wps.tex
+++ b/manual/rockbox_interface/wps.tex
@@ -226,8 +226,8 @@ browser. The value wraps at 10.
 \subsubsection{\label{ref:createbookmark}Bookmarks}
 Create a bookmark in the currently playing track, or display existing entries.
 Bookmarks can only be used with directories, or playlists stored on
-disk. If you don't see the option to create a bookmark, try saving the
-current playlist first.
+disk. You'll be asked to provide the name for a file to save the playlist to,
+if necessary.
 
 \note{If you've enabled options for queuing tracks (see \reference{ref:queuing}), keep
 in mind that those are not saved to a playlist file.