4 files changed, 39 insertions, 15 deletions

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/display_options.tex b/manual/configure_rockbox/display_options.tex
index 5b4692b9ba..0d42115efe 100755
--- a/manual/configure_rockbox/display_options.tex
+++ b/manual/configure_rockbox/display_options.tex
@@ -191,15 +191,18 @@
       is, expressed in percentage of the line length.
     \item[Screen Scrolls Out of View.]
       Screens can be manually scrolled horizontally by pressing
-      \opt{IRIVER_H10_PAD}{Long \ButtonRew/\ButtonFF}%
-      \opt{IRIVER_H10_PAD,XDUOO_X3_PAD}{Long \ButtonPrev/\ButtonNext}%
-      \nopt{IRIVER_H10_PAD,MPIO_HD200_PAD,MPIO_HD300_PAD,XDUOO_X3_PAD%
-            ,touchscreen}{%
-          Long \ButtonRight/\ButtonLeft}.
+      \opt{IRIVER_H10_PAD}{Long \ButtonRew/\ButtonFF}
+      \opt{XDUOO_X3_PAD}{Long \ButtonPrev/\ButtonNext}
+      \nopt{IRIVER_H10_PAD,MPIO_HD200_PAD,MPIO_HD300_PAD,XDUOO_X3_PAD,touchscreen}{Long \ButtonRight/\ButtonLeft}.
       Setting this option to \setting{Yes}
       will keep the list entries at their fixed positions and allow them to be
       scrolled out of view, whereas \setting{No} will only scroll those entries
       which surpass the right margin.
+    \item[Disable main menu scrolling]
+      Setting this option to \setting{Yes}
+      will stop all kind of text scrollings while you are laying on the main menu
+      which may greatly help at avoiding visual glitches if you are using a theme
+      that has a lockscreen.
     \item[Screen Scroll Step Size.]
       Defines the number of pixels the horizontal manual screen scroll should move
       for each step.
diff --git a/manual/configure_rockbox/playback_options.tex b/manual/configure_rockbox/playback_options.tex
index 68ad7042a0..0265491b94 100644
--- a/manual/configure_rockbox/playback_options.tex
+++ b/manual/configure_rockbox/playback_options.tex
@@ -88,7 +88,7 @@ you to configure settings related to audio playback.
   If it is set to \setting{Album}, \setting{Album Artist}, \setting{Artist},
   \setting{Composer}, \setting{Work}, or \setting{Genre},
   your music will pause at the next track change where this tag also
-  changes. Crossfade on track change will be ignored if this setting is enabled.
+  changes.
 
 \section{Party Mode}
   Enables unstoppable music playback. When new songs are
diff --git a/manual/configure_rockbox/sound_settings.tex b/manual/configure_rockbox/sound_settings.tex
index 951eded31c..0aeada59b2 100644
--- a/manual/configure_rockbox/sound_settings.tex
+++ b/manual/configure_rockbox/sound_settings.tex
@@ -44,10 +44,6 @@ change to customise your listening experience.
   limit, select a volume from the list and the maximum volume will be limited to
   the selected value all over the system.
   \opt{xduoox3}{This setting also applies to the Line Out of the \dap{}, as at full scale the \dap{} overdrives the signal.}
-  \opt{erosqnative}{On the \playertype{}, when using the Line Out without anything connected to the Headphone port,
-      the volume is fixed to the \setting{Volume Limit} value.
-      \note{On the \playertype{}, the Line Out level at -2~dB is approximately +7~dBV, -4~dB is approximately +4~dBu,
-      and -18~dB is approximately -10~dBV.}}
 
 \section{Bass}
   This setting emphasises
@@ -193,6 +189,33 @@ 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 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}
+
+  \section{DAC filter roll-off}
+  Later versions of the Eros Q and related devices contain a DAC with user-selectable
+  filter roll-off modes. This allows switching between the following modes:
+  \begin{itemize}
+    \item "Sharp"
+    \item "Slow"
+    \item "Short"
+    \item "Bypass"
+  \end{itemize}
+}
+
 \opt{dac_power_mode}{
   \opt{fiiom3k}{
   \section{DAC Power Mode}