3 files changed, 52 insertions, 6 deletions

diff --git a/www/manual/play-wps.t b/www/manual/play-wps.t
index 4b20a91d67..ba768e15e2 100644
--- a/www/manual/play-wps.t
+++ b/www/manual/play-wps.t
@@ -13,7 +13,7 @@ only be seen while there is actual music playback.
 Buttons:
 <p>
 <table>
-<tr><td> PLAY </td><td> Toggle PAUSE/PLAY </td></tr>
+<tr><td> PLAY </td><td> Toggle PAUSE/PLAY.  If 'resume' is enabled, pressing PAUSE will make it store a "resume point" where it can start again from later. </td></tr>
 <tr><td> ON </td><td> Switch to the <a href="play-dir.html">dir browser</a>.
 </td></tr>
 <tr><td> STOP </td><td> Stop playback </td></tr>
diff --git a/www/manual/rec-general.t b/www/manual/rec-general.t
index ab23d38cae..15b9957d21 100644
--- a/www/manual/rec-general.t
+++ b/www/manual/rec-general.t
@@ -5,9 +5,55 @@ The general settings menu offers:
 <p>
  <img src="rec-generalsettings.png">
 
-<p> Shuffle mode, mp3/m3u filter mod, sort mode, Backlight timer, Scroll speed
-and WPS control.
+<p> <b>Shuffle mode</b> - Select shuffle ON/OFF. This alters how Rockbox will
+  select which next song to play.
 
+<p> <b>mp3/m3u filter</b> - When set to ON, this will hide all files in the <a
+href="rec-dir.html">dir browser</a> that aren't mp3 or m3u files. Set to OFF
+to see all files.
+
+<p> <b>Sort mode</b> - How to sort directories displayed in the <a
+href="rec-dir.html">dir browser</a>. Case sensitive ON makes uppercase and
+lowercase differences matter. Having it OFF makes them get treated the same.
+
+<p> <b>Backlight timer</b> - How long time the backlight should be switched on
+after a keypress. Set to OFF to never light it, set to ON to never shut it off
+or set a prefered timeout period.
+
+<p> <b>Contrast</b> - changes the contrast of your LCD display. 
+
+<p> <b>Scroll speed</b> - controls at what speed the general line scrolling
+will use. The scroll appears in the <a href="rec-dir.html">dir browser</a>,
+the <a href="rec-wps.html">WPS</a> and elsewhere.
+
+<p> <b>While Playing</b> - ID3 tags, file, parse
+
+<p> <b>Deep discharge</b> - Set this to ON if you intend to keep your charger
+connected for a long period of time. It lets the batteries go down to 10%
+before starting to charge again. Setting this to OFF will cause the charging
+restart on 95%.
+
+<p> <b>Time/Date</b> - Set current time and date.
+
+<p> <b>Show Hidden Files</b> - Files with names that start with a dot or use
+the 'hidden' attribute are shown in the <a href="rec-dir.html">dir browser</a>
+if this is set to ON. If set to OFF, they're not shown.
+
+<p> <b>FF/Rewind</b> - set the FF/rewind speed. Holding down the LEFT or RIGHT
+keys in the <a href="rec-wps.html">WPS</a> makes a fast forward/backward. This
+setting controls how fast it is.
+
+<p> <b>Resume</b> - ASK, ON or OFF. If set to ASK or ON, Rockbox will save
+info about playlists/directories being played, to allow later resuming. If ASK
+is selected, a 'continue resumed play' question will appear when starting
+Rockbox. If ON is selected, resuming is done unconditionally. If OFF, no
+resuming is made.
+
+<p> <b>Disk Spindown</b> - Rockbox has a timer that makes it spin down the
+disk driver a certain time of idleness. You modify this timeout here. A very
+short timeout makes the interface less responsive and use more batteries for
+more frequent spinups, while a long timeout makes the disk spin too long and
+use more batteries...
 
 <p>
 Buttons:
diff --git a/www/manual/rec-wps.t b/www/manual/rec-wps.t
index 6b4cdc6806..6851dfe21f 100644
--- a/www/manual/rec-wps.t
+++ b/www/manual/rec-wps.t
@@ -26,12 +26,12 @@ The screen lines contain the following information:
 <tr><td> DOWN </td><td>  Decrease volume </td></tr>
 <tr><td> LEFT </td><td>  Move to previous song</td></tr>
 <tr><td> RIGHT </td><td> Move to next song </td></tr>
-<tr><td> PLAY </td><td> Toggle PAUSE/PLAY </td></tr>
-<tr><td> ON </td><td> Switch to the <a href="rec-dir.html">dir browser</a> </td></tr>
+<tr><td> PLAY </td><td> Toggle PAUSE/PLAY. If 'resume' is enabled, pressing PAUSE will make it store a "resume point" where it can start again from later. </td></tr>
+<tr><td>ON</td><td> Switch to the <a href="rec-dir.html">dir browser</a> </td></tr>
 <tr><td>OFF</td><td> Stop playback </td></tr>
 <tr><td>F1</td><td> Switch to the <a href="rec-menu.html">main menu</a></td></tr>
 <tr><td>F2</td></tr>
-<tr><td>F3</td></tr>
+<tr><td>F3</td><td>Toggle status bar ON/OFF</td></tr>
 <tr><td> F1 + DOWN </td><td> Toggle key lock ON/OFF </td></tr>
 </table>