3 files changed, 31 insertions, 19 deletions

diff --git a/manual/configure_rockbox/display_options.tex b/manual/configure_rockbox/display_options.tex
index 291ceccf0a..9adffd7095 100755
--- a/manual/configure_rockbox/display_options.tex
+++ b/manual/configure_rockbox/display_options.tex
@@ -27,8 +27,11 @@
     This setting is equivalent to the Backlight setting except it applies when
     the \dap\ is plugged into the charger. 
     \item[Caption Backlight:] 
-    This option turns the backlight on for 25 seconds either side of the 
-    start of a new track so that the display can be read to see song information.
+    This option turns on the backlight a number of seconds before the start
+    of a new track, and keeps it on for the same number of seconds after the
+    beginning so that the display can be read to see song information. The
+    amount of time is determined by the value of the backlight timeout
+    setting, but is no less than 5 seconds.
     \opt{h1xx,ipodnano,ipodcolour,ipodvideo}{
       \item[Backlight fade in:]
       The amount of time that the backlight will take to fade from off to on 
@@ -44,8 +47,10 @@
     With this option enabled the first keypress while the backlight is turned 
     off will only turn the backlight on without having any other effect. When
     disabled the first keypress will \emph{also} perform its appropriate action.
-    \item[Brightness:]
-      Changes the brightness of your LCD display.
+    \opt{h300}{
+      \item[Brightness:]
+        Changes the brightness of your LCD display.
+    }
     \item[Contrast:] 
     Changes the contrast of your LCD display. 
     \warn{Setting the contrast too dark or too light can make it hard to 
@@ -91,9 +96,11 @@
       \item[Backlight on When Plugged:]
         This controls the backlight when the \dap\ is plugged into the charger.
       \item[Caption Backlight:]
-        This option turns the backlight on for 25 seconds either side of the 
-        start of a new track so that the display can be read to see song 
-        information.
+      This option turns on the backlight a number of seconds before the start
+      of a new track, and keeps it on for the same number of seconds after the
+      beginning so that the display can be read to see song information. The
+      amount of time is determined by the value of the backlight timeout 
+      setting, but is no less than 5 seconds. 
       \opt{h1xx,ipodnano,ipodcolour,ipodvideo}{
         \item[First Keypress Enables Backlight Only:]
           This controls what happens when you press a button on your remote 
diff --git a/manual/plugins/oscilloscope.tex b/manual/plugins/oscilloscope.tex
index 8c4b675729..166bd84fc5 100644
--- a/manual/plugins/oscilloscope.tex
+++ b/manual/plugins/oscilloscope.tex
@@ -2,8 +2,11 @@
 \screenshot{plugins/images/ss-oscilloscope}{Oscilloscope}{img:oscilloscope}
 
 This demo shows the shape of the sound samples that make up the music
-being played. At faster speed rates, the Jukebox is less responsive
-to user input and music may start to skip.
+being played.
+\opt{SWCODEC}{
+  At faster speed rates, the Jukebox is less responsive
+  to user input and music may start to skip.
+}
 
 \subsubsection{Keys}
 
diff --git a/manual/rockbox_interface/tagcache.tex b/manual/rockbox_interface/tagcache.tex
index dcfb39ef35..cd39cfc211 100644
--- a/manual/rockbox_interface/tagcache.tex
+++ b/manual/rockbox_interface/tagcache.tex
@@ -14,16 +14,18 @@ create the database from your music files. This typically takes around
 this is happenning. You can even shut down your player and resume the 
 database building process next time you turn it on.
 To force the initial database to be built, go to the main menu, then 
-\setting{General Settings $\rightarrow$ File View $\rightarrow$ Force tag cache update}.
-
-The Tag Cache database can either be kept on disk (to save memory), or 
-loaded into RAM (for fast browsing). This configuration option can be 
-found in \setting{General Settings $\rightarrow$ File View $\rightarrow$ Tag cache}.
-Once the database has been built, you can browse your music using this 
-database. To use the database change the show mode by changing the 
-\setting{General Settings $\rightarrow$ File View $\rightarrow$ Show files} option to 
-\setting{ID3 database}. This disables the File Browser and instead of the file
-browser you will now access the database.
+  \setting{General Settings $\rightarrow$ Playback $\rightarrow$ Force tag cache update}.
+  
+\opt{SWCODEC}{
+  The Tag Cache database can either be kept on disk (to save memory), or 
+  loaded into RAM (for fast browsing). This configuration option can be 
+  found in \setting{General Settings $\rightarrow$ Playback $\rightarrow$ Tag cache}.
+        }
+  Once the database has been built, you can browse your music using this 
+  database. To use the database change the show mode by changing the 
+  \setting{General Settings $\rightarrow$ File view $\rightarrow$ Show files} option to 
+        \setting{ID3 database}. This disables the File Browser and instead of the file
+        browser you will now access the database.
 %
 \begin{description}
 \item[Keeping Tag Cache on disk.] This does not require extra RAM for the