16 files changed, 200 insertions, 150 deletions
diff --git a/manual/advanced_topics/main.tex b/manual/advanced_topics/main.tex
index 57007e34f8..410ceedffc 100644
--- a/manual/advanced_topics/main.tex
+++ b/manual/advanced_topics/main.tex
@@ -1,12 +1,12 @@
 \chapter{Advanced Topics}
 \section{\label{ref:CustomisingUI}Customising the userinterface}
-\subsection{\label{ref:GettingExtras}Getting Extras (Fonts, Languages)}
+\subsection{\label{ref:GettingExtras}Getting Extras}
-Rockbox supports custom fonts (for the Recorder and Ondio only) and a number of
+\opt{HAVE_LCD_BITMAP}{
-different languages. Rockbox comes with several fonts and languages already 
+Rockbox supports custom fonts. A collection of fonts is available for download
-included. If new fonts have been created, then they will be found in the font 
+in the font package at \url{http://www.rockbox.org/daily.shtml}}. Support for a
-package at \url{http://www.rockbox.org/daily.shtml}. The latest \fname{.lng} 
+number of languages is included with Rockbox, and the latest \fname{.lng} files
-files are always included in the daily Rockbox builds.
+are always included in the different Rockbox builds.
 \opt{HAVE_LCD_BITMAP}{
  \subsection{\label{ref:Loadingfonts}Loading Fonts}
@@ -362,13 +362,13 @@ Example of a configuration file:
 \section{\label{ref:FirmwareLoading}Firmware Loading}
 \opt{player,recorder,recorderv2fm,ondio}{
-  When your \dap\ powers on, it loads the Archos firmware in ROM, which
+  When your \dap{} powers on, it loads the Archos firmware in ROM, which
-  automatically checks your Jukebox hard disk's root folder for a file named 
+  automatically checks your \daps{} root folder for a file named 
  \firmwarefilename. Note that Archos firmware can only read the first 
  ten characters of each filename in this process, so don't rename your old 
  firmware files with names like \firmwarefilename.\fname{old} and so on, 
-  because it's possible that the \dap\ will load a file other than the one you 
+  because it's possible that the \dap{} will load a file other than the one 
-  intended.
+  you intended.
 }
 \subsection{\label{ref:using_rolo}Using ROLO (Rockbox loader)}
diff --git a/manual/appendix/appendix.tex b/manual/appendix/appendix.tex
index 8519b05a57..6c34f7bcca 100644
--- a/manual/appendix/appendix.tex
+++ b/manual/appendix/appendix.tex
@@ -45,8 +45,7 @@ For open bug reports refer to
 \end{enumerate}
 \begin{itemize}
-\item  Which exact model Jukebox you have (as printed on the unit)
+\item  Which exact \dap{} you have.
-\item  Which exact ROM firmware version you have
 \item  Which exact Rockbox version you are using
 (Menu{}-{\textgreater}Info {}-{\textgreater} Version)
 \item  A step{}-by{}-step description of what you did and what happened
diff --git a/manual/configure_rockbox/playback_options.tex b/manual/configure_rockbox/playback_options.tex
index 52ab76b677..8fdf06a2cf 100755
--- a/manual/configure_rockbox/playback_options.tex
+++ b/manual/configure_rockbox/playback_options.tex
@@ -60,18 +60,19 @@ related to audio playback.
  \begin{description}
  \item[Yes: ]Rockbox will unconditionally try to resume.
  \item[No:  ]Rockbox will not resume. 
-    \emph{If resume is set to \setting{No}, Rockbox will start in the
+    \note{If resume is set to \setting{No}, Rockbox will start in the
      \setting{File Browser}.}
  \end{description}
-  \note{Earlier versions of Rockbox had an ``Ask'' setting, which would ask 
+  \note{Earlier versions of Rockbox had an \setting{Ask} setting, which would 
-    whether to resume when the jukebox was turned on. This setting has been 
+    ask whether to resume when the \dap{} was turned on. This setting has been 
-    eliminated because it was redundant. If resume is set to ``Yes'' pressing 
+    eliminated because it was redundant. If resume is set to \setting{Yes} 
+    pressing 
    \opt{PLAYER_PAD,RECORDER_PAD,IAUDIO_X5_PAD,IPOD_4G_PAD,IPOD_3G_PAD}{
-      \fixme{FixMe}}
+      \fixme{FixMe}}%
-    \opt{ONDIO_PAD}{\fixme{FixMe}}
+    \opt{ONDIO_PAD}{\ButtonMenu}%
-    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}%
-    on the \dap\ will resume from the point where the \dap\ was stopped before 
+    on the \dap{} will resume playback from the point where the \dap{} was 
-    shutdown.
+    stopped before shutdown.
    
  \item[Fast-Forward/Rewind: ]How fast you want search (fast forward or rewind)
    to accelerate when you hold down the button. \setting{Off} means no 
@@ -80,9 +81,9 @@ related to audio playback.
    once every 5 seconds the button is held.
    
  \item[Anti-Skip Buffer: ]This setting allows you to control how much music is
-    stored in the \dap's memory whilst playing a song, acting as a buffer 
+    stored in the \daps{} memory whilst playing a song, acting as a buffer 
-    against shock or playback problems. The \dap\ transfers the selected amount
+    against shock or playback problems. The \dap{} transfers the selected 
-    of the forthcoming song into its memory at high speed whilst you are 
+    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 
@@ -95,8 +96,14 @@ related to audio playback.
    to reduce the chances of there being a gap or pause during playback of 
    songs.
    
-    \opt{MASCODEC}{The anti-skip buffer can be set to a value between 0 and 7 
+    \nopt{ondio}{
-      seconds.}
+      \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.}
    
diff --git a/manual/configure_rockbox/system_options.tex b/manual/configure_rockbox/system_options.tex
index ca575e27af..d8c3d278c0 100755
--- a/manual/configure_rockbox/system_options.tex
+++ b/manual/configure_rockbox/system_options.tex
@@ -14,17 +14,20 @@
      \opt{ipodcolor}{700mAh}%
      \opt{ipodnano,ipodvideo,ipod4g,ipod3g}{\fixme{unknown}}%
      \opt{x5}{950mAh}%
-      , which is the capacity value for the standard batteries shipped with the \dap.
+      , which is the capacity value for the standard batteries shipped with the
-      Rockbox uses this value to estimate remaining battery life for the status
+      \dap. Rockbox uses this value to estimate remaining battery life for the 
-      bar and WPS. Changing this setting has no effect whatsoever on actual battery life.
+      statusbar and WPS. Changing this setting has no effect what-so-ever on 
-      This setting affects only the the accuracy of the battery life display on screen.
+      actual battery life. This setting only affects the accuracy of the 
+      battery life estimation as shown on screen.
   
      \opt{ipod}{This value is fairly meaningless in the iPod family at
-        present, and work is ongoing into finding a better way to determine battery life.}
+        present, and work is on-going into finding a better way to determine 
+        battery life.}
    
    \opt{ondiosp,ondiofm}{
-      \item [Battery Type: ]This setting tells Rockbox wich type of battery
+    \item [Battery Type: ]This setting tells Rockbox wich type of battery
-        that is currently used in the \dap.
+      that is currently used in the \dap{}. Select \setting{Alkaline} or
+      \setting{NiMH} with \ButtonUp/\ButtonDown.
    }
  \end{description}
@@ -43,19 +46,19 @@
    \opt{recorder,h1xx,h300,x5}{
      \item [Disk Poweroff: ]This setting controls whether the disk is powered
      off or only set to ``sleep'' when spun down. If this setting is set to
-      \setting{YES}, the disk will power off. If set to \setting{NO}, the disk
+      \setting{Yes}, the disk will power off. If set to \setting{No}, the disk
      will enter ``sleep'' mode. Power off uses less power but takes slightly
      longer to spin-up.
    }
    \opt{SWCODEC}{
    \item [Directory Cache: ]Rockbox has the ability to scan the contents of
      your drive in the background and save those contents to a cache in RAM.
-      The \setting{Directory Cache} takes a small amount of memory away from Rockbox
+      The \setting{Directory Cache} takes a small amount of memory away from 
-      that would otherwise be used to buffer music, but it speeds up navigation
+      Rockbox that would otherwise be used to buffer music, but it speeds up 
-      by eliminating the slight pause between the time a navigation button is
+      navigation by eliminating the slight pause between the time a navigation 
-      pressed and the time Rockbox responds. Turning this setting \setting{On}
+      button is pressed and the time Rockbox responds. Turning this setting 
-      activates the directory cache, and turning it \setting{Off} deactivates the
+      \setting{On} activates the directory cache, and turning it \setting{Off} 
-      directory cache.
+      deactivates the directory cache.
      \note{The first time you set the directory cache to \setting{On},
      Rockbox will request a reboot of the \dap\ and upon restarting take a few
      minutes to scan the drive. Thereafter, the directory cache will work in the
@@ -73,30 +76,31 @@
    \end{description}
 }
-\subsection{Power Control}
+\subsection{Idle Poweroff}
-  \begin{description}
+Rockbox can be configured to turn off power after the unit has been idle for a 
-    \item [\label{ref:idlepoweroff}Idle Poweroff: ]Rockbox can be configured
+defined number of minutes. The \dap{} is idle when playback is stopped or 
-    to turn off power after the unit has been idle for a defined number of
+paused. It is not idle while the USB or charger is connected, or while 
-    minutes. The \dap\ is idle when playback is stopped or paused. It is not
+recording. Settings are either \setting{Off} or \setting{1} to \setting{10}
-    idle while the USB or charger is connected, or while recording.
+minutes in 1 minute steps. Then \setting{15,30,45} and \setting{60} minutes are
+available.
-    \item [Sleep Timer: ]This option lets you power off your \dap\ after
+\subsection{Sleep Timer}
-    playing for a given time.
+This option lets you power off your \dap{} after playing for a given time. Can
-    \opt{recorderv2fm}{This setting is reset on boot. Using this option
+be set from \setting{Off} to 5 hours in 5 minute steps.
-    disables the \setting{Wake up alarm} (see below).}
+\opt{recorderv2fm}{This setting is reset on boot. Using this option
-    \opt{recorderv2fm}{
+  disables the \setting{Wake up alarm} (see below).}
-      \item [Wake up alarm: ]This option turns the \dap\ off and then starts
+\opt{recorderv2fm}{
-      it up again at the specified time. This is most useful when combined
+  \subsection{Wake Up alarm}
-      with the \setting{resume} setting in the \setting{Playback Options}
+    This option turns the \dap{} off and then starts it up again at the 
-      menu is set to \setting{Yes}, so that the \dap\ wakes up and immediately
+    specified time. This is most useful when combined with the \setting{Resume}
-      starts playing music. Use \ButtonLeft\ and \ButtonRight\ to adjust the
+    setting in the \setting{Playback Options} menu is set to \setting{Yes}, so 
-      minutes setting, \ButtonUp\ and \ButtonDown\ to adjust the HOURS.
+    that the \dap{} wakes up and immediately starts playing music. Use 
-      \ButtonPlay\ confirms the alarm and shuts your \dap\ down, and \ButtonOff
+    \ButtonLeft{} and \ButtonRight{} to adjust the minutes setting, \ButtonUp{}
-      cancels setting an alarm. If the \dap\ is turned on again before the
+    and \ButtonDown{} to adjust the HOURS.
-      alarm occurs, the alarm will be canceled. Using this option disables
+    \ButtonPlay{} confirms the alarm and shuts your \dap{} down, and \ButtonOff
-      the \setting{Sleep Timer}(see above).
+    cancels setting an alarm. If the \dap{} is turned on again before the alarm
-    }
+    occurs, the alarm will be canceled. Using this option disables the 
-  \end{description}
+    \setting{Sleep Timer}(see above).
+}
 \subsection{Limits}
 This submenu relates to limits in the Rockbox operating system.
diff --git a/manual/getting_started/archos_choice.tex b/manual/getting_started/archos_choice.tex
index 04b91b3bde..a07cbacdfc 100644
--- a/manual/getting_started/archos_choice.tex
+++ b/manual/getting_started/archos_choice.tex
@@ -1,9 +1,9 @@
 \section{Before installation}
-Before you install Rockbox, you will need to know what model of Archos Jukebox
+Before you install Rockbox, you will need to know what model you own.  Rockbox 
-you own.  Rockbox comes in different versions depending on the model of your
+comes in different versions depending on the model of your \dap{}.  There are 
-Jukebox.  There are six different versions of the software.  The table below
+six different versions of the software.  The table below will help you to 
-will help you to identify which version of the software you need.
+identify which version of the software you need.
 The model name is printed on the case.  The hard drive size is listed on the
 serial number sticker on the back of the unit.
@@ -53,4 +53,3 @@ serial number sticker on the back of the unit.
 \end{center}
 \note{Rockbox does not run on the Archos Jukebox Multimedia or any
 Archos MP3 player products other than those mentioned here.}
diff --git a/manual/getting_started/installation.tex b/manual/getting_started/installation.tex
index 90351a6214..b5a8bf0bbc 100644
--- a/manual/getting_started/installation.tex
+++ b/manual/getting_started/installation.tex
@@ -42,10 +42,10 @@ software.
 \opt{MASCODEC}{
  \subsection{Using the windows installer}
  Using the Windows self installing executable to install Rockbox is the 
-  easiest method of installing the software on your Jukebox.  Simply follow the
+  easiest method of installing the software on your \dap{}.  Simply follow the
-  on-screen instructions and select the appropriate drive letter and Jukebox
+  on-screen instructions and select the appropriate drive letter and 
-  model when prompted.  You can use ``Add / Remove Programs'' to uninstall the
+  \dap{}-model when prompted.  You can use ``Add / Remove Programs'' to 
-  software at a later date.
+  uninstall the software at a later date.
  \subsection{Manual installation}
  For non{}-Windows users and those wishing to install manually from the archive
@@ -139,7 +139,7 @@ If you wish to use speech support you will also need a language file, available
 from \wikilink{VoiceFiles}.  For the English language, the file is called
 \fname{english.voice}. When it has been downloaded, unpack this file and copy it
 into the \fname{lang} folder which is inside the \fname{/.rockbox} folder on
-your Jukebox. Voice menus are turned on by default. See
+your \dap{}. Voice menus are turned on by default. See
 \reference{ref:Voiceconfiguration} for details on voice settings.
 \section{Running Rockbox} 
diff --git a/manual/main_menu/main.tex b/manual/main_menu/main.tex
index d3aa802366..8078eb6cd4 100644
--- a/manual/main_menu/main.tex
+++ b/manual/main_menu/main.tex
@@ -9,8 +9,9 @@ All options in Rockbox can be controlled via the \setting{Main Menu}.
 To enter the \setting{Main Menu}, 
  \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{press the \ButtonMode\ button.}%
  \opt{RECORDER_PAD}{press the \ButtonFOne\ button.}%
-  \opt{PLAYER_PAD,IPOD_4G_PAD,IPOD_3G_PAD,ONDIO_PAD}{press the \ButtonMenu\ 
+  \opt{PLAYER_PAD,IPOD_4G_PAD,IPOD_3G_PAD}{press the \ButtonMenu\
    button.}%
+  \opt{ONDIO_PAD}{hold the \ButtonMenu{} button.}%
  \opt{IAUDIO_X5_PAD}{press the \ButtonRec\ button.}%
 All settings are stored on the unit. However, Rockbox does not spin up 
@@ -176,8 +177,14 @@ pages of information.}
 \begin{description}
 \item[Rockbox Info:]
  Displays some basic system information.  This is, from top to bottom, 
-the amount of memory Rockbox has available for storing music (the buffer),
+the amount of memory Rockbox has available for storing music (the buffer). The
-battery status, hard disk size and the amount of free space on the disk.
+battery status.\nopt{ondio}{Hard disk size and the amount of free space on the
+disk.}\opt{ondio}{Memory size divided into \emph{Int} and \emph{MMC}. Int shows
+the size and state (free space) of the internal memory, and MMC shows size and
+state of the plugged in Multi Media Card (in case one is plugged in).}
+\opt{ondio}{memory} size and the amount 
+of free space on the disk.
  
 \item[Version:]
  Software version and credits display.
diff --git a/manual/plugins/nim.tex b/manual/plugins/nim.tex
index e3757135fe..ce07861436 100644
--- a/manual/plugins/nim.tex
+++ b/manual/plugins/nim.tex
@@ -1,10 +1,10 @@
 % $Id$ %
 \subsection{Nim}
 \screenshot{plugins/images/ss-nim}{Nim}{img:Nim}
-Rules of Nim: There are 21 matches. Two players (you and the Jukebox)
+Rules of Nim: There are 21 matches. Two players (you and the \dap{})
 alternately pick a certain number of matches and the one who takes the
 last match loses.  You can take up to twice as many matches as the
-Jukebox selected, and vice versa. 
+\dap{} selected, and vice versa.
 \begin{table}
 \begin{btnmap}{}{}
diff --git a/manual/plugins/rockbox_flash.tex b/manual/plugins/rockbox_flash.tex
index 6640744f17..639105e728 100644
--- a/manual/plugins/rockbox_flash.tex
+++ b/manual/plugins/rockbox_flash.tex
@@ -1,12 +1,5 @@
 \subsection{Rockbox\_flash}
-{\centering\itshape
+For ``playing'' \fname{.UCL} files on a flashed \dap. Reprograms the flash 
-  [Warning: Image ignored] % Unhandled or unsupported graphics:
+memory of the \dap{} unit (see \reference{ref:Rockboxinflash} for details).
-%\includegraphics[width=4.059cm,height=2.32cm]{images/rockbox-manual-img57.png}
- \newline
-Rockbox flash
-\par}
-For ``playing'' \fname{.UCL} files on flashed Jukeboxes. Reprograms the flash memory of
-the Jukebox unit (see \reference{ref:Rockboxinflash} for details).
diff --git a/manual/plugins/snake.tex b/manual/plugins/snake.tex
index ef3ced09bf..db65b4bcd6 100644
--- a/manual/plugins/snake.tex
+++ b/manual/plugins/snake.tex
@@ -5,6 +5,18 @@ This is the popular snake game. The aim is to grow your snake as large
 as possible by eating the dots that appear on the screen. The game will
 end when the snake touches either the borders of the screen or itself.
-Change levels with UP/DOWN keys (level 1 is slowest, level 9 is
+Change levels with the \ButtonUp/\ButtonDown{} keys (level 1 is slowest, level 
-fastest). Press PLAY to start or pause. 
+9 is fastest). Press \opt{ondio}{\ButtonMenu}\ to start or pause.
+\begin{table}
+    \begin{btnmap}{}{}
+    {\ButtonUp/\ButtonDown}
+    & Change levels (1 is slowest, 9 is fastest)\\
+    %
+    \opt{RECORDER_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD}{\ButtonPlay}
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}
+    \opt{ONDIO_PAD}{\ButtonMenu}
+    & Toggle Play/Pause\\
+    %
+    \end{btnmap}
+\end{table}
diff --git a/manual/plugins/solitaire.tex b/manual/plugins/solitaire.tex
index cda624ab3b..c34cd2c3aa 100644
--- a/manual/plugins/solitaire.tex
+++ b/manual/plugins/solitaire.tex
@@ -13,15 +13,15 @@ For the full set of rules to the game, and other facinating information
 visit\\
 \url{http://www.solitairecentral.com/rules/klondike.html}
+\nopt{ondio}{
 \begin{table}
  \begin{btnmap}{}{}
-    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}
+    \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}
      {\ButtonLeft, \ButtonRight, \ButtonUp, \ButtonDown}
    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonLeft, \ButtonRight, \ButtonMenu, \ButtonPlay}
      & Move Cursor around.\\
    %
    \opt{RECORDER_PAD}{\ButtonOn}
-    \opt{ONDIO_PAD}{\ButtonMenu}
    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD}{\ButtonSelect}
      & Select cards, move cards, reveal hidden cards...\\
    %
@@ -29,7 +29,6 @@ visit\\
    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode}
    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect + \ButtonPlay}
    \opt{IAUDIO_X5_PAD}{\ButtonPlay}
-    \opt{ONDIO_PAD}{Hold \ButtonMenu}
      & If a card was selected -- unselect it, else\\
      & Draw 3 new cards from the remains stack\\
    %
@@ -37,23 +36,38 @@ visit\\
    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn + \ButtonLeft}
    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect + \ButtonLeft}
    \opt{IAUDIO_X5_PAD}{\ButtonRec + \ButtonLeft}
-    \opt{ONDIO_PAD}{Hold \ButtonLeft}
      & Put the card from the top of the remains stack on top of the cursor\\
    %
    \opt{RECORDER_PAD}{\ButtonFOne}
    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{Hold \ButtonSelect}
    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect + \ButtonRight}
    \opt{IAUDIO_X5_PAD}{\ButtonRec + \ButtonUp}
-    \opt{ONDIO_PAD}{Hold \ButtonRight}
      & Put the card under the cursor on one of the 4 final colour stacks.\\
    %
    \opt{RECORDER_PAD}{\ButtonFThree}
    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn + \ButtonRight}
    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonLeft + \ButtonRight}
    \opt{IAUDIO_X5_PAD}{\ButtonRec + \ButtonDown}
-    \opt{ONDIO_PAD}{Hold \ButtonUp}
      & Put the card on top of the remains stack on one of the final colour stacks.\\
+   \end{btnmap}
+  \end{table}
+}
+\opt{ondio}{
+\begin{table}
+  \begin{btnmap}{}{}
+  \ButtonLeft, \ButtonRight & Move cursor between colums.\\
+   %
+  \ButtonUp, \ButtonDown & Move cursor in a column of open cards.\\
+  \ButtonMenu & Toggle select/unselect card.\\
+   %
+   Hold \ButtonMenu & Draw 3 new cards from the remains stack.\\
+   %
+   Hold \ButtonLeft & Put the card from the top of the remains stack on top of the cursor.\\
+   %
+   Hold \ButtonRight & Put the card under the cursor on one of the 4 final colour stacks.\\
+   %
+   Hold \ButtonUp & Put the card on top of the remains stack on one of the final colour stacks.\\
  \end{btnmap}
 \end{table}
+}
+\ No newline at end of file
diff --git a/manual/plugins/stopwatch.tex b/manual/plugins/stopwatch.tex
index d0a9e5a5ae..1bb2477b3a 100644
--- a/manual/plugins/stopwatch.tex
+++ b/manual/plugins/stopwatch.tex
@@ -3,8 +3,6 @@
 A simple stopwatch program with support for saving times.
-\subsubsection{Keys are as follows:}
 \begin{table}
 \begin{btnmap}{}{}
 \opt{player}{\ButtonMenu}
@@ -21,7 +19,7 @@ A simple stopwatch program with support for saving times.
 \opt{recorder,recorderv2fm,ondio}{\ButtonLeft}
 \opt{h1xx,h300}{\ButtonDown}
 \opt{ipodcolor,ipodnano}{\fixme{Unknown}} 
-& Reset timer \\
+& Reset timer (only when timer is stopped)\\
 \opt{player,recorder,recorderv2fm}{\ButtonOn}
 \opt{ondio}{\ButtonMenu}
 \opt{h1xx,h300}{\ButtonOn}
@@ -29,6 +27,7 @@ A simple stopwatch program with support for saving times.
 & Take lap time \\
 \opt{player,h1xx,h300,ipodcolor,ipodnano}{\ButtonLeft/\ButtonRight}
 \opt{recorder,recorderv2fm}{\ButtonDown/\ButtonUp}
+\opt{ondio}{\ButtonUp/\ButtonDown}
 & Scroll through lap times \\
 \end{btnmap}
 \end{table}
diff --git a/manual/plugins/sudoku.tex b/manual/plugins/sudoku.tex
index b1f82000cf..d0f416fff0 100644
--- a/manual/plugins/sudoku.tex
+++ b/manual/plugins/sudoku.tex
@@ -1,8 +1,8 @@
 \subsection{\label{ref:Sudoku}Sudoku}
 \screenshot{plugins/images/ss-sudoku}{Sudoku}{fig:sudoku}
 Sudoku in Rockbox is implemented as both a plugin and a viewer.
-When you start Sudoku in plugin mode from the \setting{Browse Plugins} menu, a random
+When you start Sudoku in plugin mode from the \setting{Browse Plugins} menu, a 
-game will be generated automatically, and an estimate of its difficulty
+random game will be generated automatically, and an estimate of its difficulty
 (very easy, easy, medium, hard or fiendish) will be displayed on the screen.
 New games can be generated from the \setting{Generate} menu option.
@@ -12,12 +12,13 @@ You need sudoku games stored (one game per file) in text files with the
 normal \setting{File Browser}, and open the file to launch Sudoku.
 You can create and save your own grids under the \setting{New} menu option.
-Press the menu button when you have finished and enter the full path
+Enter the menu (as described in the key table below) when you have finished and
-to save to including the \fname{.ss} extension (e.g. \fname{/sudoku/new.ss}).
+ enter the full path to save to including the \fname{.ss} extension 
+ (e.g. \fname{/sudoku/new.ss}).
 \subsubsection{The thing on the left (AKA the scratchpad)}
-When you play sudoku on paper most people like to mark numbers in
+When you play Sudoku on paper most people like to mark numbers in cells that 
-cells that are possible candidates for the cells.
+are possible candidates for the cells.
 This can be done with the column on the left. Change the number
 under the cursor to a number which might be valid and press the scratchpad
 button, the number will then be added on the left.
@@ -32,14 +33,14 @@ These are \emph{NOT} saved when saving the game.
    & Move the cursor\\
    %
    \opt{RECORDER_PAD}{\ButtonPlay}
-    \opt{ONDIO_PAD}{\ButtonMenu}
+    \opt{ONDIO_PAD}{Hold \ButtonMenu+\ButtonDown}
    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonSelect/\ButtonOn}
    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonLeft/\ButtonRight}
    \opt{IAUDIO_X5_PAD}{\ButtonSelect}
    & Change number under the cursor\\
    %
    \opt{RECORDER_PAD}{\ButtonFOne}
-    \opt{ONDIO_PAD}{Long press on \ButtonMenu}
+    \opt{ONDIO_PAD}{Hold \ButtonMenu}
    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode}
    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu}
    \opt{IAUDIO_X5_PAD}{\ButtonPlay} 
diff --git a/manual/rockbox_interface/main.tex b/manual/rockbox_interface/main.tex
index 0f4f0beed7..0ec3b28488 100644
--- a/manual/rockbox_interface/main.tex
+++ b/manual/rockbox_interface/main.tex
@@ -221,10 +221,7 @@ your \dap{}.
 \subsection{Basic controls}
 When browsing files and moving through menus you usually get a list view
 presented. The navigation in these lists are usually the same and should be
-pretty intuitive. \fixme{Do we need to say that Rockbox is strange?
+pretty intuitive.
-  Nevertheless sometimes it may feel a bit strange as Rockbox follows some
-  conventions that aren'tt used by major companies.}
 In the tree view use \ActionStdNext{} and \ActionStdPrev{} to move around
 the selection. Use \ActionStdOk{} to select an item. When browsing the file
 system selecting an audio file plays it. The view switches to the ``While
diff --git a/manual/rockbox_interface/playback.tex b/manual/rockbox_interface/playback.tex
index 34a5c09a7e..2f01c22807 100644
--- a/manual/rockbox_interface/playback.tex
+++ b/manual/rockbox_interface/playback.tex
@@ -22,7 +22,14 @@ setting.
 that are not available within the \setting{Tag Cache Browser}.  Read more about
 \setting{Tag Cache} in \reference{ref:tagcache}.  The remainder of this section deals with the \setting{File Browser}.}
-\opt{ondio}{\fixme{Add information on hotplug/multivolume support}}
+\opt{ondio}{
+Unlike the Archos Firmware, Rockbox provides multivolume support for the 
+MultiMediaCard, this means the \dap{} can access both data volumes (internal 
+memory and the MMC), thus being able to for instance, build playlists with 
+files from both volumes.
+In File Browser mode a new folder will appear as soon as the device has read 
+the content after inserting the card. This new folders name is generated as \fname{<MMC1>}, and will behave exactly as any other folder on the \dap{}.
+}
 \subsection{\label{ref:controls}File Browser Controls}
 \begin{table}
@@ -32,10 +39,10 @@ that are not available within the \setting{Tag Cache Browser}.  Read more about
           entry, the cursor will wrap to the last/first entry.\\
      %
      \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,RECORDER_PAD}
-        {\ButtonOn+\ButtonUp/\ButtonDown}
+        {
-      \opt{PLAYER_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD}{n/a}
+          \ButtonOn+\ButtonUp/\ButtonDown
-      \opt{ONDIO_PAD}{n/a}
+          & Move one page up/down on the list.\\
-      & Move one page up/down on the list.\\
+        }
      %
      \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,RECORDER_PAD,IAUDIO_X5_PAD,ONDIO_PAD,IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonLeft}
      \opt{PLAYER_PAD}{\ButtonStop} 
@@ -158,21 +165,23 @@ invoked on a single track, it will put only that track into the playlist.
 On the other hand, if the \setting{Playlist Submenu} is invoked on a
 directory, Rockbox adds all of the tracks in that directory to the playlist.
-\note{You can control whether or not Rockbox includes the contents of subdirectories
+\note{You can control whether or not Rockbox includes the contents of 
-when adding an entire directory to a playlists.  Set the \setting{Main Menu 
+  subdirectories when adding an entire directory to a playlists. Set the 
-$\rightarrow$ Playlist Options $\rightarrow$ Recusively Insert Directories} setting to 
+  \setting{Main Menu $\rightarrow$ Playlist Options $\rightarrow$ Recusively 
-\setting{Yes} if you would like Rockbox to include tracks in subdirectories as well as tracks
+    Insert Directories} setting to \setting{Yes} if you would like Rockbox to 
-in the currently-selected directory.}
+  include tracks in subdirectories as well as tracks in the currently-selected 
+  directory.}
-If you want to have Rockbox create a playlist of a whole folder (to play an entire 
+If you want to have Rockbox create a playlist of a whole folder (to play an 
-album, for example), use the \setting{File Browser} to select the song. When a single 
+entire album, for example), use the \setting{File Browser} to select the song. 
-song is selected from the \setting{File Browser}, Rockbox will automatically create a 
+When a single song is selected from the \setting{File Browser}, Rockbox will 
-playlist with all songs in the current folder. However, if you want to play only a single 
+automatically create a playlist with all songs in the current folder. However, 
-song and then stop, stop playback, navigate to the song you want to play, and use the 
+if you want to play only a single song and then stop, stop playback, navigate 
+to the song you want to play, and use the 
 \setting{Playlist $\rightarrow$ Insert} function to select the song.
-Dynamic playlists are saved so resume will restore them exactly as they were before
+Dynamic playlists are saved so resume will restore them exactly as they were 
-shutdown.
+before shutdown.
 \note{To view, save or reshuffle the current dynamic playlist, use the 
 \setting{Playlist Options} setting in the WPS Context Menu.}
@@ -253,31 +262,30 @@ This is the virtual keyboard that is used when entering file names in Rockbox.
  \end{table}
 }
 \opt{ondio}{
-  \textbf{Picker area}
+    \begin{table}
-  \begin{table}
+    \begin{btnmap}{Picker area}{}
-    \begin{btnmap}{}{}
      \ButtonUp/\ButtonDown/\ButtonLeft/\ButtonRight
        & Move about the virtual keyboard (moves the solid cursor).
          If you move out of the picker area with \ButtonUp/\ButtonDown,
          you get to the line edit mode. \\
      \ButtonMenu 
        & Selects the letter underneath the cursor. \\
-      Long press on \ButtonMenu 
+      Hold \ButtonMenu 
-       & Accepts the currently selected letter\\
+       & Accepts the change and returns to the File Browser.\\
      \ButtonOff 
-       & Aborts the currently selected letter\\
+       & Quit the virtual keyboard without saving the changes.\\
    \end{btnmap}
  \end{table}
-  \textbf{Line edit mode}
  \begin{table}
-    \begin{btnmap}{}{}
+    \begin{btnmap}{Line edit mode}{}
      \ButtonLeft/\ButtonRight & Move left and right\\
      \ButtonMenu & Deletes the letter to the left of the cursor\\
-      Long press on \ButtonMenu & Accepts the deletion\\
+      Hold \ButtonMenu & Accepts the deletion\\
      \ButtonUp/\ButtonDown & Returns to the picker area\\
    \end{btnmap}
  \end{table}
-}\opt{player}{
+}
+\opt{player}{
  The current filename is always listed on the first line of the display. The
  second line of the display can contain the character selection bar, as in the
  screenshot above, or  one of a number of other options.
diff --git a/manual/rockbox_interface/wps.tex b/manual/rockbox_interface/wps.tex
index afafd3d3e3..ecb9a4a63a 100644
--- a/manual/rockbox_interface/wps.tex
+++ b/manual/rockbox_interface/wps.tex
@@ -9,10 +9,17 @@ currently playing audio file.
  or off independently. Refer to \reference{ref:wps_tags} for details on how
  to change the display of the WPS.
  \begin{itemize}
-  \item Status bar: The Status bar shows Battery level, charger status, 
+    \nopt{ondio}{
-    volume, play mode, repeat mode, shuffle mode\opt{CONFIG_RTC}{ and clock}.
+    \item Status bar: The Status bar shows Battery level, charger status, 
-    In contrast to all other items, the status bar is always at the top of
+      volume, play mode, repeat mode, shuffle mode\opt{CONFIG_RTC}{ and clock}.
-    the screen.
+      In contrast to all other items, the status bar is always at the top of
+      the screen.
+    }
+    \opt{ondio}{
+    \item Status bar: The Status bar shows Battery level, USB power mode, key
+      lock status, memory access indicator. In contrast to all other items, the
+      status bar is always at the top of the screen.
+    }
  \item (Scrolling) path and filename of the current song.
  \item The ID3 track name.
  \item The ID3 album name.
@@ -69,6 +76,7 @@ your WPS (While Playing Screen).
      & Fast forward in track. \\
      %
      \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}
+      \opt{ONDIO_PAD}{Hold \ButtonOff}
      \opt{IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD,RECORDER_PAD,PLAYER_PAD}{\ButtonPlay}
      & Toggle play/pause \\
      %
@@ -113,7 +121,9 @@ your WPS (While Playing Screen).
        \ButtonMenu+\ButtonStop & Key lock on/off \\
        \ButtonMenu+\ButtonPlay & Mute on/off \\
      }
-      
+      \opt{ONDIO_PAD}{
+        Hold \ButtonMenu+\ButtonDown & Key lock on/off\\
+      }
      \opt{PLAYER_PAD,RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{
        \opt{PLAYER_PAD}{\ButtonMenu+\ButtonOn}
        \opt{RECORDER_PAD}{\ButtonFOne+\ButtonOn}
@@ -262,11 +272,11 @@ your WPS (While Playing Screen).
  Scroll bar turns the display of the Scroll bar on the left of the screen on
  or off.
  
-  Status bar turns the status display at the top of the screen on or off. Upside
+  Status bar turns the status display at the top of the screen on or off. 
-  down inverts the screen so that the top of the display appears nearest to the
+  Upside down inverts the screen so that the top of the display appears nearest
-  buttons.  This is sometimes useful when storing the \dap\ in a pocket.  Key
+  to the buttons. This is sometimes useful when storing the \dap\ in a pocket.
-  assignments swap over with the display orientation where it is logical for
+  Key assignments swap over with the display orientation where it is logical 
-  them to do so.
+  for them to do so.
  See \reference{ref:Displayoptions} for more information about these
  settings.