8 files changed, 88 insertions, 112 deletions

diff --git a/www/manual/play-dir.t b/www/manual/play-dir.t
index d1cbe58ded..a0abfd3110 100644
--- a/www/manual/play-dir.t
+++ b/www/manual/play-dir.t
@@ -10,34 +10,40 @@ directory you are currently browsing.
 If you have enabled 'mp3/m3u filter' in the global settings, only files ending
 with .mp3 or .m3u will be displayed in the browser.
 <p>
-Buttons:
-<table class=listtable>
+<table class=buttontable>
+<tr><th>Button</th><th>Function</th>
 <tr><td>-</td><td>
-      Move upwards in the list, if it already is on the topmost entry, you'll
-      see the cursor moved to the last entry in the list.
+      Move up in the list. If you already are on the topmost entry, the
+      cursor will move to the last entry in the list.
 </td></tr>
 <tr><td> +</td><td>
-        Move downwards in the list, if it already is on the last entry, you'll
-        see the cursor moved to the first entry in the list.
+        Move down in the list. If you already are on the last entry, 
+        the cursor will move to the first entry in the list.
 </td></tr>
 <tr><td>
  STOP
 </td><td>
-   Move "up" one directory level to the parent directory.
+   Move to the parent directory.
 </td></tr>
 <tr><td>
  PLAY
-</td><td>
-   If the cursor is now on a line of a directory, the browser will switch
-        into browsing that directory. If the cursor is on a line with a file,
-        special actions are peformed depending on the file type. If the file
-        is an mp3 file, it'll jump into the <a href="play-wps.html">WPS</a>
-        and start playing this file.
-        If the file is an m3u file (playlist), the list will first be loaded
-        and then pop up the WPS showing the first file that gets played from
-        the list. If you have 'shuffle' selected in the global settings, the
-        playlist will be shuffled directly after having been loaded, otherwise
-        it'll be played in a straight top-to-bottom fashion.
+</td>
+<td>If the cursor is on a directory, the browser will go into that directory.
+
+<p>If the cursor is on an .mp3 file, it'll jump into the
+  <a href="rec-wps.html">WPS</a> and start playing this file. It will then
+  continue to play the other songs in the same directory.
+
+<p> If the cursor is on an .m3u file (playlist), the list will first be
+  loaded and then pop up the WPS showing the first file that gets played from
+  the list.
+
+<p> If the cursor is on a .mod file (firmware), the firmware file will
+  be loaded and executed.
+
+<p> If the cursor is on a .wps file (WPS config), the file will
+  be loaded and used for the wps display.
+
 </td></tr>
 <tr><td>
  ON 
diff --git a/www/manual/play-menu.t b/www/manual/play-menu.t
index 807c797d64..52d0f5438a 100644
--- a/www/manual/play-menu.t
+++ b/www/manual/play-menu.t
@@ -17,9 +17,8 @@ Version -
 (Debug? -)
 
 <p>
-Buttons:
-<p>
-<table>
+<table class=buttontable>
+<tr><th>Button</th><th>Function</th>
 <tr><td>-</td><td>Move upwards in the list</td></tr>
 <tr><td>+</td><td>Move downwards in the list</td></tr>
 <tr><td>PLAY</td><td>Selects the menu alternative the cursor is "on"</td></tr>
diff --git a/www/manual/play-wps.t b/www/manual/play-wps.t
index ba768e15e2..e5a5f14739 100644
--- a/www/manual/play-wps.t
+++ b/www/manual/play-wps.t
@@ -5,20 +5,25 @@
 <p>
 The While Playing Screen shows info about what is currently played and can
 only be seen while there is actual music playback.
+
+<p>You can configure the WPS contents by creating a .wps file and "playing" it.
+The <a href="/docs/custom_wps_format.html">custom wps format</a> supports a wide variety of configurations.
+
 <p>
 [screen dump]
 <p>
 [explain screen info]
 <p>
-Buttons:
-<p>
-<table>
-<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>
+<table class=buttontable>
+<tr><th>Button</th><th>Function</th>
+<tr><td> PLAY </td><td> Toggle PAUSE/PLAY.  If 'resume' is enabled, pressing PAUSE will make it save "resume point" to disk. </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>
 <tr><td> MENU </td><td> Switches to the <a href="play-menu.html">main menu</a>.
-<tr><td> MENU+STOP </td><td> Toggle key lock ON/OFF </td></tr>
+<tr><td> MENU+STOP </td><td> Key lock on/off </td></tr>
+<tr><td> MENU+PLAY </td><td> Mute on/off </td></tr>
+<tr><td> MENU+ON </td><td> Enter id3 browser </td></tr>
 <tr><td> MENU+ '-' </td><td> Lower the volume </td></tr>
 <tr><td> MENU+ '+' </td><td> Raise the volume </td></tr>
 </td></tr>
diff --git a/www/manual/rec-dir.t b/www/manual/rec-dir.t
index 49f8547e4e..7100327d81 100644
--- a/www/manual/rec-dir.t
+++ b/www/manual/rec-dir.t
@@ -35,10 +35,11 @@ side of each entry that shows what kind of entry it is.
 <p>
 If you have enabled 'mp3/m3u filter' in the global settings, only files ending
 with .mp3 or .m3u will be displayed in the browser.
+
 <p>
-Buttons:
-<p>
-<table class=listtable>
+
+<table class=buttontable>
+<tr><th>Button</th><th>Function</th>
 <tr valign=top>
 <td> UP </td>
 <td>
@@ -56,53 +57,37 @@ Buttons:
 <td>   Move "up" one directory level to the parent directory.
 </td></tr>
 <tr valign=top>
-<td> RIGHT</td>
-<td>
-
-  If the cursor is now on a line of a directory, the browser will switch into
-  browsing that directory.
+<td> PLAY or RIGHT</td>
+<td>If the cursor is on a directory, the browser will go into that directory.
 
-<p> If the cursor is on a line with a file, special actions are peformed
-  depending on the file type. If the file is an mp3 file, it'll jump into the
+<p>If the cursor is on an .mp3 file, it'll jump into the
   <a href="rec-wps.html">WPS</a> and start playing this file. It will then
-  continue to play the other songs in the same directory. Your 'shuffle'
-  setting is acknowledged.
+  continue to play the other songs in the same directory.
 
-<p> If the selected entry is an m3u file (playlist), the list will first be
+<p> If the cursor is on an .m3u file (playlist), the list will first be
   loaded and then pop up the WPS showing the first file that gets played from
-  the list. If you have 'shuffle' selected in the global settings, the
-  playlist will be shuffled directly after having been loaded, otherwise it'll
-  be played in a straight top-to-bottom fashion.
+  the list.
+
+<p> If the cursor is on an .ajz file (firmware), the firmware file will
+  be loaded and executed.
+
+<p> If the cursor is on a .wps file (WPS config), the file will
+  be loaded and used for the wps display.
 
-</td></tr>
-<tr><td>
- PLAY
-</td><td>
-   The same as RIGHT
 </td></tr>
 <tr><td>
  ON
 </td><td>
- If there is an mp3 playing, this'll switch back the WPS.
+ If there is an mp3 playing, this will go back to the WPS.
 </td></tr>
 <tr><td>
  OFF
 </td><td>
     If there is an mp3 playing, this stops playback.
 </td></tr>
-<tr><td>
- F1
-</td><td>
- Switches to the <a href="rec-menu.html">main menu</a>.
-</td></tr>
-<tr><td>
- F2
-</td></tr>
-<tr><td>
- F3
-</td><td>
- Toggles status bar on/off
-</td></tr>
+<tr><td>F1</td><td>Switches to the <a href="rec-menu.html">main menu</a>.</td></tr>
+<tr><td>F2</td><td>Show browse/play settings screen</td></tr>
+<tr><td>F3</td><td>Show display settings screen</td></tr>
 </table>
 
 #include "foot.t"
diff --git a/www/manual/rec-general.t b/www/manual/rec-general.t
index 49d1aeb989..867a57a50c 100644
--- a/www/manual/rec-general.t
+++ b/www/manual/rec-general.t
@@ -55,15 +55,5 @@ 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:
-<p>
-<table>
-<tr><td>UP</td><td>Move upwards in the list</td></tr>
-<tr><td>DOWN</td><td>Move downwards in the list</td></tr>
-<tr><td>RIGHT</td><td>Select item in list</td></tr>
-<tr><td>F1</td><td>Toggle back to the screen you came from when you arrived here, <a href="rec-wps.html">WPS</a> or <a href="rec-dir.html">dir browser</a></td></tr>
-</table>
-
 #include "foot.t"
 
diff --git a/www/manual/rec-menu.t b/www/manual/rec-menu.t
index af63acb159..9c69c16386 100644
--- a/www/manual/rec-menu.t
+++ b/www/manual/rec-menu.t
@@ -5,9 +5,9 @@ The main menu offers:
 <p>
 <img src="rec-menu.png" width=120 height=70 alt="Main menu">
 
-<p> <a href="rec-sound.html">Sound Settings</a>
+<p> <b><a href="rec-sound.html">Sound Settings</a></b> - Vol, bass, treble etc.
 
-<p> <a href="rec-general.html">General Settings</a>
+<p> <b><a href="rec-general.html">General Settings</a></b> - Scroll, display, filters etc.
 
 <p> <b>Games</b> - pick a game to play!
 
@@ -20,15 +20,12 @@ The main menu offers:
 <p> <b>Debug (keep out)</b> - various informational displays for development purposes.
 
 <p>
-Buttons:
-<p>
-<table>
-<tr><td>UP</td><td>Move upwards in the list</td></tr>
-<tr><td>DOWN</td><td>Move downwards in the list</td></tr>
-<tr><td>RIGHT</td><td>Select item in list</td></tr>
-<tr><td>LEFT</td><td>Same as F1</td></tr>
-<tr><td>F1</td><td>Toggle back to the screen you came from when you arrived here, <a href="rec-wps.html">WPS</a> or <a href="rec-dir.html">dir browser</a></td></tr>
-<tr><td>F3</td><td>Toggle status bar ON/OFF</td></tr>
+<table class=buttontable>
+<tr><th>Button</th><th>Function</th>
+<tr><td>UP</td><td>Move up in menu</td></tr>
+<tr><td>DOWN</td><td>Move down in menu</td></tr>
+<tr><td>RIGHT or PLAY</td><td>Select item</td></tr>
+<tr><td>LEFT or F1</td><td>Toggle back to the screen you came from when you arrived here: <a href="rec-wps.html">WPS</a> or <a href="rec-dir.html">dir browser</a></td></tr>
 </table>
 
 #include "foot.t"
diff --git a/www/manual/rec-sound.t b/www/manual/rec-sound.t
index c62a26f1d1..41cbf3b169 100644
--- a/www/manual/rec-sound.t
+++ b/www/manual/rec-sound.t
@@ -17,19 +17,8 @@
 <p> <b>Auto Volume</b>
 
 <p>
-This is how the volumne screen looks like:
+This is what the volume screen looks like:<br>
  <img src="rec-volume.png">
 
-<p>
-Buttons:
-<p>
-<table>
-<tr><td>UP</td><td>Move upwards in the list</td></tr>
-<tr><td>DOWN</td><td>Move downwards in the list</td></tr>
-<tr><td>RIGHT</td><td>Select an item in list</td></tr>
-<tr><td>F1</td><td>Toggle back to the screen you came from when you arrived here, <a href="rec-wps.html">WPS</a> or <a href="rec-dir.html">dir browser</a></td></tr>
-<tr><td>F3</td><td>Toggle status bar ON/OFF</td></tr>
-</table>
-
 #include "foot.t"
 
diff --git a/www/manual/rec-wps.t b/www/manual/rec-wps.t
index c4ac390392..0949fd256a 100644
--- a/www/manual/rec-wps.t
+++ b/www/manual/rec-wps.t
@@ -7,38 +7,43 @@ only be seen while there is actual music playback.
 <p>
 <img src="rec-wps.png">
 <p>
-The screen lines contain the following information:
+The screen lines by default contain the following information:
 <ol>
 <li>Status bar: Battery level, charger status, volume, play mode, repeat mode, shuffle mode and clock
 <li>Scrolling path+filename of the current song.
 <li>The ID3 track name
 <li>The ID3 album name
 <li>The ID3 artist namn
-<li>Bit rate and sample frequency. VBR files display average bitrate.
+<li>Bit rate. VBR files display average bitrate and "(avg)".
 <li>Elapsed and total time
-<li>A slider bar representing where in the song you are
+<li>A slidebar representing where in the song you are
 </ol>
-<p>
-<table>
 
-<tr><th> Key </th><th> Function </th></tr>
+<p>You can configure the WPS contents by creating a .wps file and "playing" it.
+The <a href="/docs/custom_wps_format.html">custom wps format</a> supports a wide variety of configurations.
+
+<p>
+<table class=buttontable>
+<tr><th>Key</th><th>Function</th></tr>
 <tr><td> UP</td><td> Increase volume </td></tr>
 <tr><td> DOWN </td><td>  Decrease volume </td></tr>
 
-<tr><td> LEFT </td><td> Quick press: moves to the beginning of the song, or if
-pressed while in the beginning of a song it moves to the previous
-song. Keep the button pressed to rewind the song. </td></tr>
+<tr><td> LEFT </td><td> Quick press = Go to beginning of track, or if
+pressed while in the first second of a track, go to previous track.<br>
+Hold = Rewind in track. </td></tr>
 
-<tr><td> RIGHT </td><td> Quick press: moves to next song. Keep the button pressed to fast-forward the song. </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> RIGHT </td><td> Quick press = Go to next track. <br>
+Hold = Fast-forward in track. </td></tr>
+<tr><td> PLAY </td><td> Toggle play/pause.</td></tr>
+<tr><td>ON</td><td> Quick press: Go to <a href="rec-dir.html">dir browser</a> <br>
+Hold: Show pitch setting screen </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><td>Toggle status bar ON/OFF</td></tr>
-<tr><td> F1 + DOWN </td><td> Toggle key lock ON/OFF </td></tr>
+<tr><td>F1</td><td> Go to <a href="rec-menu.html">main menu</a></td></tr>
+<tr><td nowrap>F1 + DOWN</td><td> Key lock on/off </td></tr>
+<tr><td nowrap>F1 + PLAY</td><td> Mute on/off </td></tr>
+<tr><td nowrap>F1 + ON</td><td> Enter ID3 viewer </td></tr>
+<tr><td>F2</td><td>Show browse/play settings screen</td></tr>
+<tr><td>F3</td><td>Show display settings screen</td></tr>
 </table>
 
 #include "foot.t"
-
-