2 files changed, 16 insertions, 2 deletions

diff --git a/apps/settings_list.c b/apps/settings_list.c
index 2d73028968..7f2cf38072 100644
--- a/apps/settings_list.c
+++ b/apps/settings_list.c
@@ -368,7 +368,7 @@ static const char* scanaccel_formatter(char *buffer, size_t buffer_size,
     if (val == 0)
         return str(LANG_OFF);
     else
-        snprintf(buffer, buffer_size, "2x/%ds", val);
+        snprintf(buffer, buffer_size, "Speed up every %ds", val);
     return buffer;
 }
 #endif
@@ -1694,7 +1694,7 @@ const struct settings_list settings[] = {
 #endif
 #ifndef HAVE_WHEEL_ACCELERATION
     INT_SETTING(0, list_accel_start_delay, LANG_LISTACCEL_START_DELAY,
-                2, "list_accel_start_delay", UNIT_MS, 0, 10, 1,
+                2, "list_accel_start_delay", UNIT_SEC, 0, 10, 1,
                 formatter_unit_0_is_off, getlang_unit_0_is_off, NULL),
     INT_SETTING(0, list_accel_wait, LANG_LISTACCEL_ACCEL_SPEED,
                 3, "list_accel_wait", UNIT_SEC, 1, 10, 1, 
diff --git a/manual/configure_rockbox/display_options.tex b/manual/configure_rockbox/display_options.tex
index a6bd439661..430d361c57 100644
--- a/manual/configure_rockbox/display_options.tex
+++ b/manual/configure_rockbox/display_options.tex
@@ -181,6 +181,20 @@
       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
       useful on slow displays.
+    \nopt{scrollwheel}{
+      \item[List Acceleration Start Delay.]
+        This setting enables the acceleration of scroll speed in lists when 
+        holding \ButtonScrollUp{} or \ButtonScrollDown{}. When set to 
+        \setting{Off} the acceleration is disabled. When any other value is set 
+        the acceleration will start to accelerate after holding
+        \ButtonScrollUp{} or \ButtonScrollDown{} 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 
+        seconds while \ButtonScrollUp{} or \ButtonScrollDown{} is held.
+    }
     \end{description}
 %
   \opt{lcd_bitmap}{