17 files changed, 20 insertions, 6 deletions

diff --git a/manual/platform/h1xx.tex b/manual/platform/h1xx.tex
index b4fbec95e2..2cbe62f635 100644
--- a/manual/platform/h1xx.tex
+++ b/manual/platform/h1xx.tex
@@ -5,6 +5,7 @@
 \edef\UseOption{\UseOption,CONFIG_TUNER}
 \edef\UseOption{\UseOption,SWCODEC}
 \edef\UseOption{\UseOption,IRIVER_H100_PAD}
+\edef\UseOption{\UseOption,iriver}
 
 \newcommand{\playerman}{Iriver}
 \newcommand{\playertype}{H1xx}
diff --git a/manual/platform/h300.tex b/manual/platform/h300.tex
index 3a9ac77d8f..e9af299726 100644
--- a/manual/platform/h300.tex
+++ b/manual/platform/h300.tex
@@ -7,6 +7,7 @@
 \edef\UseOption{\UseOption,SWCODEC}
 \edef\UseOption{\UseOption,IRIVER_H300_PAD}
 \edef\UseOption{\UseOption,HAVE_LCD_COLOR}
+\edef\UseOption{\UseOption,iriver}
 
 \newcommand{\playerman}{Iriver}
 \newcommand{\playertype}{H3xx}
diff --git a/manual/platform/ipod4g.tex b/manual/platform/ipod4g.tex
index 494429564e..53843a8500 100644
--- a/manual/platform/ipod4g.tex
+++ b/manual/platform/ipod4g.tex
@@ -4,6 +4,7 @@
 \edef\UseOption{\UseOption,CONFIG_RTC}
 \edef\UseOption{\UseOption,SWCODEC}
 \edef\UseOption{\UseOption,IPOD_4G_PAD}
+\edef\UseOption{\UseOption,ipod}
 
 \newcommand{\playerman}{Ipod}
 \newcommand{\playertype}{4G}
diff --git a/manual/platform/ipodcolor.tex b/manual/platform/ipodcolor.tex
index 5e52ac8f5b..f21ab43f4e 100644
--- a/manual/platform/ipodcolor.tex
+++ b/manual/platform/ipodcolor.tex
@@ -5,6 +5,7 @@
 \edef\UseOption{\UseOption,SWCODEC}
 \edef\UseOption{\UseOption,IPOD_4G_PAD}
 \edef\UseOption{\UseOption,HAVE_LCD_COLOR}
+\edef\UseOption{\UseOption,ipod}
 
 \newcommand{\playerman}{Ipod}
 \newcommand{\playertype}{Color}
diff --git a/manual/platform/ipodmini.tex b/manual/platform/ipodmini.tex
index b1dba17e6f..f52cea90fa 100644
--- a/manual/platform/ipodmini.tex
+++ b/manual/platform/ipodmini.tex
@@ -4,6 +4,7 @@
 \edef\UseOption{\UseOption,CONFIG_RTC}
 \edef\UseOption{\UseOption,SWCODEC}
 \edef\UseOption{\UseOption,IPOD_4G_PAD}
+\edef\UseOption{\UseOption,ipod}
 
 \newcommand{\playerman}{Ipod}
 \newcommand{\playertype}{Mini}
diff --git a/manual/platform/ipodnano.tex b/manual/platform/ipodnano.tex
index d720b9e79d..a1d6ed633a 100644
--- a/manual/platform/ipodnano.tex
+++ b/manual/platform/ipodnano.tex
@@ -5,6 +5,7 @@
 \edef\UseOption{\UseOption,SWCODEC}
 \edef\UseOption{\UseOption,IPOD_4G_PAD}
 \edef\UseOption{\UseOption,HAVE_LCD_COLOR}
+\edef\UseOption{\UseOption,ipod}
 
 \newcommand{\playerman}{Ipod}
 \newcommand{\playertype}{Nano}
diff --git a/manual/platform/ipodvideo.tex b/manual/platform/ipodvideo.tex
index 6597e1934a..f297c493a1 100644
--- a/manual/platform/ipodvideo.tex
+++ b/manual/platform/ipodvideo.tex
@@ -5,6 +5,7 @@
 \edef\UseOption{\UseOption,SWCODEC}
 \edef\UseOption{\UseOption,IPOD_4G_PAD}
 \edef\UseOption{\UseOption,HAVE_LCD_COLOR}
+\edef\UseOption{\UseOption,ipod}
 
 \newcommand{\playerman}{Ipod}
 \newcommand{\playertype}{Video}
diff --git a/manual/platform/ondiofm.tex b/manual/platform/ondiofm.tex
index 917fb4da62..c126a45951 100644
--- a/manual/platform/ondiofm.tex
+++ b/manual/platform/ondiofm.tex
@@ -8,10 +8,11 @@
 \edef\UseOption{\UseOption,CONFIG_TUNER}
 \edef\UseOption{\UseOption,MASCODEC}
 \edef\UseOption{\UseOption,ONDIO_PAD}
+\edef\UseOption{\UseOption,archos}
 
 \newcommand{\playerman}{Archos}
 \newcommand{\playertype}{Ondio}
-\newcommand{\playerlongtype}{Ondio FM}
+\newcommand{\playerlongtype}{Ondio 128 FM}
 \newcommand{\genericimg}{112x64x1}
 \newcommand{\specimg}{ondiofm}
 %Used to name the player, e.g. ...to the \dap
diff --git a/manual/platform/ondiosp.tex b/manual/platform/ondiosp.tex
index be1f2ec15f..67c96de83f 100644
--- a/manual/platform/ondiosp.tex
+++ b/manual/platform/ondiosp.tex
@@ -5,10 +5,11 @@
 \edef\UseOption{\UseOption,HAVE_LCD_BITMAP}
 \edef\UseOption{\UseOption,MASCODEC}
 \edef\UseOption{\UseOption,ONDIO_PAD}
+\edef\UseOption{\UseOption,archos}
 
 \newcommand{\playerman}{Archos}
 \newcommand{\playertype}{Ondio}
-\newcommand{\playerlongtype}{Ondio SP}
+\newcommand{\playerlongtype}{Ondio 128 SP}
 \newcommand{\genericimg}{112x64x1}
 \newcommand{\specimg}{ondiosp}
 %Used to name the player, e.g. ...to the \dap
diff --git a/manual/platform/player.tex b/manual/platform/player.tex
index 6357191b13..a0aaff7f65 100644
--- a/manual/platform/player.tex
+++ b/manual/platform/player.tex
@@ -2,6 +2,7 @@
 \def\UseOption{player}
 \edef\UseOption{\UseOption,MASCODEC}
 \edef\UseOption{\UseOption,PLAYER_PAD}
+\edef\UseOption{\UseOption,archos}
 
 \newcommand{\playerman}{Archos}
 \newcommand{\playertype}{Studio/Player}
diff --git a/manual/platform/recorder.tex b/manual/platform/recorder.tex
index 6a514e72eb..e8c196820e 100644
--- a/manual/platform/recorder.tex
+++ b/manual/platform/recorder.tex
@@ -5,6 +5,7 @@
 \edef\UseOption{\UseOption,CONFIG_RTC}
 \edef\UseOption{\UseOption,MASCODEC}
 \edef\UseOption{\UseOption,RECORDER_PAD}
+\edef\UseOption{\UseOption,archos}
 
 \newcommand{\playerman}{Archos}
 \newcommand{\playertype}{Recorder}
diff --git a/manual/platform/recorderv2fm.tex b/manual/platform/recorderv2fm.tex
index cd2cd759be..fc1b0f4b99 100644
--- a/manual/platform/recorderv2fm.tex
+++ b/manual/platform/recorderv2fm.tex
@@ -6,10 +6,11 @@
 \edef\UseOption{\UseOption,CONFIG_RTC}
 \edef\UseOption{\UseOption,MASCODEC}
 \edef\UseOption{\UseOption,RECORDER_PAD}
+\edef\UseOption{\UseOption,archos}
 
 \newcommand{\playerman}{Archos}
 \newcommand{\playertype}{Recorder V2/FM}
-\newcommand{\playertypelong}{Recorder V2 and FM Recorder}
+\newcommand{\playerlongtype}{Recorder V2 and FM}
 \newcommand{\genericimg}{112x64x1}
 \newcommand{\specimg}{recorderv2fm}
 %Used to name the player, e.g. ...to the \dap
diff --git a/manual/platform/x5.tex b/manual/platform/x5.tex
index 3c84b6df0b..4f6ccf5fc7 100644
--- a/manual/platform/x5.tex
+++ b/manual/platform/x5.tex
@@ -7,10 +7,11 @@
 \edef\UseOption{\UseOption,SWCODEC}
 \edef\UseOption{\UseOption,IAUDIO_X5_PAD}
 \edef\UseOption{\UseOption,HAVE_LCD_COLOR}
+\edef\UseOption{\UseOption,archos}
 
 \newcommand{\playerman}{Iaudio}
 \newcommand{\playertype}{X5}
-\newcommand{\playerlongtype}{\playerman\ \playertype}
+\newcommand{\playerlongtype}{\playertype}
 \newcommand{\genericimg}{160x128x16}
 \newcommand{\specimg}{x5}
 %Used to name the player, e.g. ...to the \dap
diff --git a/manual/preamble.tex b/manual/preamble.tex
index bf4f3ec705..69cf5aa244 100644
--- a/manual/preamble.tex
+++ b/manual/preamble.tex
@@ -15,7 +15,7 @@
 
 \input{platform/\platform.tex}
 
-\newcommand{\playername}{\playerman\ \playertype}
+\newcommand{\playername}{\playerman\ \playerlongtype}
 
 \hypersetup{% add some values to the pdf properties
   colorlinks = true,
diff --git a/manual/rockbox_interface/images/ondiofm-front.png b/manual/rockbox_interface/images/ondiofm-front.png
new file mode 100644
index 0000000000..fc96e7d080
--- /dev/null
+++ b/manual/rockbox_interface/images/ondiofm-front.png
diff --git a/manual/rockbox_interface/images/ondio-front.png b/manual/rockbox_interface/images/ondiosp-front.png
index 6e8f988c1a..6e8f988c1a 100644
--- a/manual/rockbox_interface/images/ondio-front.png
+++ b/manual/rockbox_interface/images/ondiosp-front.png
diff --git a/manual/rockbox_interface/main.tex b/manual/rockbox_interface/main.tex
index 45ea1cdfb2..d3eb71261b 100644
--- a/manual/rockbox_interface/main.tex
+++ b/manual/rockbox_interface/main.tex
@@ -4,7 +4,8 @@
 \begin{center}
   \opt{player}{\includegraphics[height=11.8cm]{rockbox_interface/images/player-front.png}}
   \opt{recorder,recorderv2fm}{\includegraphics[height=11.8cm]{rockbox_interface/images/recorderv2fm-front.png}}
-  \opt{ondio}{\includegraphics[height=11.8cm]{rockbox_interface/images/ondio-front.png}}
+  \opt{ondiosp}{\includegraphics[height=11.8cm]{rockbox_interface/images/ondiosp-front.png}}
+  \opt{ondiofm}{\includegraphics[height=11.8cm]{rockbox_interface/images/ondiofm-front.png}}
   \opt{h1xx}{\includegraphics[height=11.8cm]{rockbox_interface/images/h1xx-front.png}}
   \opt{h300}{\includegraphics[height=11.8cm]{rockbox_interface/images/h300-front.jpg}}
 \end{center}