Manual update

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2583 a1c6a512-1295-4272-9138-f99709370657

22 files changed, 413 insertions, 428 deletions

diff --git a/www/manual/dir.t b/www/manual/dir.t
new file mode 100644
index 0000000000..e41530ce84
--- /dev/null
+++ b/www/manual/dir.t
@@ -0,0 +1,98 @@
+#define _PAGE_ Manual - Directory Browser
+#include "head.t"
+#include "manual.t"
+
+<p>
+<table>
+<tr valign=top><td>
+<img src="rec-dir.png" width=120 height=68 alt="Dir browser">
+<br><small>Recorder screenshot</small>
+</td>
+</tr></table>
+
+
+<p>
+In the dir browser, you navigate your way around the harddisk.
+There are icons on the left side of each file that shows what file type it is.
+
+<p>
+The list of files you see is affected by the
+<a href="general.html">"Show files" setting</a>.
+
+<h2>Button bindings</h2>
+
+<table class=buttontable>
+<tr><th>Button</th><th>Function</th>
+<tr valign=top>
+<td nowrap> UP/DOWN (r) <br> LEFT/RIGHT (p)</td>
+<td>
+     Go to previous/next item in list. If you are on the first/last entry, 
+     the cursor will wrap to the last/first entry.
+</td></tr>
+<tr valign=top>
+<td nowrap> ON + UP/DOWN </td>
+<td>
+     (Recorder only:) Move one page up/down in list.
+</td></tr>
+<tr valign=top>
+<td> LEFT (r) <br> STOP (p)</td>
+<td>   Go to the parent directory.
+</td></tr>
+<tr valign=top>
+<td> PLAY </td>
+<td>Action depends on the file type the cursor points at:
+<dl>
+<dt><b>Directory</b>
+<dd>The browser enters that directory.
+
+<dt><b>.mp3 file</b>
+<dd>You will be taken to the <a href="wps.html">WPS</a>
+and start playing the file.
+
+<dt><b>.m3u file</b>
+<dd>The playlist will be loaded and started and you will then be taken to the WPS.
+
+<dt><b>.ajz (recorder) or .mod (player) file</b>
+<dd>The firmware file will be loaded and executed.
+
+<dt><b>.wps file</b>
+<dd>The file will be loaded and used for the wps display.
+  Look <a href="/docs/custom_wps_format.html">here</a> for information about
+  the .wps file format.
+
+<dt><b>.cfg file</b>
+<dd>The file will be loaded and the sound settings will be set accordingly.
+  Look <a href="/docs/custom_cfg_format.html">here</a> for information about
+  the .cfg file format.
+
+<dt><b>.lng file</b>
+<dd>The language file will be loaded and replace the current language.
+  Look <a href="/lang/">here</a> for downloadable language files.
+
+<dt><b>.txt file</b>
+<dd> The text file will be displayed in the <a href="textreader.html">Text Reader</a>.
+
+<dt><b>.fnt file</b>
+<dd> (Recorder only:) The font will be loaded and used in place of the
+  default font.
+  Look <a href="/fonts/">here</a> for downloadable fonts.
+
+</dl>
+</td></tr>
+<tr><td>
+ ON
+</td><td>
+ If there is an mp3 playing, this will go back to the WPS.
+</td></tr>
+<tr><td>
+ OFF (r)
+</td><td>
+    If there is an mp3 playing, this stops playback.
+</td></tr>
+<tr><td>F1 (r) <br>MENU (p)</td>
+<td>Switches to the <a href="menu.html">main menu</a>.</td></tr>
+<tr><td>F2 (r)</td><td>(Recorder only) Show browse/play settings screen. A quick press will leave the screen up (press F2 again to exit), while holding it will close the screen when you release it.</td></tr>
+<tr><td>F3 (r)</td><td>(Recorder only) Show display settings screen. Quick/hold works as for F2.</td></tr>
+</table>
+
+#include "foot.t"
diff --git a/www/manual/general.t b/www/manual/general.t
new file mode 100644
index 0000000000..54622ed607
--- /dev/null
+++ b/www/manual/general.t
@@ -0,0 +1,87 @@
+#define _PAGE_ Manual - General Settings
+#include "head.t"
+#include "manual.t"
+
+<h2>Playback</h2>
+ <ul>
+ <li><b>Shuffle</b> - Select shuffle ON/OFF. This alters how Rockbox will
+  select which next song to play.
+
+ <li><b>Repeat</b> - Repeat modes are Off/One/All. 
+ "Off" means no repeat. "One" means repeat one track over and over. 
+ "All" means repeat playlist/directory.
+
+ <li><b>Play selected first</b> - This setting controls what happens when you
+ press PLAY on a file in a directory and shuffle mode is on.
+ If this setting is Yes, the file you selected will be played first.
+ If this setting is No, a random file in the directory will be played first.
+
+ <li><b>Resume</b> - Sets whether Rockbox will resume playing at the point where you shut off. Options are: Ask/Yes/No.
+ "Ask" means it will ask at boot time.
+ "Yes" means it will unconditionally try to resume.
+ "No" means it will not resume.
+
+ <li><b>FF/RW Min Step</b> - The smallest step you want to fast forward or rewind in a track.
+
+ <li><b>FF/RW Accel</b> - How fast you want search (ffwd/rew) to accellerate when you hold down the button. "Off" means no accelleration. "2x/1s" means double the search speed once every second the button is held. "2x/5s" means double the search speed once every 5 seconds the button is held.
+ </ul>
+
+<h2>File View</h2>
+ <ul>
+ <li><b>Sort mode</b> - How directories are sorted.
+ Case sensitivity ON makes uppercase and lowercase differences matter.
+ Having it OFF makes them get treated the same.
+
+ <li><b>Show files</b> - Controls which files are displayed in the dir browser:
+  <ul>
+  <li><b>Music</b>: Only directories, .mp3, .mp2, .mpa and .m3u files are shown. Extensions are stripped. Files and directories starting with . or has the "hidden" flag set are hidden.
+
+  <li><b>Supported</b>: All directories and files Rockbox can load (including .fnt, .wps, .cfg, .txt, .ajz/.mod) are shown. Extensions are shown. Files and directories starting with . or has the "hidden" flag set are hidden.
+
+  <li><b>All</b>: All files and directories are shown. Extensions are shown. No files or dirs are hidden.
+  </ul>
+
+ <li><b>Follow Playlist</b> - Do you want the dir browser to follow your playlist? If Follow Playlist is set to "Yes", you will find yourself in the same directory as the currently playing file if you go to the Dir Browser from the WPS. If set to "No", you will stay in the same directory as you last were in.
+ </ul>
+
+<h2>Display</h2>
+<ul>
+<li><b>Scroll speed</b> - Controls the speed of scrolling text.
+
+<li><b>Backlight timer</b> - How long time the backlight shines after a keypress. Set to OFF to never light it, set to ON to never shut it off or set a prefered timeout period.
+
+<li><b>Backlight on when plugged</b> - Do you want the backlight to be constantly on while the charger cable is connected?
+
+<li><b>Contrast</b> - Changes the contrast of your LCD display. 
+
+<li><b>Peak meter</b> (Recorder only)
+ <ul>
+ <li><b>Peak release</b>: How fast should the peak meter shrink after a peak?
+ <li><b>Peak hold</b>: How long should the peak meter hold before shrinking?
+ <li><b>Clip hold</b>: How long should the clipping indicator be visible after clipping was detected?
+ </ul>
+</ul>
+
+<h2>System</h2>
+<ul>
+<li><b>Disk Spindown</b> - Rockbox has a timer that makes it spin down the
+harddisk after being idle for a certain time. You can modify this timeout here.
+
+<li><b>Deep discharge</b> (Recorder only) -
+ 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
+to restart on 95%.
+
+<li><b>Set Time/Date</b> (Recorder only) - Set current time and date.
+
+<li><b>Idle poweroff</b> - After how long period of idle time should the unit power off?
+
+<li><b>Reset settings</b> - Reset all settings to default values. Some settings may need a reboot for the reset to take effect.
+
+</ul>
+
+#include "settings-buttons.t"
+
+#include "foot.t"
+
diff --git a/www/manual/index.t b/www/manual/index.t
index 73969cd2ae..dc2cfe5a71 100644
--- a/www/manual/index.t
+++ b/www/manual/index.t
@@ -1,16 +1,45 @@
-#define _PAGE_ The Rockbox Users Manual
+#define _PAGE_ User Manual
 #include "head.t"
 
+<h2>General concept</h2>
 <p>
- This is the first attempt at a User's Manual.
+The Rockbox user interface consists of three main screens:
+<ul>
+<li>The Directory Browser
+<li>The While Playing Screen (WPS)
+<li>The Menu
+</ul>
 
+<p>The <a href="dir.html">Directory Browser</a> is where you find yourself
+immediately after boot. It is used for exploring your harddisk and selecting files for playing or other functions. <a href="dir.html">Click here</a> for more information.
+
+<p>The <a href="wps.html">While Playing Screen</a> is the screen displayed while you are playing mp3 files. It contains information about the track you are playing. <a href="wps.html">Click here</a> for more information.
+
+<p>The <a href="menu.html">Menu</a> is where you can access all settings and auxiliary functions of the Rockbox software. <a href="menu.html">Click here</a> for more information.
+
+<h2>Configuration</h2>
+
+<p>Apart from all the <a href="menu.html">settings</a>, the major points 
+of configuration are:
+
+<ul>
+<li><a href="/fonts/">Loadable fonts</a>
+<li><a href="/lang/">Loadable languages</a>
+<li><a href="/docs/custom_wps_format.html">Loadable WPS template</a>
+</ul>
+
+<h2>Button notation</h2>
 <p>
-Booting up: <a href="rec-boot.html">Recorder</a> <a href="play-boot.html">Player</a>
-<p>
-Directory browser: <a href="rec-dir.html">Recorder</a> <a href="play-dir.html">Player</a>
-<p>
-While Playing Screen: <a href="rec-wps.html">Recorder</a> <a href="play-wps.html">Player</a>
-<p>
-Main menu: <a href="rec-menu.html">Recorder</a> <a href="play-menu.html">Player</a>
+Since the Players and the Recorders provide mostly the same functions, this manual describes them both in the same pages. However, the key bindings differ for various features. This will be noted by a a (p) or (r) suffix to the key, like this:
+
+<p><table class=buttontable>
+<tr><th>Button</th><th>Function</th>
+<tr valign=top>
+<td> UP (r) <br> LEFT (p) </td>
+<td> Go to previous item in list.
+</td></tr>
+</table>
+
+<p>In the above example: Recorders use the UP button while players use the LEFT button.
 
 #include "foot.t"
diff --git a/www/manual/menu-buttons.t b/www/manual/menu-buttons.t
new file mode 100644
index 0000000000..654bc881b9
--- /dev/null
+++ b/www/manual/menu-buttons.t
@@ -0,0 +1,8 @@
+<h2>Button bindings</h2>
+<table class=buttontable>
+<tr><th>Button</th><th>Function</th>
+<tr><td>UP (r) <br>LEFT (p)</td><td>Move up in menu</td></tr>
+<tr><td>DOWN (r) <br>RIGHT (p)</td><td>Move down in menu</td></tr>
+<tr><td>PLAY</td><td>Select item</td></tr>
+<tr><td>LEFT (r) <br>STOP (p)</td><td>Exit menu</td></tr>
+</table>
diff --git a/www/manual/menu.t b/www/manual/menu.t
new file mode 100644
index 0000000000..5f3a7ad595
--- /dev/null
+++ b/www/manual/menu.t
@@ -0,0 +1,26 @@
+#define _PAGE_ Manual - Main Menu
+#include "head.t"
+#include "manual.t"
+<p>
+<img src="rec-menu.png" width=120 height=68 alt="Main menu">
+<br><small>Recorder screenshot</small>
+
+<p>The main menu offers:
+<ul>
+<li> <b><a href="sound.html">Sound Settings</a></b> - Vol, bass, treble etc.
+<li> <b><a href="general.html">General Settings</a></b> - Scroll, display, filters etc.
+
+<li> <b>Games</b> - (Recorder only) Pick a game to play! Tetris, Sokoban and <a href=wormlet.html>Wormlet</a> are available.
+
+<li> <b>Demos</b> - (Recorder only) Some silly little toys. <i>Bounce</i> will show a bouncing text (try the buttons), <i>Snow</i> will simulate falling snow and <i>Oscillograph</i> will give you a nice animated graph of the currently playing music (try the buttons here too).
+
+<li> <b>Info</b> - Shows MP3 ram buffer size and battery voltage level info.
+
+<li> <b>Version</b> - Software version and credits display.
+
+<li> <b>Debug (keep out)</b> - Various informational displays for development purposes.
+</ul>
+
+#include "menu-buttons.t"
+
+#include "foot.t"
diff --git a/www/manual/play-boot.t b/www/manual/play-boot.t
deleted file mode 100644
index 6a87d0bd45..0000000000
--- a/www/manual/play-boot.t
+++ /dev/null
@@ -1,13 +0,0 @@
-#define _PAGE_ Rockbox Boots Up
-#include "head.t"
-#include "manual.t"
-<p>
-When Rockbox boots up, it'll display the text "Rockbox" for a short time, and
-then it'll jump right into the <a href="play-dir.html">dir browser</a> showing
-the root (toplevel) directory of your Archos.
-<p>
-<img src="play-boot.png">
-<p>
-[screen dump of toplevel dir]
-
-#include "foot.t"
diff --git a/www/manual/play-dir.t b/www/manual/play-dir.t
deleted file mode 100644
index a0abfd3110..0000000000
--- a/www/manual/play-dir.t
+++ /dev/null
@@ -1,61 +0,0 @@
-#define _PAGE_ Rockbox Directory Browser
-#include "head.t"
-#include "manual.t"
-<p>
-In the dir browser, you will see the files and directories that are put in the
-directory you are currently browsing.
-<p>
-[screen dump]
-<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>
-<table class=buttontable>
-<tr><th>Button</th><th>Function</th>
-<tr><td>-</td><td>
-      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 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 to the parent directory.
-</td></tr>
-<tr><td>
- PLAY
-</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 
-</td><td>
-    If there is an mp3 playing, this'll switch back the
-        <a href="play-wps.html">WPS</a>.
-</td></tr>
-<tr><td>
- MENU 
-</td><td>
-  Switches to the <a href="play-menu.html">main menu</a>.
-</td></tr>
-</table>
-
-#include "foot.t"
diff --git a/www/manual/play-menu.t b/www/manual/play-menu.t
deleted file mode 100644
index 52d0f5438a..0000000000
--- a/www/manual/play-menu.t
+++ /dev/null
@@ -1,32 +0,0 @@
-#define _PAGE_ Rockbox Main Menu
-#include "head.t"
-#include "manual.t"
-<p>
-The main menu offers:
-<p>
-[screen dump]
-<p>
-Sound Settings -
-<p>
-General Settings -
-<p>
-Info -
-<p>
-Version -
-<p>
-(Debug? -)
-
-<p>
-<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>
-<tr><td>MENU</td>
-<td>Toggle back to the screen you came from when you arrived here,
-<a href="play-wps.html">WPS</a> or <a href="play-dir.html">dir browser</a></td>
-</tr>
-</table>
-
-
-#include "foot.t"
diff --git a/www/manual/play-wps.t b/www/manual/play-wps.t
deleted file mode 100644
index e5a5f14739..0000000000
--- a/www/manual/play-wps.t
+++ /dev/null
@@ -1,34 +0,0 @@
-#define _PAGE_ Rockbox WPS
-#include "head.t"
-#include "manual.t"
-
-<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>
-<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> 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>
-
-</table>
-
-#include "foot.t"
-
diff --git a/www/manual/rec-boot.t b/www/manual/rec-boot.t
deleted file mode 100644
index e80f5fcded..0000000000
--- a/www/manual/rec-boot.t
+++ /dev/null
@@ -1,19 +0,0 @@
-#define _PAGE_ Rockbox Boots Up
-#include "head.t"
-#include "manual.t"
-
-<p> When Rockbox boots up it'll display the Rockbox logo (with the version
-number beneath) for a short time.
-
-<p>
- If you have previously set 'Resume' to ASK or ON, you will now either get a
-question about doing the resume or the resume will be done automaticly.
-
-<p>
- If you selected no on the resume question, or had 'Resume' set to OFF, it'll
-jump right into the <a href="rec-dir.html">dir browser</a> showing the root
-(toplevel) directory of your Archos.
-
-<p> <img src="rec-boot.png" width=120 height=70 alt="Rockbox Logo">
-
-#include "foot.t"
diff --git a/www/manual/rec-dir.png b/www/manual/rec-dir.png
index 65c8e29549..2c211a83d9 100644
--- a/www/manual/rec-dir.png
+++ b/www/manual/rec-dir.png
diff --git a/www/manual/rec-dir.t b/www/manual/rec-dir.t
deleted file mode 100644
index a8af057399..0000000000
--- a/www/manual/rec-dir.t
+++ /dev/null
@@ -1,96 +0,0 @@
-#define _PAGE_ Rockbox Directory Browser
-#include "head.t"
-#include "manual.t"
-<p>
-In the dir browser, you will see the files and directories that are put in the
-directory you are currently browsing. You will see tiny symbols on the left
-side of each entry that shows what kind of entry it is.
-
-<p>
-<table>
-<tr valign=top><td>
-<img src="rec-dir.png" width=120 height=70 alt="Dir browser">
-
-</td>
-<td>
-
-<table>
-
-<tr>
- <td> <img src="rec-folder.png" width=33 height=42 alt="folder icon"></td>
- <td>folder</td>
-</tr>
-<tr>
- <td> <img src="rec-m3u.png" width=35 height=45 alt="m3u icon"></td>
- <td>playlist</td>
-</tr>
-<tr>
- <td> <img src="rec-mp3.png" width=32 height=40 alt="mp3 icon"></td>
- <td>mp3 file </td>
-</tr>
-</table>
-
-</td></tr></table>
-
-<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>
-
-<table class=buttontable>
-<tr><th>Button</th><th>Function</th>
-<tr valign=top>
-<td> UP </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.
-</td></tr>
-<tr valign=top>
-<td>DOWN</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.
-</td></tr>
-<tr valign=top>
-<td> LEFT</td>
-<td>   Move "up" one directory level to the parent directory.
-</td></tr>
-<tr valign=top>
-<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 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 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.
-
-<p> If the cursor is on a .eq file (Equalizer configuration), the file will
-  be loaded and the sound settings will be set accordingly.
-
-</td></tr>
-<tr><td>
- ON
-</td><td>
- 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><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
deleted file mode 100644
index 867a57a50c..0000000000
--- a/www/manual/rec-general.t
+++ /dev/null
@@ -1,59 +0,0 @@
-#define _PAGE_ Rockbox General Settings
-#include "head.t"
-#include "manual.t"
-The general settings menu offers:
-<p>
- <img src="rec-generalsettings.png">
-
-<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...
-
-#include "foot.t"
-
diff --git a/www/manual/rec-menu.png b/www/manual/rec-menu.png
index 51d22d5a1f..e3cfea5735 100644
--- a/www/manual/rec-menu.png
+++ b/www/manual/rec-menu.png
diff --git a/www/manual/rec-menu.t b/www/manual/rec-menu.t
deleted file mode 100644
index 89347a9f06..0000000000
--- a/www/manual/rec-menu.t
+++ /dev/null
@@ -1,31 +0,0 @@
-#define _PAGE_ Rockbox Main Menu
-#include "head.t"
-#include "manual.t"
-The main menu offers:
-<p>
-<img src="rec-menu.png" width=120 height=70 alt="Main menu">
-
-<p> <b><a href="rec-sound.html">Sound Settings</a></b> - Vol, bass, treble etc.
-
-<p> <b><a href="rec-general.html">General Settings</a></b> - Scroll, display, filters etc.
-
-<p> <b>Games</b> - pick a game to play! <a href=wormlet.html>Wormlet</a> is one of them.
-
-<p> <b>Screensavers</b> - pick an enterainer!
-
-<p> <b>Info</b> - mp3 buffer and battery info.
-
-<p> <b>Version</b> - sofware version and credits display.
-
-<p> <b>Debug (keep out)</b> - various informational displays for development purposes.
-
-<p>
-<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
deleted file mode 100644
index 41cbf3b169..0000000000
--- a/www/manual/rec-sound.t
+++ /dev/null
@@ -1,24 +0,0 @@
-#define _PAGE_ Rockbox Sound Settings
-#include "head.t"
-#include "manual.t"
-
-<p>
- This menu offers a selection of different sound properties you may change
- to improve your sound experience.
-
-<p> <img src="rec-soundsettings.png">
-
-<p> <b>Volume</b>
-<p> <b>Bass</b>
-<p> <b>Treble</b>
-<p> <b>Balance</b>
-<p> <b>Loudness</b>
-<p> <b>Bass Boost</b>
-<p> <b>Auto Volume</b>
-
-<p>
-This is what the volume screen looks like:<br>
- <img src="rec-volume.png">
-
-#include "foot.t"
-
diff --git a/www/manual/rec-wps.t b/www/manual/rec-wps.t
deleted file mode 100644
index 0949fd256a..0000000000
--- a/www/manual/rec-wps.t
+++ /dev/null
@@ -1,49 +0,0 @@
-#define _PAGE_ Rockbox WPS
-#include "head.t"
-#include "manual.t"
-<p>
-The While Playing Screen shows info about what is currently played and can
-only be seen while there is actual music playback.
-<p>
-<img src="rec-wps.png">
-<p>
-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. VBR files display average bitrate and "(avg)".
-<li>Elapsed and total time
-<li>A slidebar representing where in the song you are
-</ol>
-
-<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 = 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 = 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> 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"
diff --git a/www/manual/settings-buttons.t b/www/manual/settings-buttons.t
new file mode 100644
index 0000000000..1fb24c850b
--- /dev/null
+++ b/www/manual/settings-buttons.t
@@ -0,0 +1,7 @@
+<h2>Button bindings</h2>
+<table class=buttontable>
+<tr><th>Button</th><th>Function</th>
+<tr><td>UP (r) <br>LEFT (p)</td><td>Decrease value / choose previous</td></tr>
+<tr><td>DOWN (r) <br>RIGHT (p)</td><td>Increase value / choose next</td></tr>
+<tr><td>LEFT (r) <br>STOP (p)</td><td>Exit setting</td></tr>
+</table>
diff --git a/www/manual/sound.t b/www/manual/sound.t
new file mode 100644
index 0000000000..3daa1b24c6
--- /dev/null
+++ b/www/manual/sound.t
@@ -0,0 +1,41 @@
+#define _PAGE_ Manual - Sound Settings
+#include "head.t"
+#include "manual.t"
+
+<p>
+ This menu offers a selection of sound properties you may change
+ to improve your sound experience.
+
+<dl>
+<dt><b>Volume</b>
+<dd>The sound volume your music is played at. Although settable range is 0-100%, many units don't produce audible output below 40%.
+
+<dt><b>Bass</b>
+<dd>Bass emphasis or suppression. 0 is flat.
+
+<dt><b>Treble</b>
+<dd>Treble emphasis or suppression. 0 is flat.
+
+<dt><b>Balance</b>
+<dd>Adjusts left/right channel balance. - is left, + is right.
+
+<dt><b>Channels</b>
+<dd>Select which channels to hear: Left, Right, Stereo (both, separated) or Mono (both, mixed).
+
+<dt><b>Loudness (Recorder only)</b>
+<dd>Loudness is an effect which emphasises bass and treble.
+
+<dt><b>Bass Boost (Recorder only)</b>
+<dd>Bass boost is an effect which emphasises low bass frequencies.
+
+<dt><b>Auto Volume (Recorder only)</b>
+<dd>Auto volume is a feature that automaticly lowers the volume on loud parts,
+and then slowly restores the volume to the previous level during N seconds.
+That N time is configurable here.
+
+</dl>
+
+#include "settings-buttons.t"
+
+#include "foot.t"
+
diff --git a/www/manual/textreader.t b/www/manual/textreader.t
new file mode 100644
index 0000000000..88c3ec4710
--- /dev/null
+++ b/www/manual/textreader.t
@@ -0,0 +1,29 @@
+#define _PAGE_ Manual - Text Reader
+#include "head.t"
+#include "manual.t"
+
+<img src="rec-reader.png">
+
+<p>The text reader is a rather primitive tool to view plain text files.
+
+<h2>Button bindings</h2>
+
+<p>
+<table class=buttontable>
+<tr><th>Key</th><th>Function</th></tr>
+<tr><td nowrap> UP/DOWN (r) <br>LEFT/RIGHT (p)</td>
+<td> Move one line up/down </td></tr>
+
+<tr><td> LEFT/RIGHT (r) <br>MENU + LEFT/RIGHT (p)</td>
+<td> Move one column left/right </td></tr>
+
+<tr><td> ON + UP/DOWN (r)</td>
+<td> (Recorder only) Move one page up/down</td></tr>
+
+<tr><td> ON + LEFT/RIGHT (r)</td>
+<td> (Recorder only) Move one screen left/right</td></tr>
+
+<tr><td>OFF (r) <br>STOP (p)</td><td> Exit </td></tr>
+</table>
+
+#include "foot.t"
diff --git a/www/manual/wormlet.t b/www/manual/wormlet.t
index 6f80b6b687..7d56a6e556 100644
--- a/www/manual/wormlet.t
+++ b/www/manual/wormlet.t
@@ -1,4 +1,4 @@
-#define _PAGE_ Wormlet
+#define _PAGE_ Manual - Wormlet
 #include "head.t"
 #include "manual.t"
 
diff --git a/www/manual/wps.t b/www/manual/wps.t
new file mode 100644
index 0000000000..4ae73c8afc
--- /dev/null
+++ b/www/manual/wps.t
@@ -0,0 +1,78 @@
+#define _PAGE_ Manual - While Playing Screen
+#include "head.t"
+#include "manual.t"
+<p>
+<img src="rec-wps.png">
+<br><small>Recorder screenshot</small>
+
+<p>
+The While Playing Screen shows info about what is currently played and can
+only be seen while there is actual music playback.
+
+<h2>Screen contents</h2>
+
+<p>
+The screen lines by default contain the following information:
+
+<h3>Recorder</h3>
+<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. VBR files display average bitrate and "(avg)".
+<li>Elapsed and total time
+<li>A slidebar progress meter representing where in the song you are
+<li>Peak meter
+</ol>
+
+<p>Notes:
+<li>The number of lines shown depends on the size of the font used.
+<li>The peak meter is normally only visible if you turn off the status bar.
+
+<h3>Player</h3>
+<ol>
+<li> Playlist index/Playlist size: Artist - Title
+<li> Current-time Progress-indicator Left
+</ol>
+
+<h2>Configuration</h2>
+
+<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.
+
+<h2>Button bindings</h2>
+
+<p>
+<table class=buttontable>
+<tr><th>Key</th><th>Function</th></tr>
+<tr><td nowrap> UP (r) <br>MENU + RIGHT (p)</td>
+<td> Increase volume </td></tr>
+<tr><td> DOWN (r) <br>MENU + LEFT (p)</td>
+<td>  Decrease volume </td></tr>
+
+<tr><td> LEFT </td><td> Quick press = Go to beginning of track, or if
+pressed while in the first seconds of a track, go to previous track.<br>
+Hold = Rewind in track. </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="dir.html">dir browser</a> <br>
+(Recorder only:) Hold = Show pitch setting screen </td></tr>
+<tr><td>OFF (r) <br>STOP (p)</td><td> Stop playback </td></tr>
+<tr><td>F1 (r) <br>MENU (p)</td>
+<td> Go to <a href="menu.html">main menu</a></td></tr>
+<tr><td nowrap>F1 + DOWN (r) <br>MENU + DOWN (p)</td>
+<td> Key lock on/off </td></tr>
+<tr><td nowrap>F1 + PLAY (r) <br>MENU + PLAY (p)</td>
+<td> Mute on/off </td></tr>
+<tr><td nowrap>F1 + ON (r) <br>MENU + ON (p)</td>
+<td> Enter ID3 viewer </td></tr>
+<tr><td>F2 (r)</td><td>(Recorder only:) Show browse/play settings screen</td></tr>
+<tr><td>F3 (r)</td><td>(Recorder only:) Show display settings screen</td></tr>
+</table>
+
+#include "foot.t"