1 files changed, 11 insertions, 8 deletions

diff --git a/manual/configure_rockbox/system_options.tex b/manual/configure_rockbox/system_options.tex
index 336b0dd84d..ba80a6e6e4 100755
--- a/manual/configure_rockbox/system_options.tex
+++ b/manual/configure_rockbox/system_options.tex
@@ -102,18 +102,21 @@ This sub menu relates to limits in the Rockbox operating system.
   \begin{description}
     \item [Max Entries in File Browser.] This setting controls the limit on
     the number of files that you can see in any particular directory in the
-    file browser. You can configure the size to be between 50 and
-    10,000 files in steps of 50. The default is 400. \opt{HAVE_DISK_STORAGE}{
-    Higher values will shorten the music buffer, which can negatively affect
-    battery life by forcing the disk to spin up more often. Increase this
-    setting \emph{only} if you need to.}
+    file browser. \opt{HAVE_DISK_STORAGE}{Higher values will shorten the music
+    buffer, which can negatively affect battery life by forcing the disk to
+    spin up more often. Increase this setting \emph{only} if you need to.}
+
+    \note{This setting also affects the maximum number of tracks that can
+    be handled by the database browser. If you find that long lists are not
+    being sorted correctly in the database browser you may need to increase
+    this setting.}
 
     \item [Max Playlist Size.] This setting controls the maximum size of
     a playlist. The playlist size can be between 1,000 and 32,000 files,
     in steps of 1,000 (default is 10,000). \opt{HAVE_DISK_STORAGE}{Higher
-    values will shorten the music buffer, which can negatively affect battery
-    life by forcing the disk to spin up more often. Increase this setting
-    \emph{only} if you use very large playlists.}
+    values will shorten the music buffer, which can negatively affect
+    battery life by forcing the disk to spin up more often. Increase this
+    setting \emph{only} if you use very large playlists.}
 
     \item [Glyphs To Cache.] This sets the default memory allocation size
     for fonts in unique glyphs. This should be set to the number of unique