2 files changed, 47 insertions, 32 deletions

diff --git a/manual/plugins/flipit.tex b/manual/plugins/flipit.tex
index a896764967..43471bfbb9 100644
--- a/manual/plugins/flipit.tex
+++ b/manual/plugins/flipit.tex
@@ -1,27 +1,41 @@
+% $Id$ %
 \subsection{Flipit}
 \screenshot{plugins/images/ss-flipit}{Flipit}{img:flipit}
-
 Flipping the colour of the token under the cursor also flips the tokens
 above, below, left and right of the cursor.  The aim is to end up with
 a screen containing tokens of only one colour.
 
 \begin{table}
 \begin{btnmap}{}{}
-\opt{recorder,recorderv2fm,ondio,h1xx,h300,ipodcolor,ipodnano}{Up/Down/Left/Right}  & Changes the cursor \\
-\opt{recorder,recorderv2fm}{PLAY}\opt{ondio}{Mode}
-\opt{h1xx,h300}{Select}\opt{ipodcolor,ipodnano}{Unknown} 
-  & Toggle \\
-\opt{recorder,recorderv2fm}{F1}\opt{ondio}{Mode+Left}
-\opt{h1xx,h300}{Mode}\opt{ipodcolor,ipodnano}{Unknown} 
-  & Shuffle \\
-\opt{recorder,recorderv2fm}{F2}\opt{ondio}{Mode + Right}
-\opt{h1xx,h300}{Play}\opt{ipodcolor,ipodnano}{Unknown} 
-  & Solution \\
-\opt{recorder,recorderv2fm}{F3}\opt{ondio}{Mode + On/off}\opt{h1xx,h300}{Rec}
-\opt{ipodcolor,ipodnano}{Unknown} 
-  & Step by step \\
-\opt{recorder,recorderv2fm}{OFF}\opt{ondio}{On/off}
-\opt{h1xx,h300}{Stop}\opt{ipodcolor,ipodnano}{Unknown} 
-  & Stop the game \\
+\opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}
+    {\ButtonUp/\ButtonDown/\ButtonLeft/\ButtonRight}
+\opt{IPOD_4G_PAD}{\ButtonMenu/\ButtonPlay/\ButtonLeft/\ButtonRight}
+    & Move the cursor \\
+\opt{RECORDER_PAD}{\ButtonPlay}
+\opt{ONDIO_PAD}{\ButtonMenu}
+\opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_4G_PAD,IAUDIO_X5_PAD}{\ButtonSelect}
+    & Flip \\
+\opt{RECORDER_PAD}{\ButtonFOne}
+\opt{ONDIO_PAD}{\ButtonMenu+\ButtonLeft}
+\opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode}
+\opt{IPOD_4G_PAD}{\ButtonSelect+\ButtonLeft}
+\opt{IAUDIO_X5_PAD}{\ButtonPlay+\ButtonLeft}
+    & Shuffle \\
+\opt{RECORDER_PAD}{\ButtonFTwo}
+\opt{ONDIO_PAD}{\ButtonMenu+\ButtonUp}
+\opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}
+\opt{IPOD_4G_PAD}{\ButtonSelect+\ButtonPlay}
+\opt{IAUDIO_X5_PAD}{\ButtonPlay+\ButtonRight}
+    & Solve \\
+\opt{RECORDER_PAD}{\ButtonFThree}
+\opt{ONDIO_PAD}{\ButtonMenu+\ButtonRight}
+\opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonRec}
+\opt{IPOD_4G_PAD}{\ButtonSelect+\ButtonRight}
+\opt{IAUDIO_X5_PAD}{\ButtonPlay+\ButtonUp}
+    & Solve step by step \\
+\opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
+\opt{IPOD_4G_PAD}{\ButtonSelect+\ButtonMenu}
+\opt{IAUDIO_X5_PAD}{\ButtonPower}
+    & Quit the game \\
 \end{btnmap}
 \end{table}
diff --git a/manual/plugins/minesweeper.tex b/manual/plugins/minesweeper.tex
index 58e334ab34..05b41ed89c 100644
--- a/manual/plugins/minesweeper.tex
+++ b/manual/plugins/minesweeper.tex
@@ -1,19 +1,19 @@
+% $Id$ %
 \subsection{Minesweeper}
 \screenshot{plugins/images/ss-minesweeper}{Minesweeper plugin}{img:minesweeper}
-
-The classic game of minesweeper.  Use 
-\opt{RECORDER_PAD,ONDIO_PAD,h1xx,h300,x5}{the \ButtonUp\ and \ButtonDown\ keys}
+The classic game of minesweeper. Use 
+\opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}
+    {the \ButtonUp\ and \ButtonDown\ keys}
 \opt{IPOD_4G_PAD}{\ButtonScrollFwd/\ButtonScrollBack }
 to select the required percentage of mines to set the difficulty 
 then press the 
 \opt{RECORDER_PAD}{\ButtonOn}
 \opt{ONDIO_PAD}{\ButtonMenu}
-\opt{h1xx,h300}{\ButtonSelect}
-\opt{IPOD_4G_PAD}{\ButtonSelect}
-\opt{x5}{\ButtonRec}key to begin.
+\opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_4G_PAD}{\ButtonSelect}
+\opt{IAUDIO_X5_PAD}{\ButtonRec}key to begin.
 
 The aim of the game is to uncover all of the squares on the board.  If a
-mine is uncovered then the game is over.  If a mine is not uncovered,
+mine is uncovered then the game is over. If a mine is not uncovered,
 then the number of mines adjacent to the current square is revealed. 
 The aim is to use the information you are given to work out where the
 mines are and avoid them.  When the player is certain that they know
@@ -23,30 +23,31 @@ the location of a mine, it can be tagged to avoid accidentally
 \begin{table}
  \begin{btnmap}{}{}
   \opt{IPOD_4G_PAD}{\ButtonMenu/\ButtonPlay/\ButtonLeft/\ButtonRight}
-  \opt{RECORDER_PAD,ONDIO_PAD,h1xx,h300,x5}{\ButtonUp/\ButtonDown/\ButtonLeft/\ButtonRight}
+  \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}
+        {\ButtonUp/\ButtonDown/\ButtonLeft/\ButtonRight}
   & Move the cursor across the minefield \\
   %
   \opt{RECORDER_PAD}{\ButtonFOne}
   \opt{ONDIO_PAD}{\ButtonMenu}
-  \opt{h1xx,h300}{\ButtonOn}
-  \opt{IPOD_4G_PAD,x5}{\ButtonPlay} 
+  \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}
+  \opt{IPOD_4G_PAD,IAUDIO_X5_PAD}{\ButtonPlay} 
   & Toggle flag on / off \\
   %
   \opt{RECORDER_PAD}{\ButtonFTwo}
   \opt{ONDIO_PAD}{Hold \ButtonMenu}
-  \opt{h1xx,h300,x5}{\ButtonSelect}
+  \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}{\ButtonSelect}
   \opt{IPOD_4G_PAD}{\ButtonSelect+\ButtonPlay}
   & Reveal the contents of the current square \\
   %
   \opt{RECORDER_PAD}{\ButtonFThree}
   \opt{ONDIO_PAD}{Hold \ButtonMenu+\ButtonOff}
-  \opt{h1xx,h300}{\ButtonMode}
+  \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode}
   \opt{IPOD_4G_PAD}{\ButtonSelect+\ButtonMenu}
-  \opt{x5}{\ButtonRec+\ButtonPlay}
+  \opt{IAUDIO_X5_PAD}{\ButtonRec+\ButtonPlay}
   & Display the current game status \\
   %
-  \opt{RECORDER_PAD,ONDIO_PAD,h1xx,h300}{\ButtonOff}
-  \opt{x5}{\ButtonPower}
+  \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
+  \opt{IAUDIO_X5_PAD}{\ButtonPower}
   \opt{IPOD_4G_PAD}{\ButtonMenu}
   & Exit the game \\
 \end{btnmap}