Index: manual/preamble.tex
===================================================================
--- manual/preamble.tex	(Revision 25249)
+++ manual/preamble.tex	(Arbeitskopie)
@@ -38,6 +38,8 @@
 
 \usepackage[table]{xcolor}
 
+\usepackage{caption2}
+
 \input{platform/\platform.tex}
 \input{features.tex}
 
@@ -148,7 +150,6 @@
 % Note: use this only for screenshots!
 % Note: leave caption empty to supress it.
 \newcommand{\screenshot}[3]{
-  \begin{figure}[H]
     \begin{center}
       \IfFileExists{#1-\genericimg-\specimg.png}
         {\includegraphics[width=\screenshotsize]{#1-\genericimg-\specimg.png}
@@ -163,10 +164,9 @@
             }
           }
         }
-      \if\blank{#3}\else{\label{#3}}\fi\if\blank{#2}\else{%
-        \caption{#2}}\fi
+      \if\blank{#3}\else{\label{#3}}\fi%
+      \if\blank{#2}\else{\captionof{figure}{#2}}\fi
     \end{center}
-  \end{figure}
 }
 
 % command to display a note.
@@ -200,14 +200,7 @@
 }}
 {\newcommand{\blind}[1]{\ifinner\else\par\noindent\fi#1}}
 
-% make table floats use "H" (as for screenshots) as default positioning
-\makeatletter\renewcommand{\fps@table}{H}\makeatother
-% change defaults for floats on a page as we have a lot of small images
-\setcounter{topnumber}{3}    % default: 2
-\setcounter{bottomnumber}{2} % default: 1
-\setcounter{totalnumber}{5}  % default: 3
 
-
 % Environment for typesetting tables in a consistent way. The header has
 % a darker background; rows are white and light gray (alternating). Top,
 % middle and bottom rules are automatically set.