6 files changed, 51 insertions, 32 deletions

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
-  [Warning: Image ignored] % Unhandled or unsupported graphics:
-%\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).
+For ``playing'' \fname{.UCL} files on a flashed \dap. Reprograms the flash 
+memory of the \dap{} 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
-fastest). Press PLAY to start or pause. 
+Change levels with the \ButtonUp/\ButtonDown{} keys (level 1 is slowest, level 
+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
-game will be generated automatically, and an estimate of its difficulty
+When you start Sudoku in plugin mode from the \setting{Browse Plugins} menu, a 
+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
-to save to including the \fname{.ss} extension (e.g. \fname{/sudoku/new.ss}).
+Enter the menu (as described in the key table below) when you have finished and
+ 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
-cells that are possible candidates for the cells.
+When you play Sudoku on paper most people like to mark numbers in cells that 
+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}