3 files changed, 15 insertions, 37 deletions

diff --git a/manual/rockbox_interface/browsing_and_playing.tex b/manual/rockbox_interface/browsing_and_playing.tex
index c087036a6b..8d7972b237 100644
--- a/manual/rockbox_interface/browsing_and_playing.tex
+++ b/manual/rockbox_interface/browsing_and_playing.tex
@@ -43,8 +43,7 @@ the \setting{Show Files} setting to all.
 }}
 
 \subsection{\label{ref:controls}File Browser Controls}
-\begin{table}
-    \begin{btnmap}{}{}
+\begin{btnmap}
       \ActionStdPrev{}/\ActionStdNext{}
       \opt{HAVEREMOTEKEYMAP}{& \ActionRCStdPrev{}/\ActionRCStdNext{}}
          & Go to previous/next item in list. If you are on the first/last 
@@ -117,8 +116,7 @@ the \setting{Show Files} setting to all.
         (see \reference{ref:Hotkeys}).
             \\
       }
-    \end{btnmap}
-\end{table}
+\end{btnmap}
 
 \opt{RECORDER_PAD}{
   The functions of the F keys are also summarised on the button bar at the
@@ -216,8 +214,7 @@ example when renaming a file or creating a new directory.
 
 \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,RECORDER_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD%
     ,MROBE100_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD,SANSA_C200_PAD}{
-  \begin{table}
-    \begin{btnmap}{}{}
+    \begin{btnmap}
       \ActionKbdLeft{} / \ActionKbdRight{} / \ActionKbdUp{} / \ActionKbdDown
       \opt{HAVEREMOTEKEYMAP}{
       & \ActionRCKbdLeft{} / \ActionRCKbdRight{} / \ActionRCKbdUp{} / \ActionRCKbdDown}
@@ -261,13 +258,11 @@ example when renaming a file or creating a new directory.
         %
       }
     \end{btnmap}
-  \end{table}
 }
 \opt{ONDIO_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IRIVER_H10_PAD,IAUDIO_X5_PAD,IAUDIO_M3_PAD
      ,PBELL_VIBE500_PAD}{
   \textbf{Picker area}
-  \begin{table}
-    \begin{btnmap}{}{}
+    \begin{btnmap}
       \ActionKbdLeft{} / \ActionKbdRight
       \opt{HAVEREMOTEKEYMAP}{& }
       & Move the cursor on the virtual keyboard.
@@ -309,11 +304,9 @@ example when renaming a file or creating a new directory.
         %
       }
     \end{btnmap}
-  \end{table}
 
   \textbf{Line edit mode}
-  \begin{table}
-    \begin{btnmap}{}{}
+    \begin{btnmap}
       \ActionKbdLeft{} / \ActionKbdRight
       \opt{HAVEREMOTEKEYMAP}{& }
       & Move the line cursor within the text line. \\
@@ -327,14 +320,12 @@ example when renaming a file or creating a new directory.
       & Return to the picker area. \\
       %
     \end{btnmap}
-  \end{table}
 }
 \opt{player}{
   The current text line to be entered or edited is always listed on the first
   line of the display. The second line of the display can contain the character
   selection bar, as in the screenshot above.
-  \begin{table}
-    \begin{btnmap}{}{}
+    \begin{btnmap}
       \ButtonOn & Toggle picker- and line edit mode. \\
       \ButtonLeft{} / \ButtonRight
         & Move back and forth in the selected line (picker of input line). \\
@@ -344,7 +335,6 @@ example when renaming a file or creating a new directory.
       \ButtonStop & Cancel \\
       \ButtonMenu & Flip picker lines. \\
     \end{btnmap}
-  \end{table}
 }
 
 \input{rockbox_interface/tagcache.tex}
diff --git a/manual/rockbox_interface/main.tex b/manual/rockbox_interface/main.tex
index d51f63fca0..e66ba0c926 100644
--- a/manual/rockbox_interface/main.tex
+++ b/manual/rockbox_interface/main.tex
@@ -484,8 +484,7 @@ detail in the following paragraph.
 \opt{cowond2}{Rockbox has a dual-boot feature with the original firmware being
   the default.\\}
 To turn on and off your Rockbox enabled \dap{} use the following keys:
-  \begin{table}
-    \begin{btnmap}{}{}
+    \begin{btnmap}
       \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}%
       \opt{IPOD_4G_PAD}{\ButtonMenu{} / \ButtonSelect}%
       \opt{IPOD_3G_PAD}{\ButtonMenu{} / \ButtonPlay}%
@@ -512,7 +511,6 @@ To turn on and off your Rockbox enabled \dap{} use the following keys:
           }
       & Shutdown Rockbox.\\
     \end{btnmap}
-  \end{table}
 
 \label{ref:Safeshutdown}On shutdown, Rockbox automatically saves its settings.
 
diff --git a/manual/rockbox_interface/wps.tex b/manual/rockbox_interface/wps.tex
index 8f750b8461..579caddfa8 100644
--- a/manual/rockbox_interface/wps.tex
+++ b/manual/rockbox_interface/wps.tex
@@ -55,8 +55,7 @@ your WPS (While Playing Screen).
 
 \subsection{\label{ref:WPS_Key_Controls}WPS Key Controls}
 
-\begin{table}
-  \begin{btnmap}{}{}
+  \begin{btnmap}
       \ActionWpsVolUp{} / \ActionWpsVolDown
       \opt{HAVEREMOTEKEYMAP}{& \ActionRCWpsVolUp{} / \ActionRCWpsVolDown}
       & Volume up/down.\\
@@ -170,8 +169,7 @@ your WPS (While Playing Screen).
           \opt{HAVEREMOTEKEYMAP}{&} 
           & Switch to the \setting{Recording Screen}.\\
       }%
-    \end{btnmap}
-\end{table}
+  \end{btnmap}
 
 
 \opt{lcd_bitmap}{
@@ -321,8 +319,7 @@ This may even be the whole track.
   playing back those bookmarks.}
 
   \nopt{swcodec}{
-    \begin{table}
-      \begin{btnmap}{}{}
+      \begin{btnmap}
         \ActionPsToggleMode
         & Toggle pitch changing mode. \\
         %
@@ -344,14 +341,12 @@ This may even be the whole track.
         & Leave the \setting{Pitch Screen}. \\
         %
       \end{btnmap}
-    \end{table}
 
     \warn{Changing the pitch can cause audible `Artifacts' or `Dropouts'.}
   }
 
   \opt{swcodec}{
-    \begin{table}
-      \begin{btnmap}{}{}
+      \begin{btnmap}
         \ActionPsToggleMode
         \opt{HAVEREMOTEKEYMAP}{& \ActionRCPsToggleMode}
         & Toggle pitch changing mode (cycle through all available modes).\\
@@ -381,7 +376,6 @@ This may even be the whole track.
         & Leave the \setting{Pitch Screen}. \\
         %
       \end{btnmap}
-    \end{table}
   }
 
 }
@@ -412,13 +406,11 @@ This may even be the whole track.
   See \reference{ref:PlaybackOptions} for more information about these
   settings.
 
-  \begin{table}
-    \begin{btnmap}{}{}
+  \begin{btnmap}
       \ButtonLeft & Control Shuffle mode setting. \\
       \ButtonRight & Control Repeat mode setting. \\
       \ButtonDown & Control Show file setting. \\
-    \end{btnmap}
-  \end{table}
+  \end{btnmap}
   
   \ButtonFThree\ controls frequently used display options.
   
@@ -434,11 +426,9 @@ This may even be the whole track.
   See \reference{ref:Displayoptions} for more information about these
   settings.
   
-  \begin{table}
-    \begin{btnmap}{}{}
+  \begin{btnmap}
       \ButtonLeft & Control scroll bar display. \\
       \ButtonRight & Control status bar display. \\
       \ButtonDown & Control upside down screen setting. \\
-    \end{btnmap}
-  \end{table}
+  \end{btnmap}
 }