12 files changed, 39 insertions, 31 deletions
diff --git a/manual/plugins/images/ss-oscillograph-112x64x1.png b/manual/plugins/images/ss-oscillograph-112x64x1.png
deleted file mode 100644
index 305b0ba22b..0000000000
--- a/manual/plugins/images/ss-oscillograph-112x64x1.png
+++ /dev/null
diff --git a/manual/plugins/images/ss-oscillograph-160x128x2.png b/manual/plugins/images/ss-oscillograph-160x128x2.png
deleted file mode 100644
index ae8c8c2daf..0000000000
--- a/manual/plugins/images/ss-oscillograph-160x128x2.png
+++ /dev/null
diff --git a/manual/plugins/images/ss-oscillograph-176x132x16.png b/manual/plugins/images/ss-oscillograph-176x132x16.png
deleted file mode 100644
index 9168ce5563..0000000000
--- a/manual/plugins/images/ss-oscillograph-176x132x16.png
+++ /dev/null
diff --git a/manual/plugins/images/ss-oscillograph-220x176x16.png b/manual/plugins/images/ss-oscillograph-220x176x16.png
deleted file mode 100644
index 8a9608ab10..0000000000
--- a/manual/plugins/images/ss-oscillograph-220x176x16.png
+++ /dev/null
diff --git a/manual/plugins/images/ss-oscilloscope-112x64x1.png b/manual/plugins/images/ss-oscilloscope-112x64x1.png
new file mode 100644
index 0000000000..4503dc08d2
--- /dev/null
+++ b/manual/plugins/images/ss-oscilloscope-112x64x1.png
diff --git a/manual/plugins/images/ss-oscilloscope-160x128x2.png b/manual/plugins/images/ss-oscilloscope-160x128x2.png
new file mode 100644
index 0000000000..e308fc8b95
--- /dev/null
+++ b/manual/plugins/images/ss-oscilloscope-160x128x2.png
diff --git a/manual/plugins/images/ss-oscilloscope-176x132x16.png b/manual/plugins/images/ss-oscilloscope-176x132x16.png
new file mode 100644
index 0000000000..8e3708295b
--- /dev/null
+++ b/manual/plugins/images/ss-oscilloscope-176x132x16.png
diff --git a/manual/plugins/images/ss-oscilloscope-220x176x16.png b/manual/plugins/images/ss-oscilloscope-220x176x16.png
new file mode 100644
index 0000000000..6afce6f874
--- /dev/null
+++ b/manual/plugins/images/ss-oscilloscope-220x176x16.png
diff --git a/manual/plugins/images/ss-oscilloscope-320x240x16.png b/manual/plugins/images/ss-oscilloscope-320x240x16.png
new file mode 100644
index 0000000000..b3ae57e7ea
--- /dev/null
+++ b/manual/plugins/images/ss-oscilloscope-320x240x16.png
diff --git a/manual/plugins/main.tex b/manual/plugins/main.tex
index d8bfb0888f..c5c5d73b85 100644
--- a/manual/plugins/main.tex
+++ b/manual/plugins/main.tex
@@ -69,7 +69,7 @@ will carry on playing whilst plugins are being run.
 
 \opt{recorder,recorderv2fm,ondio,h1xx,h300,ipodcolor,ipodnano}{\input{plugins/mosaic.tex}}
 
-\opt{recorder,recorderv2fm,ondio,h1xx,h300,ipodcolor,ipodnano}{\input{plugins/oscillograph.tex}}
+\opt{recorder,recorderv2fm,ondio,h1xx,h300,ipodcolor,ipodnano}{\input{plugins/oscilloscope.tex}}
 
 \opt{recorder,recorderv2fm,ondio,h1xx,h300,ipodcolor,ipodnano}{\input{plugins/snow.tex}}
 
diff --git a/manual/plugins/oscillograph.tex b/manual/plugins/oscillograph.tex
deleted file mode 100644
index 87099b2310..0000000000
--- a/manual/plugins/oscillograph.tex
+++ /dev/null
@@ -1,30 +0,0 @@
-\subsection{Oscillograph}
-\begin{figure}[h!]
-\begin{center}
-\includegraphics[width=4cm]{plugins/images/ss-oscillograph-\genericimg.png}
-\end{center}
-\caption{Oscillograph}
-\end{figure}
-
-This demo shows the shape of the sound samples that make up the music
-being played.
-
-At faster speed rates, the Jukebox is less responsive to user input.
-
-\subsubsection{Key controls:}
-
-\begin{table}[h!]
-\begin{center}
-\begin{tabular}{@{}ll@{}}\toprule
-\textbf{Key} & \textbf{Action} \\\midrule
-F1 & toggles whether to scroll or not \\
-F2 & toggles filled / curve / plot \\
-F3 & reset speed to 0 \\
-UP & slow down scrolling \\
-DOWN & Speeds up scrolling \\
-PLAY & Pauses the demo \\
-OFF & Exits demo \\\bottomrule
-\end{tabular}
-\end{center}
-\end{table}
-
diff --git a/manual/plugins/oscilloscope.tex b/manual/plugins/oscilloscope.tex
new file mode 100644
index 0000000000..8324b851d6
--- /dev/null
+++ b/manual/plugins/oscilloscope.tex
@@ -0,0 +1,38 @@
+\subsection{Oscilloscope}
+\begin{figure}[ht!]
+\begin{center}
+\includegraphics[width=4cm]{plugins/images/ss-oscilloscope-\genericimg.png}
+\end{center}
+\caption{Oscilloscope}
+\end{figure}
+
+This demo shows the shape of the sound samples that make up the music
+being played. At faster speed rates, the Jukebox is less responsive
+to user input and music may start to skip.
+
+\subsubsection{Keys}
+
+\begin{table}[ht!]
+\begin{center}
+\begin{tabular}{@{}ll@{}}\toprule
+\textbf{Key} & \textbf{Action} \\\midrule
+\opt{recorder,recorderv2fm}{F1}\opt{ondio}{Mode}\opt{h1xx}{Select}\opt{h300}{Navi}\opt{ipodcolor,ipodnano}{Select+Play}
+    & Toggle filled / curve / plot \\
+\opt{recorder,recorderv2fm}{F2}\opt{ondio}{Mode+Right}\opt{h1xx,h300}{A-B}\opt{ipodcolor,ipodnano}{Select+Right}
+    & Toggle whether to scroll or not \\
+\opt{recorder,recorderv2fm}{F3}\opt{ondio}{Mode+Left}\opt{h1xx,h300}{Record}\opt{ipodcolor,ipodnano}{Select+Left}
+    & Toggle drawing orientation \\
+Left & Slow down scrolling \\
+Right & Speed up scrolling \\
+\opt{recorder,recorderv2fm,h1xx,h300,ipodcolor,ipodnano}{Play}\opt{ondio}{Mode+Off}
+    & Pause the demo \\
+\opt{recorder,recorderv2fm,ondio,h1xx,h300}{Up}\opt{ipodcolor,ipodnano}{Scroll forward}
+    & Increase volume\\
+\opt{recorder,recorderv2fm,ondio,h1xx,h300}{Down}\opt{ipodcolor,ipodnano}{Scroll backward}
+    & Decrease volume\\
+\opt{recorder,recorderv2fm,h1xx,h300}{Stop}\opt{ondio}{Off}\opt{ipodcolor,ipodnano}{Select+Menu}
+    & Exit demo \\\bottomrule
+\end{tabular}
+\end{center}
+\end{table}
+