2 files changed, 53 insertions, 20 deletions

diff --git a/manual/plugins/mandelbrot.tex b/manual/plugins/mandelbrot.tex
index 463a7bc731..7b378b2483 100644
--- a/manual/plugins/mandelbrot.tex
+++ b/manual/plugins/mandelbrot.tex
@@ -1,16 +1,41 @@
 \subsection{Mandelbrot}
-\screenshot{plugins/images/ss-mandelbrot}{Mandelbrot}%
-{img:mandelbrot}
-
-This is another demonstration using the grayscale engine.  It draws fractal images from the Mandelbrot set.
-
+\screenshot{plugins/images/ss-mandelbrot}{Mandelbrot}{img:mandelbrot}
+This demonstration draws fractal images from the Mandelbrot set
+\opt{archos,h1xx}{using the greyscale engine}.
 \begin{table}
 \begin{btnmap}{}{}
-Arrow keys & Move about the image \\
-PLAY & Zoom in \\
-OFF & Quit \\
-F1 & Increase iteration depth (more detail) \\
-F2 & Decrease iteration depth (less detail) \\
-F3 & Reset and return to the default image \\
+Arrow keys & Move about the image\\
+\opt{RECORDER_PAD}{\ButtonPlay}
+\opt{ONDIO_PAD}{\ButtonMenu\ / \ButtonMenu+\ButtonUp}
+\opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}{\ButtonSelect}
+\opt{IPOD_4G_PAD}{\ButtonScrollFwd}
+& Zoom in\\
+\opt{RECORDER_PAD}{\ButtonOn}
+\opt{ONDIO_PAD}{\ButtonMenu+\ButtonDown}
+\opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode}
+\opt{IPOD_4G_PAD}{\ButtonScrollBack}
+\opt{IAUDIO_X5_PAD}{Hold \ButtonSelect}
+& Zoom out\\
+\opt{RECORDER_PAD}{\ButtonFOne}
+\opt{ONDIO_PAD}{\ButtonMenu+\ButtonLeft}
+\opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn+\ButtonLeft}
+\opt{IPOD_4G_PAD}{\ButtonSelect+\ButtonLeft}
+\opt{IAUDIO_X5_PAD}{\ButtonPlay+\ButtonLeft}
+& Decrease iteration depth (less detail)\\
+\opt{RECORDER_PAD}{\ButtonFTwo}
+\opt{ONDIO_PAD}{\ButtonMenu+\ButtonRight}
+\opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn+\ButtonRight}
+\opt{IPOD_4G_PAD}{\ButtonSelect+\ButtonRight}
+\opt{IAUDIO_X5_PAD}{\ButtonPlay+\ButtonRight}
+& Increase iteration depth (more detail)\\
+\opt{RECORDER_PAD}{\ButtonFThree}
+\opt{ONDIO_PAD}{\ButtonMenu+\ButtonOff}
+\opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}{\ButtonRec}
+\opt{IPOD_4G_PAD}{\ButtonSelect+\ButtonPlay}
+& Reset and return to the default image\\
+\opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
+\opt{IPOD_4G_PAD}{\ButtonSelect+\ButtonMenu}
+\opt{IAUDIO_X5_PAD}{\ButtonPower}
+& Quit\\
 \end{btnmap}
 \end{table}
diff --git a/manual/plugins/rockboy.tex b/manual/plugins/rockboy.tex
index 5ab16a53e7..9d44d82fab 100644
--- a/manual/plugins/rockboy.tex
+++ b/manual/plugins/rockboy.tex
@@ -1,22 +1,30 @@
 \subsection{\label{ref:Rockboy}Rockboy}
 \screenshot{plugins/images/ss-rockboy}{Rockboy}{img:rockboy}
-Rockboy is a Nintendo Game Boy and Game Boy Color emulator for Rockbox based
-on the gnuboy emulator. To start a game open a ROM file saved as .gb or
-.gbc in the file browser.\\
+Rockboy is a Nintendo Game Boy and Game Boy Color emulator for Rockbox based on
+the gnuboy emulator. To start a game open a ROM file saved as \fname{.gb} or
+\fname{.gbc} in the file browser.\\
 
 \textbf{Default keys}
 \begin{table}
     \begin{btnmap}{}{}
-    \opt{recorder,recorderv2fm}{F1}\opt{h1xx}{PLAY}\opt{h300}{RECORD}
+    \opt{RECORDER_PAD}{\ButtonFOne}
+    \opt{IRIVER_H100_PAD}{\ButtonOn}
+    \opt{IRIVER_H300_PAD}{\ButtonRec}
     & A button\\
-    \opt{recorder,recorderv2fm}{F2}\opt{h1xx}{STOP}\opt{h300}{A-B}
+    \opt{RECORDER_PAD}{\ButtonFTwo}
+    \opt{IRIVER_H100_PAD}{\ButtonOff}
+    \opt{IRIVER_H300_PAD}{\ButtonMode}
     & B button\\
-    \opt{recorder,recorderv2fm}{F3}\opt{h1xx}{RECORD}\opt{h300}{PLAY}
+    \opt{RECORDER_PAD}{\ButtonFThree}
+    \opt{IRIVER_H100_PAD}{\ButtonRec}
+    \opt{IRIVER_H300_PAD}{\ButtonOn}
     & Start\\
-    \opt{recorder,recorderv2fm}{PLAY}\opt{h1xx}{SELECT}\opt{h300}{NAVI}
+    \opt{RECORDER_PAD}{\ButtonPlay}
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonSelect}
     & Select\\
-    \opt{recorder,recorderv2fm}{MENU & Cycle display scaling modes\\}
-    \opt{recorder,recorderv2fm,h300}{STOP}\opt{h1xx}{A-B}
+    \opt{RECORDER_PAD}{\ButtonOn & Cycle display scaling modes\\}
+    \opt{RECORDER_PAD,IRIVER_H300_PAD}{\ButtonOff}
+    \opt{IRIVER_H100_PAD}{\ButtonMode}
     & Open Rockboy menu\\
     \end{btnmap}
 \end{table}