3 files changed, 13 insertions, 11 deletions

diff --git a/manual/plugins/metronome.tex b/manual/plugins/metronome.tex
index 6b7fde92f0..458d7a2298 100644
--- a/manual/plugins/metronome.tex
+++ b/manual/plugins/metronome.tex
@@ -25,7 +25,7 @@ on the appropriate button.
         \opt{HAVEREMOTEKEYMAP}{& \PluginRCUp{} / \PluginRCDown}
         & Adjust volume \\
 
-    \opt{h100,h300,e200}{
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,SANSA_E200_PAD}{
       \ButtonRec
         \opt{HAVEREMOTEKEYMAP}{& }
         & Sync tap \\}
diff --git a/manual/plugins/pacbox.tex b/manual/plugins/pacbox.tex
index afb4387679..4ad03234d1 100644
--- a/manual/plugins/pacbox.tex
+++ b/manual/plugins/pacbox.tex
@@ -27,31 +27,33 @@ found at \url{http://www.mame.net}.
 
 \subsubsection{Keys}
 \begin{btnmap}
+    % 20GB H10 and 5/6GB H10 have different direction key mappings to match the
+    % orientation of the playing field on their different displays - don't use *_PAD !
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,IPOD_4G_PAD,%
-        IPOD_3G_PAD,h10,MROBE100_PAD,SANSA_FUZE_PAD}{\ButtonRight}
+        IPOD_3G_PAD,iriverh10,MROBE100_PAD,SANSA_FUZE_PAD}{\ButtonRight}
     \opt{GIGABEAT_PAD,GIGABEAT_S_PAD,SANSA_E200_PAD,PBELL_VIBE500_PAD}{\ButtonUp}
-    \opt{h10_5gb}{\ButtonScrollUp}
+    \opt{iriverh10_5gb}{\ButtonScrollUp}
     \opt{COWON_D2_PAD}{\TouchTopMiddle}
       \opt{HAVEREMOTEKEYMAP}{& }
     & Move Up\\
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,IPOD_4G_PAD,%
-    IPOD_3G_PAD,h10,MROBE100_PAD,SANSA_FUZE_PAD}{\ButtonLeft}
-    \opt{h10_5gb}{\ButtonScrollDown}
+    IPOD_3G_PAD,iriverh10,MROBE100_PAD,SANSA_FUZE_PAD}{\ButtonLeft}
+    \opt{iriverh10_5gb}{\ButtonScrollDown}
     \opt{GIGABEAT_PAD,GIGABEAT_S_PAD,SANSA_E200_PAD,PBELL_VIBE500_PAD}{\ButtonDown}
     \opt{COWON_D2_PAD}{\TouchBottomMiddle}
       \opt{HAVEREMOTEKEYMAP}{& }
     & Move Down\\
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,MROBE100_PAD,SANSA_FUZE_PAD}{\ButtonUp}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu}
-    \opt{h10}{\ButtonScrollUp}
-    \opt{h10_5gb,GIGABEAT_PAD,GIGABEAT_S_PAD,SANSA_E200_PAD,PBELL_VIBE500_PAD}{\ButtonLeft}
+    \opt{iriverh10}{\ButtonScrollUp}
+    \opt{iriverh10_5gb,GIGABEAT_PAD,GIGABEAT_S_PAD,SANSA_E200_PAD,PBELL_VIBE500_PAD}{\ButtonLeft}
     \opt{COWON_D2_PAD}{\TouchMidLeft}
       \opt{HAVEREMOTEKEYMAP}{& }
     & Move Left\\
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,MROBE100_PAD,SANSA_FUZE_PAD}{\ButtonDown}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonPlay}
-    \opt{h10}{\ButtonScrollDown}
-    \opt{h10_5gb,GIGABEAT_PAD,GIGABEAT_S_PAD,SANSA_E200_PAD,PBELL_VIBE500_PAD}{\ButtonRight}
+    \opt{iriverh10}{\ButtonScrollDown}
+    \opt{iriverh10_5gb,GIGABEAT_PAD,GIGABEAT_S_PAD,SANSA_E200_PAD,PBELL_VIBE500_PAD}{\ButtonRight}
     \opt{COWON_D2_PAD}{\TouchMidRight}
       \opt{HAVEREMOTEKEYMAP}{& }
     & Move Right\\
diff --git a/manual/plugins/rockboy.tex b/manual/plugins/rockboy.tex
index a363a89f7b..a30d07ccdb 100644
--- a/manual/plugins/rockboy.tex
+++ b/manual/plugins/rockboy.tex
@@ -82,7 +82,7 @@ the gnuboy emulator. To start a game, open a ROM file saved as \fname{.gb} or
         \opt{IRIVER_H100_PAD,IAUDIO_X5_PAD}{\ButtonHold{} switch}
               \opt{HAVEREMOTEKEYMAP}{& }
         & Cycle display scaling modes\\
-    %
+    %  defined for the Recorders and targets with 160x128x2 displays (H100, M5)
     }
     \opt{RECORDER_PAD,IRIVER_H300_PAD}{\ButtonOff}
     \opt{IRIVER_H100_PAD}{\ButtonMode}
@@ -115,7 +115,7 @@ the gnuboy emulator. To start a game, open a ROM file saved as \fname{.gb} or
         Choose whether the original aspect ratio should be kept when scaling
         the picture to the screen%
         % targets with bigger displays than the original gameboy
-        \opt{gigabeat,h300,ipodcolor,ipodvideo,e200,e200v2}{
+        \opt{gigabeat,iriverh300,ipodcolor,ipodvideo,e200,e200v2}{
             or whether it should be displayed unscaled%
         }.
         \item[Screen Rotate.]