2 files changed, 46 insertions, 14 deletions

diff --git a/manual/plugins/chip8emulator.tex b/manual/plugins/chip8emulator.tex
index dee286d06c..cc6c26bc6f 100644
--- a/manual/plugins/chip8emulator.tex
+++ b/manual/plugins/chip8emulator.tex
@@ -12,7 +12,7 @@ graphics.
 The only problem is that they are based on a 4x4 keyboard, but since most
 games do not use all of the buttons, this can easily be worked around.
 
-To do this, one may put a ".c8k" file with the same name as the
+To do this, one may put a ``.c8k'' file with the same name as the
 original program which contains new key mappings (for BLINKY.ch8, one
 writes a BLINKY.c8k file).
 That c8k file contains 16 characters
@@ -21,9 +21,9 @@ mapping (that way, several Chip8 keys can be pressed using only one
 Rockbox key). For example, a file containing the single line:\\\\
 \textbf{0122458469ABCDEF}\\\\
 would correspond to the following non-default mappings:\\\\
-3-\textgreater 2\hspace{1cm} 6-\textgreater 8\hspace{1cm} 7-\textgreater 4\hspace{1cm} 8-\textgreater 6\\\\
+3 $\rightarrow$ 2\hspace{1cm} 6 $\rightarrow$ 8\hspace{1cm} 7 $\rightarrow$ 4\hspace{1cm} 8 $\rightarrow$ 6\\\\
 Default keymappings:
-\begin{table}[ht!]
+\begin{table}[!htb]
   \begin{center}
   \begin{footnotesize}
     \begin{tabular}{@{}*{16}{@{\hspace{1mm}}c@{\hspace{1mm}}|}@{\hspace{1mm}}c@{}}\toprule
diff --git a/manual/plugins/jpegviewer.tex b/manual/plugins/jpegviewer.tex
index b8cce62cdd..c67a970a93 100644
--- a/manual/plugins/jpegviewer.tex
+++ b/manual/plugins/jpegviewer.tex
@@ -1,25 +1,57 @@
 \subsection{JPEG viewer}
 Open a .jpg file in the file browser to view it\opt{recorder,recorderv2fm,ondio,h1xx}
-    { contents using Rockbox's greyscale library}.
+{ contents using Rockbox's greyscale library}. 
+\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 viewing
+bigger file you may need to stop playback.}
 
-\begin{table}[ht!]
+\begin{table}[!htb]
     \begin{center}
-    \begin{tabular}{ll}\toprule
+    \begin{tabularx}{.8\textwidth}{lX}\toprule
     \textbf{Key} & \textbf{Action}\\\midrule
-    UP/DOWN/LEFT/RIGHT & Move around in zoomed in image\\
-    \opt{recorder,recorderv2fm}{PLAY}\opt{ondio}{MODE}\opt{h1xx}{SELECT}\opt{h300}{NAVI}\opt{ipodcolor,ipodnano}{Scroll forward}
+    \opt{recorder,recorderv2fm,h1xx,h300}{\ButtonUp\ / \ButtonDown\ / }
+      \ButtonLeft\ / \ButtonRight
+    & Move around in zoomed in image\\
+    \opt{recorder,recorderv2fm}{\ButtonPlay}
+    \opt{ondio}{\ButtonMenu}
+    \opt{h1xx,h300}{\ButtonSelect}
+    \opt{ipodcolor,ipodnano}{\ButtonScrollFwd}
     & Zoom in\\
-    \opt{recorder,recorderv2fm}{MENU}\opt{ondio}{MODE+DOWN}\opt{h1xx,h300}{A-B}\opt{ipodcolor,ipodnano}{Scroll backward}
+    \opt{recorder,recorderv2fm}{\fixme{MENU}}
+    \opt{ondio}{\ButtonMenu+\ButtonDown}
+    \opt{h1xx,h300}{\ButtonMode}
+    \opt{ipodcolor,ipodnano,ipod4g,ipodmini}{\ButtonScrollBack}
     & Zoom out\\
-    \opt{recorder,recorderv2fm}{F3}\opt{ondio}{MODE+RIGHT}\opt{h1xx}{PLAY}\opt{h300}{RECORD}\opt{ipodcolor,ipodnano}{SELECT+RIGHT}
+    \opt{recorder,recorderv2fm}{\ButtonFThree}
+    \opt{ondio}{\ButtonMenu+\ButtonRight}
+    \opt{h1xx}{\ButtonOn}
+    \opt{h300}{\ButtonRec}
+    \opt{ipodcolor,ipodnano}{\ButtonSelect+\ButtonRight}
     & Next jpeg in folder\\
-    \opt{recorder,recorderv2fm}{F2}\opt{ondio}{MODE+LEFT}\opt{h1xx}{RECORD}\opt{h300}{PLAY}\opt{ipodcolor,ipodnano}{SELECT+LEFT}
+    \opt{recorder,recorderv2fm}{\ButtonFTwo}
+    \opt{ondio}{\ButtonMenu}
+    \opt{h1xx}{\ButtonRec}
+    \opt{h300}{\ButtonOn}
+    \opt{ipodcolor,ipodnano}{\ButtonSelect+\ButtonLeft}
     & Previous jpeg in folder\\
-    \opt{recorder,recorderv2fm,h1xx,h300}{STOP}\opt{ondio}{OFF}\opt{ipodcolor,ipodnano}{SELECT+MENU}
-    & Quit\\\bottomrule
-    \end{tabular}
+    \opt{recorder,recorderv2fm,h1xx,h300}{\ButtonOff}
+    \opt{ondio}{\ButtonOff}
+    \opt{ipodcolor,ipodnano}{\ButtonSelect+\ButtonMenu}
+    & Show menu\\\bottomrule
+    \end{tabularx}
     \end{center}
 \end{table}
 
+The menu has the following entries.
+\begin{description}
+\item[Quit.] Quits the viewer and returns to the file browser.
+\item[Toggle Slideshow Mode.] Enables or disables the slideshow mode.
+\item[Change Slideshow Timeout.] You can set the timeout for the slideshow
+  between 1 second and 20 seconds.
+\item[Show Playback Menu.] From the playback menu you can control the 
+playback of the currently loaded playlist and change the volume of you \dap.
+\item[Return.] Returns you to the image
+\end{description}
+
 \note{JPEGs that use progressive scan encoding are not supported and will 
   produce an error.}