2 files changed, 111 insertions, 26 deletions

diff --git a/manual/configure_rockbox/display_options.tex b/manual/configure_rockbox/display_options.tex
index c872f08031..163b1e884c 100644..100755
--- a/manual/configure_rockbox/display_options.tex
+++ b/manual/configure_rockbox/display_options.tex
@@ -1,6 +1,6 @@
 % $Id$ %
 \section{\label{ref:Displayoptions}Display}
-  
+
   \begin{description}
 
   \item[LCD Settings.]
@@ -32,14 +32,14 @@
         \item[Backlight Fade In.]
         The amount of time that the backlight will take to fade from off to on
         after a button is pressed. If set to \setting{Off} the backlight will
-        turn on immediately, with no fade in. Can also be set to 
+        turn on immediately, with no fade in. Can also be set to
         \setting{500ms}, \setting{1s} or \setting{2s}.
         \item[Backlight Fade Out.]
         Like Backlight fade in, this controls the amount of time that the
         backlight will take to fade from on to off after a button is pressed. If
         set to \setting{Off} the backlight will turn off immediately, with no
         fade out. Other valid values: \setting{500ms}, \setting{1s},
-        \setting{2s}, \setting{3s}, \setting{4s}, \setting{5s} or 
+        \setting{2s}, \setting{3s}, \setting{4s}, \setting{5s} or
         \setting{10s}.
       }
       \opt{backlight_fade_bool}{
@@ -56,21 +56,51 @@
       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[\label{ref:selectivebacklight}Selective Backlight]
+       This option allows some selected actions in While Playing Screen and
+       FM screen to \emph{not} turn on the backlight in order to save power.
+      \begin{description}
+        \item[Enabled.]
+        Enables/disables the feature.
+
+        \item[Settings.]
+        Allows to select actions that will \emph{not} activate backlight.
+                \begin{itemize}
+                \item[Volume.]
+                Volume up/down.
+                \item[Play.]
+                Toggling Play/Pause.
+                \item[Seek.]
+                Seeking in a track.
+                \item[Skip.]
+                Skipping of a track.
+                \item[Disable Unmapped Keys.]
+                Buttons that have no action assigned and accidental button
+                    combinations don't turn on backlight.
+                \item[Disable on External Power.]
+                When plugged goes back to regular behavior.
+                \end{itemize}
+        Selected actions are indicated by a leading +.
+        Note: If all options get de-selected, the entire feature is disabled.
+        \end{description}
+
+
+
       \opt{lcd_sleep}{
         \item[Sleep (After Backlight Off).]
         This setting controls how long rockbox will wait before turning off the
         display after the backlight is turned off. Turning off the display
-        saves battery power but turning on the display takes noticeably longer 
+        saves battery power but turning on the display takes noticeably longer
         than just turning on the backlight.
       }
-      
+
       \opt{backlight_brightness}{
         \item[Brightness.]
         Changes the brightness of your LCD display.
       }
     } % \opt{HAVE_BACKLIGHT}
-    
+
     \opt{lcd_contrast}{
       \item[Contrast.]
       Changes the contrast of your LCD display.
@@ -122,7 +152,7 @@
          This setting lets you invert the whole screen, so now you get a
          black background and light text and graphics.
        \item[Upside Down.]
-         Displays the screen so that the top of the display is nearest 
+         Displays the screen so that the top of the display is nearest
          the buttons. This is sometimes useful when carrying the \dap\ in a
          pocket for easy access to the headphone socket.
        \opt{remote_ticking}{
@@ -138,7 +168,7 @@
     the following parameters:
     \begin{description}
     \item[Scroll Speed.]
-      Sets how many times per second the automatic horizontal scrolling text 
+      Sets how many times per second the automatic horizontal scrolling text
       will move a step.
     \item[Scroll Start Delay.]
       Controls how many milliseconds Rockbox should wait before a new
@@ -184,23 +214,23 @@
       useful on slow displays.
     \nopt{scrollwheel}{
       \item[List Acceleration Start Delay.]
-        This setting enables the acceleration of scroll speed in lists when 
-        holding \ActionStdPrev{} or \ActionStdNext{}. When set to 
-        \setting{Off} the acceleration is disabled. When any other value is set 
+        This setting enables the acceleration of scroll speed in lists when
+        holding \ActionStdPrev{} or \ActionStdNext{}. When set to
+        \setting{Off} the acceleration is disabled. When any other value is set
         the acceleration will start to accelerate after holding
-        \ActionStdPrev{} or \ActionStdNext{} for the chosen time (in 
+        \ActionStdPrev{} or \ActionStdNext{} for the chosen time (in
         seconds).
       \item[List Acceleration Speed.]
-        This setting controls how fast the scroll speed accelerates. The scroll 
-        speed will increase every N seconds. For example, selecting 
-        \setting{Speed up every 3s} will increase the scroll speed every 3 
+        This setting controls how fast the scroll speed accelerates. The scroll
+        speed will increase every N seconds. For example, selecting
+        \setting{Speed up every 3s} will increase the scroll speed every 3
         seconds while \ActionStdPrev{} or \ActionStdNext{} is held.
     }
     \end{description}
 %
   \opt{lcd_bitmap}{
     \item[Peak Meter.]
-      The peak meter can be configured with a number of parameters. 
+      The peak meter can be configured with a number of parameters.
       \begin{description}
       \item[Peak Release.]
         This determines how fast the bar shrinks when the music becomes
@@ -216,7 +246,7 @@
       \item[Clip Hold Time.]
         The number of seconds that the clipping indicator will be visible
         after clipping is detected.
-      \opt{recording}{  
+      \opt{recording}{
         \item[Clip Counter.]
           Show the number of times the clip indicator went active during
           recording in front of the peak meters.
diff --git a/manual/configure_rockbox/system_options.tex b/manual/configure_rockbox/system_options.tex
index b505175a68..ff2967cec7 100644..100755
--- a/manual/configure_rockbox/system_options.tex
+++ b/manual/configure_rockbox/system_options.tex
@@ -167,11 +167,11 @@ this option \setting{On}. If it is not required, then turning this setting
 
 \opt{lineout_poweroff}{
 \subsection{\label{ref:LineoutOnOff}Line Out}
-This option turns the \dap{}'s line-out \setting{On} and \setting{Off}. On some 
-devices an enabled line-out will consume some power even if not used. If it is 
-not required, then turning this setting \setting{Off} will save battery and 
+This option turns the \dap{}'s line-out \setting{On} and \setting{Off}. On some
+devices an enabled line-out will consume some power even if not used. If it is
+not required, then turning this setting \setting{Off} will save battery and
 therefore result in better runtime.
-} 
+}
 
 \opt{HAVE_BUTTON_LIGHTS}{
   \opt{e200,e200v2}{
@@ -243,6 +243,61 @@ therefore result in better runtime.
 
 
 
+
+\nopt{HAS_BUTTON_HOLD}{
+  \subsection{Advanced Key Lock}
+    This option allows users to select actions that when within WPS or FMS will \emph{not} be
+    blocked by the key lock (software hold switch).
+
+
+        \begin{description}
+        \item[Enabled.]
+        Enables/disables the feature.
+
+        \item[Settings.]
+        Allows to select actions that will \emph{not} be blocked by the key lock.
+                \begin{itemize}
+                \item[Volume.]
+                Volume up/down.
+                \item[Play.]
+                Toggling Play/Pause.
+                \item[Seek.]
+                Seeking in a track.
+                \item[Skip.]
+                Skipping of a track.
+                \opt{HAVE_BACKLIGHT}{
+                \item[Autolock On.]
+                When the backlight turns off, softlock will lock the screen,
+                activates when you press the lock key and if you manually lock
+                again, while active it then disables autolock.
+                \begin{itemize}
+                        \item
+                        (Lock Button Pressed \#1) >Auto Lock On
+                            (device still unlocked till backlight timeout).
+                        \item
+                        (Lock Button Pressed \#2) >Auto Lock Off (device locked).
+                        \item
+                        (Lock Button Pressed \#3) >(device unlocked).
+                \end{itemize}
+                } %\opt{HAVE_BACKLIGHT}
+                \opt{touchpad}{
+                \item[Disable Touch.]
+                 Blocks touch screen buttons like the original.
+                }
+                \item[Disable Notify.]
+                Suppresses the notification 'Buttons Locked'
+                    (still will if power button is pressed).
+                \note{This is a pre-requisite for \setting{selectivebacklight}
+                \reference{ref:selectivebacklight} to work also during key lock.}
+
+                \end{itemize}
+        Selected actions are indicated by a leading +.
+        Note: If all options get de-selected, the entire feature is disabled.
+
+        \end{description}
+} %\nopt{HAS_BUTTON_HOLD}
+
+
 \opt{usb_hid}{
   \subsection{\label{ref:USB_HID}USB HID}
     This option turns the USB HID feature \setting{On} and \setting{Off}.
@@ -550,7 +605,7 @@ therefore result in better runtime.
                 \\
             \end{btnmap}
 
-        \item [Browser.] This mode lets you control a web browser (e.g. 
+        \item [Browser.] This mode lets you control a web browser (e.g.
         Firefox). It uses the \dap{}'s keys to navigate through the web page
         and different tabs, navigate through history, and to control zoom.
 
@@ -592,7 +647,7 @@ therefore result in better runtime.
                     \\
                 }
 
-                % Zoom in / out 
+                % Zoom in / out
                 \opt{SANSA_FUZEPLUS_PAD}{Long \ButtonBottomRight}
                 \opt{SANSA_E200_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD}
                     {Long \ButtonUp / Long \ButtonDown}
@@ -707,13 +762,13 @@ therefore result in better runtime.
                     ,SANSA_CLIP_PAD,MROBE100_PAD,PBELL_VIBE500_PAD,SANSA_FUZEPLUS_PAD%
                     ,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}
                     {\ButtonUp / \ButtonDown / \ButtonLeft / \ButtonRight}
-                \opt{IRIVER_H10_PAD}{\ButtonScrollUp / \ButtonScrollDown / 
+                \opt{IRIVER_H10_PAD}{\ButtonScrollUp / \ButtonScrollDown /
                     \ButtonLeft / \ButtonRight}
                 \opt{IPOD_4G_PAD,IPOD_3G_PAD,IPOD_1G2G_PAD}
                     {\ButtonMenu / \ButtonPlay / \ButtonLeft / \ButtonRight}
                     &
                 \opt{HAVEREMOTEKEYMAP}{
-                    \opt{MROBE100_RC_PAD}{\ButtonRCPlay / \ButtonRCDisplay / 
+                    \opt{MROBE100_RC_PAD}{\ButtonRCPlay / \ButtonRCDisplay /
                         \ButtonRCRew / \ButtonRCFF}%
                     &}
                 Cursor move up / down / left / right, respectively