Reverted r23881 mistakenly committed to branch.v3.4

git-svn-id: svn://svn.rockbox.org/rockbox/branches/v3_4@23882 a1c6a512-1295-4272-9138-f99709370657

39 files changed, 182 insertions, 182 deletions

diff --git a/manual/platform/sansac200.tex b/manual/platform/c200.tex
index 732faded82..0c7473ee18 100644
--- a/manual/platform/sansac200.tex
+++ b/manual/platform/c200.tex
@@ -1,5 +1,5 @@
 % $Id$ %
-\def\UseOption{sansac200}
+\def\UseOption{c200}
 \edef\UseOption{\UseOption,HAVE_RB_BL_ON_DISK}
 \edef\UseOption{\UseOption,SANSA_C200_PAD}
 \edef\UseOption{\UseOption,HAVE_BACKLIGHT}
@@ -7,15 +7,15 @@
 \edef\UseOption{\UseOption,HAVE_BUTTON_LIGHTS}
 \edef\UseOption{\UseOption,sansa}
 
-\newcommand{\archosplayerman}{Sansa}
-\newcommand{\archosplayertype}{sansac200 Series}
-\newcommand{\archosplayerlongtype}{\archosplayertype}
+\newcommand{\playerman}{Sansa}
+\newcommand{\playertype}{c200 Series}
+\newcommand{\playerlongtype}{\playertype}
 \newcommand{\genericimg}{132x80x16}
-\newcommand{\specimg}{sansac200}
+\newcommand{\specimg}{c200}
 %Used to name the player, e.g. ...to the \dap
-\newcommand{\dap}{archosplayer}
+\newcommand{\dap}{player}
 %For use when referring to the player. E.g. the \daps\ capacity ...
-\newcommand{\daps}{archosplayer's}
+\newcommand{\daps}{player's}
 \newcommand{\firmwarefilename}{\fname{rockbox.mi4}}
 \newcommand{\firmwareextension}{\fname{mi4}}
 \newcommand{\screenshotsize}{4cm}
diff --git a/manual/platform/sansaclip.tex b/manual/platform/clip.tex
index 0ac35127e4..c6811b6316 100644
--- a/manual/platform/sansaclip.tex
+++ b/manual/platform/clip.tex
@@ -1,20 +1,20 @@
 % Id: %
-\def\UseOption{sansaclip}
+\def\UseOption{clip}
 \edef\UseOption{\UseOption,SANSA_CLIP_PAD}
 \edef\UseOption{\UseOption,HAVE_BACKLIGHT}
 \edef\UseOption{\UseOption,HAVE_CAR_ADAPTER_MODE}
 \edef\UseOption{\UseOption,HAVE_BUTTON_LIGHTS}
 \edef\UseOption{\UseOption,sansaAMS}
 
-\newcommand{\archosplayerman}{Sansa}
-\newcommand{\archosplayertype}{Clip}
-\newcommand{\archosplayerlongtype}{\archosplayertype}
+\newcommand{\playerman}{Sansa}
+\newcommand{\playertype}{Clip}
+\newcommand{\playerlongtype}{\playertype}
 \newcommand{\genericimg}{128x64x1-clip}
-\newcommand{\specimg}{sansaclip}
+\newcommand{\specimg}{clip}
 %Used to name the player, e.g. ...to the \dap
-\newcommand{\dap}{archosplayer}
+\newcommand{\dap}{player}
 %For use when referring to the player. E.g. the \daps\ capacity...
-\newcommand{\daps}{archosplayer's}
+\newcommand{\daps}{player's}
 \newcommand{\firmwarefilename}{\fname{rockbox.sansa}}
 \newcommand{\firmwareextension}{\fname{sansa}}
 \newcommand{\screenshotsize}{3cm}
diff --git a/manual/platform/sansae200.tex b/manual/platform/e200.tex
index 821346e39d..d20d34f2d7 100644
--- a/manual/platform/sansae200.tex
+++ b/manual/platform/e200.tex
@@ -1,5 +1,5 @@
 % $Id$ %
-\def\UseOption{sansae200}
+\def\UseOption{e200}
 \edef\UseOption{\UseOption,HAVE_RB_BL_ON_DISK}
 \edef\UseOption{\UseOption,SANSA_E200_PAD}
 \edef\UseOption{\UseOption,HAVE_BACKLIGHT}
@@ -7,15 +7,15 @@
 \edef\UseOption{\UseOption,HAVE_BUTTON_LIGHTS}
 \edef\UseOption{\UseOption,sansa}
 
-\newcommand{\archosplayerman}{Sansa}
-\newcommand{\archosplayertype}{sansae200 and e200R Series}
-\newcommand{\archosplayerlongtype}{\archosplayertype}
+\newcommand{\playerman}{Sansa}
+\newcommand{\playertype}{e200 and e200R Series}
+\newcommand{\playerlongtype}{\playertype}
 \newcommand{\genericimg}{176x220x16}
-\newcommand{\specimg}{sansae200}
+\newcommand{\specimg}{e200}
 %Used to name the player, e.g. ...to the \dap
-\newcommand{\dap}{archosplayer}
+\newcommand{\dap}{player}
 %For use when referring to the player. E.g. the \daps\ capacity ...
-\newcommand{\daps}{archosplayer's}
+\newcommand{\daps}{player's}
 \newcommand{\firmwarefilename}{\fname{rockbox.mi4}}
 \newcommand{\firmwareextension}{\fname{mi4}}
 \newcommand{\screenshotsize}{4cm}
diff --git a/manual/platform/sansafuze.tex b/manual/platform/fuze.tex
index e00939f94e..887d62ea89 100644
--- a/manual/platform/sansafuze.tex
+++ b/manual/platform/fuze.tex
@@ -1,20 +1,20 @@
 % $Id$ %
-\def\UseOption{sansafuze}
+\def\UseOption{fuze}
 \edef\UseOption{\UseOption,SANSA_FUZE_PAD}
 \edef\UseOption{\UseOption,HAVE_BACKLIGHT}
 \edef\UseOption{\UseOption,HAVE_CAR_ADAPTER_MODE}
 \edef\UseOption{\UseOption,HAVE_BUTTON_LIGHTS}
 \edef\UseOption{\UseOption,sansaAMS}
 
-\newcommand{\archosplayerman}{Sansa}
-\newcommand{\archosplayertype}{Fuze}
-\newcommand{\archosplayerlongtype}{\archosplayertype}
+\newcommand{\playerman}{Sansa}
+\newcommand{\playertype}{Fuze}
+\newcommand{\playerlongtype}{\playertype}
 \newcommand{\genericimg}{220x176x16}
-\newcommand{\specimg}{sansafuze}
+\newcommand{\specimg}{fuze}
 %Used to name the player, e.g. ...to the \dap
-\newcommand{\dap}{archosplayer}
+\newcommand{\dap}{player}
 %For use when referring to the player. E.g. the \daps\ capacity ...
-\newcommand{\daps}{archosplayer's}
+\newcommand{\daps}{player's}
 \newcommand{\firmwarefilename}{\fname{rockbox.sansa}}
 \newcommand{\firmwareextension}{\fname{sansa}}
 \newcommand{\screenshotsize}{4cm}
diff --git a/manual/platform/gigabeatfx.tex b/manual/platform/gigabeatf.tex
index b1803f02b8..e49f1593c8 100644
--- a/manual/platform/gigabeatfx.tex
+++ b/manual/platform/gigabeatf.tex
@@ -1,5 +1,5 @@
 % $Id$ %
-\def\UseOption{gigabeatfx}
+\def\UseOption{gigabeatf}
 \edef\UseOption{\UseOption,HAVE_RB_BL_ON_DISK}
 \edef\UseOption{\UseOption,GIGABEAT_PAD}
 \edef\UseOption{\UseOption,HAVE_BACKLIGHT}
@@ -10,20 +10,20 @@
 \edef\UseOption{\UseOption,GIGABEAT_RC_PAD}
 \edef\UseOption{\UseOption,HAVEREMOTEKEYMAP}
 
-\newcommand{\archosplayerman}{Toshiba}
-\newcommand{\archosplayertype}{Gigabeat F and X Series}
-\newcommand{\archosplayerlongtype}{\archosplayertype}
+\newcommand{\playerman}{Toshiba}
+\newcommand{\playertype}{Gigabeat F and X Series}
+\newcommand{\playerlongtype}{\playertype}
 \newcommand{\genericimg}{240x320x16}
-\newcommand{\specimg}{gigabeatfx}
+\newcommand{\specimg}{gigabeatf}
 %Used to name the player, e.g. ...to the \dap
-\newcommand{\dap}{archosplayer}
+\newcommand{\dap}{player}
 %For use when referring to the player. E.g. the \daps\ capacity ...
-\newcommand{\daps}{archosplayer's}
+\newcommand{\daps}{player's}
 \newcommand{\firmwarefilename}{\fname{rockbox.gigabeat}}
 \newcommand{\firmwareextension}{\fname{gigabeat}}
 \newcommand{\screenshotsize}{6cm}
 \newcommand{\disk}{hard disk}
 
 % link external keymap file
-\input{platform/keymap-gigabeatfx.tex}
+\input{platform/keymap-gigabeatf.tex}
 \input{platform/remote-keymap-gigabeat.tex}
diff --git a/manual/platform/gigabeats.tex b/manual/platform/gigabeats.tex
index 664bf85fb1..920eb1789f 100644
--- a/manual/platform/gigabeats.tex
+++ b/manual/platform/gigabeats.tex
@@ -9,15 +9,15 @@
 \edef\UseOption{\UseOption,GIGABEAT_RC_PAD}
 \edef\UseOption{\UseOption,HAVEREMOTEKEYMAP}
 
-\newcommand{\archosplayerman}{Toshiba}
-\newcommand{\archosplayertype}{Gigabeat S Series}
-\newcommand{\archosplayerlongtype}{\archosplayertype}
+\newcommand{\playerman}{Toshiba}
+\newcommand{\playertype}{Gigabeat S Series}
+\newcommand{\playerlongtype}{\playertype}
 \newcommand{\genericimg}{240x320x16}
 \newcommand{\specimg}{gigabeats}
 %Used to name the player, e.g. ...to the \dap
-\newcommand{\dap}{archosplayer}
+\newcommand{\dap}{player}
 %For use when referring to the player. E.g. the \daps\ capacity ...
-\newcommand{\daps}{archosplayer's}
+\newcommand{\daps}{player's}
 \newcommand{\firmwarefilename}{\fname{rockbox.gigabeat}}
 \newcommand{\firmwareextension}{\fname{gigabeat}}
 \newcommand{\screenshotsize}{6cm}
diff --git a/manual/platform/iriverh10.tex b/manual/platform/h10.tex
index d810ac42d5..4b99b1ba51 100644
--- a/manual/platform/iriverh10.tex
+++ b/manual/platform/h10.tex
@@ -1,5 +1,5 @@
 % $Id$ %
-\def\UseOption{iriverh10}
+\def\UseOption{h10}
 \edef\UseOption{\UseOption,HAVE_RB_BL_ON_DISK}
 \edef\UseOption{\UseOption,IRIVER_H10_PAD}
 \edef\UseOption{\UseOption,HAVE_BACKLIGHT}
@@ -7,19 +7,19 @@
 \edef\UseOption{\UseOption,HAVE_CAR_ADAPTER_MODE}
 \edef\UseOption{\UseOption,iriver}
 
-\newcommand{\archosplayerman}{Iriver}
-\newcommand{\archosplayertype}{H10}
-\newcommand{\archosplayerlongtype}{\archosplayertype{} 20GB}
+\newcommand{\playerman}{Iriver}
+\newcommand{\playertype}{H10}
+\newcommand{\playerlongtype}{\playertype{} 20GB}
 \newcommand{\genericimg}{160x128x16}
-\newcommand{\specimg}{iriverh10}
+\newcommand{\specimg}{h10}
 %Used to name the player, e.g. ...to the \dap
-\newcommand{\dap}{archosplayer}
+\newcommand{\dap}{player}
 %For use when referring to the player. E.g. the \daps\ capacity ...
-\newcommand{\daps}{archosplayer's}
+\newcommand{\daps}{player's}
 \newcommand{\firmwarefilename}{\fname{rockbox.mi4}}
 \newcommand{\firmwareextension}{\fname{mi4}}
 \newcommand{\screenshotsize}{4cm}
 \newcommand{\disk}{hard disk}
 
 % link external keymap file
-\input{platform/keymap-iriverh10.tex}
+\input{platform/keymap-h10.tex}
diff --git a/manual/platform/iriverh100.tex b/manual/platform/h100.tex
index 96f9e00d8b..19e4ef0677 100644
--- a/manual/platform/iriverh100.tex
+++ b/manual/platform/h100.tex
@@ -1,5 +1,5 @@
 % $Id$ %
-\def\UseOption{iriverh100}
+\def\UseOption{h100}
 \edef\UseOption{\UseOption,HAVE_RB_BL_IN_FLASH}
 \edef\UseOption{\UseOption,IRIVER_H100_PAD}
 \edef\UseOption{\UseOption,HAVE_REMOTE_LCD}
@@ -10,21 +10,21 @@
 \edef\UseOption{\UseOption,IRIVER_RC_H100_PAD}
 \edef\UseOption{\UseOption,HAVEREMOTEKEYMAP}
 
-\newcommand{\archosplayerman}{Iriver}
-\newcommand{\archosplayertype}{H100}
-\newcommand{\archosplayerlongtype}{iHP100, iHP115, iHP120, iHP140, H120 and H140}
+\newcommand{\playerman}{Iriver}
+\newcommand{\playertype}{H100}
+\newcommand{\playerlongtype}{iHP100, iHP115, iHP120, iHP140, H120 and H140}
 \newcommand{\genericimg}{160x128x2}
-\newcommand{\specimg}{iriverh100}
+\newcommand{\specimg}{h100}
 %Used to name the player, e.g. ...to the \dap
-\newcommand{\dap}{archosplayer}
+\newcommand{\dap}{player}
 %For use when referring to the player. E.g. the \daps\ capacity ...
-\newcommand{\daps}{archosplayer's}
+\newcommand{\daps}{player's}
 \newcommand{\firmwarefilename}{\fname{rockbox.iriver}}
 \newcommand{\firmwareextension}{\fname{iriver}}
 \newcommand{\screenshotsize}{4cm}
 \newcommand{\disk}{hard disk}
 
 % link external keymap file
-\input{platform/keymap-iriverh100_h300.tex}
-\input{platform/remote-keymap-iriverh100.tex}
+\input{platform/keymap-h100_h300.tex}
+\input{platform/remote-keymap-h100.tex}
 
diff --git a/manual/platform/iriverh10_5gb.tex b/manual/platform/h10_5gb.tex
index 37bfb8d22c..d89e1eabcd 100644
--- a/manual/platform/iriverh10_5gb.tex
+++ b/manual/platform/h10_5gb.tex
@@ -1,5 +1,5 @@
 % $Id$ %
-\def\UseOption{iriverh10_5gb}
+\def\UseOption{h10_5gb}
 \edef\UseOption{\UseOption,HAVE_RB_BL_ON_DISK}
 \edef\UseOption{\UseOption,IRIVER_H10_PAD}
 \edef\UseOption{\UseOption,HAVE_BACKLIGHT}
@@ -7,19 +7,19 @@
 \edef\UseOption{\UseOption,HAVE_CAR_ADAPTER_MODE}
 \edef\UseOption{\UseOption,iriver}
 
-\newcommand{\archosplayerman}{Iriver}
-\newcommand{\archosplayertype}{H10}
-\newcommand{\archosplayerlongtype}{\archosplayertype{} 5GB and 6GB}
+\newcommand{\playerman}{Iriver}
+\newcommand{\playertype}{H10}
+\newcommand{\playerlongtype}{\playertype{} 5GB and 6GB}
 \newcommand{\genericimg}{128x128x16}
-\newcommand{\specimg}{iriverh10_5gb}
+\newcommand{\specimg}{h10_5gb}
 %Used to name the player, e.g. ...to the \dap
-\newcommand{\dap}{archosplayer}
+\newcommand{\dap}{player}
 %For use when referring to the player. E.g. the \daps\ capacity ...
-\newcommand{\daps}{archosplayer's}
+\newcommand{\daps}{player's}
 \newcommand{\firmwarefilename}{\fname{rockbox.mi4}}
 \newcommand{\firmwareextension}{\fname{mi4}}
 \newcommand{\screenshotsize}{4cm}
 \newcommand{\disk}{hard disk}
 
 % link external keymap file
-\input{platform/keymap-iriverh10.tex}
+\input{platform/keymap-h10.tex}
diff --git a/manual/platform/iriverh300.tex b/manual/platform/h300.tex
index 00370b2887..211bc1a9b0 100644
--- a/manual/platform/iriverh300.tex
+++ b/manual/platform/h300.tex
@@ -1,5 +1,5 @@
 % $Id$ %
-\def\UseOption{iriverh300}
+\def\UseOption{h300}
 \edef\UseOption{\UseOption,HAVE_RB_BL_IN_FLASH}
 \edef\UseOption{\UseOption,IRIVER_H300_PAD}
 \edef\UseOption{\UseOption,HAVE_REMOTE_LCD}
@@ -8,20 +8,20 @@
 \edef\UseOption{\UseOption,HAVE_DISK_STORAGE}
 \edef\UseOption{\UseOption,iriver}
 
-\newcommand{\archosplayerman}{Iriver}
-\newcommand{\archosplayertype}{H3xx}
-\newcommand{\archosplayerlongtype}{H320 and H340}
+\newcommand{\playerman}{Iriver}
+\newcommand{\playertype}{H3xx}
+\newcommand{\playerlongtype}{H320 and H340}
 \newcommand{\genericimg}{220x176x16}
-\newcommand{\specimg}{iriverh300}
+\newcommand{\specimg}{h300}
 %Used to name the player, e.g. ...to the \dap
-\newcommand{\dap}{archosplayer}
+\newcommand{\dap}{player}
 %For use when referring to the player. E.g. the \daps\ capacity ...
-\newcommand{\daps}{archosplayer's}
+\newcommand{\daps}{player's}
 \newcommand{\firmwarefilename}{\fname{rockbox.iriver}}
 \newcommand{\firmwareextension}{\fname{iriver}}
 \newcommand{\screenshotsize}{6cm}
 \newcommand{\disk}{hard disk}
 
 % link external keymap file
-\input{platform/keymap-iriverh100_h300.tex}
+\input{platform/keymap-h100_h300.tex}
 
diff --git a/manual/platform/ipod1g2g.tex b/manual/platform/ipod1g2g.tex
index 884834344d..28679a5025 100644
--- a/manual/platform/ipod1g2g.tex
+++ b/manual/platform/ipod1g2g.tex
@@ -6,15 +6,15 @@
 \edef\UseOption{\UseOption,HAVE_DISK_STORAGE}
 \edef\UseOption{\UseOption,ipod}
 
-\newcommand{\archosplayerman}{Ipod}
-\newcommand{\archosplayertype}{1G / 2G}
-\newcommand{\archosplayerlongtype}{\archosplayertype}
+\newcommand{\playerman}{Ipod}
+\newcommand{\playertype}{1G / 2G}
+\newcommand{\playerlongtype}{\playertype}
 \newcommand{\genericimg}{160x128x2}
 \newcommand{\specimg}{ipod1g2g}
 %Used to name the player, e.g. ...to the \dap
-\newcommand{\dap}{archosplayer}
+\newcommand{\dap}{player}
 %For use when referring to the player. E.g. the \daps\ capacity ...
-\newcommand{\daps}{archosplayer's}
+\newcommand{\daps}{player's}
 \newcommand{\firmwarefilename}{\fname{rockbox.ipod}}
 \newcommand{\firmwareextension}{\fname{ipod}}
 \newcommand{\screenshotsize}{4cm}
diff --git a/manual/platform/ipod3g.tex b/manual/platform/ipod3g.tex
index 2ca6e60053..21ca69adbb 100644
--- a/manual/platform/ipod3g.tex
+++ b/manual/platform/ipod3g.tex
@@ -6,15 +6,15 @@
 \edef\UseOption{\UseOption,HAVE_DISK_STORAGE}
 \edef\UseOption{\UseOption,ipod}
 
-\newcommand{\archosplayerman}{Ipod}
-\newcommand{\archosplayertype}{3G}
-\newcommand{\archosplayerlongtype}{\archosplayertype}
+\newcommand{\playerman}{Ipod}
+\newcommand{\playertype}{3G}
+\newcommand{\playerlongtype}{\playertype}
 \newcommand{\genericimg}{160x128x2}
 \newcommand{\specimg}{ipod3g}
 %Used to name the player, e.g. ...to the \dap
-\newcommand{\dap}{archosplayer}
+\newcommand{\dap}{player}
 %For use when referring to the player. E.g. the \daps\ capacity ...
-\newcommand{\daps}{archosplayer's}
+\newcommand{\daps}{player's}
 \newcommand{\firmwarefilename}{\fname{rockbox.ipod}}
 \newcommand{\firmwareextension}{\fname{ipod}}
 \newcommand{\screenshotsize}{4cm}
diff --git a/manual/platform/ipod4g.tex b/manual/platform/ipod4g.tex
index 72ab509239..06483fa6e2 100644
--- a/manual/platform/ipod4g.tex
+++ b/manual/platform/ipod4g.tex
@@ -6,15 +6,15 @@
 \edef\UseOption{\UseOption,HAVE_DISK_STORAGE}
 \edef\UseOption{\UseOption,ipod}
 
-\newcommand{\archosplayerman}{Ipod}
-\newcommand{\archosplayertype}{4G}
-\newcommand{\archosplayerlongtype}{\archosplayertype}
+\newcommand{\playerman}{Ipod}
+\newcommand{\playertype}{4G}
+\newcommand{\playerlongtype}{\playertype}
 \newcommand{\genericimg}{160x128x2}
 \newcommand{\specimg}{ipod4g}
 %Used to name the player, e.g. ...to the \dap
-\newcommand{\dap}{archosplayer}
+\newcommand{\dap}{player}
 %For use when referring to the player. E.g. the \daps\ capacity ...
-\newcommand{\daps}{archosplayer's}
+\newcommand{\daps}{player's}
 \newcommand{\firmwarefilename}{\fname{rockbox.ipod}}
 \newcommand{\firmwareextension}{\fname{ipod}}
 \newcommand{\screenshotsize}{4cm}
diff --git a/manual/platform/ipodcolor.tex b/manual/platform/ipodcolor.tex
index dd9755114d..04dc457a81 100644
--- a/manual/platform/ipodcolor.tex
+++ b/manual/platform/ipodcolor.tex
@@ -6,15 +6,15 @@
 \edef\UseOption{\UseOption,HAVE_DISK_STORAGE}
 \edef\UseOption{\UseOption,ipod}
 
-\newcommand{\archosplayerman}{Ipod}
-\newcommand{\archosplayertype}{Color}
-\newcommand{\archosplayerlongtype}{\archosplayertype}
+\newcommand{\playerman}{Ipod}
+\newcommand{\playertype}{Color}
+\newcommand{\playerlongtype}{\playertype}
 \newcommand{\genericimg}{220x176x16}
 \newcommand{\specimg}{ipodcolor}
 %Used to name the player, e.g. ...to the \dap
-\newcommand{\dap}{archosplayer}
+\newcommand{\dap}{player}
 %For use when referring to the player. E.g. the \daps\ capacity ...
-\newcommand{\daps}{archosplayer's}
+\newcommand{\daps}{player's}
 \newcommand{\firmwarefilename}{\fname{rockbox.ipod}}
 \newcommand{\firmwareextension}{\fname{ipod}}
 \newcommand{\screenshotsize}{6cm}
diff --git a/manual/platform/ipodmini1g.tex b/manual/platform/ipodmini.tex
index f9f8673048..7671a4fb1a 100644
--- a/manual/platform/ipodmini1g.tex
+++ b/manual/platform/ipodmini.tex
@@ -1,20 +1,20 @@
 % $Id$ %
-\def\UseOption{ipodmini1g}
+\def\UseOption{ipodmini}
 \edef\UseOption{\UseOption,HAVE_RB_BL_ON_DISK}
 \edef\UseOption{\UseOption,IPOD_4G_PAD}
 \edef\UseOption{\UseOption,HAVE_BACKLIGHT}
 \edef\UseOption{\UseOption,HAVE_DISK_STORAGE}
 \edef\UseOption{\UseOption,ipod}
 
-\newcommand{\archosplayerman}{Ipod}
-\newcommand{\archosplayertype}{Mini}
-\newcommand{\archosplayerlongtype}{\archosplayertype}
+\newcommand{\playerman}{Ipod}
+\newcommand{\playertype}{Mini}
+\newcommand{\playerlongtype}{\playertype}
 \newcommand{\genericimg}{138x110x2}
-\newcommand{\specimg}{ipodmini1g}
+\newcommand{\specimg}{ipodmini}
 %Used to name the player, e.g. ...to the \dap
-\newcommand{\dap}{archosplayer}
+\newcommand{\dap}{player}
 %For use when referring to the player. E.g. the \daps\ capacity ...
-\newcommand{\daps}{archosplayer's}
+\newcommand{\daps}{player's}
 \newcommand{\firmwarefilename}{\fname{rockbox.ipod}}
 \newcommand{\firmwareextension}{\fname{ipod}}
 \newcommand{\screenshotsize}{4cm}
diff --git a/manual/platform/ipodnano1g.tex b/manual/platform/ipodnano.tex
index d5078ea9d6..974fe687ec 100644
--- a/manual/platform/ipodnano1g.tex
+++ b/manual/platform/ipodnano.tex
@@ -1,19 +1,19 @@
 % $Id$ %
-\def\UseOption{ipodnano1g}
+\def\UseOption{ipodnano}
 \edef\UseOption{\UseOption,HAVE_RB_BL_ON_DISK}
 \edef\UseOption{\UseOption,IPOD_4G_PAD}
 \edef\UseOption{\UseOption,HAVE_BACKLIGHT}
 \edef\UseOption{\UseOption,ipod}
 
-\newcommand{\archosplayerman}{Ipod}
-\newcommand{\archosplayertype}{Nano}
-\newcommand{\archosplayerlongtype}{\archosplayertype{} 1st generation}
+\newcommand{\playerman}{Ipod}
+\newcommand{\playertype}{Nano}
+\newcommand{\playerlongtype}{\playertype{} 1st generation}
 \newcommand{\genericimg}{176x132x16}
-\newcommand{\specimg}{ipodnano1g}
+\newcommand{\specimg}{ipodnano}
 %Used to name the player, e.g. ...to the \dap
-\newcommand{\dap}{archosplayer}
+\newcommand{\dap}{player}
 %For use when referring to the player. E.g. the \daps\ capacity ...
-\newcommand{\daps}{archosplayer's}
+\newcommand{\daps}{player's}
 \newcommand{\firmwarefilename}{\fname{rockbox.ipod}}
 \newcommand{\firmwareextension}{\fname{ipod}}
 \newcommand{\screenshotsize}{4cm}
diff --git a/manual/platform/ipodvideo.tex b/manual/platform/ipodvideo.tex
index 52d892c2d4..ff18551266 100644
--- a/manual/platform/ipodvideo.tex
+++ b/manual/platform/ipodvideo.tex
@@ -7,15 +7,15 @@
 \edef\UseOption{\UseOption,HAVE_CAR_ADAPTER_MODE}
 \edef\UseOption{\UseOption,ipod}
 
-\newcommand{\archosplayerman}{Ipod}
-\newcommand{\archosplayertype}{Video}
-\newcommand{\archosplayerlongtype}{\archosplayertype}
+\newcommand{\playerman}{Ipod}
+\newcommand{\playertype}{Video}
+\newcommand{\playerlongtype}{\playertype}
 \newcommand{\genericimg}{320x240x16}
 \newcommand{\specimg}{ipodvideo}
 %Used to name the player, e.g. ...to the \dap
-\newcommand{\dap}{archosplayer}
+\newcommand{\dap}{player}
 %For use when referring to the player. E.g. the \daps\ capacity ...
-\newcommand{\daps}{archosplayer's}
+\newcommand{\daps}{player's}
 \newcommand{\firmwarefilename}{\fname{rockbox.ipod}}
 \newcommand{\firmwareextension}{\fname{ipod}}
 \newcommand{\screenshotsize}{8cm}
diff --git a/manual/platform/keymap-sansac200.tex b/manual/platform/keymap-c200.tex
index 8fbed84de3..8fbed84de3 100644
--- a/manual/platform/keymap-sansac200.tex
+++ b/manual/platform/keymap-c200.tex
diff --git a/manual/platform/keymap-sansaclip.tex b/manual/platform/keymap-clip.tex
index 1ddc718e44..1ddc718e44 100644
--- a/manual/platform/keymap-sansaclip.tex
+++ b/manual/platform/keymap-clip.tex
diff --git a/manual/platform/keymap-sansae200.tex b/manual/platform/keymap-e200.tex
index ce2bc5a47a..ce2bc5a47a 100644
--- a/manual/platform/keymap-sansae200.tex
+++ b/manual/platform/keymap-e200.tex
diff --git a/manual/platform/keymap-sansafuze.tex b/manual/platform/keymap-fuze.tex
index 351db621b0..351db621b0 100644
--- a/manual/platform/keymap-sansafuze.tex
+++ b/manual/platform/keymap-fuze.tex
diff --git a/manual/platform/keymap-gigabeatfx.tex b/manual/platform/keymap-gigabeatf.tex
index 39d51b0dd5..39d51b0dd5 100644
--- a/manual/platform/keymap-gigabeatfx.tex
+++ b/manual/platform/keymap-gigabeatf.tex
diff --git a/manual/platform/keymap-iriverh10.tex b/manual/platform/keymap-h10.tex
index 364504fcd7..364504fcd7 100644
--- a/manual/platform/keymap-iriverh10.tex
+++ b/manual/platform/keymap-h10.tex
diff --git a/manual/platform/keymap-iriverh100_h300.tex b/manual/platform/keymap-h100_h300.tex
index 419dc0bfcf..419dc0bfcf 100644
--- a/manual/platform/keymap-iriverh100_h300.tex
+++ b/manual/platform/keymap-h100_h300.tex
diff --git a/manual/platform/keymap-iaudiom3.tex b/manual/platform/keymap-m3.tex
index 098422b21d..098422b21d 100644
--- a/manual/platform/keymap-iaudiom3.tex
+++ b/manual/platform/keymap-m3.tex
diff --git a/manual/platform/keymap-iaudiomx5.tex b/manual/platform/keymap-mx5.tex
index aea09f4496..aea09f4496 100644
--- a/manual/platform/keymap-iaudiomx5.tex
+++ b/manual/platform/keymap-mx5.tex
diff --git a/manual/platform/keymap-archosondio.tex b/manual/platform/keymap-ondio.tex
index dd0cf25061..dd0cf25061 100644
--- a/manual/platform/keymap-archosondio.tex
+++ b/manual/platform/keymap-ondio.tex
diff --git a/manual/platform/keymap-archosplayer.tex b/manual/platform/keymap-player.tex
index 651239b4d9..651239b4d9 100644
--- a/manual/platform/keymap-archosplayer.tex
+++ b/manual/platform/keymap-player.tex
diff --git a/manual/platform/keymap-archosrecorder.tex b/manual/platform/keymap-recorder.tex
index ac194a4422..ac194a4422 100644
--- a/manual/platform/keymap-archosrecorder.tex
+++ b/manual/platform/keymap-recorder.tex
diff --git a/manual/platform/iaudiom3.tex b/manual/platform/m3.tex
index 032c9007a0..bbdd255299 100644
--- a/manual/platform/iaudiom3.tex
+++ b/manual/platform/m3.tex
@@ -1,5 +1,5 @@
 % $Id$ %
-\def\UseOption{iaudiom3}
+\def\UseOption{m3}
 \edef\UseOption{\UseOption,HAVE_RB_BL_IN_FLASH}
 \edef\UseOption{\UseOption,IAUDIO_M3_PAD}
 \edef\UseOption{\UseOption,IAUDIO_RC_PAD}
@@ -8,19 +8,19 @@
 \edef\UseOption{\UseOption,iaudio}
 \edef\UseOption{\UseOption,HAVEREMOTEKEYMAP}
 
-\newcommand{\archosplayerman}{Iaudio}
-\newcommand{\archosplayertype}{M3}
-\newcommand{\archosplayerlongtype}{\archosplayertype}
+\newcommand{\playerman}{Iaudio}
+\newcommand{\playertype}{M3}
+\newcommand{\playerlongtype}{\playertype}
 \newcommand{\genericimg}{128x96x2}
-\newcommand{\specimg}{iaudiom3}
+\newcommand{\specimg}{m3}
 %Used to name the player, e.g. ...to the \dap
-\newcommand{\dap}{archosplayer}
+\newcommand{\dap}{player}
 %For use when referring to the player. E.g. the \daps\ capacity ...
-\newcommand{\daps}{archosplayer's}
+\newcommand{\daps}{player's}
 \newcommand{\firmwarefilename}{\fname{rockbox.iaudio}}
 \newcommand{\screenshotsize}{4cm}
 \newcommand{\disk}{hard disk}
 
 % link external keymap files
-\input{platform/keymap-iaudiom3.tex}
+\input{platform/keymap-m3.tex}
 \input{platform/remote-keymap-iaudio.tex}
diff --git a/manual/platform/iaudiom5.tex b/manual/platform/m5.tex
index 2dbcd06584..c7233b11f2 100644
--- a/manual/platform/iaudiom5.tex
+++ b/manual/platform/m5.tex
@@ -1,5 +1,5 @@
 % $Id$ %
-\def\UseOption{iaudiom5}
+\def\UseOption{m5}
 \edef\UseOption{\UseOption,HAVE_RB_BL_IN_FLASH}
 \edef\UseOption{\UseOption,IAUDIO_X5_PAD}
 \edef\UseOption{\UseOption,HAVE_REMOTE_LCD}
@@ -8,19 +8,19 @@
 \edef\UseOption{\UseOption,HAVE_CAR_ADAPTER_MODE}
 \edef\UseOption{\UseOption,iaudio}
 
-\newcommand{\archosplayerman}{Iaudio}
-\newcommand{\archosplayertype}{M5}
-\newcommand{\archosplayerlongtype}{\archosplayertype}
+\newcommand{\playerman}{Iaudio}
+\newcommand{\playertype}{M5}
+\newcommand{\playerlongtype}{\playertype}
 \newcommand{\genericimg}{160x128x2}
-\newcommand{\specimg}{iaudiom5}
+\newcommand{\specimg}{m5}
 %Used to name the player, e.g. ...to the \dap
-\newcommand{\dap}{archosplayer}
+\newcommand{\dap}{player}
 %For use when referring to the player. E.g. the \daps\ capacity ...
-\newcommand{\daps}{archosplayer's}
+\newcommand{\daps}{player's}
 \newcommand{\firmwarefilename}{\fname{rockbox.iaudio}}
 \newcommand{\firmwareextension}{\fname{iaudio}}
 \newcommand{\screenshotsize}{4cm}
 \newcommand{\disk}{hard disk}
 
 % link to external keymap file
-\input{platform/keymap-iaudiomx5.tex}
+\input{platform/keymap-mx5.tex}
diff --git a/manual/platform/mrobe100.tex b/manual/platform/mrobe100.tex
index 6a07a35f7a..ddac2fda67 100644
--- a/manual/platform/mrobe100.tex
+++ b/manual/platform/mrobe100.tex
@@ -7,15 +7,15 @@
 \edef\UseOption{\UseOption,HAVE_BUTTON_LIGHTS}
 \edef\UseOption{\UseOption,olympus}
 
-\newcommand{\archosplayerman}{Olympus}
-\newcommand{\archosplayertype}{m:robe 100}
-\newcommand{\archosplayerlongtype}{\archosplayertype}
+\newcommand{\playerman}{Olympus}
+\newcommand{\playertype}{m:robe 100}
+\newcommand{\playerlongtype}{\playertype}
 \newcommand{\genericimg}{160x128x1}
 \newcommand{\specimg}{mrobe100}
 %Used to name the player, e.g. ...to the \dap
-\newcommand{\dap}{archosplayer}
+\newcommand{\dap}{player}
 %For use when referring to the player. E.g. the \daps\ capacity ...
-\newcommand{\daps}{archosplayer's}
+\newcommand{\daps}{player's}
 \newcommand{\firmwarefilename}{\fname{rockbox.mi4}}
 \newcommand{\firmwareextension}{\fname{mi4}}
 \newcommand{\screenshotsize}{4cm}
diff --git a/manual/platform/archosondiofm.tex b/manual/platform/ondiofm.tex
index d78f1c53fa..c49a1363d7 100644
--- a/manual/platform/archosondiofm.tex
+++ b/manual/platform/ondiofm.tex
@@ -1,24 +1,24 @@
 % $Id$ %
 %platform file for the Ondio FM
-\def\UseOption{archosondiofm}
+\def\UseOption{ondiofm}
 % To not break the current manual
 \edef\UseOption{\UseOption,ondio}
 \edef\UseOption{\UseOption,ONDIO_PAD}
 \edef\UseOption{\UseOption,archos}
 
-\newcommand{\archosplayerman}{Archos}
-\newcommand{\archosplayertype}{Ondio}
-\newcommand{\archosplayerlongtype}{Ondio 128 FM}
+\newcommand{\playerman}{Archos}
+\newcommand{\playertype}{Ondio}
+\newcommand{\playerlongtype}{Ondio 128 FM}
 \newcommand{\genericimg}{112x64x1}
-\newcommand{\specimg}{archosondiofm}
+\newcommand{\specimg}{ondiofm}
 %Used to name the player, e.g. ...to the \dap
-\newcommand{\dap}{archosplayer}
+\newcommand{\dap}{player}
 %For use when referring to the player. E.g. the \daps\ capacity ...
-\newcommand{\daps}{archosplayer's}
+\newcommand{\daps}{player's}
 \newcommand{\firmwarefilename}{\fname{ajbrec.ajz}}
 \newcommand{\firmwareextension}{\fname{ajz}}
 \newcommand{\screenshotsize}{4cm}
 \newcommand{\disk}{flash storage}
 
 % link external keymap file
-\input{platform/keymap-archosondio.tex}
+\input{platform/keymap-ondio.tex}
diff --git a/manual/platform/archosondiosp.tex b/manual/platform/ondiosp.tex
index 9414d2ba72..43d74e76fd 100644
--- a/manual/platform/archosondiosp.tex
+++ b/manual/platform/ondiosp.tex
@@ -1,24 +1,24 @@
 % $Id$ %
 %platform file for the Ondio SP
-\def\UseOption{archosondiosp}
+\def\UseOption{ondiosp}
 \edef\UseOption{\UseOption,ondio}
 \edef\UseOption{\UseOption,ONDIO_PAD}
 \edef\UseOption{\UseOption,archos}
 \edef\UseOption{\UseOption,rombox}
 
-\newcommand{\archosplayerman}{Archos}
-\newcommand{\archosplayertype}{Ondio}
-\newcommand{\archosplayerlongtype}{Ondio 128 SP}
+\newcommand{\playerman}{Archos}
+\newcommand{\playertype}{Ondio}
+\newcommand{\playerlongtype}{Ondio 128 SP}
 \newcommand{\genericimg}{112x64x1}
-\newcommand{\specimg}{archosondiosp}
+\newcommand{\specimg}{ondiosp}
 %Used to name the player, e.g. ...to the \dap
-\newcommand{\dap}{archosplayer}
+\newcommand{\dap}{player}
 %For use when referring to the player. E.g. the \daps\ capacity ...
-\newcommand{\daps}{archosplayer's}
+\newcommand{\daps}{player's}
 \newcommand{\firmwarefilename}{\fname{ajbrec.ajz}}
 \newcommand{\firmwareextension}{\fname{ajz}}
 \newcommand{\screenshotsize}{4cm}
 \newcommand{\disk}{flash storage}
 
 % link external keymap file
-\input{platform/keymap-archosondio.tex}
+\input{platform/keymap-ondio.tex}
diff --git a/manual/platform/archosplayer.tex b/manual/platform/player.tex
index 8fcf375b42..eddd5eddfc 100644
--- a/manual/platform/archosplayer.tex
+++ b/manual/platform/player.tex
@@ -1,5 +1,5 @@
 % $Id$ %
-\def\UseOption{archosplayer}
+\def\UseOption{player}
 \edef\UseOption{\UseOption,PLAYER_PAD}
 \edef\UseOption{\UseOption,HAVE_BACKLIGHT}
 \edef\UseOption{\UseOption,HAVE_DISK_STORAGE}
@@ -7,19 +7,19 @@
 \edef\UseOption{\UseOption,archos}
 \edef\UseOption{\UseOption,rombox}
 
-\newcommand{\archosplayerman}{Archos}
-\newcommand{\archosplayertype}{Studio/Player}
-\newcommand{\archosplayerlongtype}{Jukebox 5000, 6000, Studio 10 and 20}
+\newcommand{\playerman}{Archos}
+\newcommand{\playertype}{Studio/Player}
+\newcommand{\playerlongtype}{Jukebox 5000, 6000, Studio 10 and 20}
 \newcommand{\genericimg}{charx11x1}
-\newcommand{\specimg}{archosplayer}
+\newcommand{\specimg}{player}
 %Used to name the player, e.g. ...to the \dap
-\newcommand{\dap}{archosplayer}
+\newcommand{\dap}{player}
 %For use when referring to the player. E.g. the \daps\ capacity ...
-\newcommand{\daps}{archosplayer's}
+\newcommand{\daps}{player's}
 \newcommand{\firmwarefilename}{\fname{archos.mod}}
 \newcommand{\firmwareextension}{\fname{mod}}
 \newcommand{\screenshotsize}{4cm}
 \newcommand{\disk}{hard disk}
 
 % link external keymap file
-\input{platform/keymap-archosplayer.tex}
+\input{platform/keymap-player.tex}
diff --git a/manual/platform/archosrecorder.tex b/manual/platform/recorder.tex
index 6897947de5..9eaf9091d8 100644
--- a/manual/platform/archosrecorder.tex
+++ b/manual/platform/recorder.tex
@@ -1,25 +1,25 @@
 % $Id$ %
-\def\UseOption{archosrecorder}
+\def\UseOption{recorder}
 \edef\UseOption{\UseOption,RECORDER_PAD}
 \edef\UseOption{\UseOption,HAVE_BACKLIGHT}
 \edef\UseOption{\UseOption,HAVE_DISK_STORAGE}
 \edef\UseOption{\UseOption,HAVE_CAR_ADAPTER_MODE}
 \edef\UseOption{\UseOption,archos}
 
-\newcommand{\archosplayerman}{Archos}
-\newcommand{\archosplayertype}{Recorder}
-\newcommand{\archosplayerlongtype}{Recorder 6, 10, 15 and 20}
+\newcommand{\playerman}{Archos}
+\newcommand{\playertype}{Recorder}
+\newcommand{\playerlongtype}{Recorder 6, 10, 15 and 20}
 \newcommand{\genericimg}{112x64x1}
 
-\newcommand{\specimg}{archosrecorder}
+\newcommand{\specimg}{recorder}
 %Used to name the player, e.g. ...to the \dap
-\newcommand{\dap}{archosplayer}
+\newcommand{\dap}{player}
 %For use when referring to the player. E.g. the \daps\ capacity ...
-\newcommand{\daps}{archosplayer's}
+\newcommand{\daps}{player's}
 \newcommand{\firmwarefilename}{\fname{ajbrec.ajz}}
 \newcommand{\firmwareextension}{\fname{ajz}}
 \newcommand{\screenshotsize}{4cm}
 \newcommand{\disk}{hard disk}
 
 % link external keymap file
-\input{platform/keymap-archosrecorder.tex}
+\input{platform/keymap-recorder.tex}
diff --git a/manual/platform/archosrecorderv2fm.tex b/manual/platform/recorderv2fm.tex
index 1fd9e78bed..99b829d8a5 100644
--- a/manual/platform/archosrecorderv2fm.tex
+++ b/manual/platform/recorderv2fm.tex
@@ -1,24 +1,24 @@
 % $Id$ %
-\def\UseOption{archosrecorderv2fm}
+\def\UseOption{recorderv2fm}
 \edef\UseOption{\UseOption,RECORDER_PAD}
 \edef\UseOption{\UseOption,HAVE_BACKLIGHT}
 \edef\UseOption{\UseOption,HAVE_DISK_STORAGE}
 \edef\UseOption{\UseOption,HAVE_CAR_ADAPTER_MODE}
 \edef\UseOption{\UseOption,archos}
 
-\newcommand{\archosplayerman}{Archos}
-\newcommand{\archosplayertype}{Recorder V2/FM}
-\newcommand{\archosplayerlongtype}{Recorder V2 and FM}
+\newcommand{\playerman}{Archos}
+\newcommand{\playertype}{Recorder V2/FM}
+\newcommand{\playerlongtype}{Recorder V2 and FM}
 \newcommand{\genericimg}{112x64x1}
-\newcommand{\specimg}{archosrecorderv2fm}
+\newcommand{\specimg}{recorderv2fm}
 %Used to name the player, e.g. ...to the \dap
-\newcommand{\dap}{archosplayer}
+\newcommand{\dap}{player}
 %For use when referring to the player. E.g. the \daps\ capacity ...
-\newcommand{\daps}{archosplayer's}
+\newcommand{\daps}{player's}
 \newcommand{\firmwarefilename}{\fname{ajbrec.ajz}}
 \newcommand{\firmwareextension}{\fname{ajz}}
 \newcommand{\screenshotsize}{4cm}
 \newcommand{\disk}{hard disk}
 
 % link external keymap file
-\input{platform/keymap-archosrecorder.tex}
+\input{platform/keymap-recorder.tex}
diff --git a/manual/platform/remote-keymap-iriverh100.tex b/manual/platform/remote-keymap-h100.tex
index cc0537047b..cc0537047b 100644
--- a/manual/platform/remote-keymap-iriverh100.tex
+++ b/manual/platform/remote-keymap-h100.tex
diff --git a/manual/platform/iaudiox5.tex b/manual/platform/x5.tex
index 9864a6ffec..df8473c602 100644
--- a/manual/platform/iaudiox5.tex
+++ b/manual/platform/x5.tex
@@ -1,5 +1,5 @@
 % $Id$ %
-\def\UseOption{iaudiox5}
+\def\UseOption{x5}
 \edef\UseOption{\UseOption,HAVE_RB_BL_IN_FLASH}
 \edef\UseOption{\UseOption,IAUDIO_X5_PAD}
 \edef\UseOption{\UseOption,HAVE_REMOTE_LCD}
@@ -8,19 +8,19 @@
 \edef\UseOption{\UseOption,HAVE_CAR_ADAPTER_MODE}
 \edef\UseOption{\UseOption,iaudio}
 
-\newcommand{\archosplayerman}{Iaudio}
-\newcommand{\archosplayertype}{X5}
-\newcommand{\archosplayerlongtype}{\archosplayertype}
+\newcommand{\playerman}{Iaudio}
+\newcommand{\playertype}{X5}
+\newcommand{\playerlongtype}{\playertype}
 \newcommand{\genericimg}{160x128x16}
-\newcommand{\specimg}{iaudiox5}
+\newcommand{\specimg}{x5}
 %Used to name the player, e.g. ...to the \dap
-\newcommand{\dap}{archosplayer}
+\newcommand{\dap}{player}
 %For use when referring to the player. E.g. the \daps\ capacity ...
-\newcommand{\daps}{archosplayer's}
+\newcommand{\daps}{player's}
 \newcommand{\firmwarefilename}{\fname{rockbox.iaudio}}
 \newcommand{\firmwareextension}{\fname{iaudio}}
 \newcommand{\screenshotsize}{4cm}
 \newcommand{\disk}{hard disk}
 
 % link external keymap file
-\input{platform/keymap-iaudiomx5.tex}
+\input{platform/keymap-mx5.tex}