12 files changed, 37 insertions, 4 deletions

diff --git a/manual/advanced_topics/main.tex b/manual/advanced_topics/main.tex
index 410ceedffc..071f69c6e6 100644
--- a/manual/advanced_topics/main.tex
+++ b/manual/advanced_topics/main.tex
@@ -322,10 +322,10 @@ Example of a configuration file:
     This displays a list of firmware files in the \fname{/.rockbox} 
     system directory. 
     % 
-    \opt{recorder,recorderv2fm}{Firmware files have an extension of 
+    \opt{recorder,recorderv2fm,ondio}{Firmware files have an extension of 
       \fname{.ajz}. }                   
     %
-    \opt{player,ondio}{Firmware files have an extension of \fname{.mod}. }
+    \opt{player}{Firmware files have an extension       of \fname{.mod}. }
     %
     Playing a firmware file loads it into       memory.  Thus, it is possible 
     to run the original Archos  firmware or a different version of Rockbox 
diff --git a/manual/main_menu/fmradio.tex b/manual/main_menu/fmradio.tex
index 0867645e7c..ecdf394735 100644
--- a/manual/main_menu/fmradio.tex
+++ b/manual/main_menu/fmradio.tex
@@ -4,6 +4,9 @@
   This menu option switches to the radio screen.
   The FM radio has the ability \opt{HAVE_RECORDING}{to record and } to
   remember station frequency settings (presets).
+  \opt{MASCODEC}{\note{The radio will shorten battery life, because the 
+      MAS-chip is set to record mode for instant recordings.}
+  }
 
     \begin{table}
       \begin{btnmap}{}{}
diff --git a/manual/main_menu/main.tex b/manual/main_menu/main.tex
index 8078eb6cd4..e9d9457035 100644
--- a/manual/main_menu/main.tex
+++ b/manual/main_menu/main.tex
@@ -87,7 +87,7 @@ and the way it plays music.  The details of this menu are covered in detail in
 \section{Manage Settings}
 The \setting{Manage Settings} option allows the saving and re-loading of user 
 configuration settings, browsing the hard drive for alternate firmwares, and finally
-resetting your \dap\ back to initial configuration. 
+resetting your \dap{} back to initial configuration.
 %
 \opt{MASCODEC}{This menu also allows the user to load different versions of the 
 Rockbox firmware.} 
diff --git a/manual/plugins/chessbox.tex b/manual/plugins/chessbox.tex
index afd98cd457..33b9f6a1ed 100644
--- a/manual/plugins/chessbox.tex
+++ b/manual/plugins/chessbox.tex
@@ -5,6 +5,9 @@ Chessbox is a chess game with computer AI. The chess engine is a port of
 GNU Chess 2 by John Stanback.
 When you quit the game the current state will be saved and restored when
 you resume the game. 
+\opt{recorder,recorderv2fm,ondio}{
+\note{This plugin will stop playback.}
+}
 
 \subsubsection{Keys}
 \begin{table}
diff --git a/manual/plugins/images/ss-bubbles-112x64x1.png b/manual/plugins/images/ss-bubbles-112x64x1.png
index fe2c020e4f..fef9f8c48c 100644
--- a/manual/plugins/images/ss-bubbles-112x64x1.png
+++ b/manual/plugins/images/ss-bubbles-112x64x1.png
diff --git a/manual/plugins/images/ss-sudoku-112x64x1.png b/manual/plugins/images/ss-sudoku-112x64x1.png
index 43ac47a203..03ead1c83b 100644
--- a/manual/plugins/images/ss-sudoku-112x64x1.png
+++ b/manual/plugins/images/ss-sudoku-112x64x1.png
diff --git a/manual/plugins/images/ss-tetrox-112x64x1.png b/manual/plugins/images/ss-tetrox-112x64x1.png
index 875366d3cd..1c4d97b8a4 100755
--- a/manual/plugins/images/ss-tetrox-112x64x1.png
+++ b/manual/plugins/images/ss-tetrox-112x64x1.png
diff --git a/manual/plugins/images/ss-wavplay-112x64x1.png b/manual/plugins/images/ss-wavplay-112x64x1.png
new file mode 100644
index 0000000000..3e4d9e162b
--- /dev/null
+++ b/manual/plugins/images/ss-wavplay-112x64x1.png
diff --git a/manual/plugins/jpegviewer.tex b/manual/plugins/jpegviewer.tex
index a7802b6822..3b7a0e72a6 100644
--- a/manual/plugins/jpegviewer.tex
+++ b/manual/plugins/jpegviewer.tex
@@ -1,10 +1,16 @@
 % $Id$ %
 \subsection{JPEG viewer}
 Open a JPEG file in the \setting{File Browser} to view it
-\opt{recorder,recorderv2fm,ondio,h1xx}{ using Rockbox's greyscale library}.
+\opt{recorder,recorderv2fm,ondio,h1xx,ipod4g,ipod3g,ipodmini}{ using Rockbox's 
+greyscale library}.
+\opt{SWCODEC}{
 \note{When an audio file is playing the size of the image is limited as 
 the decoding process needs to share memory with audio tracks. To be able to
 view a bigger file you may need to stop playback.}
+}
+\opt{MASCODEC}{
+\note{This plugin will case playback to stop.}
+}
 \begin{table}
 \begin{btnmap}{}{}
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}
diff --git a/manual/plugins/main.tex b/manual/plugins/main.tex
index 8537735a0c..fc608b5aa7 100644
--- a/manual/plugins/main.tex
+++ b/manual/plugins/main.tex
@@ -115,6 +115,8 @@ the associated file.  Viewers are stored in the
 
 {\input{plugins/vbrfix.tex}}
 
+\opt{recorder,recorderv2fm,ondio}{\input{plugins/wavplay.tex}}
+
 \section{Applications}
 
 \opt{player,recorder,recorderv2fm}{\input{plugins/alpinecdc.tex}}
diff --git a/manual/plugins/split_editor.tex b/manual/plugins/split_editor.tex
index 7fdabe386d..34fd40894f 100644
--- a/manual/plugins/split_editor.tex
+++ b/manual/plugins/split_editor.tex
@@ -1,4 +1,6 @@
 \subsection{Split Editor}
+\fixme{This chapter has to be rewritten, to fit in the multi-platform latex
+source code that we currently use}
 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 contains
diff --git a/manual/plugins/wavplay.tex b/manual/plugins/wavplay.tex
new file mode 100644
index 0000000000..c1b39c50db
--- /dev/null
+++ b/manual/plugins/wavplay.tex
@@ -0,0 +1,17 @@
+\subsection{Wavplay}
+\screenshot{plugins/images/ss-wavplay}{Wavplay}{fig:wavplay}
+This plugin is for demo purposes only. It is planned to have 
+Wavplay as part of the normal playback engine in Rockbox version 3.1.
+
+At the moment it is only possible to start playing one \fname{.wav}-file at a 
+time. Therefore playlists are impossible. As every other viewer plugin, Wavplay
+is associated with the specific files.  Pressing \ButtonPlay{} on a 
+\fname{.wav}-file starts the plugin automatically and the Wavplay screen 
+appears. This screen gives information about samplerate and length of the 
+playing file. 
+\note{Seeking within the \fname{.wav}-file or changing the volume once the 
+  plugin is running isn't possible. Wavplay uses the sound settings that were 
+  used before (except for pitch).}
+The only action that can be performed is to stop by pressing \ButtonOff, and 
+Wavplay will be exited and you are returned to the  filebrowser. If the end of 
+the file has been reached, you will also be returned to the filebrowser.
\ No newline at end of file