1 files changed, 4 insertions, 7 deletions

diff --git a/manual/preamble.tex b/manual/preamble.tex
index 3eef5eb3b8..9223fee406 100644
--- a/manual/preamble.tex
+++ b/manual/preamble.tex
@@ -354,10 +354,9 @@
 \newcommand{\btnhead}{\textbf{Key} \opt{HAVEREMOTEKEYMAP}{%
   & \textbf{Remote Key}} & \textbf{Action} \\\midrule}
 % environment intended to be used with button maps
-% usage: \begin{btnmap}{caption}{label} Button & ButtonAction \\ \end{btnmap}
+% usage: \begin{btnmap} Button & ButtonAction \\ \end{btnmap}
 % Note: this automatically sets the table lines.
 % Note: you *need* to terminate the last line with a linebreak \\
-% Note: you still need to enclose this with \begin{table} / \end{table}
 % Cheers for the usenet helping me building this up :)
 
 % tabularx is set to be either two or three columns wide depending on whether
@@ -365,17 +364,15 @@
 % If it is, then every button table has three columns of the form
 % Main Unit Key  &  Remote Key  &  Description \\
 
-\newenvironment{btnmap}[2]{%
+\newenvironment{btnmap}{%
   \rowcolors{2}{tbloddrowbgcolor}{tblevenrowbgcolor}
   \expandafter\let\expandafter\SavedEndTab\csname endtabular*\endcsname
   \expandafter\renewcommand\expandafter*\csname endtabular*\endcsname{%
     \bottomrule
     \SavedEndTab%
-     \if\given{#1}\caption{#1}\fi%
-     \if\given{#2}\label{#2}\fi%
-    \endcenter%
+    \endcenter\vspace{2ex}%
   }
-  \center
+  \vspace{2ex}\center
   \opt{HAVEREMOTEKEYMAP}{
     % here is the table width defined for 3 columns
     \tabularx{.95\textwidth}{>{\raggedright\arraybackslash}p{.2\textwidth}>{\raggedright\arraybackslash}p{.2\textwidth}X}\toprule\rowcolor{tblhdrbgcolor}