3 files changed, 7 insertions, 19 deletions

diff --git a/manual/configure_rockbox/bookmarking.tex b/manual/configure_rockbox/bookmarking.tex
index 8f308972ec..a148262485 100644
--- a/manual/configure_rockbox/bookmarking.tex
+++ b/manual/configure_rockbox/bookmarking.tex
@@ -79,8 +79,7 @@
 \end{description}
 
 The following keys can be used to navigate in any bookmark list.
-\begin{table}
-    \begin{btnmap}{}{}
+  \begin{btnmap}
       \ActionStdNext
       \opt{HAVEREMOTEKEYMAP}{& \ActionRCStdNext}
       & Selects the next bookmark.\\
@@ -104,8 +103,7 @@ The following keys can be used to navigate in any bookmark list.
       \ActionStdContext
       \opt{HAVEREMOTEKEYMAP}{& \ActionRCStdContext}
       & Enters the context menu for the selected bookmark.\\
-    \end{btnmap}
-\end{table}
+  \end{btnmap}
 
 There are two options in the context menu:
 
diff --git a/manual/configure_rockbox/sound_settings.tex b/manual/configure_rockbox/sound_settings.tex
index 4828826366..b239efbb1e 100644
--- a/manual/configure_rockbox/sound_settings.tex
+++ b/manual/configure_rockbox/sound_settings.tex
@@ -323,8 +323,7 @@ change to customise your listening experience.
   the three parameters described above (gain, centre frequency, and Q) for each
   of the five EQ bands.
   
-  \begin{table}
-    \begin{btnmap}{}{}
+    \begin{btnmap}
       \opt{IPOD_4G_PAD,IPOD_3G_PAD,IPOD_VIDEO_PAD}{\ButtonScrollFwd}
       \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,PBELL_VIBE500_PAD}{\ButtonUp}
       \opt{SANSA_E200_PAD}{\ButtonScrollBack}
@@ -385,7 +384,6 @@ change to customise your listening experience.
         }
       & Exits the graphic EQ screen.\\
     \end{btnmap}
-  \end{table}
 
   \item[Pre-cut.]
   If too much gain is added through the graphical EQ, your music may distort.
diff --git a/manual/configure_rockbox/system_options.tex b/manual/configure_rockbox/system_options.tex
index 7488eaa331..a5be25bb27 100644
--- a/manual/configure_rockbox/system_options.tex
+++ b/manual/configure_rockbox/system_options.tex
@@ -251,8 +251,7 @@ therefore result in better runtime.
         and skips tracks on the host computer. It is equivalent for the
         multimedia keys found on top of some multimedia keyboards.
 
-        \begin{table}
-            \begin{btnmap}{}{}
+            \begin{btnmap}
                 % Volume up / down
                 \opt{SANSA_E200_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IPOD_1G2G_PAD}
                     {\ButtonScrollFwd / \ButtonScrollBack}
@@ -338,7 +337,6 @@ therefore result in better runtime.
                 Scan next track
                 \\
             \end{btnmap}
-        \end{table}
 
         \item [Presentation.] This mode lets you control a presentation program
         (e.g. OpenOffice Impress, and some other popular application), making
@@ -346,8 +344,7 @@ therefore result in better runtime.
         for lecturers who does not have a wireless remote control for this
         purpose.
 
-        \begin{table}
-            \begin{btnmap}{}{}
+            \begin{btnmap}
                 % Slideshow start
                 \opt{SANSA_E200_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD}{\ButtonUp}
                 \opt{GIGABEAT_S_PAD}{\ButtonPlay; \ButtonUp}
@@ -498,14 +495,12 @@ therefore result in better runtime.
                 Perform a `mouse over' over a link
                 \\
             \end{btnmap}
-        \end{table}
 
         \item [Browser.] This mode lets you control a web browser (e.g. 
         Firefox). It uses the \dap{}'s keys to navigate through the web page
         and different tabs, navigate through history, and to control zoom.
 
-        \begin{table}
-            \begin{btnmap}{}{}
+            \begin{btnmap}
                 % Scroll up / down
                 \opt{SANSA_E200_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IPOD_1G2G_PAD}
                     {\ButtonScrollBack / \ButtonScrollFwd}
@@ -633,14 +628,12 @@ therefore result in better runtime.
                 View full-screen toggle
                 \\
             \end{btnmap}
-        \end{table}
 
         {\opt{usb_hid_mouse}{
         \item [Mouse.] This mode emulates a mouse. Features supported: Mouse
         movement; left and right button clicking; and dragging and dropping.
 
-        \begin{table}
-            \begin{btnmap}{}{}
+            \begin{btnmap}
                 % Cursor move up / down / left / right
                 \opt{SANSA_E200_PAD,GIGABEAT_S_PAD,SANSA_C200_PAD%
                     ,SANSA_CLIP_PAD,MROBE100_PAD,PBELL_VIBE500_PAD}
@@ -701,7 +694,6 @@ therefore result in better runtime.
                 Mouse wheel scroll up / down, respectively
                 \\
             \end{btnmap}
-        \end{table}
     }}
     \end{description}
 }