diff --git a/manual/configure_rockbox/playback_options.tex b/manual/configure_rockbox/playback_options.tex
index e7a2977660..4008375b3b 100644
--- a/manual/configure_rockbox/playback_options.tex
+++ b/manual/configure_rockbox/playback_options.tex
@@ -60,38 +60,29 @@ related to audio playback.
   These settings control the speed and acceleration during fast forward and rewind.
   The setting \setting{FF/RW Min Step} controls the initial speed and \setting{FF/RW Accel} controls the acceleration.
 
-\section{Anti-Skip Buffer}
-  This setting allows you to control how much music is
-  stored in the \daps{} memory whilst playing a song, acting as a buffer
-  against shock or playback problems. The \dap{} transfers the selected
-  amount of the forthcoming song into its memory at high speed whilst you are
-  playing the song. It keeps a ``rolling'' buffer, which keeps feeding more
-  of the forthcoming song into memory as it goes along.
-  If the \dap{} is knocked, shaken or jogged heavily while Rockbox is trying
-  to read the hard drive, Rockbox might not be able to read the drive.
-  Rockbox will retry over and over again until it succeeds, but may
-  eventually reach the end of the memory buffer. When that happens, Rockbox
-  must stop playing and wait for more data from the disk, which causes your
-  music to skip. The anti-skip setting tells Rockbox how much extra buffer
-  memory to spare to handle this situation. This setting therefore allows you
-  to reduce the chances of there being a gap or pause during playback of
-  songs.
-    
-  \nopt{ondio}{
-    \opt{MASCODEC}{The anti-skip buffer can be set to a value between 0 and 7
-      seconds.}
-  }%
-  \opt{ondio}{
-    The anti-skip buffer can safely be kept at zero. It will eventually be 
-    eliminated.
-  }%
-  \opt{swcodec}{The anti-skip buffer can be set to various values between
-    5 seconds and 10 minutes.}%
+\opt{disk_storage}{
+  \section{Anti-Skip Buffer}
+    This setting controls how early Rockbox starts refilling the music buffer
+    from the hard drive when playing. A longer Anti-Skip Buffer helps prevent
+    skips in music playback if Rockbox has trouble reading from the disk.
+    This can happen if the \dap{} is knocked, shaken or jogged heavily while
+    Rockbox is trying to read the hard drive.
+
+    \opt{MASCODEC}{
+      The anti-skip buffer can be set to a value between 0 and 7
+      seconds.
+    }
+
+    \opt{swcodec}{
+      The anti-skip buffer can be set to various values between
+      5 seconds and 10 minutes.
+    }
+
+    \note{Having a large anti-skip buffer tends to use more power, and may
+      reduce your battery life. It is recommended to always use the lowest
+      possible setting that allows correct and continuous playback.}
+}
 
-  \note{Having a large anti-skip buffer tends to use more power, and may
-    reduce your battery life. It is recommended to always use the lowest
-    possible setting that allows correct and continuous playback.}
-    
 \section{Fade on Stop/Pause}
   Enables and disables a fade effect when you
   pause or stop playing a song. If the Fade on Stop/Pause option is