5 files changed, 25 insertions, 18 deletions
diff --git a/manual/plugins/batterybenchmark.tex b/manual/plugins/batterybenchmark.tex
index b416590db1..4fc51812b3 100755
--- a/manual/plugins/batterybenchmark.tex
+++ b/manual/plugins/batterybenchmark.tex
@@ -34,7 +34,7 @@ On the top of the file you will see various info on how to use the plugin.
 \begin{description}
 \item[Time] It is the total time of operation of the \dap. It is not the time
 that you started the plug-in. If you have your player on for 5 minutes and then
-startt the plugin, it will start measuring from 5 minutes.
+start the plugin, it will start measuring from 5 minutes.
 \item[Seconds] As time, it shows time passed in seconds. Nothing special, it is
 there because it is free and maybe someone might want to make graphs with
 seconds.
diff --git a/manual/plugins/split_editor.tex b/manual/plugins/split_editor.tex
index c158da9122..7fdabe386d 100644
--- a/manual/plugins/split_editor.tex
+++ b/manual/plugins/split_editor.tex
@@ -1,8 +1,8 @@
 \subsection{Split Editor}
 When recording an mp3 file, it is common practice to start the recording
 a little bit early and stop it a little bit late to ensure all the
-desired sound is recorded. This results in recordings that contain
-extra snippets of sound and the beginning and end. Unfortunately these
+desired sound is recorded. This results in recordings that contains
+extra snippets of sound in the beginning and the end. Unfortunately these
 snippets can not be deleted easily because they are stored in the same
 file as the desired recording. The purpose of the split editor is to
 split a mp3 file (the input file) at a point in time (split point). Two
diff --git a/manual/plugins/stopwatch.tex b/manual/plugins/stopwatch.tex
index c5a26aea2c..d0a9e5a5ae 100644
--- a/manual/plugins/stopwatch.tex
+++ b/manual/plugins/stopwatch.tex
@@ -7,21 +7,28 @@ A simple stopwatch program with support for saving times.
 
 \begin{table}
 \begin{btnmap}{}{}
-\opt{player}{Menu}\opt{recorder,recorderv2fm}{Off}
-\opt{ondio}{OnOff}\opt{h1xx,h300}{Stop}
-\opt{ipodcolor,ipodnano}{Menu} 
+\opt{player}{\ButtonMenu}
+\opt{recorder,recorderv2fm,h1xx,h300}{\ButtonOff}
+\opt{ondio}{\ButtonOff}
+\opt{ipodcolor,ipodnano}{\ButtonMenu}
 & Quit Plugin \\
-\opt{player,recorder,recorderv2fm}{Play}\opt{ondio}{Right}
-\opt{h1xx,h300}{Select}\opt{ipodcolor,ipodnano}{Play} 
+\opt{player,recorder,recorderv2fm}{\ButtonPlay}
+\opt{ondio}{\ButtonRight}
+\opt{h1xx,h300}{\ButtonSelect}
+\opt{ipodcolor,ipodnano}{\ButtonPlay}
 & Start / stop \\
-\opt{player}{Stop}\opt{recorder,recorderv2fm,ondio}{Left}
-\opt{h1xx,h300}{Down}\opt{ipodcolor,ipodnano}{\fixme{Unknown}} 
+\opt{player}{\ButtonStop}
+\opt{recorder,recorderv2fm,ondio}{\ButtonLeft}
+\opt{h1xx,h300}{\ButtonDown}
+\opt{ipodcolor,ipodnano}{\fixme{Unknown}} 
 & Reset timer \\
-\opt{player,recorder,recorderv2fm}{On}\opt{ondio}{Mode}\opt{h1xx,h300}{Play}
+\opt{player,recorder,recorderv2fm}{\ButtonOn}
+\opt{ondio}{\ButtonMenu}
+\opt{h1xx,h300}{\ButtonOn}
 \opt{ipodcolor,ipodnano}{\fixme{Unknown}} 
 & Take lap time \\
-\opt{player,h1xx,h300,ipodcolor,ipodnano}{Left/Right}
-\opt{recorder,recorderv2fm}{Down/Up} 
+\opt{player,h1xx,h300,ipodcolor,ipodnano}{\ButtonLeft/\ButtonRight}
+\opt{recorder,recorderv2fm}{\ButtonDown/\ButtonUp}
 & Scroll through lap times \\
 \end{btnmap}
 \end{table}
diff --git a/manual/plugins/text_editor.tex b/manual/plugins/text_editor.tex
index 41f69f45ac..c51e8cfe53 100644
--- a/manual/plugins/text_editor.tex
+++ b/manual/plugins/text_editor.tex
@@ -1,13 +1,13 @@
 \subsection{Text Editor}
 This plugin allows you to view and edit simple text documents on your DAP.
-You can view files by using \textbf{Open with} from the
-\textbf{File Menu} (see \reference{ref:Filemenu}).
+You can view files by using \setting{Open with} from the
+\setting{File Menu} (see \reference{ref:Filemenu}).
 
 \subsubsection{Usage}
 If you start the Text Editor from the plugin browser you will be greeted with
-a blank screen. When started from the \textbf{Open with} menu item your file 
+a blank screen. When started from the \setting{Open with} menu item your file 
 should be shown on the screen. You can now edit the file.
-The Text Editor is line base. This means you can edit one line at a time using
+The Text Editor is line based. This means you can edit one line at a time using
 the virtual keyboard.
 
 \begin{itemize}
diff --git a/manual/plugins/text_viewer.tex b/manual/plugins/text_viewer.tex
index 162951d570..47a39075cc 100644
--- a/manual/plugins/text_viewer.tex
+++ b/manual/plugins/text_viewer.tex
@@ -1,6 +1,6 @@
 \subsection{Text Viewer}
 This is a Viewer for text files with word wrap. Just open a .txt file to
-display it. The text vewer features controls to handle various styles of text
+display it. The text viewer features controls to handle various styles of text
 formatting, has top{}-of{}-file and bottom{}-of{}-file buttons. You can view
 files without a \fname{.txt} extension by using \emph{Open with} from the
 \emph{File Menu} (see \reference{ref:Filemenu}).