10 files changed, 48 insertions, 36 deletions

diff --git a/manual/plugins/bubbles.tex b/manual/plugins/bubbles.tex
index 3bb6f1c1d1..c9722624d5 100644
--- a/manual/plugins/bubbles.tex
+++ b/manual/plugins/bubbles.tex
@@ -9,8 +9,8 @@ entire board is shifted down every time a certain number of shots have been
 fired. Points are awarded depending on how quickly the level was completed.
 
     \begin{btnmap}
-    \opt{ONDIO_PAD,IRIVER_H10_PAD}{\PluginSelect}
-    \nopt{ONDIO_PAD,IRIVER_H10_PAD}{\PluginUp}
+    \opt{ONDIO_PAD,IRIVER_H10_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\PluginSelect}
+    \nopt{ONDIO_PAD,IRIVER_H10_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\PluginUp}
        \opt{HAVEREMOTEKEYMAP}{& \PluginRCUp}
         & Pause game\\
 
@@ -19,8 +19,8 @@ fired. Points are awarded depending on how quickly the level was completed.
        \opt{HAVEREMOTEKEYMAP}{& \PluginRCLeft{} / \PluginRCRight}
         & Aim the bubble\\
 
-    \opt{ONDIO_PAD,IRIVER_H10_PAD}{\PluginUp}
-    \nopt{ONDIO_PAD,IRIVER_H10_PAD}{\PluginSelect}
+    \opt{ONDIO_PAD,IRIVER_H10_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\PluginUp}
+    \nopt{ONDIO_PAD,IRIVER_H10_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\PluginSelect}
        \opt{HAVEREMOTEKEYMAP}{& \PluginRCSelect}
         & Fire bubble\\
 
diff --git a/manual/plugins/doom.tex b/manual/plugins/doom.tex
index be5ad23dbb..452522edb2 100644
--- a/manual/plugins/doom.tex
+++ b/manual/plugins/doom.tex
@@ -53,12 +53,12 @@ Rockdoom options, you will need to quit your current game and restart the plugin
 
   \item[InGame Main Menu. ]This menu can only be accessed from within a running game, and is displayed by
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{pressing \ButtonOff}%
-    \opt{IPOD_3G_PAD,IPOD_4G_PAD}{flipping your \ButtonHold{} switch a couple of times}%
+    \opt{IPOD_3G_PAD,IPOD_4G_PAD,SAMSUNG_YH92X_PAD}{flipping your \ButtonHold{} switch 
+    a couple of times}%
     \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD%
          ,GIGABEAT_PAD,GIGABEAT_S_PAD,COWON_D2_PAD}{pressing \ButtonPower}%
     \opt{SANSA_FUZE_PAD}{pressing \ButtonHome}
     \opt{PBELL_VIBE500_PAD,SAMSUNG_YH820_PAD}{pressing \ButtonRec}
-    \opt{SAMSUNG_YH92X_PAD}{flipping the \ButtonRec{} switch}
     \opt{SANSA_FUZEPLUS_PAD}{pressing \ButtonBack}
 
   \emph{New Game. } Start a new game\\
@@ -144,13 +144,12 @@ Rockdoom options, you will need to quit your current game and restart the plugin
     & Open \\
 %
   \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
-  \opt{IPOD_3G_PAD,IPOD_4G_PAD}{\ButtonHold{} switch}
+  \opt{IPOD_3G_PAD,IPOD_4G_PAD,SAMSUNG_YH92X_PAD}{\ButtonHold{} switch}
   \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD%
       ,GIGABEAT_S_PAD,MROBE100_PAD,SANSA_CLIP_PAD}{\ButtonPower}
   \opt{SANSA_FUZE_PAD}{\ButtonHome}
   \opt{COWON_D2_PAD}{\TouchTopLeft}
   \opt{PBELL_VIBE500_PAD,MPIO_HD300_PAD,SAMSUNG_YH820_PAD}{\ButtonRec}
-  \opt{SAMSUNG_YH92X_PAD}{\ButtonRec{} switch}
   \opt{SANSA_FUZEPLUS_PAD}{\ButtonBack}
        \opt{HAVEREMOTEKEYMAP}{& }
     & InGame Menu \\
diff --git a/manual/plugins/goban.tex b/manual/plugins/goban.tex
index 0fb238d836..228129c9b7 100644
--- a/manual/plugins/goban.tex
+++ b/manual/plugins/goban.tex
@@ -50,7 +50,8 @@ these markers:
          \opt{PBELL_VIBE500_PAD}{\ButtonCancel}%
          \opt{MPIO_HD200_PAD}{Long \ButtonFunc}%
          \opt{MPIO_HD300_PAD}{\ButtonMenu}%
-         \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonPlay+\ButtonDown}
+         \opt{SAMSUNG_YH92X_PAD}{\ButtonFF{} + \ButtonUp}
+         \opt{SAMSUNG_YH820_PAD}{\ButtonRec{} + \ButtonUp}
          \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonRec} button}. \\
       \emph{C } & There is a comment at the current node.  It can be viewed/edited using
                 the \emph{Add/Edit Comment} menu option of the \emph{Context Menu}. \\
@@ -143,7 +144,8 @@ these markers:
             \opt{touchscreen}{\TouchBottomLeft}
             \opt{PBELL_VIBE500_PAD}{\ButtonOK{} + \ButtonLeft}
             \opt{MPIO_HD200_PAD,MPIO_HD300_PAD}{\ButtonRec + \ButtonRew}
-            \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonRew}
+            \opt{SAMSUNG_YH92X_PAD}{\ButtonFF{} + \ButtonLeft}
+            \opt{SAMSUNG_YH820_PAD}{\ButtonRec{} + \ButtonLeft}
                 &
             \opt{HAVEREMOTEKEYMAP}{
                 &}
@@ -161,7 +163,8 @@ these markers:
             \opt{touchscreen}{\TouchBottomRight}
             \opt{PBELL_VIBE500_PAD}{\ButtonOK{} + \ButtonRight}
             \opt{MPIO_HD200_PAD,MPIO_HD300_PAD}{\ButtonRec + \ButtonFF}
-            \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonFF}
+            \opt{SAMSUNG_YH92X_PAD}{\ButtonFF{} + \ButtonRight}
+            \opt{SAMSUNG_YH820_PAD}{\ButtonRec{} + \ButtonRight}
                 &
             \opt{HAVEREMOTEKEYMAP}{
                 &}
@@ -180,7 +183,7 @@ these markers:
         \opt{RECORDER_PAD}{\ButtonFTwo}%
         \opt{ONDIO_PAD}{Long \ButtonMenu}
         \opt{MPIO_HD200_PAD}{Long \ButtonPlay}
-        \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonPlay+\ButtonLeft}
+        \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonRew}
         \opt{touchscreen}{\TouchTopLeft}
             &
         \opt{HAVEREMOTEKEYMAP}{
@@ -202,7 +205,7 @@ these markers:
             \opt{SANSA_FUZEPLUS_PAD}{\ButtonBottomLeft}
             \opt{MPIO_HD200_PAD}{Long \ButtonFunc}
             \opt{MPIO_HD300_PAD}{Long \ButtonEnter}
-            \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonPlay+\ButtonDown}%
+            \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{Long \ButtonPlay}%
                 &
             \opt{HAVEREMOTEKEYMAP}{
                 &}
@@ -224,7 +227,8 @@ these markers:
             \opt{touchscreen}{\TouchTopRight}%
             \opt{PBELL_VIBE500_PAD}{\ButtonCancel}%
             \opt{SANSA_FUZEPLUS_PAD}{\ButtonBottomRight}%
-            \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonPlay+\ButtonUp}%
+            \opt{SAMSUNG_YH92X_PAD}{\ButtonFF{} + \ButtonUp}%
+            \opt{SAMSUNG_YH820_PAD}{\ButtonRec{} + \ButtonUp}%
                 &
             \opt{HAVEREMOTEKEYMAP}{
                 &}
diff --git a/manual/plugins/imageviewer.tex b/manual/plugins/imageviewer.tex
index 2d17b14b66..9f646dc8fb 100644
--- a/manual/plugins/imageviewer.tex
+++ b/manual/plugins/imageviewer.tex
@@ -135,7 +135,7 @@ view a bigger file you may need to stop playback.}
        }
     & Show menu / Abort \\
     \opt{IPOD_4G_PAD,IPOD_3G_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD,PBELL_VIBE500_PAD%
-        ,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{
+        ,SAMSUNG_YH820_PAD}{
         \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonPlay}
         \opt{GIGABEAT_PAD,MROBE100_PAD}{\ButtonPower}
         \opt{GIGABEAT_S_PAD}{\ButtonBack}
diff --git a/manual/plugins/pacbox.tex b/manual/plugins/pacbox.tex
index 6c4cd4e8dc..e94067ac78 100644
--- a/manual/plugins/pacbox.tex
+++ b/manual/plugins/pacbox.tex
@@ -30,34 +30,38 @@ found at \url{http://www.mame.net}.
     % 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,iriverh10,MROBE100_PAD,SANSA_FUZE_PAD}{\ButtonRight}
+        IPOD_3G_PAD,iriverh10,MROBE100_PAD,SANSA_FUZE_PAD,SAMSUNG_YH92X_PAD,%
+        SAMSUNG_YH820_PAD}{\ButtonRight}
     \opt{GIGABEAT_PAD,GIGABEAT_S_PAD,SANSA_E200_PAD,PBELL_VIBE500_PAD%
-         ,SANSA_FUZEPLUS_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonUp}
+         ,SANSA_FUZEPLUS_PAD}{\ButtonUp}
     \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,iriverh10,MROBE100_PAD,SANSA_FUZE_PAD}{\ButtonLeft}
+        IPOD_3G_PAD,iriverh10,MROBE100_PAD,SANSA_FUZE_PAD,SAMSUNG_YH92X_PAD,%
+        SAMSUNG_YH820_PAD}{\ButtonLeft}
     \opt{iriverh10_5gb}{\ButtonScrollDown}
-    \opt{GIGABEAT_PAD,GIGABEAT_S_PAD,SANSA_E200_PAD,PBELL_VIBE500_PAD,SANSA_FUZEPLUS_PAD%
-        ,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonDown}
+    \opt{GIGABEAT_PAD,GIGABEAT_S_PAD,SANSA_E200_PAD,PBELL_VIBE500_PAD,%
+        SANSA_FUZEPLUS_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{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,MROBE100_PAD,SANSA_FUZE_PAD%
+        ,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonUp}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu}
     \opt{iriverh10}{\ButtonScrollUp}
     \opt{iriverh10_5gb,GIGABEAT_PAD,GIGABEAT_S_PAD,SANSA_E200_PAD,PBELL_VIBE500_PAD%
-         ,SANSA_FUZEPLUS_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonLeft}
+         ,SANSA_FUZEPLUS_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{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,MROBE100_PAD,SANSA_FUZE_PAD%
+        ,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonDown}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonPlay}
     \opt{iriverh10}{\ButtonScrollDown}
     \opt{iriverh10_5gb,GIGABEAT_PAD,GIGABEAT_S_PAD,SANSA_E200_PAD,PBELL_VIBE500_PAD%
-         ,SANSA_FUZEPLUS_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonRight}
+         ,SANSA_FUZEPLUS_PAD}{\ButtonRight}
     \opt{COWON_D2_PAD}{\TouchMidRight}
       \opt{HAVEREMOTEKEYMAP}{& }
     & Move Right\\
@@ -88,7 +92,8 @@ found at \url{http://www.mame.net}.
     \opt{MROBE100_PAD}{\ButtonMenu}
     \opt{SANSA_FUZEPLUS_PAD}{\ButtonBottomRight}
     \opt{COWON_D2_PAD}{\TouchBottomRight}
-    \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonRew}
+    \opt{SAMSUNG_YH92X_PAD}{n/a}
+    \opt{SAMSUNG_YH820_PAD}{\ButtonRew}
       \opt{HAVEREMOTEKEYMAP}{& }
     & 2-Player Start\\
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode}
@@ -97,7 +102,7 @@ found at \url{http://www.mame.net}.
     \opt{SANSA_E200_PAD,SANSA_FUZEPLUS_PAD}{\ButtonPower}
     \opt{SANSA_FUZE_PAD}{\ButtonHome}
     \opt{GIGABEAT_PAD,GIGABEAT_S_PAD,COWON_D2_PAD,PBELL_VIBE500_PAD}{\ButtonMenu}
-    \opt{SAMSUNG_YH92X_PAD}{\ButtonRec{} switch}
+    \opt{SAMSUNG_YH92X_PAD}{\ButtonRew}
     \opt{SAMSUNG_YH820_PAD}{\ButtonRec}
       \opt{HAVEREMOTEKEYMAP}{& }
     & Menu\\
diff --git a/manual/plugins/pictureflow.tex b/manual/plugins/pictureflow.tex
index 5e8d6c0b36..5de66fe49c 100644
--- a/manual/plugins/pictureflow.tex
+++ b/manual/plugins/pictureflow.tex
@@ -106,7 +106,7 @@ aware:
         \nopt{IAUDIO_M3_PAD,SANSA_FUZEPLUS_PAD}{\ActionStdMenu}
         \nopt{IAUDIO_M3_PAD,SANSA_FUZEPLUS_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ActionStdMenu}
             \opt{SANSA_FUZEPLUS_PAD}{long \ButtonSelect}
-            \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonRew}
+            \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{or \ButtonRew}
             &
         \opt{HAVEREMOTEKEYMAP}{
             \opt{IAUDIO_M3_PAD,GIGABEAT_RC_PAD}{\ActionRCStdMenu}
diff --git a/manual/plugins/rockpaint.tex b/manual/plugins/rockpaint.tex
index 0f38edca6e..e7c1f40e1b 100644
--- a/manual/plugins/rockpaint.tex
+++ b/manual/plugins/rockpaint.tex
@@ -149,8 +149,8 @@ if you select Exit, so any unsaved changes will be lost.}
     \opt{SANSA_FUZEPLUS_PAD}{\ButtonBottomLeft{} or \ButtonBottomRight}
     \opt{touchscreen}{\TouchBottomLeft}
     \opt{PBELL_VIBE500_PAD}{\ButtonOK}
-    \opt{SAMSUNG_YH92X_PAD}{\ButtonFF{} or \ButtonRec}%
-    \opt{SAMSUNG_YH820_PAD}{\ButtonFF{} or \ButtonLeft+\ButtonFF}%
+    \opt{SAMSUNG_YH92X_PAD}{\ButtonFF{} or \ButtonLeft+\ButtonFF}%
+    \opt{SAMSUNG_YH820_PAD}{\ButtonFF{} or \ButtonRec}%
       \opt{HAVEREMOTEKEYMAP}{& }
     & Displays the toolbar.\\
 
diff --git a/manual/plugins/text_editor.tex b/manual/plugins/text_editor.tex
index 18d1d91982..c72d90bcf2 100644
--- a/manual/plugins/text_editor.tex
+++ b/manual/plugins/text_editor.tex
@@ -27,12 +27,15 @@ the \setting{Virtual Keyboard} (see \reference{sec:virtual_keyboard}).
       \opt{HAVEREMOTEKEYMAP}{& \ActionRCStdCancel} 
     & Exit / Abort Editing\\
 
-    \ActionStdMenu 
+    \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ActionStdContext}
+    \nopt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ActionStdMenu}
       \opt{HAVEREMOTEKEYMAP}{& \ActionRCStdMenu} 
     & Show Item Menu\\
 
-    \ActionStdContext 
-      \opt{HAVEREMOTEKEYMAP}{& \ActionRCStdContext} 
-    & Delete Line\\
+    \nopt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{
+        \ActionStdContext
+          \opt{HAVEREMOTEKEYMAP}{& \ActionRCStdContext}
+        & Delete Line\\
+    }
 \end{btnmap}
 
diff --git a/manual/plugins/xworld.tex b/manual/plugins/xworld.tex
index cd4860172e..57d42bde0f 100644
--- a/manual/plugins/xworld.tex
+++ b/manual/plugins/xworld.tex
@@ -46,7 +46,7 @@ Additionally, ``extra'' data files that modify the in-game strings and font can
     & Move Left and Right\\
     %
     \opt{SANSA_FUZE_PAD}{\ButtonHome}
-    \opt{SAMSUNG_YH920_PAD}{\ButtonFFWD}
+    \opt{SAMSUNG_YH92X_PAD}{\ButtonFF}
     \opt{IRIVER_H300_PAD,SANSA_E200_PAD,SAMSUNG_YH820_PAD,IAUDIO_X5M5_PAD}{\ButtonRec}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD,IPOD_1G2G_PAD,CREATIVE_ZEN_PAD,SANSA_CLIP_PAD}{\ButtonSelect}
     \opt{SONY_NWZ_PAD,CREATIVEZVM_PAD}{\ButtonPlay}
@@ -68,7 +68,7 @@ Additionally, ``extra'' data files that modify the in-game strings and font can
         ,SANSA_FUZEPLUS_PAD}{\ButtonVolDown}
     \opt{GIGABEAT_PAD,GIGABEAT_S_PAD}{\ButtonMenu}
     \opt{SANSA_FUZE_PAD}{\ButtonSelect}
-    \opt{SAMSUNG_YH920_PAD}{\ButtonRew}
+    \opt{SAMSUNG_YH92X_PAD}{\ButtonRew}
     \opt{SAMSUNG_YH820_PAD,IAUDIO_X5M5_PAD}{\ButtonPlay}
     \opt{SANSA_E200_PAD,SANSA_CLIP_PAD}{\ButtonPower}
     \opt{CREATIVE_ZEN_PAD,SONY_NWZ_PAD}{\ButtonBack}
diff --git a/manual/plugins/zxbox.tex b/manual/plugins/zxbox.tex
index 5f20d9576c..1d42febea4 100644
--- a/manual/plugins/zxbox.tex
+++ b/manual/plugins/zxbox.tex
@@ -33,7 +33,8 @@ including an additional but fixed menu button, are assigned as follows:
     \opt{IPOD_3G_PAD,IPOD_4G_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,IAUDIO_X5_PAD%
         ,SANSA_C200_PAD,SANSA_CLIP_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD,MROBE100_PAD
         ,SANSA_FUZEPLUS_PAD}{\ButtonSelect}
-    \opt{RECORDER_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonPlay}
+    \opt{RECORDER_PAD}{\ButtonPlay}
+    \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonPlay{} or \ButtonFF}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}
     \opt{ONDIO_PAD}{\ButtonMenu}
     \opt{IRIVER_H10_PAD}{\ButtonRew}