3 files changed, 19 insertions, 28 deletions

diff --git a/manual/configure_rockbox/display_options.tex b/manual/configure_rockbox/display_options.tex
index 6d32e44963..40f81b381b 100644
--- a/manual/configure_rockbox/display_options.tex
+++ b/manual/configure_rockbox/display_options.tex
@@ -167,9 +167,8 @@
         \opt{recorder,recorderv2fm}{\ButtonOn+\ButtonRight/\ButtonLeft}
         \opt{ondio}{\ButtonMenu+\ButtonRight/\ButtonLeft}
         \opt{c200,e200,h100,h300,ipod1g2g,ipod3g,ipod4g,ipodcolor,ipodmini,ipodnano,
-        ipodnano2g,ipodvideo,x5,mrobe100,gigabeatf,gigabeats,e200v2}
-        {Long \ButtonRight/\ButtonLeft}\opt{h10,h10_5gb}{Long \ButtonRew/\ButtonFF}
-        \opt{vibe500}{Long \ButtonPrev/\ButtonNext}.
+        ipodnano2g,ipodvideo,x5,mrobe100,gigabeatf,gigabeats,e200v2,vibe500}
+        {Long \ButtonRight/\ButtonLeft}\opt{h10,h10_5gb}{Long \ButtonRew/\ButtonFF}.
         Setting this option to \setting{Yes}
         will keep the list entries at their fixed positions and allow them to be
         scrolled out of view, whereas \setting{No} will only scroll those entries
diff --git a/manual/configure_rockbox/sound_settings.tex b/manual/configure_rockbox/sound_settings.tex
index 21d65b35d8..a0b5e39768 100644
--- a/manual/configure_rockbox/sound_settings.tex
+++ b/manual/configure_rockbox/sound_settings.tex
@@ -346,19 +346,17 @@ change to customise your listening experience.
       & Lowers the highlighted parameter.\\
       %
       \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}{\ButtonLeft}
-      \opt{IPOD_4G_PAD,IPOD_3G_PAD,IPOD_VIDEO_PAD}{\ButtonLeft}
+      \opt{IPOD_4G_PAD,IPOD_3G_PAD,IPOD_VIDEO_PAD,PBELL_VIBE500_PAD}{\ButtonLeft}
       \opt{SANSA_E200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD}{\ButtonUp}
       \opt{COWON_D2_PAD}{\ActionStdPrev}
-      \opt{PBELL_VIBE500_PAD}{\ButtonPrev}
     \opt{HAVEREMOTEKEYMAP}{& }
       \opt{GIGABEAT_RC_PAD}{\ButtonRCVolUp}
       & Moves to the previous EQ band. \\
       %
       \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}{\ButtonRight}
-      \opt{IPOD_4G_PAD,IPOD_3G_PAD,IPOD_VIDEO_PAD}{\ButtonRight}
+      \opt{IPOD_4G_PAD,IPOD_3G_PAD,IPOD_VIDEO_PAD,PBELL_VIBE500_PAD}{\ButtonRight}
       \opt{SANSA_E200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD}{\ButtonDown}
       \opt{COWON_D2_PAD}{\ActionStdNext}
-      \opt{PBELL_VIBE500_PAD}{\ButtonNext}
     \opt{HAVEREMOTEKEYMAP}{& }
       \opt{GIGABEAT_RC_PAD}{\ButtonRCVolDown}
       & Moves to the next EQ band. \\
diff --git a/manual/configure_rockbox/system_options.tex b/manual/configure_rockbox/system_options.tex
index 0cfe22c4f8..025496efd1 100644
--- a/manual/configure_rockbox/system_options.tex
+++ b/manual/configure_rockbox/system_options.tex
@@ -212,13 +212,13 @@ therefore result in better runtime.
         \opt{GIGABEAT_S_PAD,SANSA_CLIP_PAD,MROBE100_PAD,IRIVER_H10_PAD}%
             {\ButtonPower}%
         \opt{IPOD_4G_PAD,IPOD_3G_PAD,IPOD_1G2G_PAD}{\ButtonSelect+\ButtonRight}
-        \opt{PBELL_VIBE500_PAD}{\ButtonOK+\ButtonPrev}
+        \opt{PBELL_VIBE500_PAD}{\ButtonOK+\ButtonLeft}
     and
         \opt{SANSA_E200_PAD,SANSA_C200_PAD}{Long \ButtonRec}%
         \opt{GIGABEAT_S_PAD,SANSA_CLIP_PAD,MROBE100_PAD,IRIVER_H10_PAD}%
             {Long \ButtonPower}%
         \opt{IPOD_4G_PAD,IPOD_3G_PAD,IPOD_1G2G_PAD}{\ButtonSelect+\ButtonLeft}
-        \opt{PBELL_VIBE500_PAD}{\ButtonOK+\ButtonNext}
+        \opt{PBELL_VIBE500_PAD}{\ButtonOK+\ButtonRight}
     keys, respectively.%
     }%
     \opt{HAVEREMOTEKEYMAP}{
@@ -299,9 +299,8 @@ therefore result in better runtime.
                 % Scan previous track
                 \opt{SANSA_E200_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD,%
                     IRIVER_H10_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IPOD_1G2G_PAD%
-                    ,MROBE100_PAD}
+                    ,MROBE100_PAD,PBELL_VIBE500_PAD}
                     {\ButtonLeft}
-                \opt{PBELL_VIBE500_PAD}{\ButtonPrev}
                 \opt{GIGABEAT_RC_PAD}{\ButtonPrev; \ButtonLeft}%
                     &
                 \opt{HAVEREMOTEKEYMAP}{
@@ -313,9 +312,8 @@ therefore result in better runtime.
                 % Scan next track
                 \opt{SANSA_E200_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD%
                     ,IRIVER_H10_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IPOD_1G2G_PAD%
-                    ,MROBE100_PAD}
+                    ,MROBE100_PAD,PBELL_VIBE500_PAD}
                     {\ButtonRight}
-                \opt{PBELL_VIBE500_PAD}{\ButtonNext}
                 \opt{GIGABEAT_RC_PAD}{\ButtonNext; \ButtonRight}%
                     &
                 \opt{HAVEREMOTEKEYMAP}{
@@ -362,10 +360,10 @@ therefore result in better runtime.
 
                 % Slide previous
                 \opt{SANSA_E200_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD,IPOD_4G_PAD%
-                    ,IPOD_3G_PAD,IPOD_1G2G_PAD,MROBE100_PAD}{\ButtonLeft}
+                    ,IPOD_3G_PAD,IPOD_1G2G_PAD,MROBE100_PAD,PBELL_VIBE500_PAD}
+                    {\ButtonLeft}
                 \opt{GIGABEAT_S_PAD}{\ButtonPrev; \ButtonLeft}
                 \opt{IRIVER_H10_PAD}{\ButtonRew}
-                \opt{PBELL_VIBE500_PAD}{\ButtonPrev}
                     &
                 \opt{HAVEREMOTEKEYMAP}{
                   \opt{GIGABEAT_RC_PAD,MROBE100_RC_PAD}{\ButtonRCRew}%
@@ -375,10 +373,10 @@ therefore result in better runtime.
 
                 % Slide next
                 \opt{SANSA_E200_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD,IPOD_4G_PAD%
-                    ,IPOD_3G_PAD,IPOD_1G2G_PAD,MROBE100_PAD}{\ButtonRight}
+                    ,IPOD_3G_PAD,IPOD_1G2G_PAD,MROBE100_PAD,PBELL_VIBE500_PAD}
+                    {\ButtonRight}
                 \opt{GIGABEAT_S_PAD}{\ButtonNext; \ButtonRight}
                 \opt{IRIVER_H10_PAD}{\ButtonFF}
-                \opt{PBELL_VIBE500_PAD}{\ButtonNext}
                     &
                 \opt{HAVEREMOTEKEYMAP}{
                     \opt{GIGABEAT_RC_PAD,MROBE100_RC_PAD}{\ButtonRCFF}%
@@ -388,10 +386,10 @@ therefore result in better runtime.
 
                 % Slide first
                 \opt{SANSA_E200_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD,IPOD_4G_PAD%
-                    ,IPOD_3G_PAD,IPOD_1G2G_PAD,MROBE100_PAD}{Long \ButtonLeft}
+                    ,IPOD_3G_PAD,IPOD_1G2G_PAD,MROBE100_PAD,PBELL_VIBE500_PAD}
+                    {Long \ButtonLeft}
                 \opt{GIGABEAT_S_PAD}{Long \ButtonPrev; Long \ButtonLeft}
                 \opt{IRIVER_H10_PAD}{Long \ButtonRew}
-                \opt{PBELL_VIBE500_PAD}{Long \ButtonPrev}
                     &
                 \opt{HAVEREMOTEKEYMAP}{
                     \opt{MROBE100_RC_PAD}{Long \ButtonRCRew}%
@@ -401,10 +399,10 @@ therefore result in better runtime.
 
                 % Slide last
                 \opt{SANSA_E200_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD,IPOD_4G_PAD%
-                    ,IPOD_3G_PAD,IPOD_1G2G_PAD,MROBE100_PAD}{Long \ButtonRight}
+                    ,IPOD_3G_PAD,IPOD_1G2G_PAD,MROBE100_PAD,PBELL_VIBE500_PAD}
+                    {Long \ButtonRight}
                 \opt{GIGABEAT_S_PAD}{Long \ButtonNext; Long \ButtonRight}
                 \opt{IRIVER_H10_PAD}{Long \ButtonFF}
-                \opt{PBELL_VIBE500_PAD}{Long \ButtonNext}
                     &
                 \opt{HAVEREMOTEKEYMAP}{
                     \opt{MROBE100_RC_PAD}{Long \ButtonRCFF}%
@@ -565,9 +563,8 @@ therefore result in better runtime.
                 % Tab previous / next
                 \opt{SANSA_E200_PAD,GIGABEAT_S_PAD,SANSA_C200_PAD%
                     ,SANSA_CLIP_PAD,IRIVER_H10_PAD,IPOD_4G_PAD,IPOD_3G_PAD%
-                    ,IPOD_1G2G_PAD,MROBE100_PAD}
+                    ,IPOD_1G2G_PAD,MROBE100_PAD,PBELL_VIBE500_PAD}
                     {\ButtonLeft / \ButtonRight}
-                \opt{PBELL_VIBE500_PAD}{\ButtonPrev / \ButtonNext}
                     &
                 \opt{HAVEREMOTEKEYMAP}{
                     \opt{GIGABEAT_RC_PAD,MROBE100_RC_PAD}
@@ -595,9 +592,8 @@ therefore result in better runtime.
                 % History back / forward
                 \opt{SANSA_E200_PAD,GIGABEAT_S_PAD,SANSA_C200_PAD%
                     ,SANSA_CLIP_PAD,IRIVER_H10_PAD,IPOD_4G_PAD,IPOD_3G_PAD%
-                    ,IPOD_1G2G_PAD,MROBE100_PAD}
+                    ,IPOD_1G2G_PAD,MROBE100_PAD,PBELL_VIBE500_PAD}
                     {Long \ButtonLeft / Long \ButtonRight}
-                \opt{PBELL_VIBE500_PAD}{Long \ButtonPrev / Long \ButtonNext}
                     &
                 \opt{HAVEREMOTEKEYMAP}{
                     \opt{MROBE100_RC_PAD}{Long \ButtonRCRew / Long \ButtonRCFF}%
@@ -631,14 +627,12 @@ therefore result in better runtime.
             \begin{btnmap}{}{}
                 % Cursor move up / down / left / right
                 \opt{SANSA_E200_PAD,GIGABEAT_S_PAD,SANSA_C200_PAD%
-                    ,SANSA_CLIP_PAD,MROBE100_PAD}
+                    ,SANSA_CLIP_PAD,MROBE100_PAD,PBELL_VIBE500_PAD}
                     {\ButtonUp / \ButtonDown / \ButtonLeft / \ButtonRight}
                 \opt{IRIVER_H10_PAD}{\ButtonScrollUp / \ButtonScrollDown / 
                     \ButtonLeft / \ButtonRight}
                 \opt{IPOD_4G_PAD,IPOD_3G_PAD,IPOD_1G2G_PAD}
                     {\ButtonMenu / \ButtonPlay / \ButtonLeft / \ButtonRight}
-                \opt{PBELL_VIBE500_PAD}
-                    {\ButtonUp / \ButtonDown / \ButtonPrev / \ButtonNext}
                     &
                 \opt{HAVEREMOTEKEYMAP}{
                     \opt{MROBE100_RC_PAD}{\ButtonRCPlay / \ButtonRCDisplay /