6 files changed, 74 insertions, 7 deletions
diff --git a/manual/plugins/images/ss-rockboy-112x64x1.png b/manual/plugins/images/ss-rockboy-112x64x1.png
new file mode 100644
index 0000000000..b92f5e2e61
--- /dev/null
+++ b/manual/plugins/images/ss-rockboy-112x64x1.png
diff --git a/manual/plugins/images/ss-rockboy-160x128x2.png b/manual/plugins/images/ss-rockboy-160x128x2.png
new file mode 100644
index 0000000000..8f0b5d5d3e
--- /dev/null
+++ b/manual/plugins/images/ss-rockboy-160x128x2.png
diff --git a/manual/plugins/images/ss-rockboy-220x176x16.png b/manual/plugins/images/ss-rockboy-220x176x16.png
new file mode 100644
index 0000000000..7d6216c1c9
--- /dev/null
+++ b/manual/plugins/images/ss-rockboy-220x176x16.png
diff --git a/manual/plugins/jpegviewer.tex b/manual/plugins/jpegviewer.tex
index 71a38de49c..d34a2c6991 100644
--- a/manual/plugins/jpegviewer.tex
+++ b/manual/plugins/jpegviewer.tex
@@ -1,7 +1,24 @@
 \subsection{JPEG viewer}
-Press PLAY on a .jpg file in order to view the contents using Rockbox's greyscale library.  Use the arrow keys to move around the image, PLAY to zoom in
-and ON to zoom out.  Press OFF to exit the viewer.
-
-Note: JPEGs that use progressive scan encoding are not supported and will produce an error.
+Open a .jpg file in the file browser to view it\opt{recorder,recorderv2fm,ondio,h1xx}
+    { contents using Rockbox's greyscale library}.
 
+\begin{table}[ht!]
+    \begin{center}
+    \begin{tabular}{ll}\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}
+    & Zoom in\\
+    \opt{recorder,recorderv2fm}{MENU}\opt{ondio}{MODE+DOWN}\opt{h1xx,h300}{A-B}\opt{ipodcolor,ipodnano}{Scroll backward}
+    & Zoom out\\
+    \opt{recorder,recorderv2fm}{F3}\opt{ondio}{MODE+RIGHT}\opt{h1xx}{PLAY}\opt{h300}{RECORD}\opt{ipodcolor,ipodnano}{SELECT+RIGHT}
+    & Next jpeg in folder\\
+    \opt{recorder,recorderv2fm}{F2}\opt{ondio}{MODE+LEFT}\opt{h1xx}{RECORD}\opt{h300}{PLAY}\opt{ipodcolor,ipodnano}{SELECT+LEFT}
+    & Previous jpeg in folder\\
+    \opt{recorder,recorderv2fm,h1xx,h300}{STOP}\opt{ondio}{OFF}\opt{ipodcolor,ipodnano}{SELECT+MENU}
+    & Quit\\\bottomrule
+    \end{tabular}
+    \end{center}
+\end{table}
 
+Note: JPEGs that use progressive scan encoding are not supported and will produce an error.
diff --git a/manual/plugins/main.tex b/manual/plugins/main.tex
index eeb97f5467..d8bfb0888f 100644
--- a/manual/plugins/main.tex
+++ b/manual/plugins/main.tex
@@ -18,8 +18,8 @@ will carry on playing whilst plugins are being run.
 \section{Games}
 \opt{recorder,recorderv2fm,ondio,h1xx,h300,ipodcolor,ipodnano}
     {See also the Chip{}-8 emulator on page \pageref{ref:Chip8emulator}
-    \opt{recorder,recorderv2fm,ondio,h1xx,h300,ipodcolor}{and Sudoku on page
-    \pageref{ref:Sudoku}}.}
+    \opt{recorder,recorderv2fm,ondio,h1xx,h300,ipodcolor}{, Rockboy on page
+    \pageref{ref:Rockboy} and Sudoku on page \pageref{ref:Sudoku}}.}
 
 \opt{recorder,recorderv2fm,ondio,h1xx,h300,ipodcolor,ipodnano}{\input{plugins/bejeweled.tex}}
 
@@ -84,12 +84,14 @@ the associated file.  Viewers are stored in the
 
 \opt{recorder,recorderv2fm,ondio,h1xx,h300,ipodcolor,ipodnano}{\input{plugins/chip8emulator.tex}}
 
-\opt{recorder,recorderv2fm,ondio,h1xx,h300}{\input{plugins/jpegviewer.tex}}
+\opt{recorder,recorderv2fm,ondio,h1xx,h300,ipodcolor,ipodnano}{\input{plugins/jpegviewer.tex}}
 
 \opt{recorder,recorderv2fm,ondio}{\input{plugins/movieplayer.tex}}
 
 \opt{recorder,recorderv2fm,ondio}{\input{plugins/rockbox_flash.tex}}
 
+\opt{recorder,recorderv2fm,h1xx,h300,ipodcolor}{\input{plugins/rockboy.tex}}
+
 \opt{recorder,recorderv2fm,ondio,h1xx,h300,ipodcolor,ipodnano}{\input{plugins/search.tex}}
 
 \opt{recorder,recorderv2fm,ondio,h1xx,h300,ipodcolor,ipodnano}{\input{plugins/sort.tex}}
diff --git a/manual/plugins/rockboy.tex b/manual/plugins/rockboy.tex
new file mode 100644
index 0000000000..0f20e4f1a2
--- /dev/null
+++ b/manual/plugins/rockboy.tex
@@ -0,0 +1,48 @@
+\subsection{\label{ref:Rockboy}Rockboy}
+\begin{figure}[ht!]
+\begin{center}
+\includegraphics[width=4cm]{plugins/images/ss-rockboy-\genericimg.png}
+\end{center}
+\caption{Rockboy}
+\end{figure}
+Rockboy is a Nintendo Game Boy and Game Boy Color emulator for Rockbox based
+on the gnuboy emulator. To start a game open a ROM file saved as .gb or
+.gbc in the file browser.\\
+
+\textbf{Default keys}
+\begin{table}[ht!]
+    \begin{center}
+    \begin{tabular}{cll}\toprule
+    \textbf{Key} & \textbf{Function}\\\midrule
+    \opt{recorder,recorderv2fm}{F1}\opt{h1xx}{PLAY}\opt{h300}{RECORD}& A button\\
+    \opt{recorder,recorderv2fm}{F2}\opt{h1xx}{STOP}\opt{h300}{A-B}& B button\\
+    \opt{recorder,recorderv2fm}{F3}\opt{h1xx}{RECORD}\opt{h300}{PLAY}& Start\\
+    \opt{recorder,recorderv2fm}{PLAY}\opt{h1xx}{SELECT}\opt{h300}{NAVI}& Select\\
+    \opt{recorder,recorderv2fm}{MENU & Cycle display scaling modes\\}
+    \opt{recorder,recorderv2fm,h300}{STOP}\opt{h1xx}{A-B}& Open Rockboy menu\\\bottomrule
+    \end{tabular}
+    \end{center}
+\end{table}
+
+\textbf{Rockboy menu}
+\begin{itemize}
+\item \textbf{Back to Game}
+Takes you back to the game.
+\item \textbf{Load State...}
+Loads a previously saved state.
+\item \textbf{Save State...}
+Saves your current state.
+\item \textbf{Options...}
+    \begin{itemize}
+    \item \textbf{Frameskip}
+    Change frameskip setting to improve speed.
+    \item \textbf{Sound ON/OFF}
+    Toggle sound.
+    \item \textbf{Stats ON/OFF}
+    Toggle showing fps and current frameskip.
+    \item \textbf{Set Keys (BUGGY)}
+    Select this option to set a new keymapping.
+    \end{itemize}
+\item \textbf{Quit RockBoy}
+Quits the Rockboy plugin.
+\end{itemize}