1 files changed, 56 insertions, 61 deletions

diff --git a/manual/configure_rockbox/display_options.tex b/manual/configure_rockbox/display_options.tex
index 33ddc3e18c..f00b0a2da9 100755
--- a/manual/configure_rockbox/display_options.tex
+++ b/manual/configure_rockbox/display_options.tex
@@ -173,11 +173,9 @@
     \item[Scroll Start Delay.]
       Controls how many milliseconds Rockbox should wait before a new
       text begins automatically scrolling.
-    \opt{lcd_bitmap}{
       \item[Scroll Step Size.]
         Defines the number of pixels the text should move for each step, as used
         by the Scroll Speed setting.
-    }
     \opt{remote}{
       \item[Remote Scrolling Options.]
         The options here have the same effect on the remote LCD as the options
@@ -191,22 +189,20 @@
       Rockbox chooses which method it should use depending of how much it has to
       scroll to the left. This setting lets you tell Rockbox where that limit
       is, expressed in percentage of the line length.
-    \opt{lcd_bitmap}{
-      \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}.
-        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[Screen Scroll Step Size.]
-        Defines the number of pixels the horizontal manual screen scroll should move
-        for each step.
-    }
+    \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}.
+      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[Screen Scroll Step Size.]
+      Defines the number of pixels the horizontal manual screen scroll should move
+      for each step.
     \item[Paged Scrolling.]
       When set to \setting{Yes} scrolling vertically on pages that surpass the
       screen size will page up/down instead of simply changing lines. This can be
@@ -227,50 +223,49 @@
     }
     \end{description}
 %
-  \opt{lcd_bitmap}{
-    \item[Peak Meter.]
-      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
-        softer. Lower values make the peak meter look smoother.
-        Expressed in scale units per 10~ms.
-      \item[Peak Hold Time.]
-        Specifies the time after which the peak indicator will reset.
-        For example, if you set this value to 5~s, the peak indicator displays
-        the loudest volume value that occurred within the last 5 seconds.
-        Larger values are useful if you want to find the peak level of a song,
-        which might be of interest when copying music from the \dap\ via the
-        analogue output to some other recording device.
-      \item[Clip Hold Time.]
-        The number of seconds that the clipping indicator will be visible
-        after clipping is detected.
-      \opt{recording}{
-        \item[Clip Counter.]
-          Show the number of times the clip indicator went active during
-          recording in front of the peak meters.
-      }
-      \item[\label{ref:Peakmetersetting}Scale.]
-        Select whether the peak meter displays linear or logarithmic values.
-        The human ear perceives loudness on a logarithmic scale. If the Scale
-        setting is set to \setting{Logarithmic} (dB) scale, the volume values
-        are scaled logarithmically. The volume meters of digital audio
-        devices usually are scaled this way. On the other hand, if you
-        are interested in the power level that is applied to your headphones
-        you should choose \setting{Linear} display. This setting cannot be
-        displayed in units like volts or watts because such units depend
-        on your headphones.
-      \item[Minimum and maximum range.]
-        These two options define the full value range that the peak meter
-        displays. Recommended values for the \setting{Logarithmic} (dB) setting
-        are {}-40~dB for minimum and 0~dB for maximum. Recommended values
-        for \setting{Linear} display are 0 and 100\%. Note that {}-40~dB is
-        approximately 1\% in linear value, but if you change the minimum
-        setting in linear mode slightly and then change to the dB scale,
-        there will be a large change. You can use these values for `zooming'
-        into the peak meter.
-      \end{description}
+  \item[Peak Meter.]
+    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
+      softer. Lower values make the peak meter look smoother.
+      Expressed in scale units per 10~ms.
+    \item[Peak Hold Time.]
+      Specifies the time after which the peak indicator will reset.
+      For example, if you set this value to 5~s, the peak indicator displays
+      the loudest volume value that occurred within the last 5 seconds.
+      Larger values are useful if you want to find the peak level of a song,
+      which might be of interest when copying music from the \dap\ via the
+      analogue output to some other recording device.
+    \item[Clip Hold Time.]
+      The number of seconds that the clipping indicator will be visible
+      after clipping is detected.
+    \opt{recording}{
+      \item[Clip Counter.]
+        Show the number of times the clip indicator went active during
+        recording in front of the peak meters.
     }
+    \item[\label{ref:Peakmetersetting}Scale.]
+      Select whether the peak meter displays linear or logarithmic values.
+      The human ear perceives loudness on a logarithmic scale. If the Scale
+      setting is set to \setting{Logarithmic} (dB) scale, the volume values
+      are scaled logarithmically. The volume meters of digital audio
+      devices usually are scaled this way. On the other hand, if you
+      are interested in the power level that is applied to your headphones
+      you should choose \setting{Linear} display. This setting cannot be
+      displayed in units like volts or watts because such units depend
+      on your headphones.
+    \item[Minimum and maximum range.]
+      These two options define the full value range that the peak meter
+      displays. Recommended values for the \setting{Logarithmic} (dB) setting
+      are {}-40~dB for minimum and 0~dB for maximum. Recommended values
+      for \setting{Linear} display are 0 and 100\%. Note that {}-40~dB is
+      approximately 1\% in linear value, but if you change the minimum
+      setting in linear mode slightly and then change to the dB scale,
+      there will be a large change. You can use these values for `zooming'
+      into the peak meter.
+    \end{description}
+
     \item[\label{ref:Defaultcodepage}Default Codepage.]
       A codepage describes the way extended characters that are not available
       within the ASCII character set are encoded. ID3v1 tags do not have a