6 files changed, 62 insertions, 52 deletions

diff --git a/manual/plugins/chess_clock.tex b/manual/plugins/chess_clock.tex
index 57eb3944fa..49d0a24f0b 100644
--- a/manual/plugins/chess_clock.tex
+++ b/manual/plugins/chess_clock.tex
@@ -7,21 +7,24 @@ used in any kind of game with up to ten players.
 \subsubsection{Setup}
 \begin{table}
   \begin{btnmap}{}{}
-    \opt{PLAYER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,GIGABEAT_PAD,MROBE100_PAD}
-      {\ButtonRight/\ButtonLeft}
-    \opt{RECORDER_PAD,ONDIO_PAD}{\ButtonUp/\ButtonDown}
-    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollBack/\ButtonScrollFwd}
+    \opt{PLAYER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,IRIVER_H10_PAD%
+        ,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonRight{} / \ButtonLeft}
+    \opt{RECORDER_PAD,ONDIO_PAD}{\ButtonUp{} / \ButtonDown}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollBack{} / \ButtonScrollFwd}
       & Increase / decrease displayed Value\\
+    %
     \opt{PLAYER_PAD,RECORDER_PAD,IRIVER_H10_PAD}{\ButtonPlay}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}
     \opt{ONDIO_PAD}{\ButtonRight}
-    \opt{IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonSelect}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD,SANSA_C200_PAD%
+        ,GIGABEAT_PAD,MROBE100_PAD}{\ButtonSelect}
       & Move to next screen\\
+    %
     \opt{PLAYER_PAD}{\ButtonStop}
     \opt{ONDIO_PAD,IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu}
     \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
     \opt{IAUDIO_X5_PAD}{\ButtonRec}
-    \opt{IRIVER_H10_PAD,SANSA_E200_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonPower}
+    \opt{IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonPower}
       & Move to previous screen\\
   \end{btnmap}
 \end{table}
@@ -38,7 +41,7 @@ used in any kind of game with up to ten players.
 \subsubsection{While playing}
 The number of the current player is displayed on the top line. The time
 below is the time remaining for that round (and possibly also the total
-time left if different). 
+time left if different).
 
 Keys are as follows:
 
@@ -49,45 +52,54 @@ Keys are as follows:
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonSelect}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonPlay}
     \opt{IAUDIO_X5_PAD}{\ButtonRec}
-    \opt{IRIVER_H10_PAD,SANSA_E200_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonPower}
+    \opt{IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonPower}
       & Exit plugin \\
+    %
     \opt{PLAYER_PAD}{\ButtonStop}
     \opt{RECORDER_PAD,ONDIO_PAD,IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonLeft}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
-    \opt{IAUDIO_X5_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonPower}
+    \opt{IAUDIO_X5_PAD,GIGABEAT_PAD}{\ButtonPower}
     \opt{IRIVER_H10_PAD}{\ButtonFF}
-    \opt{SANSA_E200_PAD}{\ButtonDown}
+    \opt{SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonDown}
+    \opt{MROBE100_PAD}{\ButtonDisplay}
       & Restart round for the current player \\
+    %
     \opt{PLAYER_PAD,RECORDER_PAD,IAUDIO_X5_PAD,IRIVER_H10_PAD}{\ButtonPlay}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}
     \opt{ONDIO_PAD}{\ButtonRight}
-    \opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonSelect}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD%
+        ,MROBE100_PAD}{\ButtonSelect}
       & Pause the time (press again to continue) \\
-    \opt{PLAYER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD}
-      {\ButtonRight}
+    %
+    \opt{PLAYER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,IRIVER_H10_PAD%
+        ,SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonRight}
     \opt{RECORDER_PAD,ONDIO_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonUp}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollBack}
       & Switch to next player \\
-    \opt{PLAYER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD}{\ButtonLeft}
+    %
+    \opt{PLAYER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,IRIVER_H10_PAD%
+        ,SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonLeft}
     \opt{RECORDER_PAD,ONDIO_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonDown}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollFwd}
       & Switch to previous player \\
+    %
     \opt{PLAYER_PAD,ONDIO_PAD,IPOD_4G_PAD,IPOD_3G_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonMenu}
     \opt{RECORDER_PAD}{\ButtonFOne}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonRec}
     \opt{IAUDIO_X5_PAD}{\ButtonSelect}
     \opt{IRIVER_H10_PAD}{\ButtonRew}
-    \opt{SANSA_E200_PAD}{\ButtonUp}
-      & Open menu
-      \opt{PLAYER_PAD,RECORDER_PAD,IRIVER_H10_PAD}{(\ButtonPlay\ to select.)}
-      \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{(\ButtonOn\ to select.)}
-      \opt{ONDIO_PAD}{(\ButtonRight\ to select.)}
-      \opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD,GIGABEAT_PAD,MROBE100_PAD}{(\ButtonSelect\ to select.)}
-      \opt{IAUDIO_X5_PAD}{(press again to select.)}\\
+    \opt{SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonUp}
+      & Open menu %
+        \opt{PLAYER_PAD,RECORDER_PAD,IRIVER_H10_PAD}{(\ButtonPlay\ to select.)}%
+        \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{(\ButtonOn\ to select.)}%
+        \opt{ONDIO_PAD}{(\ButtonRight\ to select.)}%
+        \opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD%
+            ,MROBE100_PAD}{(\ButtonSelect\ to select.)}%
+        \opt{IAUDIO_X5_PAD}{(press again to select.)}\\
   \end{btnmap}
 \end{table}
 From the menu it is possible to delete a player, modify the round time
 for the current player or set the total time for the game. When the round time
 is up for a player the message ``ROUND UP!'' is shown (press  NEXT to
 continue). When the total time is up for a player the message ``TIME UP!''is
-shown. Then player will  then be removed from the timer.
+shown. The player will then be removed from the timer.
diff --git a/manual/plugins/dice.tex b/manual/plugins/dice.tex
index e977737b70..f890ce1b2d 100644
--- a/manual/plugins/dice.tex
+++ b/manual/plugins/dice.tex
@@ -1,28 +1,21 @@
 \subsection{Dice}
-Dice is a simple dice rolling simulator. You can select number and type of dice
-to roll, it shows individual numbers as well as the total of the rolled
-dice.
+Dice is a simple dice rolling simulator. Select number and type of dice to roll
+in a menu and start by choosing ``Roll Dice''. The result is shown as individual
+numbers as well as the total of the rolled dice.
 
 \begin{table}
     \begin{btnmap}{}{}
-    \ButtonLeft/\ButtonRight 
-        & Pick between type and number of dice\\
-    \opt{PLAYER_PAD}{\ButtonPlay/\ButtonStop}
-    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,GIGABEAT_PAD,MROBE100_PAD}
-        {\ButtonUp/\ButtonDown}
-    \opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD}{\ButtonScrollFwd/\ButtonScrollBack}
-        & Select number of sides or number of dice\\
-    \opt{PLAYER_PAD}{\ButtonOn}
-    \opt{RECORDER_PAD}{\ButtonOn/\ButtonPlay}
+    \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}
     \opt{ONDIO_PAD}{\ButtonMenu}
-    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn/\ButtonSelect}
-    \opt{IPOD_4G_PAD,IPOD_4G_PAD,SANSA_E200_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonSelect}
-    \opt{IAUDIO_X5_PAD}{\ButtonSelect/\ButtonPlay}
-        & Roll dice\\
-    \opt{PLAYER_PAD}{\ButtonMenu}
+    \opt{GIGABEAT_PAD}{\ButtonA}
+    \opt{PLAYER_PAD,IAUDIO_X5_PAD,IRIVER_H10_PAD,IPOD_4G_PAD,IPOD_3G_PAD,MROBE100_PAD}{\ButtonPlay}
+    \opt{SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonUp}
+        & Roll dice again\\
+    \opt{PLAYER_PAD}{\ButtonStop}
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
-    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{Long press on \ButtonPlay}
-    \opt{IAUDIO_x5_PAD,SANSA_E200_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonPower}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu+\ButtonSelect}
+    \opt{IAUDIO_X5_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD%
+        ,IRIVER_H10_PAD}{\ButtonPower}
         & Quit\\
     \end{btnmap}
 \end{table}
diff --git a/manual/plugins/images/ss-chess_clock-132x80x16.png b/manual/plugins/images/ss-chess_clock-132x80x16.png
new file mode 100644
index 0000000000..ba8b236ef2
--- /dev/null
+++ b/manual/plugins/images/ss-chess_clock-132x80x16.png
diff --git a/manual/plugins/mpegplayer.tex b/manual/plugins/mpegplayer.tex
index e4340febdf..73a19f6616 100644
--- a/manual/plugins/mpegplayer.tex
+++ b/manual/plugins/mpegplayer.tex
@@ -17,8 +17,7 @@ option and choose \setting{mpegplayer}.
     \opt{IPOD_4G_PAD,IPOD_3G_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonMenu}
     \opt{IAUDIO_X5_PAD}{\ButtonRec}
     \opt{IRIVER_H10_PAD}{\ButtonRew}
-    \opt{SANSA_E200_PAD}{\ButtonSelect}
-    \opt{SANSA_C200_PAD}{\ButtonDown}
+    \opt{SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonSelect}
     & Open the MPEG Player menu\\
 \end{btnmap}
 \end{table}
diff --git a/manual/plugins/shortcuts.tex b/manual/plugins/shortcuts.tex
index cb9979a68b..7cd7fc5a92 100644
--- a/manual/plugins/shortcuts.tex
+++ b/manual/plugins/shortcuts.tex
@@ -48,5 +48,7 @@ the entry \fname{/MyMusic/collection/song.mp3} will be shown as
 
 You can also provide a custom display name for each entry individually. To
 do so, append a tabulator character after the entry's path followed by your
-custom name. That name will then be used for showing the entry. For example,
-\fname{/MyMusic/collection/song.mp3<TAB>My favourite song!}
+custom name. That name will then be used for showing the entry. For example:
+\begin{example}
+    /MyMusic/collection/song.mp3<TAB>My favourite song\symbol{33}
+\end{example}
diff --git a/manual/plugins/stats.tex b/manual/plugins/stats.tex
index b8ecbab439..8c0b6f43a9 100644
--- a/manual/plugins/stats.tex
+++ b/manual/plugins/stats.tex
@@ -1,10 +1,14 @@
 \subsection{Stats}
 \screenshot{plugins/images/ss-stats}{The stats-plugin}{}
+
 The stats-plugin simply counts the number of files%
-\opt{h1xx,h300,ipodcolor,ipod3g,ipod4g,ipodmini,ipodnano,ipodvideo}{, music 
-files }
-and directories on your \dap. Press %
-\opt{player}{\ButtonStop}
-\opt{recorder,recorderv2,ondio,h1xx,h300}{\ButtonOff}
-\opt{ipodcolor,ipod3g,ipod4g,ipodmini,ipodnano,ipodvideo}{\fixme:TBD}
-to exit the plugin.
+\nopt{player}{, music files }%
+and directories on your \dap.
+Press %
+\opt{PLAYER_PAD}{\ButtonStop}%
+\opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}%
+\opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu}%
+\opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD%
+    ,MROBE100_PAD}{\ButtonPower} %
+to abort counting and exit the plugin. Press any key to quit after counting
+has finished.