2 files changed, 10 insertions, 18 deletions

diff --git a/manual/plugins/calendar.tex b/manual/plugins/calendar.tex
index a7698782b3..7715a13d7d 100644
--- a/manual/plugins/calendar.tex
+++ b/manual/plugins/calendar.tex
@@ -1,24 +1,16 @@
+% $Id$ %
 \subsection{Calendar}
-{\centering\itshape
-  [Warning: Image ignored] % Unhandled or unsupported graphics:
-%\includegraphics[width=3.9cm,height=2.23cm]{images/rockbox-manual-img61.png}
- \newline
-Calendar
-\par}
-
+\screenshot{plugins/images/ss-calendar}{Calendar}{img:calendar}
 This is a small and simple calendar application with memo saving function.
-
-Dots indicate dates with memos. To add a new memo press PLAY on the
-date. Includes one off, annual, monthly, and weekly memos:
-
+Dots indicate dates with memos. To add a new memo press \ButtonPlay\ on the
+date and choose which type of memo to add. The available types are: one off,
+annual, monthly, and weekly memos.
 \begin{table}
   \begin{btnmap}{}{}
-  PLAY & monthly \\
-  LEFT & weekly \\
-  RIGHT & annually \\
-  ON & one off \\
-  STOP & exit \\
+  \ButtonPlay & monthly \\
+  \ButtonLeft & weekly \\
+  \ButtonRight & annually \\
+  \ButtonOn & one off \\
+  \ButtonOff & Exit \\
   \end{btnmap}
 \end{table}
-
-
diff --git a/manual/plugins/images/ss-calendar-112x64x1.png b/manual/plugins/images/ss-calendar-112x64x1.png
new file mode 100644
index 0000000000..6bec3d51a4
--- /dev/null
+++ b/manual/plugins/images/ss-calendar-112x64x1.png