summaryrefslogtreecommitdiff
path: root/manual
diff options
context:
space:
mode:
Diffstat (limited to 'manual')
-rw-r--r--manual/advanced_topics/archos-flashing.tex26
-rw-r--r--manual/advanced_topics/main.tex14
-rw-r--r--manual/appendix/appendix.tex2
-rw-r--r--manual/appendix/config_file_options.tex22
-rw-r--r--manual/appendix/file_formats.tex12
-rw-r--r--manual/appendix/wps_tags.tex12
-rw-r--r--manual/configure_rockbox/display_options.tex16
-rw-r--r--manual/configure_rockbox/recording_settings.tex14
-rw-r--r--manual/configure_rockbox/sound_settings.tex34
-rw-r--r--manual/configure_rockbox/system_options.tex28
-rw-r--r--manual/configure_rockbox/theme_settings.tex36
-rw-r--r--manual/frontpage/frontpage.tex2
-rw-r--r--manual/getting_started/gigabeat_install.tex2
-rw-r--r--manual/getting_started/gigabeats_install.tex6
-rw-r--r--manual/getting_started/h10_install.tex14
-rw-r--r--manual/getting_started/iaudio_install.tex12
-rw-r--r--manual/getting_started/installation.tex156
-rw-r--r--manual/getting_started/main.tex2
-rw-r--r--manual/getting_started/mrobe100_install.tex6
-rw-r--r--manual/getting_started/sansaAMS_install.tex2
-rw-r--r--manual/getting_started/sansa_install.tex4
-rw-r--r--manual/main_menu/main.tex6
-rw-r--r--manual/platform/c200.tex (renamed from manual/platform/sansac200.tex)14
-rw-r--r--manual/platform/clip.tex (renamed from manual/platform/sansaclip.tex)14
-rw-r--r--manual/platform/e200.tex (renamed from manual/platform/sansae200.tex)14
-rw-r--r--manual/platform/fuze.tex (renamed from manual/platform/sansafuze.tex)14
-rw-r--r--manual/platform/gigabeatf.tex (renamed from manual/platform/gigabeatfx.tex)16
-rw-r--r--manual/platform/gigabeats.tex10
-rw-r--r--manual/platform/h10.tex (renamed from manual/platform/iriverh10.tex)16
-rw-r--r--manual/platform/h100.tex (renamed from manual/platform/iriverh100.tex)18
-rw-r--r--manual/platform/h10_5gb.tex (renamed from manual/platform/iriverh10_5gb.tex)16
-rw-r--r--manual/platform/h300.tex (renamed from manual/platform/iriverh300.tex)16
-rw-r--r--manual/platform/ipod1g2g.tex10
-rw-r--r--manual/platform/ipod3g.tex10
-rw-r--r--manual/platform/ipod4g.tex10
-rw-r--r--manual/platform/ipodcolor.tex10
-rw-r--r--manual/platform/ipodmini.tex (renamed from manual/platform/ipodmini1g.tex)14
-rw-r--r--manual/platform/ipodnano.tex (renamed from manual/platform/ipodnano1g.tex)14
-rw-r--r--manual/platform/ipodvideo.tex10
-rw-r--r--manual/platform/keymap-c200.tex (renamed from manual/platform/keymap-sansac200.tex)0
-rw-r--r--manual/platform/keymap-clip.tex (renamed from manual/platform/keymap-sansaclip.tex)0
-rw-r--r--manual/platform/keymap-e200.tex (renamed from manual/platform/keymap-sansae200.tex)0
-rw-r--r--manual/platform/keymap-fuze.tex (renamed from manual/platform/keymap-sansafuze.tex)0
-rw-r--r--manual/platform/keymap-gigabeatf.tex (renamed from manual/platform/keymap-gigabeatfx.tex)0
-rw-r--r--manual/platform/keymap-h10.tex (renamed from manual/platform/keymap-iriverh10.tex)0
-rw-r--r--manual/platform/keymap-h100_h300.tex (renamed from manual/platform/keymap-iriverh100_h300.tex)0
-rw-r--r--manual/platform/keymap-m3.tex (renamed from manual/platform/keymap-iaudiom3.tex)0
-rw-r--r--manual/platform/keymap-mx5.tex (renamed from manual/platform/keymap-iaudiomx5.tex)0
-rw-r--r--manual/platform/keymap-ondio.tex (renamed from manual/platform/keymap-archosondio.tex)0
-rw-r--r--manual/platform/keymap-player.tex (renamed from manual/platform/keymap-archosplayer.tex)0
-rw-r--r--manual/platform/keymap-recorder.tex (renamed from manual/platform/keymap-archosrecorder.tex)0
-rw-r--r--manual/platform/m3.tex (renamed from manual/platform/iaudiom3.tex)16
-rw-r--r--manual/platform/m5.tex (renamed from manual/platform/iaudiom5.tex)16
-rw-r--r--manual/platform/mrobe100.tex10
-rw-r--r--manual/platform/ondiofm.tex (renamed from manual/platform/archosondiofm.tex)16
-rw-r--r--manual/platform/ondiosp.tex (renamed from manual/platform/archosondiosp.tex)16
-rw-r--r--manual/platform/player.tex (renamed from manual/platform/archosplayer.tex)16
-rw-r--r--manual/platform/recorder.tex (renamed from manual/platform/archosrecorder.tex)16
-rw-r--r--manual/platform/recorderv2fm.tex (renamed from manual/platform/archosrecorderv2fm.tex)16
-rw-r--r--manual/platform/remote-keymap-h100.tex (renamed from manual/platform/remote-keymap-iriverh100.tex)0
-rw-r--r--manual/platform/x5.tex (renamed from manual/platform/iaudiox5.tex)16
-rw-r--r--manual/plugins/chessbox.tex2
-rw-r--r--manual/plugins/main.tex24
-rw-r--r--manual/plugins/mandelbrot.tex2
-rw-r--r--manual/plugins/midiplay.tex2
-rw-r--r--manual/plugins/pacbox.tex16
-rw-r--r--manual/plugins/rockboy.tex4
-rw-r--r--manual/plugins/snow.tex2
-rw-r--r--manual/plugins/stats.tex2
-rw-r--r--manual/preamble.tex6
-rw-r--r--manual/rockbox_interface/browsing_and_playing.tex6
-rw-r--r--manual/rockbox_interface/main.tex54
-rw-r--r--manual/rockbox_interface/wps.tex4
73 files changed, 458 insertions, 458 deletions
diff --git a/manual/advanced_topics/archos-flashing.tex b/manual/advanced_topics/archos-flashing.tex
index a964444f5b..4f6c622cd4 100644
--- a/manual/advanced_topics/archos-flashing.tex
+++ b/manual/advanced_topics/archos-flashing.tex
@@ -2,18 +2,18 @@
2 2
3\subsection{Introduction} 3\subsection{Introduction}
4 4
5When you bought your \archosplayertype, it came with the \archosplayerman\ firmware in 5When you bought your \playertype, it came with the \playerman\ firmware in
6flash ROM. When you power on your \dap, this \archosplayerman\ firmware starts, 6flash ROM. When you power on your \dap, this \playerman\ firmware starts,
7and then loads an updated firmware from disk if present (\firmwarefilename). 7and then loads an updated firmware from disk if present (\firmwarefilename).
8An ordinary Rockbox installation only replaces the on-disk firmware, leaving 8An ordinary Rockbox installation only replaces the on-disk firmware, leaving
9the flash ROM contents intact. That means the \archosplayerman\ firmware still 9the flash ROM contents intact. That means the \playerman\ firmware still
10controls the boot process. 10controls the boot process.
11 11
12The main reason to change this is to improve the startup time of your player. 12The main reason to change this is to improve the startup time of your player.
13The \archosplayerman\ bootloader is rather slow. With Rockbox in flash, your \dap\ 13The \playerman\ bootloader is rather slow. With Rockbox in flash, your \dap\
14will boot much faster, typically in three to five seconds. Furthermore you 14will boot much faster, typically in three to five seconds. Furthermore you
15might prefer a clean Rockbox environment, with as little remnants of the 15might prefer a clean Rockbox environment, with as little remnants of the
16\archosplayerman\ software as possible. 16\playerman\ software as possible.
17\opt{rombox}{On your \dap\ it is also possible to execute Rockbox directly 17\opt{rombox}{On your \dap\ it is also possible to execute Rockbox directly
18 from flash ROM, increasing the amount of free RAM for buffering music. This 18 from flash ROM, increasing the amount of free RAM for buffering music. This
19 is called \emph{Rombox}. 19 is called \emph{Rombox}.
@@ -28,11 +28,11 @@ might prefer a clean Rockbox environment, with as little remnants of the
28 of them fails, it will not program. 28 of them fails, it will not program.
29} 29}
30 30
31\opt{ondio}{\warn{After flashing Rockbox, never try to ROLO the \archosplayerman\ 31\opt{ondio}{\warn{After flashing Rockbox, never try to ROLO the \playerman\
32 firmware 32 firmware
33 \opt{archosondiofm}{versions 1.31f or 1.32b! These versions are flash updates 33 \opt{ondiofm}{versions 1.31f or 1.32b! These versions are flash updates
34 themselves. If they are} 34 themselves. If they are}
35 \opt{archosondiosp}{version 1.32b! This version is a flash update itself. 35 \opt{ondiosp}{version 1.32b! This version is a flash update itself.
36 If it is} 36 If it is}
37 applied when Rockbox is flashed, you'll end up with a garbled flash ROM 37 applied when Rockbox is flashed, you'll end up with a garbled flash ROM
38 and hence a dead box. 38 and hence a dead box.
@@ -76,14 +76,14 @@ screen. To get out of it, perform a hardware shutdown of your \dap.
76\subsection{Initial Flashing Procedure} 76\subsection{Initial Flashing Procedure}
77 77
78You only need to perform this procedure the first time you flash your 78You only need to perform this procedure the first time you flash your
79\archosplayertype. You may also want to perform it in case the update procedure for 79\playertype. You may also want to perform it in case the update procedure for
80the second image recommends it. In the latter case do not perform the steps 80the second image recommends it. In the latter case do not perform the steps
81listed under "Preparation". 81listed under "Preparation".
82 82
83\subsubsection{Preparation} 83\subsubsection{Preparation}
84 84
85\nopt{ondio}{ 85\nopt{ondio}{
86 First, check whether your \archosplayertype\ is flashable at all. Select 86 First, check whether your \playertype\ is flashable at all. Select
87 \setting{System $\rightarrow$ Debug (Keep Out!) $\rightarrow$ View HW 87 \setting{System $\rightarrow$ Debug (Keep Out!) $\rightarrow$ View HW
88 Info}. 88 Info}.
89 \opt{lcd_charcell}{Cycle through the displayed values with \ButtonRight / 89 \opt{lcd_charcell}{Cycle through the displayed values with \ButtonRight /
@@ -115,7 +115,7 @@ a safe place.
115 \nopt{ondio}{This will extract two files to the root, 115 \nopt{ondio}{This will extract two files to the root,
116 \fname{firmware\_{\textless}model{\textgreater}.bin} and 116 \fname{firmware\_{\textless}model{\textgreater}.bin} and
117 \fname{firmware\_{\textless}model{\textgreater}\_norom.bin}. 117 \fname{firmware\_{\textless}model{\textgreater}\_norom.bin}.
118 \opt{archosrecorder,archosrecorderv2fm}{(The {\textless}model{\textgreater} part is 118 \opt{recorder,recorderv2fm}{(The {\textless}model{\textgreater} part is
119 slighty different from that in the .zip file name.) 119 slighty different from that in the .zip file name.)
120 } 120 }
121 The flash plugin will select the correct one for your \dap. 121 The flash plugin will select the correct one for your \dap.
@@ -152,14 +152,14 @@ a safe place.
152 152
153\note{There are no separate flash packages for {\dap}s modified to have 8MB 153\note{There are no separate flash packages for {\dap}s modified to have 8MB
154 of RAM. You need to use the corresponding package for non-modified 154 of RAM. You need to use the corresponding package for non-modified
155 \archosplayertype. You should then install a Rockbox image that makes use of all 155 \playertype. You should then install a Rockbox image that makes use of all
156 available RAM as described in the following section. 156 available RAM as described in the following section.
157} 157}
158 158
159\subsection{Updating the Rockbox Image in Flash} 159\subsection{Updating the Rockbox Image in Flash}
160 160
161When Rockbox is booted from flash, it does not check for an updated firmware 161When Rockbox is booted from flash, it does not check for an updated firmware
162on disk. This is one of the reasons why it boots faster than the \archosplayerman\ 162on disk. This is one of the reasons why it boots faster than the \playerman\
163firmware. It means that whenever you update Rockbox, you also need to update 163firmware. It means that whenever you update Rockbox, you also need to update
164the image in the flash. This is a simple and safe procedure: 164the image in the flash. This is a simple and safe procedure:
165 165
diff --git a/manual/advanced_topics/main.tex b/manual/advanced_topics/main.tex
index 23748da18a..53bb984f2e 100644
--- a/manual/advanced_topics/main.tex
+++ b/manual/advanced_topics/main.tex
@@ -213,7 +213,7 @@ all the tags that are available.
213 the last number giving the colour depth in bits) when 213 the last number giving the colour depth in bits) when
214 designing your own WPS, or if you use a WPS designed for another target. 214 designing your own WPS, or if you use a WPS designed for another target.
215 \opt{HAVE_REMOTE_LCD}{The resolution of the remote is 215 \opt{HAVE_REMOTE_LCD}{The resolution of the remote is
216 \opt{iriverh100,iriverh300}{128x64x1}\opt{iaudiox5,iaudiom5}{128x96x2} pixels.}} 216 \opt{h100,h300}{128x64x1}\opt{x5,m5}{128x96x2} pixels.}}
217 217
218\nopt{lcd_charcell}{ 218\nopt{lcd_charcell}{
219\subsubsection{\label{ref:Viewports}Viewports} 219\subsubsection{\label{ref:Viewports}Viewports}
@@ -554,7 +554,7 @@ Example of a configuration file:
554\end{description} 554\end{description}
555 555
556\section{\label{ref:FirmwareLoading}Firmware Loading} 556\section{\label{ref:FirmwareLoading}Firmware Loading}
557\opt{archosplayer,archosrecorder,archosrecorderv2fm,ondio}{ 557\opt{player,recorder,recorderv2fm,ondio}{
558 When your \dap{} powers on, it loads the Archos firmware in ROM, which 558 When your \dap{} powers on, it loads the Archos firmware in ROM, which
559 automatically checks your \daps{} root directory for a file named 559 automatically checks your \daps{} root directory for a file named
560 \firmwarefilename. Note that Archos firmware can only read the first 560 \firmwarefilename. Note that Archos firmware can only read the first
@@ -567,14 +567,14 @@ Example of a configuration file:
567\subsection{\label{ref:using_rolo}Using ROLO (Rockbox Loader)} 567\subsection{\label{ref:using_rolo}Using ROLO (Rockbox Loader)}
568Rockbox is able to load and start another firmware file without rebooting. 568Rockbox is able to load and start another firmware file without rebooting.
569You just ``play'' a file with the extension % 569You just ``play'' a file with the extension %
570\opt{archosrecorder,archosrecorderv2fm,ondio}{\fname{.ajz}.} % 570\opt{recorder,recorderv2fm,ondio}{\fname{.ajz}.} %
571\opt{archosplayer}{\fname{.mod}.} % 571\opt{player}{\fname{.mod}.} %
572\opt{iriverh100,iriverh300}{\fname{.iriver}.} % 572\opt{h100,h300}{\fname{.iriver}.} %
573\opt{ipod}{\fname{.ipod}.} % 573\opt{ipod}{\fname{.ipod}.} %
574\opt{iaudio}{\fname{.iaudio}.} % 574\opt{iaudio}{\fname{.iaudio}.} %
575\opt{sansa,iriverh10,iriverh10_5gb}{\fname{.mi4}.} % 575\opt{sansa,h10,h10_5gb}{\fname{.mi4}.} %
576\opt{sansaAMS}{\fname{.sansa}.} % 576\opt{sansaAMS}{\fname{.sansa}.} %
577\opt{gigabeatfx,gigabeats}{\fname{.gigabeat}.} % 577\opt{gigabeatf,gigabeats}{\fname{.gigabeat}.} %
578This can be used to test new firmware versions without deleting your 578This can be used to test new firmware versions without deleting your
579current version. 579current version.
580 580
diff --git a/manual/appendix/appendix.tex b/manual/appendix/appendix.tex
index f06d8380e6..9aeadba56d 100644
--- a/manual/appendix/appendix.tex
+++ b/manual/appendix/appendix.tex
@@ -95,7 +95,7 @@ The recording hardware (the MAS) does not allow us to do this
95 do that. The MAS chip is programmable, but we have no access to the chip 95 do that. The MAS chip is programmable, but we have no access to the chip
96 documentation. 96 documentation.
97} 97}
98\nopt{iriverh300,iaudiox5}{ 98\nopt{h300,x5}{
99\item Interfacing with other USB devices (like cameras) or 2 player games over USB\\ 99\item Interfacing with other USB devices (like cameras) or 2 player games over USB\\
100 The USB system demands that there is a master that talks to a slave. The 100 The USB system demands that there is a master that talks to a slave. The
101 \dap{} can only serve as a slave, as most other USB devices such as 101 \dap{} can only serve as a slave, as most other USB devices such as
diff --git a/manual/appendix/config_file_options.tex b/manual/appendix/config_file_options.tex
index 41b90e6a32..d0fa073635 100644
--- a/manual/appendix/config_file_options.tex
+++ b/manual/appendix/config_file_options.tex
@@ -13,25 +13,25 @@
13 \midrule\localendhead % endhead breaks with htlatex 13 \midrule\localendhead % endhead breaks with htlatex
14 volume & \opt{masd}{-78 to +18}% 14 volume & \opt{masd}{-78 to +18}%
15 \opt{masf}{-100 -to +12}% 15 \opt{masf}{-100 -to +12}%
16 \opt{iriverh100,iriverh300}{-84 to 0}% 16 \opt{h100,h300}{-84 to 0}%
17 \opt{ipodnano1g}{-72 to +6}% 17 \opt{ipodnano}{-72 to +6}%
18 \opt{ipodvideo}{-57 to +6}% 18 \opt{ipodvideo}{-57 to +6}%
19 \opt{iaudiox5}{-73 to +6} 19 \opt{x5}{-73 to +6}
20 \opt{sansae200}{-74 to +6} 20 \opt{e200}{-74 to +6}
21 \opt{ipodcolor}{-74 to +6}% 21 \opt{ipodcolor}{-74 to +6}%
22 & dB\\ 22 & dB\\
23 \nopt{iaudiox5}{% 23 \nopt{x5}{%
24 bass & \opt{masd}{-15 to +15}% 24 bass & \opt{masd}{-15 to +15}%
25 \opt{masf}{-12 to +12}% 25 \opt{masf}{-12 to +12}%
26 \opt{iriverh100,iriverh300}{0 to +24}% 26 \opt{h100,h300}{0 to +24}%
27 \opt{ipod}{-6 to +9}% 27 \opt{ipod}{-6 to +9}%
28 \opt{sansae200}{-24 to +24}% 28 \opt{e200}{-24 to +24}%
29 & dB\\ 29 & dB\\
30 treble & \opt{masd}{-15 to +15}% 30 treble & \opt{masd}{-15 to +15}%
31 \opt{masf}{-12 to +12}% 31 \opt{masf}{-12 to +12}%
32 \opt{iriverh100,iriverh300}{0 to +6}% 32 \opt{h100,h300}{0 to +6}%
33 \opt{ipod}{-6 to +9}% 33 \opt{ipod}{-6 to +9}%
34 \opt{sansae200}{-24 to +24}% 34 \opt{e200}{-24 to +24}%
35 & dB\\ 35 & dB\\
36 }% 36 }%
37 balance & -100 to +100 & \%\\ 37 balance & -100 to +100 & \%\\
@@ -299,7 +299,7 @@
299 & on, off & N/A\\ 299 & on, off & N/A\\
300 remote iconset & /path/filename.bmp & N/A\\ 300 remote iconset & /path/filename.bmp & N/A\\
301 remote viewers iconset & /path/filename.bmp & N/A\\ 301 remote viewers iconset & /path/filename.bmp & N/A\\
302 \opt{iriverh100,iriverh300}{ 302 \opt{h100,h300}{
303 remote reduce ticking 303 remote reduce ticking
304 & on, off & N/A\\ 304 & on, off & N/A\\
305 }% 305 }%
@@ -333,7 +333,7 @@
333 force fm mono 333 force fm mono
334 & off, on & N/A\\ 334 & off, on & N/A\\
335 }% 335 }%
336 \opt{archosplayer}{ 336 \opt{player}{
337 jump scroll 337 jump scroll
338 & 0 to 5 & N/A\\ 338 & 0 to 5 & N/A\\
339 jump scroll delay 339 jump scroll delay
diff --git a/manual/appendix/file_formats.tex b/manual/appendix/file_formats.tex
index 2ca8582388..cbf1ab2c07 100644
--- a/manual/appendix/file_formats.tex
+++ b/manual/appendix/file_formats.tex
@@ -25,9 +25,9 @@
25 the first file \\ 25 the first file \\
26\includegraphics[width=0.37cm]{appendix/images/icon-rolo.png} 26\includegraphics[width=0.37cm]{appendix/images/icon-rolo.png}
27 & Rockbox firmware & 27 & Rockbox firmware &
28 \opt{archosplayer}{\fname{.mod}}\opt{archosrecorder,archosrecorderv2fm,archosondiofm,archosondiosp}{\fname{.ajz}}% 28 \opt{player}{\fname{.mod}}\opt{recorder,recorderv2fm,ondiofm,ondiosp}{\fname{.ajz}}%
29 \opt{iriverh100,iriverh300}{\fname{.iriver}}\opt{ipod}{\fname{.ipod}}\opt{iaudio}{\fname{.iaudio}}% 29 \opt{h100,h300}{\fname{.iriver}}\opt{ipod}{\fname{.ipod}}\opt{iaudio}{\fname{.iaudio}}%
30 \opt{iriverh10,iriverh10_5gb,sansa}{\fname{.mi4}}\opt{gigabeat}{\fname{.gigabeat}}% 30 \opt{h10,h10_5gb,sansa}{\fname{.mi4}}\opt{gigabeat}{\fname{.gigabeat}}%
31 \opt{sansaAMS}{\fname{.sansa}} 31 \opt{sansaAMS}{\fname{.sansa}}
32 & Load the new firmware with ROLO \\ 32 & Load the new firmware with ROLO \\
33\includegraphics[width=0.37cm]{appendix/images/icon-wps.png} 33\includegraphics[width=0.37cm]{appendix/images/icon-wps.png}
@@ -100,16 +100,16 @@
100 Apple Lossless & \fname{.m4a, .mp4} & \\ 100 Apple Lossless & \fname{.m4a, .mp4} & \\
101 Wavpack & \fname{.wv} & \\ 101 Wavpack & \fname{.wv} & \\
102 Shorten & \fname{.shn} & Seeking not supported.\\ 102 Shorten & \fname{.shn} & Seeking not supported.\\
103 \opt{iriverh100,iriverh300,iaudiox5,iaudiom5,iaudiom3}{ 103 \opt{h100,h300,x5,m5,m3}{
104 Monkey's Audio & \fname{.ape, .mac} & -c1000 and -c2000 files decode 104 Monkey's Audio & \fname{.ape, .mac} & -c1000 and -c2000 files decode
105 fast enough to be useful.} 105 fast enough to be useful.}
106 \opt{gigabeatfx}{ 106 \opt{gigabeatf}{
107 Monkey's Audio & \fname{.ape, .mac} & -c1000 to -c3000 107 Monkey's Audio & \fname{.ape, .mac} & -c1000 to -c3000
108 files decode fast enough to be useful.} 108 files decode fast enough to be useful.}
109 \opt{gigabeats}{ 109 \opt{gigabeats}{
110 Monkey's Audio & \fname{.ape, .mac} & -c1000 to -c4000 files decode 110 Monkey's Audio & \fname{.ape, .mac} & -c1000 to -c4000 files decode
111 fast enough to be useful.} 111 fast enough to be useful.}
112 \opt{ipod,iriverh10,iriverh10_5gb,mrobe100,sansa}{ 112 \opt{ipod,h10,h10_5gb,mrobe100,sansa}{
113 Monkey's Audio & \fname{.ape, .mac} & Only -c1000 files decode fast 113 Monkey's Audio & \fname{.ape, .mac} & Only -c1000 files decode fast
114 enough to be useful.} 114 enough to be useful.}
115 \\ 115 \\
diff --git a/manual/appendix/wps_tags.tex b/manual/appendix/wps_tags.tex
index 828a379d23..7c4fd5418a 100644
--- a/manual/appendix/wps_tags.tex
+++ b/manual/appendix/wps_tags.tex
@@ -112,7 +112,7 @@ produce the information for the next file to be played.
112\begin{table} 112\begin{table}
113 \begin{tagmap}{}{} 113 \begin{tagmap}{}{}
114 \config{\%pb} & Progress Bar\\ 114 \config{\%pb} & Progress Bar\\
115 \opt{archosplayer}{ 115 \opt{player}{
116 & This will display a one character ``cup'' 116 & This will display a one character ``cup''
117 that empties as the time progresses.} 117 that empties as the time progresses.}
118 \opt{lcd_bitmap}{ 118 \opt{lcd_bitmap}{
@@ -120,13 +120,13 @@ produce the information for the next file to be played.
120 & You can set the position, width and height of the progressbar % 120 & You can set the position, width and height of the progressbar %
121 (in pixels) and load a custom image for it: % 121 (in pixels) and load a custom image for it: %
122 \config{\%pb{\textbar}image.bmp{\textbar}x{\textbar}y{\textbar}width{\textbar}height{\textbar}}} \\ 122 \config{\%pb{\textbar}image.bmp{\textbar}x{\textbar}y{\textbar}width{\textbar}height{\textbar}}} \\
123 \opt{archosplayer}{% 123 \opt{player}{%
124 \config{\%pf} & Full-line progress bar \& time display\\ 124 \config{\%pf} & Full-line progress bar \& time display\\
125 }% 125 }%
126 \config{\%px} & Percentage Played In Song\\ 126 \config{\%px} & Percentage Played In Song\\
127 \config{\%pc} & Current Time In Song\\ 127 \config{\%pc} & Current Time In Song\\
128 \config{\%pe} & Total Number of Playlist Entries\\ 128 \config{\%pe} & Total Number of Playlist Entries\\
129 \nopt{archosplayer}{% 129 \nopt{player}{%
130 \config{\%pm} & Peak Meter. The entire line is used as % 130 \config{\%pm} & Peak Meter. The entire line is used as %
131 volume peak meter.\\% 131 volume peak meter.\\%
132 }% 132 }%
@@ -202,7 +202,7 @@ produce the information for the next file to be played.
202\begin{table} 202\begin{table}
203 \begin{tagmap}{}{} 203 \begin{tagmap}{}{}
204 \config{\%mm} & Repeat mode, 0-4, in the order: Off, All, One, Shuffle 204 \config{\%mm} & Repeat mode, 0-4, in the order: Off, All, One, Shuffle
205 \opt{archosplayer,archosrecorder,archosrecorderv2fm}{, A-B}\\ 205 \opt{player,recorder,recorderv2fm}{, A-B}\\
206 \end{tagmap} 206 \end{tagmap}
207\end{table} 207\end{table}
208Example: \config{\%?mm{\textless}Off{\textbar}All{\textbar}One{\textbar}Shuffle% 208Example: \config{\%?mm{\textless}Off{\textbar}All{\textbar}One{\textbar}Shuffle%
@@ -422,9 +422,9 @@ used as a conditional. This can be very useful for designing a WPS that works on
422multiple targets, some with and some without a clock. By using this tag as a 422multiple targets, some with and some without a clock. By using this tag as a
423conditional it is possible to display current date and time on those targets that 423conditional it is possible to display current date and time on those targets that
424support this 424support this
425\opt{rtc}{ (like the \archosplayertype)}, 425\opt{rtc}{ (like the \playertype)},
426or alternate information on those that do not 426or alternate information on those that do not
427\nopt{rtc}{ (like the \archosplayertype)}% 427\nopt{rtc}{ (like the \playertype)}%
428. 428.
429 429
430Example: 430Example:
diff --git a/manual/configure_rockbox/display_options.tex b/manual/configure_rockbox/display_options.tex
index 823a313adc..9ea7e4713c 100644
--- a/manual/configure_rockbox/display_options.tex
+++ b/manual/configure_rockbox/display_options.tex
@@ -70,12 +70,12 @@
70 } 70 }
71 } % \opt{HAVE_BACKLIGHT} 71 } % \opt{HAVE_BACKLIGHT}
72 72
73 \opt{archos,iriverh100,ipodmini1g,ipod3g,ipod4g,iaudiox5}{ 73 \opt{archos,h100,ipodmini,ipod3g,ipod4g,x5}{
74 \item[Contrast:] 74 \item[Contrast:]
75 Changes the contrast of your LCD display. 75 Changes the contrast of your LCD display.
76 \warn{Setting the contrast too dark or too light can make it hard to 76 \warn{Setting the contrast too dark or too light can make it hard to
77 find this menu option again!} 77 find this menu option again!}
78 } % \opt{archos,iriverh100,ipodmini1g,ipod4g,iaudiox5} 78 } % \opt{archos,h100,ipodmini,ipod4g,x5}
79 79
80 \opt{lcd_invert}{ 80 \opt{lcd_invert}{
81 \item[LCD Mode:] 81 \item[LCD Mode:]
@@ -124,7 +124,7 @@
124 Displays the screen so that the top of the display is nearest 124 Displays the screen so that the top of the display is nearest
125 the buttons. This is sometimes useful when carrying the \dap\ in a 125 the buttons. This is sometimes useful when carrying the \dap\ in a
126 pocket for easy access to the headphone socket. 126 pocket for easy access to the headphone socket.
127 \opt{iriverh100,iriverh300}{ 127 \opt{h100,h300}{
128 \item[Reduce Ticking:] 128 \item[Reduce Ticking:]
129 Enable this option if you can hear a ticking sound in your headphones 129 Enable this option if you can hear a ticking sound in your headphones
130 when using your remote. 130 when using your remote.
@@ -163,11 +163,11 @@
163 \opt{lcd_bitmap}{ 163 \opt{lcd_bitmap}{
164 \item[Screen Scrolls Out of View:] 164 \item[Screen Scrolls Out of View:]
165 Screens can be manually scrolled horizontally by pressing 165 Screens can be manually scrolled horizontally by pressing
166 \opt{archosrecorder,archosrecorderv2fm}{\ButtonOn+\ButtonRight/\ButtonLeft} 166 \opt{recorder,recorderv2fm}{\ButtonOn+\ButtonRight/\ButtonLeft}
167 \opt{ondio}{\ButtonMenu+\ButtonRight/\ButtonLeft} 167 \opt{ondio}{\ButtonMenu+\ButtonRight/\ButtonLeft}
168 \opt{sansac200,sansae200,iriverh100,iriverh300,ipod1g2g,ipod3g,ipod4g,ipodcolor,ipodmini1g,ipodnano1g, 168 \opt{c200,e200,h100,h300,ipod1g2g,ipod3g,ipod4g,ipodcolor,ipodmini,ipodnano,
169 ipodvideo,iaudiox5,mrobe100,gigabeatfx,gigabeats} 169 ipodvideo,x5,mrobe100,gigabeatf,gigabeats}
170 {Long \ButtonRight/\ButtonLeft}\opt{iriverh10,iriverh10_5gb}{Long \ButtonRew/\ButtonFF}. 170 {Long \ButtonRight/\ButtonLeft}\opt{h10,h10_5gb}{Long \ButtonRew/\ButtonFF}.
171 Setting this option to \setting{Yes} 171 Setting this option to \setting{Yes}
172 will keep the list entries at their fixed positions and allow them to be 172 will keep the list entries at their fixed positions and allow them to be
173 scrolled out of view, whereas \setting{No} will only scroll those entries 173 scrolled out of view, whereas \setting{No} will only scroll those entries
@@ -176,7 +176,7 @@
176 Defines the number of pixels the horizontal manual screen scroll should move 176 Defines the number of pixels the horizontal manual screen scroll should move
177 for each step. 177 for each step.
178 } 178 }
179 \opt{archosplayer}{ 179 \opt{player}{
180 \item[Jump Scroll:] 180 \item[Jump Scroll:]
181 This setting makes text scroll a page at a time instead of a character 181 This setting makes text scroll a page at a time instead of a character
182 at a time. If set to \setting{One time}, \setting{2}, \setting{3} or 182 at a time. If set to \setting{One time}, \setting{2}, \setting{3} or
diff --git a/manual/configure_rockbox/recording_settings.tex b/manual/configure_rockbox/recording_settings.tex
index e8f1fdac12..27db3e86ce 100644
--- a/manual/configure_rockbox/recording_settings.tex
+++ b/manual/configure_rockbox/recording_settings.tex
@@ -45,8 +45,8 @@
45 \nopt{sansa}{ 45 \nopt{sansa}{
46 Choose the recording frequency (sample rate). 46 Choose the recording frequency (sample rate).
47 \opt{masf}{48kHz, 44.1kHz, 32kHz, 24kHz, 22.05kHz, 16kHz} 47 \opt{masf}{48kHz, 44.1kHz, 32kHz, 24kHz, 22.05kHz, 16kHz}
48 \opt{iriverh100,iriverh300}{44.1kHz, 22.05kHz and 11.025kHz} 48 \opt{h100,h300}{44.1kHz, 22.05kHz and 11.025kHz}
49 \opt{iaudiox5}{88.2kHz, 44.1kHz, 22.05kHz and 11.025kHz} 49 \opt{x5}{88.2kHz, 44.1kHz, 22.05kHz and 11.025kHz}
50 are available. Higher sample rates use up more disk space, but give better 50 are available. Higher sample rates use up more disk space, but give better
51 sound quality. 51 sound quality.
52 \opt{swcodec}{\note{The 11.025kHz setting is not available when using% 52 \opt{swcodec}{\note{The 11.025kHz setting is not available when using%
@@ -58,19 +58,19 @@
58 MPEG v1 for 48, 44.1 and 32\\ 58 MPEG v1 for 48, 44.1 and 32\\
59 MPEG v2 for 24, 22.05 and 16\\ 59 MPEG v2 for 24, 22.05 and 16\\
60 } 60 }
61 \opt{archosrecorder,archosrecorderv2fm,iriverh100} 61 \opt{recorder,recorderv2fm,h100}
62 {\note{You cannot change the sample rate for digital recordings.} 62 {\note{You cannot change the sample rate for digital recordings.}
63 } 63 }
64 } % nopt e200 64 } % nopt e200
65 \opt{sansae200}{ 65 \opt{e200}{
66 Recordings can only be made at a 22.05kHz frequency (sample rate) 66 Recordings can only be made at a 22.05kHz frequency (sample rate)
67 on this \dap. 67 on this \dap.
68 } % opt e200 68 } % opt e200
69 69
70\section{Source} 70\section{Source}
71 Choose the source of the recording. The options are: 71 Choose the source of the recording. The options are:
72 \opt{archosrecorder,archosrecorderv2fm,iriverh100}{\setting{SPDIF (digital)}, }% 72 \opt{recorder,recorderv2fm,h100}{\setting{SPDIF (digital)}, }%
73 \nopt{ipodnano1g,ipodvideo}{\setting{Mic}}% 73 \nopt{ipodnano,ipodvideo}{\setting{Mic}}%
74 \nopt{sansa}{, and {\setting{Line In}}}. % 74 \nopt{sansa}{, and {\setting{Line In}}}. %
75 \opt{radio}{For recording from the radio see \reference{ref:FMradio}.} 75 \opt{radio}{For recording from the radio see \reference{ref:FMradio}.}
76 76
@@ -228,7 +228,7 @@
228 228
229More information can be found at \wikilink{VolumeTriggeredRecording}. 229More information can be found at \wikilink{VolumeTriggeredRecording}.
230 230
231\opt{iriverh100,iriverh300}{% 231\opt{h100,h300}{%
232 \section{Automatic Gain Control} 232 \section{Automatic Gain Control}
233 The \setting{Automatic Gain Control} has five different presets for 233 The \setting{Automatic Gain Control} has five different presets for
234 automatically controlling the gain while recording. 234 automatically controlling the gain while recording.
diff --git a/manual/configure_rockbox/sound_settings.tex b/manual/configure_rockbox/sound_settings.tex
index a395b7f0d6..c24b38a891 100644
--- a/manual/configure_rockbox/sound_settings.tex
+++ b/manual/configure_rockbox/sound_settings.tex
@@ -10,35 +10,35 @@ change to customise your listening experience.
10 where 0 dB is a reference that indicates the maximum volume that the \dap{} 10 where 0 dB is a reference that indicates the maximum volume that the \dap{}
11 can produce without possible distortion (clipping). All values lower than 11 can produce without possible distortion (clipping). All values lower than
12 this reference will be negative and yield a progressively softer volume. 12 this reference will be negative and yield a progressively softer volume.
13 \opt{archosplayer,archosrecorder,archosrecorderv2fm,ondio,iaudiox5,iaudiom5,ipodnano1g,ipodvideo, 13 \opt{player,recorder,recorderv2fm,ondio,x5,m5,ipodnano,ipodvideo,
14 ipodcolor,ipod1g2g,iriverh10,iriverh10_5gb,sansa,sansaAMS,gigabeats,gigabeatfx}{ 14 ipodcolor,ipod1g2g,h10,h10_5gb,sansa,sansaAMS,gigabeats,gigabeatf}{
15 Values higher than 0 dB are available and can be used to raise the 15 Values higher than 0 dB are available and can be used to raise the
16 volume more than would otherwise be possible. These volume levels will 16 volume more than would otherwise be possible. These volume levels will
17 ordinarily lead to distorted sound, but might work nicely for music that has 17 ordinarily lead to distorted sound, but might work nicely for music that has
18 an otherwise low volume level.} 18 an otherwise low volume level.}
19 The volume can be adjusted from a 19 The volume can be adjusted from a
20 \opt{archosplayer}{minimum of -78 dB to a maximum of +18 dB.}% 20 \opt{player}{minimum of -78 dB to a maximum of +18 dB.}%
21 \opt{archosrecorder,archosrecorderv2fm,ondio}{minimum of -100 dB to a maximum of +12 dB.}% 21 \opt{recorder,recorderv2fm,ondio}{minimum of -100 dB to a maximum of +12 dB.}%
22 \opt{iriverh100,iriverh300}{minimum of -84 dB to a maximum of 0 dB.}% 22 \opt{h100,h300}{minimum of -84 dB to a maximum of 0 dB.}%
23 \opt{iaudiox5,iaudiom5,ipod3g,ipod4g,gigabeatfx,mrobe100}{minimum of -73 dB to a maximum of +6 dB.}% 23 \opt{x5,m5,ipod3g,ipod4g,gigabeatf,mrobe100}{minimum of -73 dB to a maximum of +6 dB.}%
24 \opt{ipodnano1g}{minimum of -72 dB to a maximum of +6 dB.}% 24 \opt{ipodnano}{minimum of -72 dB to a maximum of +6 dB.}%
25 \opt{ipodvideo}{minimum of -57 dB to a maximum of +6 dB.}% 25 \opt{ipodvideo}{minimum of -57 dB to a maximum of +6 dB.}%
26 \opt{ipodcolor,ipod1g2g,iriverh10,iriverh10_5gb,sansa,sansaAMS}{minimum of -74 dB to a maximum 26 \opt{ipodcolor,ipod1g2g,h10,h10_5gb,sansa,sansaAMS}{minimum of -74 dB to a maximum
27 of +6 db.}% 27 of +6 db.}%
28 \opt{gigabeats}{minimum of -90 dB to a maximum of +6 dB.}% 28 \opt{gigabeats}{minimum of -90 dB to a maximum of +6 dB.}%
29 \opt{gigabeatfx}{minimum of -74 dB to a maximum of +6 dB.}% 29 \opt{gigabeatf}{minimum of -74 dB to a maximum of +6 dB.}%
30 30
31\section{Bass} 31\section{Bass}
32 This setting emphasises 32 This setting emphasises
33 \nopt{iriverh100,iriverh300}{or suppresses} 33 \nopt{h100,h300}{or suppresses}
34 the lower (bass) frequencies in the sound. A value of 0 dB means that bass 34 the lower (bass) frequencies in the sound. A value of 0 dB means that bass
35 sounds are unaltered (flat response). 35 sounds are unaltered (flat response).
36 \opt{masd}{The minimum setting is -15 dB and the maximum is 15 dB.}% 36 \opt{masd}{The minimum setting is -15 dB and the maximum is 15 dB.}%
37 \opt{masf}{The minimum setting is -12 dB and the maximum is 12 dB.}% 37 \opt{masf}{The minimum setting is -12 dB and the maximum is 12 dB.}%
38 \opt{iriverh100,iriverh300}{The minimum setting is 0 dB and the maximum is 24 dB.}% 38 \opt{h100,h300}{The minimum setting is 0 dB and the maximum is 24 dB.}%
39 \opt{ipodnano1g,ipodcolor}{The minimum setting is -6 dB and the maximum is 9 dB.}% 39 \opt{ipodnano,ipodcolor}{The minimum setting is -6 dB and the maximum is 9 dB.}%
40 \opt{ipodvideo}{The minimum setting is -12 dB and the maximum is 12 dB.}% 40 \opt{ipodvideo}{The minimum setting is -12 dB and the maximum is 12 dB.}%
41 \opt{iaudiox5,sansa,sansaAMS,iriverh10,iriverh10_5gb}{The minimum setting is -24 dB and the maximum is 24 dB.} 41 \opt{x5,sansa,sansaAMS,h10,h10_5gb}{The minimum setting is -24 dB and the maximum is 24 dB.}
42 42
43\opt{ipodvideo}{ 43\opt{ipodvideo}{
44\section{Bass Cutoff} 44\section{Bass Cutoff}
@@ -50,15 +50,15 @@ change to customise your listening experience.
50 50
51\section{Treble} 51\section{Treble}
52 This setting emphasises 52 This setting emphasises
53 \nopt{iriverh100,iriverh300}{or suppresses} 53 \nopt{h100,h300}{or suppresses}
54 the higher (treble) frequencies in the sound. A value of 0 dB means that 54 the higher (treble) frequencies in the sound. A value of 0 dB means that
55 treble sounds are unaltered (flat response). 55 treble sounds are unaltered (flat response).
56 \opt{masd}{The minimum setting is -15 dB and the maximum is 15 dB.}% 56 \opt{masd}{The minimum setting is -15 dB and the maximum is 15 dB.}%
57 \opt{masf}{The minimum setting is -12 dB and the maximum is 12 dB.}% 57 \opt{masf}{The minimum setting is -12 dB and the maximum is 12 dB.}%
58 \opt{iriverh100,iriverh300}{The minimum setting is 0 dB and the maximum is 6 dB.}% 58 \opt{h100,h300}{The minimum setting is 0 dB and the maximum is 6 dB.}%
59 \opt{ipodnano1g,ipodcolor}{The minimum setting is -6 dB and the maximum is 9 dB.}% 59 \opt{ipodnano,ipodcolor}{The minimum setting is -6 dB and the maximum is 9 dB.}%
60 \opt{ipodvideo}{The minimum setting is -12 dB and the maximum is 12 dB.}% 60 \opt{ipodvideo}{The minimum setting is -12 dB and the maximum is 12 dB.}%
61 \opt{iaudiox5,sansa,sansaAMS,iriverh10,iriverh10_5gb}{The minimum setting is -24 dB and the maximum is 24 dB.} 61 \opt{x5,sansa,sansaAMS,h10,h10_5gb}{The minimum setting is -24 dB and the maximum is 24 dB.}
62 62
63\opt{ipodvideo}{ 63\opt{ipodvideo}{
64\section{Treble Cutoff} 64\section{Treble Cutoff}
diff --git a/manual/configure_rockbox/system_options.tex b/manual/configure_rockbox/system_options.tex
index d1cf61061a..52c42e0ccf 100644
--- a/manual/configure_rockbox/system_options.tex
+++ b/manual/configure_rockbox/system_options.tex
@@ -15,19 +15,19 @@
15 \begin{description} 15 \begin{description}
16 \item [Battery Capacity: ]This setting can be used to tell Rockbox what 16 \item [Battery Capacity: ]This setting can be used to tell Rockbox what
17 capacity (in mAh) the battery being used has. The default is 17 capacity (in mAh) the battery being used has. The default is
18 \opt{archosplayer,archosrecorder}{1500mAh}% 18 \opt{player,recorder}{1500mAh}%
19 \opt{archosrecorderv2fm}{2200mAh}% 19 \opt{recorderv2fm}{2200mAh}%
20 \opt{archosondiosp,archosondiofm}{1000mAh}% 20 \opt{ondiosp,ondiofm}{1000mAh}%
21 \opt{iriverh100,iriverh300}{1300mAh}% 21 \opt{h100,h300}{1300mAh}%
22 \opt{ipodmini1g}{400mAh (1G) or 630mAh (2G)}% 22 \opt{ipodmini}{400mAh (1G) or 630mAh (2G)}%
23 \opt{ipodcolor}{700mAh}% 23 \opt{ipodcolor}{700mAh}%
24 \opt{ipodnano1g}{300mAh}% 24 \opt{ipodnano}{300mAh}%
25 \opt{ipodvideo}{400mAh (30GB) or 600mAh (60/80GB)}% 25 \opt{ipodvideo}{400mAh (30GB) or 600mAh (60/80GB)}%
26 \opt{ipod4g}{630mAh}% 26 \opt{ipod4g}{630mAh}%
27 \opt{ipod3g}{630mAh}% 27 \opt{ipod3g}{630mAh}%
28 \opt{ipod1g2g}{1200mAh}% 28 \opt{ipod1g2g}{1200mAh}%
29 \opt{iaudiom5,iaudiox5}{950mAh}% 29 \opt{m5,x5}{950mAh}%
30 \opt{gigabeatfx}{2000mAh}% 30 \opt{gigabeatf}{2000mAh}%
31 \opt{gigabeats}{700mAh}% 31 \opt{gigabeats}{700mAh}%
32 , which is the capacity value for the standard 32 , which is the capacity value for the standard
33 \opt{archos}{batteries}\nopt{archos}{battery} shipped with the \dap. 33 \opt{archos}{batteries}\nopt{archos}{battery} shipped with the \dap.
@@ -37,9 +37,9 @@
37 runtime estimation as shown on screen. 37 runtime estimation as shown on screen.
38 \opt{iaudio}{Rockbox does not automatically distinguish between the 38 \opt{iaudio}{Rockbox does not automatically distinguish between the
39 ``L'' models and the ``simple'' models which determine the default 39 ``L'' models and the ``simple'' models which determine the default
40 value. If your dap{} is an \opt{iaudiom5}{M5L}\opt{iaudiox5}{X5L} set the value 40 value. If your dap{} is an \opt{m5}{M5L}\opt{x5}{X5L} set the value
41 to 2250mAh for more accuracy in the runtime estimation.} 41 to 2250mAh for more accuracy in the runtime estimation.}
42 \opt{ipod,sansa}{This value is fairly meaningless in the \archosplayerman{} 42 \opt{ipod,sansa}{This value is fairly meaningless in the \playerman{}
43 family at present, and work is on-going into finding a better way to 43 family at present, and work is on-going into finding a better way to
44 determine battery life.} 44 determine battery life.}
45 45
@@ -117,7 +117,7 @@ This sub menu relates to limits in the Rockbox operating system.
117 \end{description} 117 \end{description}
118 118
119% TODO: this needs to be rewritten in another style, it lets you mix sound from another source into the music 119% TODO: this needs to be rewritten in another style, it lets you mix sound from another source into the music
120\opt{archosplayer}{ 120\opt{player}{
121 \subsection{Line In} This option activates the line in port on \dap, which is 121 \subsection{Line In} This option activates the line in port on \dap, which is
122 off by default. This is useful for such applications as: 122 off by default. This is useful for such applications as:
123 \begin{itemize} 123 \begin{itemize}
@@ -161,7 +161,7 @@ this option \setting{On}. If it is not required, then turning this setting
161} 161}
162 162
163\opt{HAVE_BUTTON_LIGHTS}{ 163\opt{HAVE_BUTTON_LIGHTS}{
164 \opt{sansae200}{ 164 \opt{e200}{
165 \subsection{Wheel Light Timeout} 165 \subsection{Wheel Light Timeout}
166 This setting controls the amount of time the wheel lights shine after a 166 This setting controls the amount of time the wheel lights shine after a
167 button press or wheel turn. If set to \setting{Off}, the LEDs will not 167 button press or wheel turn. If set to \setting{Off}, the LEDs will not
@@ -169,7 +169,7 @@ this option \setting{On}. If it is not required, then turning this setting
169 never shut off. If set to a time (1 to 120 seconds), the wheel will stay 169 never shut off. If set to a time (1 to 120 seconds), the wheel will stay
170 lit for that amount of time after a button press or wheel turn. 170 lit for that amount of time after a button press or wheel turn.
171 } 171 }
172 \nopt{sansae200}{ 172 \nopt{e200}{
173 \subsection{Button Light Timeout} 173 \subsection{Button Light Timeout}
174 This setting controls the amount of time the button lights shine after a 174 This setting controls the amount of time the button lights shine after a
175 button press. If set to \setting{Off}, the LEDs will not light when a 175 button press. If set to \setting{Off}, the LEDs will not light when a
@@ -177,7 +177,7 @@ this option \setting{On}. If it is not required, then turning this setting
177 If set to a time (1 to 120 seconds), the buttons will stay lit for 177 If set to a time (1 to 120 seconds), the buttons will stay lit for
178 that amount of time after a button press. 178 that amount of time after a button press.
179 } 179 }
180 \opt{gigabeatfx}{ 180 \opt{gigabeatf}{
181 \subsection{Button Light Brightness} 181 \subsection{Button Light Brightness}
182 Changes the brightness of the button lights. 182 Changes the brightness of the button lights.
183 } 183 }
diff --git a/manual/configure_rockbox/theme_settings.tex b/manual/configure_rockbox/theme_settings.tex
index 2acb88c454..b87c0f8583 100644
--- a/manual/configure_rockbox/theme_settings.tex
+++ b/manual/configure_rockbox/theme_settings.tex
@@ -14,28 +14,28 @@ customize the visual apperance of Rockbox.
14 14
15 There are a number of themes that ship with Rockbox. If none of 15 There are a number of themes that ship with Rockbox. If none of
16 these suit your needs, many more can be downloaded from 16 these suit your needs, many more can be downloaded from
17 \opt{archosplayer}{\url{http://themes.rockbox.org/index.php?target=player}}% 17 \opt{player}{\url{http://themes.rockbox.org/index.php?target=player}}%
18 \opt{archosrecorder}{\url{http://themes.rockbox.org/index.php?target=fmrecorder}}% 18 \opt{recorder}{\url{http://themes.rockbox.org/index.php?target=fmrecorder}}%
19 \opt{archosrecorderv2fm}{\url{http://themes.rockbox.org/index.php?target=fmrecorder}}% 19 \opt{recorderv2fm}{\url{http://themes.rockbox.org/index.php?target=fmrecorder}}%
20 \opt{archosondiofm}{\url{http://themes.rockbox.org/index.php?target=ondiofm}}% 20 \opt{ondiofm}{\url{http://themes.rockbox.org/index.php?target=ondiofm}}%
21 \opt{archosondiosp}{\url{http://themes.rockbox.org/index.php?target=ondiosp}}% 21 \opt{ondiosp}{\url{http://themes.rockbox.org/index.php?target=ondiosp}}%
22 \opt{iaudiom5}{\url{http://themes.rockbox.org/index.php?target=m5}}% 22 \opt{m5}{\url{http://themes.rockbox.org/index.php?target=m5}}%
23 \opt{iaudiox5}{\url{http://themes.rockbox.org/index.php?target=x5}}% 23 \opt{x5}{\url{http://themes.rockbox.org/index.php?target=x5}}%
24 \opt{iaudiom3}{\url{http://themes.rockbox.org/index.php?target=m3}}% 24 \opt{m3}{\url{http://themes.rockbox.org/index.php?target=m3}}%
25 \opt{iriverh100}{\url{http://themes.rockbox.org/index.php?target=h100}}% 25 \opt{h100}{\url{http://themes.rockbox.org/index.php?target=h100}}%
26 \opt{iriverh300}{\url{http://themes.rockbox.org/index.php?target=h300}}% 26 \opt{h300}{\url{http://themes.rockbox.org/index.php?target=h300}}%
27 \opt{iriverh10_5gb}{\url{http://themes.rockbox.org/index.php?target=h10_5gb}}% 27 \opt{h10_5gb}{\url{http://themes.rockbox.org/index.php?target=h10_5gb}}%
28 \opt{iriverh10}{\url{http://themes.rockbox.org/index.php?target=h10}}% 28 \opt{h10}{\url{http://themes.rockbox.org/index.php?target=h10}}%
29 \opt{ipod1g2g}{\url{http://themes.rockbox.org/index.php?target=ipod1g2g}}% 29 \opt{ipod1g2g}{\url{http://themes.rockbox.org/index.php?target=ipod1g2g}}%
30 \opt{ipod3g}{\url{http://themes.rockbox.org/index.php?target=ipod3g}}% 30 \opt{ipod3g}{\url{http://themes.rockbox.org/index.php?target=ipod3g}}%
31 \opt{ipod4g}{\url{http://themes.rockbox.org/index.php?target=ipod4g}}% 31 \opt{ipod4g}{\url{http://themes.rockbox.org/index.php?target=ipod4g}}%
32 \opt{ipodcolor}{\url{http://themes.rockbox.org/index.php?target=ipodcolor}}% 32 \opt{ipodcolor}{\url{http://themes.rockbox.org/index.php?target=ipodcolor}}%
33 \opt{ipodvideo}{\url{http://themes.rockbox.org/index.php?target=ipodvideo}}% 33 \opt{ipodvideo}{\url{http://themes.rockbox.org/index.php?target=ipodvideo}}%
34 \opt{ipodmini1g}{\url{http://themes.rockbox.org/index.php?target=ipodmini}}% 34 \opt{ipodmini}{\url{http://themes.rockbox.org/index.php?target=ipodmini}}%
35 \opt{ipodnano1g}{\url{http://themes.rockbox.org/index.php?target=ipodnano}}% 35 \opt{ipodnano}{\url{http://themes.rockbox.org/index.php?target=ipodnano}}%
36 \opt{sansae200}{\url{http://themes.rockbox.org/index.php?target=e200}}% 36 \opt{e200}{\url{http://themes.rockbox.org/index.php?target=e200}}%
37 \opt{sansac200}{\url{http://themes.rockbox.org/index.php?target=c200}}% 37 \opt{c200}{\url{http://themes.rockbox.org/index.php?target=c200}}%
38 \opt{gigabeatfx}{\url{http://themes.rockbox.org/index.php?target=gigabeatf}}% 38 \opt{gigabeatf}{\url{http://themes.rockbox.org/index.php?target=gigabeatf}}%
39 \opt{gigabeats}{\url{http://themes.rockbox.org/index.php?target=gigabeats}}% 39 \opt{gigabeats}{\url{http://themes.rockbox.org/index.php?target=gigabeats}}%
40 \opt{mrobe100}{\url{http://themes.rockbox.org/index.php?target=mrobe100}}% 40 \opt{mrobe100}{\url{http://themes.rockbox.org/index.php?target=mrobe100}}%
41 . 41 .
@@ -49,7 +49,7 @@ customize the visual apperance of Rockbox.
49 \item[Font.] 49 \item[Font.]
50 Browse the installed fonts on your \dap{}. Selecting one will activate it. 50 Browse the installed fonts on your \dap{}. Selecting one will activate it.
51 See \reference{ref:Loadingfonts} for further details about fonts. 51 See \reference{ref:Loadingfonts} for further details about fonts.
52} % \nopt{archosplayer} 52} % \nopt{player}
53 53
54\item[While Playing Screen.] 54\item[While Playing Screen.]
55 Opens the \setting{File Browser} in the \fname{/.rockbox/wps} directory and 55 Opens the \setting{File Browser} in the \fname{/.rockbox/wps} directory and
diff --git a/manual/frontpage/frontpage.tex b/manual/frontpage/frontpage.tex
index 4f5eeef2e7..bfeb192fd6 100644
--- a/manual/frontpage/frontpage.tex
+++ b/manual/frontpage/frontpage.tex
@@ -4,7 +4,7 @@
4\ifpdfoutput{\includegraphics[width=10cm]{frontpage/rockboxlogo.pdf}} 4\ifpdfoutput{\includegraphics[width=10cm]{frontpage/rockboxlogo.pdf}}
5{\includegraphics{frontpage/rockbox-web.png}}\\ 5{\includegraphics{frontpage/rockbox-web.png}}\\
6\vspace{2cm} 6\vspace{2cm}
7\huge{The Rockbox Manual\\for\\\archosplayername}\vspace{1cm}\\ 7\huge{The Rockbox Manual\\for\\\playername}\vspace{1cm}\\
8 8
9\vspace{\fill} 9\vspace{\fill}
10 10
diff --git a/manual/getting_started/gigabeat_install.tex b/manual/getting_started/gigabeat_install.tex
index 9929449340..c248527c20 100644
--- a/manual/getting_started/gigabeat_install.tex
+++ b/manual/getting_started/gigabeat_install.tex
@@ -9,7 +9,7 @@
9 to show hidden files or you may be unable to see \fname{FWIMG}. 9 to show hidden files or you may be unable to see \fname{FWIMG}.
10\item In that directory you'll find a file called \fname{FWIMG01.DAT}. This too 10\item In that directory you'll find a file called \fname{FWIMG01.DAT}. This too
11 may be hidden. Rename the file to \fname{FWIMG01.DAT.ORIG}. Make sure you 11 may be hidden. Rename the file to \fname{FWIMG01.DAT.ORIG}. Make sure you
12 spelled that name correctly as it is needed for booting the \archosplayerman{} firmware. 12 spelled that name correctly as it is needed for booting the \playerman{} firmware.
13 \warn{If you do not complete this step then you will be unable to uninstall Rockbox 13 \warn{If you do not complete this step then you will be unable to uninstall Rockbox
14 without a copy of the original firmware from the original install CD.} 14 without a copy of the original firmware from the original install CD.}
15\item Now copy the file \fname{FWIMG01.DAT} you downloaded to that directory. 15\item Now copy the file \fname{FWIMG01.DAT} you downloaded to that directory.
diff --git a/manual/getting_started/gigabeats_install.tex b/manual/getting_started/gigabeats_install.tex
index 9b6402548f..317e190fe0 100644
--- a/manual/getting_started/gigabeats_install.tex
+++ b/manual/getting_started/gigabeats_install.tex
@@ -1,14 +1,14 @@
1% $Id$ 1% $Id$
2 2
3\warn{Before starting this procedure, ensure that you have a copy 3\warn{Before starting this procedure, ensure that you have a copy
4of the original \archosplayerman{} firmware. Without this, it is 4of the original \playerman{} firmware. Without this, it is
5\emph{not} possible to uninstall Rockbox. The \archosplayerman{} 5\emph{not} possible to uninstall Rockbox. The \playerman{}
6firmware can be downloaded from 6firmware can be downloaded from
7\url{http://www.tacp.toshiba.com/tacpassets-images/firmware/MESV12US.zip}.\\} 7\url{http://www.tacp.toshiba.com/tacpassets-images/firmware/MESV12US.zip}.\\}
8 8
9Installing the bootloader is only needed once. It involves replacing the 9Installing the bootloader is only needed once. It involves replacing the
10existing firmware file on your \dap{} with another version. 10existing firmware file on your \dap{} with another version.
11When running the original \archosplayerman{} firmware (a version of Windows CE), it is 11When running the original \playerman{} firmware (a version of Windows CE), it is
12only possible to connect the \dap{} to a PC in ``MTP mode'', which hides 12only possible to connect the \dap{} to a PC in ``MTP mode'', which hides
13the actual content of your \daps{} disk and provides restricted access 13the actual content of your \daps{} disk and provides restricted access
14to its contents. 14to its contents.
diff --git a/manual/getting_started/h10_install.tex b/manual/getting_started/h10_install.tex
index a8909e68dc..ff72f6661e 100644
--- a/manual/getting_started/h10_install.tex
+++ b/manual/getting_started/h10_install.tex
@@ -1,17 +1,17 @@
1\subsubsection{Installation} 1\subsubsection{Installation}
2\begin{enumerate} 2\begin{enumerate}
3 \item Download 3 \item Download
4 \opt{iriverh10}{\url{http://download.rockbox.org/bootloader/iriver/H10_20GC.mi4}} 4 \opt{h10}{\url{http://download.rockbox.org/bootloader/iriver/H10_20GC.mi4}}
5 \opt{iriverh10_5gb}{ 5 \opt{h10_5gb}{
6 \begin{itemize} 6 \begin{itemize}
7 \item \url{http://download.rockbox.org/bootloader/iriver/H10.mi4} if your \dap{} is UMS or 7 \item \url{http://download.rockbox.org/bootloader/iriver/H10.mi4} if your \dap{} is UMS or
8 \item \url{http://download.rockbox.org/bootloader/iriver/H10_5GB-MTP/H10.mi4} if it is MTP. 8 \item \url{http://download.rockbox.org/bootloader/iriver/H10_5GB-MTP/H10.mi4} if it is MTP.
9 \end{itemize}} 9 \end{itemize}}
10 \item Connect your \archosplayertype{} to the computer using UMS mode and the UMS trick\opt{iriverh10_5gb}{ if necessary}. 10 \item Connect your \playertype{} to the computer using UMS mode and the UMS trick\opt{h10_5gb}{ if necessary}.
11 \item Rename the \opt{iriverh10}{\fname{H10\_20GC.mi4}}\opt{iriverh10_5gb}{\fname{H10.mi4}} file to \fname{OF.mi4} in the \fname{System} directory on your \archosplayertype{}. 11 \item Rename the \opt{h10}{\fname{H10\_20GC.mi4}}\opt{h10_5gb}{\fname{H10.mi4}} file to \fname{OF.mi4} in the \fname{System} directory on your \playertype{}.
12 \opt{iriverh10_5gb}{\note{If you have a Pure model \archosplayertype{} (which does not have a FM radio) it is possible that this file will be called \fname{H10EMP.mi4} instead. If so, rename the \fname{H10.mi4} you downloaded in step 1 to \fname{H10EMP.mi4}.}} 12 \opt{h10_5gb}{\note{If you have a Pure model \playertype{} (which does not have a FM radio) it is possible that this file will be called \fname{H10EMP.mi4} instead. If so, rename the \fname{H10.mi4} you downloaded in step 1 to \fname{H10EMP.mi4}.}}
13 \note{You should keep a safe backup of this file for use if you ever wish to switch back to the \archosplayerman{} firmware.} 13 \note{You should keep a safe backup of this file for use if you ever wish to switch back to the \playerman{} firmware.}
14 \note{If you cannot see the \fname{System} directory, you will need to make sure your operating system is configured to show hidden files and directories.} 14 \note{If you cannot see the \fname{System} directory, you will need to make sure your operating system is configured to show hidden files and directories.}
15 15
16 \item Copy the \opt{iriverh10}{\fname{H10\_20GC.mi4}}\opt{iriverh10_5gb}{\fname{H10.mi4} (or \fname{H10EMP.mi4} if you have a \archosplayertype{} Pure)} file you downloaded to the System directory on your \dap{}. 16 \item Copy the \opt{h10}{\fname{H10\_20GC.mi4}}\opt{h10_5gb}{\fname{H10.mi4} (or \fname{H10EMP.mi4} if you have a \playertype{} Pure)} file you downloaded to the System directory on your \dap{}.
17\end{enumerate} 17\end{enumerate}
diff --git a/manual/getting_started/iaudio_install.tex b/manual/getting_started/iaudio_install.tex
index cb56027fc9..1ef566173e 100644
--- a/manual/getting_started/iaudio_install.tex
+++ b/manual/getting_started/iaudio_install.tex
@@ -1,8 +1,8 @@
1The \archosplayername{} has a built-in bootloader which performs the 1The \playername{} has a built-in bootloader which performs the
2firmware update and can also access the hard drive via USB. The 2firmware update and can also access the hard drive via USB. The
3Rockbox bootloader can therefore be very minimalistic, as it does not require 3Rockbox bootloader can therefore be very minimalistic, as it does not require
4 it's own USB mode. This makes it less dangerous to install the Rockbox bootloader 4 it's own USB mode. This makes it less dangerous to install the Rockbox bootloader
5 as you can always restore it using the \archosplayerman{} bootloader. 5 as you can always restore it using the \playerman{} bootloader.
6 6
7\note{The Rockbox bootloader overwrites the original firmware, making it 7\note{The Rockbox bootloader overwrites the original firmware, making it
8 impossible to dual-boot.} 8 impossible to dual-boot.}
@@ -11,9 +11,9 @@ Rockbox bootloader can therefore be very minimalistic, as it does not require
11\begin{itemize} 11\begin{itemize}
12\item Download the Rockbox bootloader binary from 12\item Download the Rockbox bootloader binary from
13\url{http://download.rockbox.org/bootloader/iaudio/}. 13\url{http://download.rockbox.org/bootloader/iaudio/}.
14 \opt{iaudiox5}{Use the \fname{iaudiox5v\_fw.bin} file if your \dap{} is a X5V. If it is a X5 14 \opt{x5}{Use the \fname{x5v\_fw.bin} file if your \dap{} is a X5V. If it is a X5
15 or X5L, use the \fname{iaudiox5\_fw.bin} file.} 15 or X5L, use the \fname{x5\_fw.bin} file.}
16 \opt{iaudiom5}{Use the \fname{iaudiom5\_fw.bin} file.} 16 \opt{m5}{Use the \fname{m5\_fw.bin} file.}
17 \opt{iaudiom3}{Use the \fname{cowon\_m3.bin} file.} 17 \opt{m3}{Use the \fname{cowon\_m3.bin} file.}
18\item Copy it to the \fname{FIRMWARE} directory on your \dap{}. 18\item Copy it to the \fname{FIRMWARE} directory on your \dap{}.
19\end{itemize} 19\end{itemize}
diff --git a/manual/getting_started/installation.tex b/manual/getting_started/installation.tex
index c42afa6815..582937f9ed 100644
--- a/manual/getting_started/installation.tex
+++ b/manual/getting_started/installation.tex
@@ -6,16 +6,16 @@ before beginning there are a few things it is important to know.
6 6
7\section{Before Starting} 7\section{Before Starting}
8 8
9\opt{sansae200}{\fixme{NOTE: These instructions will not work on the 9\opt{e200}{\fixme{NOTE: These instructions will not work on the
10``Rhapsody'' version of the E200 series (also known as E200R). Please 10``Rhapsody'' version of the E200 series (also known as E200R). Please
11follow the instructions at 11follow the instructions at
12\url{http://www.rockbox.org/twiki/bin/view/Main/SansaE200RInstallation}.}} 12\url{http://www.rockbox.org/twiki/bin/view/Main/SansaE200RInstallation}.}}
13 13
14\opt{ipodnano1g,ipodvideo,sansae200,sansac200}{ 14\opt{ipodnano,ipodvideo,e200,c200}{
15\begin{description} 15\begin{description}
16\item[Supported hardware versions.] 16\item[Supported hardware versions.]
17 \opt{ipodnano1g}{ 17 \opt{ipodnano}{
18 The \archosplayertype{} is available in multiple versions, not 18 The \playertype{} is available in multiple versions, not
19 all of which run Rockbox. Rockbox presently runs only on 19 all of which run Rockbox. Rockbox presently runs only on
20 the original Ipod Nano. Rockbox does 20 the original Ipod Nano. Rockbox does
21 \emph{not} run on the second, third, or fourth generation Ipod Nano. 21 \emph{not} run on the second, third, or fourth generation Ipod Nano.
@@ -23,13 +23,13 @@ follow the instructions at
23 Apple's website: \url{http://www.info.apple.com/kbnum/n61688}. 23 Apple's website: \url{http://www.info.apple.com/kbnum/n61688}.
24 } 24 }
25 \opt{ipodvideo}{ 25 \opt{ipodvideo}{
26 The \archosplayertype{} is the 5th/5.5th generation \archosplayerman{} only. 26 The \playertype{} is the 5th/5.5th generation \playerman{} only.
27 Rockbox does \emph{not} run on the newer, 6th/Classic generation Ipod. 27 Rockbox does \emph{not} run on the newer, 6th/Classic generation Ipod.
28 For information on identifying which Ipod you own, see this page on Apple's 28 For information on identifying which Ipod you own, see this page on Apple's
29 website: \url{http://www.info.apple.com/kbnum/n61688}. 29 website: \url{http://www.info.apple.com/kbnum/n61688}.
30 } 30 }
31 \opt{sansae200,sansac200}{ 31 \opt{e200,c200}{
32 The \archosplayertype{} is available in multiple versions, not 32 The \playertype{} is available in multiple versions, not
33 all of which run Rockbox. Rockbox doesn't run on the 33 all of which run Rockbox. Rockbox doesn't run on the
34 newer v2 models. They can be identified 34 newer v2 models. They can be identified
35 by checking the Sandisk firmware version number under 35 by checking the Sandisk firmware version number under
@@ -39,7 +39,7 @@ follow the instructions at
39\end{description} 39\end{description}
40} 40}
41 41
42\opt{iriverh300}{ 42\opt{h300}{
43\begin{description} 43\begin{description}
44 \item[DRM capability.] If your \dap{} has a US firmware, then by installing Rockbox you will 44 \item[DRM capability.] If your \dap{} has a US firmware, then by installing Rockbox you will
45 \emph{permanently} lose the ability to playback files with DRM. 45 \emph{permanently} lose the ability to playback files with DRM.
@@ -77,7 +77,7 @@ follow the instructions at
77 and hold the \ButtonSelect{} and \ButtonPlay{} buttons simultaneously. Your 77 and hold the \ButtonSelect{} and \ButtonPlay{} buttons simultaneously. Your
78 \dap{} should enter disk mode and you can try reconnecting to the computer. 78 \dap{} should enter disk mode and you can try reconnecting to the computer.
79 } 79 }
80 \opt{iaudiox5}{ 80 \opt{x5}{
81 When instructed to connect/disconnect the USB cable, always use 81 When instructed to connect/disconnect the USB cable, always use
82 the USB port through the subpack, not the side 'USB Host' port. The side port 82 the USB port through the subpack, not the side 'USB Host' port. The side port
83 is intended to be used for USB OTG connections only (digital cameras, memory 83 is intended to be used for USB OTG connections only (digital cameras, memory
@@ -89,15 +89,15 @@ follow the instructions at
89 89
90 \warn{Never extract files to your \dap{} while it is in recovery mode.} 90 \warn{Never extract files to your \dap{} while it is in recovery mode.}
91 } 91 }
92 \opt{iriverh10,iriverh10_5gb}{ 92 \opt{h10,h10_5gb}{
93 The installation requires you to use UMS mode and so 93 The installation requires you to use UMS mode and so
94 may require use of the UMS trick, whereby it is possible to force a MTP 94 may require use of the UMS trick, whereby it is possible to force a MTP
95 \archosplayertype{} to start up in UMS mode as follows: 95 \playertype{} to start up in UMS mode as follows:
96 \begin{enumerate} 96 \begin{enumerate}
97 \item Ensure the \dap{} is fully powered off by \opt{iriverh10}{using a pin to 97 \item Ensure the \dap{} is fully powered off by \opt{h10}{using a pin to
98 push the small reset button inside the hole between the Hold switch and 98 push the small reset button inside the hole between the Hold switch and
99 remote control connector.}\opt{iriverh10_5gb}{removing the battery and putting it back in again.} 99 remote control connector.}\opt{h10_5gb}{removing the battery and putting it back in again.}
100 \item Connect your \archosplayertype{} to the computer using the data cable. 100 \item Connect your \playertype{} to the computer using the data cable.
101 \item Hold \ButtonRight{} and push \ButtonPower{} to turn the \dap{} on. 101 \item Hold \ButtonRight{} and push \ButtonPower{} to turn the \dap{} on.
102 \item Continue holding \ButtonRight{} until the USB Connected screen appears. 102 \item Continue holding \ButtonRight{} until the USB Connected screen appears.
103 \item The \dap{} will now appear as a regular disk on your computer. 103 \item The \dap{} will now appear as a regular disk on your computer.
@@ -105,7 +105,7 @@ follow the instructions at
105 \note{Once Rockbox has been installed, when you shut down your \dap{} from Rockbox it will totally 105 \note{Once Rockbox has been installed, when you shut down your \dap{} from Rockbox it will totally
106 power the player off so step 1 is no longer necessary.} 106 power the player off so step 1 is no longer necessary.}
107 } 107 }
108 \opt{gigabeatfx}{During installation, do not connect your \dap{} 108 \opt{gigabeatf}{During installation, do not connect your \dap{}
109 using the cradle but plug the USB cable directly to the \dap{}. 109 using the cradle but plug the USB cable directly to the \dap{}.
110 } 110 }
111\end{description} 111\end{description}
@@ -141,7 +141,7 @@ for you. However, should you encounter a problem, then the manual way is
141still available to you.\\ 141still available to you.\\
142 142
143\opt{gigabeats}{\note{The automated install is not yet available for the 143\opt{gigabeats}{\note{The automated install is not yet available for the
144 \archosplayertype{}. For now you can use the manual method to install Rockbox. 144 \playertype{}. For now you can use the manual method to install Rockbox.
145 Please still read the section on the automatic install as it explains 145 Please still read the section on the automatic install as it explains
146 various important aspects of Rockbox, such as the different versions 146 various important aspects of Rockbox, such as the different versions
147 available.\\}} 147 available.\\}}
@@ -156,31 +156,31 @@ still available to you.\\
156 156
157\begin{description} 157\begin{description}
158\opt{HAVE_RB_BL_ON_DISK}{ 158\opt{HAVE_RB_BL_ON_DISK}{
159\item[The \archosplayerman{} bootloader.] 159\item[The \playerman{} bootloader.]
160 The \archosplayerman{} bootloader is the program that tells your \dap{} how to load 160 The \playerman{} bootloader is the program that tells your \dap{} how to load
161 and start the original firmware. It is also responsible for any emergency, 161 and start the original firmware. It is also responsible for any emergency,
162 recovery, or disk modes on your \dap{}. This bootloader is stored in special flash 162 recovery, or disk modes on your \dap{}. This bootloader is stored in special flash
163 memory in your \archosplayerman{} and comes factory-installed. It is not necessary 163 memory in your \playerman{} and comes factory-installed. It is not necessary
164 to modify this in order to install Rockbox.} 164 to modify this in order to install Rockbox.}
165 165
166\item[The Rockbox bootloader.] \index{Bootloader} 166\item[The Rockbox bootloader.] \index{Bootloader}
167 \opt{HAVE_RB_BL_ON_DISK}{The Rockbox bootloader is loaded from disk by 167 \opt{HAVE_RB_BL_ON_DISK}{The Rockbox bootloader is loaded from disk by
168 the \archosplayerman{} bootloader. It is responsible for loading the Rockbox 168 the \playerman{} bootloader. It is responsible for loading the Rockbox
169 firmware and for providing the dual boot function. It directly replaces the 169 firmware and for providing the dual boot function. It directly replaces the
170 \archosplayerman{} firmware in the \daps{} boot sequence. 170 \playerman{} firmware in the \daps{} boot sequence.
171 \opt{gigabeatfx}{\note{Dual boot does not currently work on the Gigabeat.}}} 171 \opt{gigabeatf}{\note{Dual boot does not currently work on the Gigabeat.}}}
172 172
173 \opt{HAVE_RB_BL_IN_FLASH}{ 173 \opt{HAVE_RB_BL_IN_FLASH}{
174 The bootloader is the program that tells your 174 The bootloader is the program that tells your
175 \dap{} how to load and start other components of Rockbox and for providing 175 \dap{} how to load and start other components of Rockbox and for providing
176 the dual boot function. This is the component of Rockbox that is installed 176 the dual boot function. This is the component of Rockbox that is installed
177 to the flash memory of your \archosplayerman. 177 to the flash memory of your \playerman.
178 \opt{iaudio}{\note{Dual boot does not currently work on the \archosplayertype{}.}}} 178 \opt{iaudio}{\note{Dual boot does not currently work on the \playertype{}.}}}
179 179
180\item[The Rockbox firmware.] 180\item[The Rockbox firmware.]
181 \opt{HAVE_RB_BL_IN_FLASH}{Unlike the \archosplayerman{} firmware, which runs 181 \opt{HAVE_RB_BL_IN_FLASH}{Unlike the \playerman{} firmware, which runs
182 entirely from flash memory,} 182 entirely from flash memory,}
183 \opt{HAVE_RB_BL_ON_DISK}{Similar to the \archosplayerman{} firmware,} 183 \opt{HAVE_RB_BL_ON_DISK}{Similar to the \playerman{} firmware,}
184 most of the Rockbox code is contained in a 184 most of the Rockbox code is contained in a
185 ``build'' that resides on your \daps{} drive. This makes it easy to 185 ``build'' that resides on your \daps{} drive. This makes it easy to
186 update Rockbox. The build consists of a directory called 186 update Rockbox. The build consists of a directory called
@@ -190,7 +190,7 @@ still available to you.\\
190\end{description} 190\end{description}
191} 191}
192 192
193\nopt{archosplayer} { 193\nopt{player} {
194 Apart from the required parts there are some addons you might be interested 194 Apart from the required parts there are some addons you might be interested
195 in installing. 195 in installing.
196 \begin{description} 196 \begin{description}
@@ -214,7 +214,7 @@ housekeeping tool \caps{Rockbox Utility}. It allows you to:
214 (``Minimal Installation''). 214 (``Minimal Installation'').
215\item Automatically install all suggested components (``Complete Installation''). 215\item Automatically install all suggested components (``Complete Installation'').
216\item Selectively install optional components. 216\item Selectively install optional components.
217\nopt{archosplayer}{\item Install additional fonts and themes.} 217\nopt{player}{\item Install additional fonts and themes.}
218\item Install voice files and generate talk clips. 218\item Install voice files and generate talk clips.
219\item Uninstall all components you installed using Rockbox Utility. 219\item Uninstall all components you installed using Rockbox Utility.
220\end{itemize} 220\end{itemize}
@@ -232,35 +232,35 @@ filesystem.\\*
232 232
233\opt{ipodvideo} 233\opt{ipodvideo}
234 {\note{Autodetection is unable to distinguish between the 234 {\note{Autodetection is unable to distinguish between the
235 \archosplayerman{} 30~GB and 60~GB / 80~GB models and defaults to the 235 \playerman{} 30~GB and 60~GB / 80~GB models and defaults to the
236 30~GB model. This will usually work but you might want to check the 236 30~GB model. This will usually work but you might want to check the
237 detected value, especially if you experience problems with Rockbox.} 237 detected value, especially if you experience problems with Rockbox.}
238} 238}
239 239
240\opt{iriverh100,iriverh300}{ 240\opt{h100,h300}{
241 Rockbox Utility will ask you for a compatible copy of the original 241 Rockbox Utility will ask you for a compatible copy of the original
242 firmware. This is because for legal reasons we cannot distribute 242 firmware. This is because for legal reasons we cannot distribute
243 the bootloader directly. Instead, we have to patch the Iriver firmware 243 the bootloader directly. Instead, we have to patch the Iriver firmware
244 with the Rockbox bootloader. 244 with the Rockbox bootloader.
245 245
246 Download a supported version of the Iriver firmware for your 246 Download a supported version of the Iriver firmware for your
247 \archosplayername{} from the Iriver website, links can be found on 247 \playername{} from the Iriver website, links can be found on
248 \wikilink{IriverBoot}. 248 \wikilink{IriverBoot}.
249 249
250 Supported Iriver firmware versions currently include 250 Supported Iriver firmware versions currently include
251 \opt{iriverh100}{1.63US, 1.63EU, 1.63K, 1.65US, 1.65EU, 1.65K, 1.66US, 251 \opt{h100}{1.63US, 1.63EU, 1.63K, 1.65US, 1.65EU, 1.65K, 1.66US,
252 1.66EU and 1.66K. Note that the H140 uses the same firmware as the H120; 252 1.66EU and 1.66K. Note that the H140 uses the same firmware as the H120;
253 H120 and H140 owners should use the firmware called \fname{ihp\_120.hex}. 253 H120 and H140 owners should use the firmware called \fname{ihp\_120.hex}.
254 Likewise, the iHP110 and iHP115 use the same firmware, called 254 Likewise, the iHP110 and iHP115 use the same firmware, called
255 \fname{ihp\_100.hex}. Be sure to use the correct firmware file for 255 \fname{ihp\_100.hex}. Be sure to use the correct firmware file for
256 your player.} 256 your player.}
257 \opt{iriverh300}{1.28K, 1.28EU, 1.28J, 1.29K, 1.29J and 1.30EU. 257 \opt{h300}{1.28K, 1.28EU, 1.28J, 1.29K, 1.29J and 1.30EU.
258 \note{The US \archosplayername{} firmware is not supported and cannot be 258 \note{The US \playername{} firmware is not supported and cannot be
259 patched to be used with the bootloader. If you wish to install Rockbox 259 patched to be used with the bootloader. If you wish to install Rockbox
260 on a US \archosplayername{}, you must first install a non-US version of the 260 on a US \playername{}, you must first install a non-US version of the
261 original firmware and then install one of the supported versions patched 261 original firmware and then install one of the supported versions patched
262 with the Rockbox bootloader.} 262 with the Rockbox bootloader.}
263 \warn{Installing a non-US firmware on a US \archosplayername{} will 263 \warn{Installing a non-US firmware on a US \playername{} will
264 \emph{permanently} remove DRM support from the player.}} 264 \emph{permanently} remove DRM support from the player.}}
265 265
266 If the file that you downloaded is a \fname{.zip} file, use an unzip 266 If the file that you downloaded is a \fname{.zip} file, use an unzip
@@ -339,7 +339,7 @@ data partiton.}}
339\dap{}.}} 339\dap{}.}}
340 340
341\item Connect your \dap{} to the computer via USB 341\item Connect your \dap{} to the computer via USB
342 \opt{ipod3g,ipod4g,ipodmini1g,ipodcolor}{ or Firewire} as described in 342 \opt{ipod3g,ipod4g,ipodmini,ipodcolor}{ or Firewire} as described in
343 the manual that came with your \dap{}. 343 the manual that came with your \dap{}.
344 344
345\item Take the \fname{.zip} file that you downloaded and use 345\item Take the \fname{.zip} file that you downloaded and use
@@ -370,18 +370,18 @@ structure that Rockbox needs.\\}
370 370
371\opt{swcodec}{\nopt{gigabeats}{ 371\opt{swcodec}{\nopt{gigabeats}{
372 \subsubsection{Installing the bootloader} 372 \subsubsection{Installing the bootloader}
373 \opt{iriverh100,iriverh300}{\input{getting_started/iriver_install.tex}} 373 \opt{h100,h300}{\input{getting_started/iriver_install.tex}}
374 \opt{ipod}{\input{getting_started/ipod_install.tex}} 374 \opt{ipod}{\input{getting_started/ipod_install.tex}}
375 \opt{iaudiom3,iaudiom5,iaudiox5}{\input{getting_started/iaudio_install.tex}} 375 \opt{m3,m5,x5}{\input{getting_started/iaudio_install.tex}}
376 \opt{iriverh10,iriverh10_5gb}{\input{getting_started/h10_install.tex}} 376 \opt{h10,h10_5gb}{\input{getting_started/h10_install.tex}}
377 \opt{gigabeatfx}{\input{getting_started/gigabeat_install.tex}} 377 \opt{gigabeatf}{\input{getting_started/gigabeat_install.tex}}
378 \opt{sansa}{\input{getting_started/sansa_install.tex}} 378 \opt{sansa}{\input{getting_started/sansa_install.tex}}
379 \opt{mrobe100}{\input{getting_started/mrobe100_install.tex}} 379 \opt{mrobe100}{\input{getting_started/mrobe100_install.tex}}
380}} 380}}
381 381
382\subsection{Finishing the install}\label{ref:finish_install} 382\subsection{Finishing the install}\label{ref:finish_install}
383 383
384\opt{gigabeatfx}{ 384\opt{gigabeatf}{
385 After installing you \emph{need} to power-cycle the 385 After installing you \emph{need} to power-cycle the
386 \dap{} by doing the following steps. Failure to do so may result in problems. 386 \dap{} by doing the following steps. Failure to do so may result in problems.
387 \begin{itemize} 387 \begin{itemize}
@@ -394,7 +394,7 @@ structure that Rockbox needs.\\}
394 \end{itemize} 394 \end{itemize}
395} 395}
396 396
397\opt{iaudiom3,iaudiom5,iaudiox5}{ 397\opt{m3,m5,x5}{
398 After installing you \emph{need} to power-cycle the 398 After installing you \emph{need} to power-cycle the
399 \dap{} by doing the following steps. 399 \dap{} by doing the following steps.
400 \begin{itemize} 400 \begin{itemize}
@@ -407,7 +407,7 @@ structure that Rockbox needs.\\}
407 \end{itemize} 407 \end{itemize}
408} 408}
409 409
410\opt{iriverh10,iriverh10_5gb,ipod,mrobe100,sansa,archos}{ 410\opt{h10,h10_5gb,ipod,mrobe100,sansa,archos}{
411 Safely eject / unmount the USB drive, unplug the cable and restart. 411 Safely eject / unmount the USB drive, unplug the cable and restart.
412} 412}
413 413
@@ -415,7 +415,7 @@ structure that Rockbox needs.\\}
415 Safely eject / unmount your \dap{}. 415 Safely eject / unmount your \dap{}.
416} 416}
417 417
418\opt{iriverh100,iriverh300}{ 418\opt{h100,h300}{
419 \begin{itemize} 419 \begin{itemize}
420 \item Safely eject / unmount your \dap{}. 420 \item Safely eject / unmount your \dap{}.
421 421
@@ -426,14 +426,14 @@ structure that Rockbox needs.\\}
426 the jukebox on. Press and hold the \ButtonSelect{} button to enter the main menu, 426 the jukebox on. Press and hold the \ButtonSelect{} button to enter the main menu,
427 and navigate to \setting{General $\rightarrow$ Firmware Upgrade}. Select 427 and navigate to \setting{General $\rightarrow$ Firmware Upgrade}. Select
428 \setting{Yes} when asked to confirm if you want to upgrade the 428 \setting{Yes} when asked to confirm if you want to upgrade the
429 firmware. The \archosplayerman{} will display a message indicating that the 429 firmware. The \playerman{} will display a message indicating that the
430 firmware update is in progress. Do \emph{not} interrupt this process. When the 430 firmware update is in progress. Do \emph{not} interrupt this process. When the
431 firmware update is complete the player will turn itself off. (The update 431 firmware update is complete the player will turn itself off. (The update
432 firmware process usually takes a minute or so.). You are now ready to go. 432 firmware process usually takes a minute or so.). You are now ready to go.
433\end{itemize} 433\end{itemize}
434} 434}
435 435
436\opt{sansae200}{Your e200 will automatically reboot and Rockbox should load.} 436\opt{e200}{Your e200 will automatically reboot and Rockbox should load.}
437 437
438 438
439 439
@@ -463,10 +463,10 @@ you turn the unit on, Rockbox should load.}
463\opt{gigabeats}{Rockbox should automatically load when you turn on your player.\\ 463\opt{gigabeats}{Rockbox should automatically load when you turn on your player.\\
464 464
465 \note{ 465 \note{
466 If you have loaded music onto your \dap{} using the \archosplayerman{} 466 If you have loaded music onto your \dap{} using the \playerman{}
467 firmware, you will not be able to see your music properly in the 467 firmware, you will not be able to see your music properly in the
468 \setting{File Browser} as MTP mode changes the location and file names. 468 \setting{File Browser} as MTP mode changes the location and file names.
469 Files placed on your \dap{} using the \archosplayerman{} firmware can be 469 Files placed on your \dap{} using the \playerman{} firmware can be
470 viewed by initialising and using Rockbox's database. 470 viewed by initialising and using Rockbox's database.
471 See \reference{ref:database} for more information.} 471 See \reference{ref:database} for more information.}
472} 472}
@@ -482,7 +482,7 @@ you turn the unit on, Rockbox should load.}
482 } 482 }
483} 483}
484 484
485\opt{iaudiom3}{ 485\opt{m3}{
486 \fixme{Add a note about the charging trick and place it here?} 486 \fixme{Add a note about the charging trick and place it here?}
487} 487}
488 488
@@ -512,7 +512,7 @@ The new build will be installed over your current build.\\
512 512
513\section{Uninstalling Rockbox}\index{Installation!uninstall} 513\section{Uninstalling Rockbox}\index{Installation!uninstall}
514 514
515\nopt{gigabeatfx,iaudiom5,iaudiox5,archos,mrobe100,gigabeats}{ 515\nopt{gigabeatf,m5,x5,archos,mrobe100,gigabeats}{
516 \note{The Rockbox bootloader allows you to choose between Rockbox and 516 \note{The Rockbox bootloader allows you to choose between Rockbox and
517 the original firmware. (See \reference{ref:Dualboot} for more information.)} 517 the original firmware. (See \reference{ref:Dualboot} for more information.)}
518} 518}
@@ -524,37 +524,37 @@ You can uninstall Rockbox automatically by using Rockbox Utility. If you
524installed Rockbox manually you can still use Rockbox Utility for uninstallation 524installed Rockbox manually you can still use Rockbox Utility for uninstallation
525but will not be able to do this selectively. 525but will not be able to do this selectively.
526 526
527\opt{iriverh100,iriverh300}{\note{Rockbox Utility cannot uninstall the bootloader due to 527\opt{h100,h300}{\note{Rockbox Utility cannot uninstall the bootloader due to
528the fact that it requires a flashing procedure. To uninstall the bootloader 528the fact that it requires a flashing procedure. To uninstall the bootloader
529completely follow the manual uninstallation instructions below.}} 529completely follow the manual uninstallation instructions below.}}
530 530
531\subsection{Manual Uninstallation} 531\subsection{Manual Uninstallation}
532 532
533\opt{archos}{ 533\opt{archos}{
534 If you would like to go back to using the original \archosplayerman{} software, 534 If you would like to go back to using the original \playerman{} software,
535 connect the \dap{} to your computer, and delete the 535 connect the \dap{} to your computer, and delete the
536 \fname{\firmwarefilename} file. 536 \fname{\firmwarefilename} file.
537} 537}
538 538
539\opt{iriverh10,iriverh10_5gb}{ 539\opt{h10,h10_5gb}{
540 If you would like to go back to using the original \archosplayerman{} software, 540 If you would like to go back to using the original \playerman{} software,
541 connect the \dap{} to your computer, and delete the 541 connect the \dap{} to your computer, and delete the
542 \opt{iriverh10}{\fname{H10\_20GC.mi4}}\opt{iriverh10_5gb}{\fname{H10.mi4}} file and rename 542 \opt{h10}{\fname{H10\_20GC.mi4}}\opt{h10_5gb}{\fname{H10.mi4}} file and rename
543 \fname{OF.mi4} to \opt{iriverh10}{\fname{H10\_20GC.mi4}}\opt{iriverh10_5gb}{\fname{H10.mi4}} 543 \fname{OF.mi4} to \opt{h10}{\fname{H10\_20GC.mi4}}\opt{h10_5gb}{\fname{H10.mi4}}
544 in the \fname{System} directory on your \archosplayertype{}. As in the installation, 544 in the \fname{System} directory on your \playertype{}. As in the installation,
545 it may be necessary to first put your device into UMS mode. 545 it may be necessary to first put your device into UMS mode.
546} 546}
547 547
548\opt{mrobe100}{ 548\opt{mrobe100}{
549 If you would like to go back to using the original \archosplayerman{} software, 549 If you would like to go back to using the original \playerman{} software,
550 connect the \dap{} to your computer, and delete the 550 connect the \dap{} to your computer, and delete the
551 \fname{pp5020.mi4} file and rename 551 \fname{pp5020.mi4} file and rename
552 \fname{OF.mi4} to \fname{pp5020.mi4} 552 \fname{OF.mi4} to \fname{pp5020.mi4}
553 in the \fname{System} directory on your \archosplayertype{}. 553 in the \fname{System} directory on your \playertype{}.
554} 554}
555 555
556\opt{sansae200}{ 556\opt{e200}{
557 If you would like to go back to using the original \archosplayerman{} software, 557 If you would like to go back to using the original \playerman{} software,
558 connect the \dap{} to your computer, and follow the instructions to install 558 connect the \dap{} to your computer, and follow the instructions to install
559 the bootloader, but when prompted by sansapatcher, enter \texttt{u} for uninstall, 559 the bootloader, but when prompted by sansapatcher, enter \texttt{u} for uninstall,
560 instead of \texttt{i} for install. As in the installation, it may be necessary to 560 instead of \texttt{i} for install. As in the installation, it may be necessary to
@@ -568,26 +568,26 @@ completely follow the manual uninstallation instructions below.}}
568 instead of \texttt{i} for install. 568 instead of \texttt{i} for install.
569} 569}
570 570
571\opt{iaudiom5,iaudiox5}{ 571\opt{m5,x5}{
572 If you would like to go back to using the original \archosplayerman{} software, 572 If you would like to go back to using the original \playerman{} software,
573 connect the \dap{} to your computer, download the original \archosplayername{} 573 connect the \dap{} to your computer, download the original \playername{}
574 firmware from the \archosplayerman{} website, and copy it to the \fname{FIRMWARE} 574 firmware from the \playerman{} website, and copy it to the \fname{FIRMWARE}
575 directory on your \archosplayername{}. Turn off the \dap{}, remove the USB cable 575 directory on your \playername{}. Turn off the \dap{}, remove the USB cable
576 and insert the charger. The original firmware will automatically be flashed. 576 and insert the charger. The original firmware will automatically be flashed.
577} 577}
578 578
579\opt{iriverh100,iriverh300}{ 579\opt{h100,h300}{
580 If you want to remove the Rockbox bootloader, simply flash an unpatched 580 If you want to remove the Rockbox bootloader, simply flash an unpatched
581 \archosplayerman{} firmware. Be aware that doing so will also remove the bootloader 581 \playerman{} firmware. Be aware that doing so will also remove the bootloader
582 USB mode. As that mode can come in quite handy (especially if you experience 582 USB mode. As that mode can come in quite handy (especially if you experience
583 disk errors) it is recommended to keep the bootloader. It also 583 disk errors) it is recommended to keep the bootloader. It also
584 gives you the possibility of trying Rockbox anytime later by simply 584 gives you the possibility of trying Rockbox anytime later by simply
585 installing the distribution files. 585 installing the distribution files.
586 \opt{iriverh100}{ 586 \opt{h100}{
587 The Rockbox bootloader will automatically start the original firmware if 587 The Rockbox bootloader will automatically start the original firmware if
588 the \fname{.rockbox} directory has been deleted. 588 the \fname{.rockbox} directory has been deleted.
589 } 589 }
590 \opt{iriverh300}{ 590 \opt{h300}{
591 Although if you retain the Rockbox bootloader, you will need to hold the 591 Although if you retain the Rockbox bootloader, you will need to hold the
592 \ButtonRec{} button each time you want to start the original firmware. 592 \ButtonRec{} button each time you want to start the original firmware.
593 } 593 }
@@ -596,8 +596,8 @@ completely follow the manual uninstallation instructions below.}}
596\nopt{gigabeats}{ 596\nopt{gigabeats}{
597 If you wish to clean up your disk, you may also wish to delete the 597 If you wish to clean up your disk, you may also wish to delete the
598 \fname{.rockbox} directory and its contents. 598 \fname{.rockbox} directory and its contents.
599 \nopt{iaudiom5,iaudiox5}{Turn the \archosplayerman{} off. 599 \nopt{m5,x5}{Turn the \playerman{} off.
600 Turn the \dap{} back on and the original \archosplayerman{} software will load.} 600 Turn the \dap{} back on and the original \playerman{} software will load.}
601} 601}
602 602
603\opt{gigabeats}{ 603\opt{gigabeats}{
@@ -605,7 +605,7 @@ completely follow the manual uninstallation instructions below.}}
605 \fname{.rockbox} directory and its contents, this must be done 605 \fname{.rockbox} directory and its contents, this must be done
606 before uninstalling the bootloader in the next step. 606 before uninstalling the bootloader in the next step.
607 607
608 Before installation you should have downloaded a copy of the \archosplayerman{} 608 Before installation you should have downloaded a copy of the \playerman{}
609 firmware from 609 firmware from
610 \url{http://www.tacp.toshiba.com/tacpassets-images/firmware/MESV12US.zip}. 610 \url{http://www.tacp.toshiba.com/tacpassets-images/firmware/MESV12US.zip}.
611 \begin{itemize} 611 \begin{itemize}
@@ -633,7 +633,7 @@ completely follow the manual uninstallation instructions below.}}
633 please ensure that you are either logged in as an administrator (Windows), or 633 please ensure that you are either logged in as an administrator (Windows), or
634 you have root rights (Linux)} 634 you have root rights (Linux)}
635 635
636\opt{iriverh100,iriverh300}{ 636\opt{h100,h300}{
637 \item[Immediately loading original firmware.] 637 \item[Immediately loading original firmware.]
638 If the original firmware is immediately 638 If the original firmware is immediately
639 loaded without the Rockbox bootloader appearing first, then the Rockbox bootloader 639 loaded without the Rockbox bootloader appearing first, then the Rockbox bootloader
@@ -641,10 +641,10 @@ completely follow the manual uninstallation instructions below.}}
641 the update if the filename is correct, including case. Make sure that the patched 641 the update if the filename is correct, including case. Make sure that the patched
642 Iriver firmware is called \fname{.hex}.} 642 Iriver firmware is called \fname{.hex}.}
643 643
644\nopt{iriverh100,iriverh300}{\item[``File Not Found'']} 644\nopt{h100,h300}{\item[``File Not Found'']}
645\opt{iriverh100,iriverh300}{\item[``-1 error'']} 645\opt{h100,h300}{\item[``-1 error'']}
646 If you receive a 646 If you receive a
647 \nopt{iriverh100,iriverh300}{``File Not Found''}\opt{iriverh100,iriverh300}{``-1 error''} from the 647 \nopt{h100,h300}{``File Not Found''}\opt{h100,h300}{``-1 error''} from the
648 bootloader, then the bootloader cannot find the Rockbox firmware. This is 648 bootloader, then the bootloader cannot find the Rockbox firmware. This is
649 usually a result of not extracting the contents of the \fname{.zip} file 649 usually a result of not extracting the contents of the \fname{.zip} file
650 to the proper location, and should not happen when Rockbox has been 650 to the proper location, and should not happen when Rockbox has been
diff --git a/manual/getting_started/main.tex b/manual/getting_started/main.tex
index 5d9e812784..f5eba1fae8 100644
--- a/manual/getting_started/main.tex
+++ b/manual/getting_started/main.tex
@@ -60,7 +60,7 @@ We have some conventions (especially for naming) that are intended to be
60consistent throughout this manual. 60consistent throughout this manual.
61 61
62Manufacturer and product names are formatted in accordance with the standard 62Manufacturer and product names are formatted in accordance with the standard
63rules of English grammar, e.g. ``\archosplayerman{} playback is currently 63rules of English grammar, e.g. ``\playerman{} playback is currently
64unsupported''. Manufacturer and model names are proper nouns, and 64unsupported''. Manufacturer and model names are proper nouns, and
65thus are written beginning with a capital letter. 65thus are written beginning with a capital letter.
66 66
diff --git a/manual/getting_started/mrobe100_install.tex b/manual/getting_started/mrobe100_install.tex
index 0ddc966c4a..41fafac073 100644
--- a/manual/getting_started/mrobe100_install.tex
+++ b/manual/getting_started/mrobe100_install.tex
@@ -2,9 +2,9 @@
2\begin{enumerate} 2\begin{enumerate}
3 \item Download 3 \item Download
4 {\url{http://download.rockbox.org/bootloader/olympus/mrobe100/pp5020.mi4}} 4 {\url{http://download.rockbox.org/bootloader/olympus/mrobe100/pp5020.mi4}}
5 \item Connect your \archosplayertype{} to the computer. 5 \item Connect your \playertype{} to the computer.
6 \item Rename the original \fname{pp5020.mi4} file to \fname{OF.mi4} in the \fname{System} directory on your \archosplayertype{}. 6 \item Rename the original \fname{pp5020.mi4} file to \fname{OF.mi4} in the \fname{System} directory on your \playertype{}.
7 \warn{You should keep a safe backup of this file for use if you ever wish to switch back to the \archosplayerman{} firmware.} 7 \warn{You should keep a safe backup of this file for use if you ever wish to switch back to the \playerman{} firmware.}
8 \note{If you cannot see the \fname{System} directory, you will need to make sure your operating system is configured to show hidden files and directories.} 8 \note{If you cannot see the \fname{System} directory, you will need to make sure your operating system is configured to show hidden files and directories.}
9 9
10 \item Copy the \fname{pp5020.mi4} file you downloaded to the System directory on your \dap{}. 10 \item Copy the \fname{pp5020.mi4} file you downloaded to the System directory on your \dap{}.
diff --git a/manual/getting_started/sansaAMS_install.tex b/manual/getting_started/sansaAMS_install.tex
index 9e07c1b28a..9f2e25c64b 100644
--- a/manual/getting_started/sansaAMS_install.tex
+++ b/manual/getting_started/sansaAMS_install.tex
@@ -1,6 +1,6 @@
1% $Id: % 1% $Id: %
2 2
3In order to make your \archosplayertype{} load and execute the Rockbox 3In order to make your \playertype{} load and execute the Rockbox
4firmware you have just installed, you will need to install the 4firmware you have just installed, you will need to install the
5Rockbox bootloader. Unless bugs are found in the bootloader code, or 5Rockbox bootloader. Unless bugs are found in the bootloader code, or
6significant new features are added, you will only have to perform this 6significant new features are added, you will only have to perform this
diff --git a/manual/getting_started/sansa_install.tex b/manual/getting_started/sansa_install.tex
index edfb3b646d..7956e94f76 100644
--- a/manual/getting_started/sansa_install.tex
+++ b/manual/getting_started/sansa_install.tex
@@ -8,7 +8,7 @@
8and run it whilst logged in with an administrator account. 8and run it whilst logged in with an administrator account.
9 9
10\item If all has gone well, you should see some information displayed about 10\item If all has gone well, you should see some information displayed about
11your \archosplayertype{} and a message asking you if you wish to install the Rockbox 11your \playertype{} and a message asking you if you wish to install the Rockbox
12bootloader. Press i followed by ENTER, and sansapatcher will now 12bootloader. Press i followed by ENTER, and sansapatcher will now
13install the bootloader. After a short time you should see the message 13install the bootloader. After a short time you should see the message
14``[INFO] Bootloader installed successfully.'' Press ENTER again to exit 14``[INFO] Bootloader installed successfully.'' Press ENTER again to exit
@@ -58,7 +58,7 @@ steps will assume you have saved it in your home directory.
58sufficient permission to perform raw disk access to your \dap{}.} 58sufficient permission to perform raw disk access to your \dap{}.}
59 59
60\item If all has gone well, you should see some information displayed about 60\item If all has gone well, you should see some information displayed about
61your \archosplayertype{} and a message asking you if you wish to install the Rockbox 61your \playertype{} and a message asking you if you wish to install the Rockbox
62bootloader. Press i followed by ENTER, and sansapatcher will now install the 62bootloader. Press i followed by ENTER, and sansapatcher will now install the
63bootloader. After a short time you should see the message ``[INFO] Bootloader 63bootloader. After a short time you should see the message ``[INFO] Bootloader
64installed successfully.'' Press ENTER again to exit sansapatcher. 64installed successfully.'' Press ENTER again to exit sansapatcher.
diff --git a/manual/main_menu/main.tex b/manual/main_menu/main.tex
index 50bdd4c657..6eb539c718 100644
--- a/manual/main_menu/main.tex
+++ b/manual/main_menu/main.tex
@@ -181,7 +181,7 @@ utilities. A detailed description of the different plugins is to be found in
181\reference{ref:plugins}. 181\reference{ref:plugins}.
182 182
183\section{\label{ref:Info}System} 183\section{\label{ref:Info}System}
184\opt{archosplayer}{Use the MINUS and PLUS keys to step through several 184\opt{player}{Use the MINUS and PLUS keys to step through several
185pages of information.} 185pages of information.}
186 186
187\begin{description} 187\begin{description}
@@ -224,7 +224,7 @@ pages of information.}
224 given seperately for internal memory (\emph{Int}) and for a plugged in 224 given seperately for internal memory (\emph{Int}) and for a plugged in
225 memory card 225 memory card
226 \opt{ondio}{(\emph{MMC})} 226 \opt{ondio}{(\emph{MMC})}
227 \opt{sansa,sansae200v2,sansafuze}{(\emph{MSD})}. 227 \opt{sansa,e200v2,fuze}{(\emph{MSD})}.
228}% 228}%
229\nopt{multivolume}{Hard disk size and the amount of free space on the disk.} 229\nopt{multivolume}{Hard disk size and the amount of free space on the disk.}
230 230
@@ -248,7 +248,7 @@ pages of information.}
248 settings before asking for help.} 248 settings before asking for help.}
249\end{description} 249\end{description}
250 250
251\opt{archosplayer}{ 251\opt{player}{
252 \section{Shutdown} 252 \section{Shutdown}
253 This menu option saves the Rockbox configuration and turns off the hard 253 This menu option saves the Rockbox configuration and turns off the hard
254 drive before shutting down the machine. For maximum safety this procedure 254 drive before shutting down the machine. For maximum safety this procedure
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 @@
1% $Id$ % 1% $Id$ %
2\def\UseOption{sansac200} 2\def\UseOption{c200}
3\edef\UseOption{\UseOption,HAVE_RB_BL_ON_DISK} 3\edef\UseOption{\UseOption,HAVE_RB_BL_ON_DISK}
4\edef\UseOption{\UseOption,SANSA_C200_PAD} 4\edef\UseOption{\UseOption,SANSA_C200_PAD}
5\edef\UseOption{\UseOption,HAVE_BACKLIGHT} 5\edef\UseOption{\UseOption,HAVE_BACKLIGHT}
@@ -7,15 +7,15 @@
7\edef\UseOption{\UseOption,HAVE_BUTTON_LIGHTS} 7\edef\UseOption{\UseOption,HAVE_BUTTON_LIGHTS}
8\edef\UseOption{\UseOption,sansa} 8\edef\UseOption{\UseOption,sansa}
9 9
10\newcommand{\archosplayerman}{Sansa} 10\newcommand{\playerman}{Sansa}
11\newcommand{\archosplayertype}{sansac200 Series} 11\newcommand{\playertype}{c200 Series}
12\newcommand{\archosplayerlongtype}{\archosplayertype} 12\newcommand{\playerlongtype}{\playertype}
13\newcommand{\genericimg}{132x80x16} 13\newcommand{\genericimg}{132x80x16}
14\newcommand{\specimg}{sansac200} 14\newcommand{\specimg}{c200}
15%Used to name the player, e.g. ...to the \dap 15%Used to name the player, e.g. ...to the \dap
16\newcommand{\dap}{archosplayer} 16\newcommand{\dap}{player}
17%For use when referring to the player. E.g. the \daps\ capacity ... 17%For use when referring to the player. E.g. the \daps\ capacity ...
18\newcommand{\daps}{archosplayer's} 18\newcommand{\daps}{player's}
19\newcommand{\firmwarefilename}{\fname{rockbox.mi4}} 19\newcommand{\firmwarefilename}{\fname{rockbox.mi4}}
20\newcommand{\firmwareextension}{\fname{mi4}} 20\newcommand{\firmwareextension}{\fname{mi4}}
21\newcommand{\screenshotsize}{4cm} 21\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 @@
1% Id: % 1% Id: %
2\def\UseOption{sansaclip} 2\def\UseOption{clip}
3\edef\UseOption{\UseOption,SANSA_CLIP_PAD} 3\edef\UseOption{\UseOption,SANSA_CLIP_PAD}
4\edef\UseOption{\UseOption,HAVE_BACKLIGHT} 4\edef\UseOption{\UseOption,HAVE_BACKLIGHT}
5\edef\UseOption{\UseOption,HAVE_CAR_ADAPTER_MODE} 5\edef\UseOption{\UseOption,HAVE_CAR_ADAPTER_MODE}
6\edef\UseOption{\UseOption,HAVE_BUTTON_LIGHTS} 6\edef\UseOption{\UseOption,HAVE_BUTTON_LIGHTS}
7\edef\UseOption{\UseOption,sansaAMS} 7\edef\UseOption{\UseOption,sansaAMS}
8 8
9\newcommand{\archosplayerman}{Sansa} 9\newcommand{\playerman}{Sansa}
10\newcommand{\archosplayertype}{Clip} 10\newcommand{\playertype}{Clip}
11\newcommand{\archosplayerlongtype}{\archosplayertype} 11\newcommand{\playerlongtype}{\playertype}
12\newcommand{\genericimg}{128x64x1-clip} 12\newcommand{\genericimg}{128x64x1-clip}
13\newcommand{\specimg}{sansaclip} 13\newcommand{\specimg}{clip}
14%Used to name the player, e.g. ...to the \dap 14%Used to name the player, e.g. ...to the \dap
15\newcommand{\dap}{archosplayer} 15\newcommand{\dap}{player}
16%For use when referring to the player. E.g. the \daps\ capacity... 16%For use when referring to the player. E.g. the \daps\ capacity...
17\newcommand{\daps}{archosplayer's} 17\newcommand{\daps}{player's}
18\newcommand{\firmwarefilename}{\fname{rockbox.sansa}} 18\newcommand{\firmwarefilename}{\fname{rockbox.sansa}}
19\newcommand{\firmwareextension}{\fname{sansa}} 19\newcommand{\firmwareextension}{\fname{sansa}}
20\newcommand{\screenshotsize}{3cm} 20\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 @@
1% $Id$ % 1% $Id$ %
2\def\UseOption{sansae200} 2\def\UseOption{e200}
3\edef\UseOption{\UseOption,HAVE_RB_BL_ON_DISK} 3\edef\UseOption{\UseOption,HAVE_RB_BL_ON_DISK}
4\edef\UseOption{\UseOption,SANSA_E200_PAD} 4\edef\UseOption{\UseOption,SANSA_E200_PAD}
5\edef\UseOption{\UseOption,HAVE_BACKLIGHT} 5\edef\UseOption{\UseOption,HAVE_BACKLIGHT}
@@ -7,15 +7,15 @@
7\edef\UseOption{\UseOption,HAVE_BUTTON_LIGHTS} 7\edef\UseOption{\UseOption,HAVE_BUTTON_LIGHTS}
8\edef\UseOption{\UseOption,sansa} 8\edef\UseOption{\UseOption,sansa}
9 9
10\newcommand{\archosplayerman}{Sansa} 10\newcommand{\playerman}{Sansa}
11\newcommand{\archosplayertype}{sansae200 and e200R Series} 11\newcommand{\playertype}{e200 and e200R Series}
12\newcommand{\archosplayerlongtype}{\archosplayertype} 12\newcommand{\playerlongtype}{\playertype}
13\newcommand{\genericimg}{176x220x16} 13\newcommand{\genericimg}{176x220x16}
14\newcommand{\specimg}{sansae200} 14\newcommand{\specimg}{e200}
15%Used to name the player, e.g. ...to the \dap 15%Used to name the player, e.g. ...to the \dap
16\newcommand{\dap}{archosplayer} 16\newcommand{\dap}{player}
17%For use when referring to the player. E.g. the \daps\ capacity ... 17%For use when referring to the player. E.g. the \daps\ capacity ...
18\newcommand{\daps}{archosplayer's} 18\newcommand{\daps}{player's}
19\newcommand{\firmwarefilename}{\fname{rockbox.mi4}} 19\newcommand{\firmwarefilename}{\fname{rockbox.mi4}}
20\newcommand{\firmwareextension}{\fname{mi4}} 20\newcommand{\firmwareextension}{\fname{mi4}}
21\newcommand{\screenshotsize}{4cm} 21\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 @@
1% $Id$ % 1% $Id$ %
2\def\UseOption{sansafuze} 2\def\UseOption{fuze}
3\edef\UseOption{\UseOption,SANSA_FUZE_PAD} 3\edef\UseOption{\UseOption,SANSA_FUZE_PAD}
4\edef\UseOption{\UseOption,HAVE_BACKLIGHT} 4\edef\UseOption{\UseOption,HAVE_BACKLIGHT}
5\edef\UseOption{\UseOption,HAVE_CAR_ADAPTER_MODE} 5\edef\UseOption{\UseOption,HAVE_CAR_ADAPTER_MODE}
6\edef\UseOption{\UseOption,HAVE_BUTTON_LIGHTS} 6\edef\UseOption{\UseOption,HAVE_BUTTON_LIGHTS}
7\edef\UseOption{\UseOption,sansaAMS} 7\edef\UseOption{\UseOption,sansaAMS}
8 8
9\newcommand{\archosplayerman}{Sansa} 9\newcommand{\playerman}{Sansa}
10\newcommand{\archosplayertype}{Fuze} 10\newcommand{\playertype}{Fuze}
11\newcommand{\archosplayerlongtype}{\archosplayertype} 11\newcommand{\playerlongtype}{\playertype}
12\newcommand{\genericimg}{220x176x16} 12\newcommand{\genericimg}{220x176x16}
13\newcommand{\specimg}{sansafuze} 13\newcommand{\specimg}{fuze}
14%Used to name the player, e.g. ...to the \dap 14%Used to name the player, e.g. ...to the \dap
15\newcommand{\dap}{archosplayer} 15\newcommand{\dap}{player}
16%For use when referring to the player. E.g. the \daps\ capacity ... 16%For use when referring to the player. E.g. the \daps\ capacity ...
17\newcommand{\daps}{archosplayer's} 17\newcommand{\daps}{player's}
18\newcommand{\firmwarefilename}{\fname{rockbox.sansa}} 18\newcommand{\firmwarefilename}{\fname{rockbox.sansa}}
19\newcommand{\firmwareextension}{\fname{sansa}} 19\newcommand{\firmwareextension}{\fname{sansa}}
20\newcommand{\screenshotsize}{4cm} 20\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 @@
1% $Id$ % 1% $Id$ %
2\def\UseOption{gigabeatfx} 2\def\UseOption{gigabeatf}
3\edef\UseOption{\UseOption,HAVE_RB_BL_ON_DISK} 3\edef\UseOption{\UseOption,HAVE_RB_BL_ON_DISK}
4\edef\UseOption{\UseOption,GIGABEAT_PAD} 4\edef\UseOption{\UseOption,GIGABEAT_PAD}
5\edef\UseOption{\UseOption,HAVE_BACKLIGHT} 5\edef\UseOption{\UseOption,HAVE_BACKLIGHT}
@@ -10,20 +10,20 @@
10\edef\UseOption{\UseOption,GIGABEAT_RC_PAD} 10\edef\UseOption{\UseOption,GIGABEAT_RC_PAD}
11\edef\UseOption{\UseOption,HAVEREMOTEKEYMAP} 11\edef\UseOption{\UseOption,HAVEREMOTEKEYMAP}
12 12
13\newcommand{\archosplayerman}{Toshiba} 13\newcommand{\playerman}{Toshiba}
14\newcommand{\archosplayertype}{Gigabeat F and X Series} 14\newcommand{\playertype}{Gigabeat F and X Series}
15\newcommand{\archosplayerlongtype}{\archosplayertype} 15\newcommand{\playerlongtype}{\playertype}
16\newcommand{\genericimg}{240x320x16} 16\newcommand{\genericimg}{240x320x16}
17\newcommand{\specimg}{gigabeatfx} 17\newcommand{\specimg}{gigabeatf}
18%Used to name the player, e.g. ...to the \dap 18%Used to name the player, e.g. ...to the \dap
19\newcommand{\dap}{archosplayer} 19\newcommand{\dap}{player}
20%For use when referring to the player. E.g. the \daps\ capacity ... 20%For use when referring to the player. E.g. the \daps\ capacity ...
21\newcommand{\daps}{archosplayer's} 21\newcommand{\daps}{player's}
22\newcommand{\firmwarefilename}{\fname{rockbox.gigabeat}} 22\newcommand{\firmwarefilename}{\fname{rockbox.gigabeat}}
23\newcommand{\firmwareextension}{\fname{gigabeat}} 23\newcommand{\firmwareextension}{\fname{gigabeat}}
24\newcommand{\screenshotsize}{6cm} 24\newcommand{\screenshotsize}{6cm}
25\newcommand{\disk}{hard disk} 25\newcommand{\disk}{hard disk}
26 26
27% link external keymap file 27% link external keymap file
28\input{platform/keymap-gigabeatfx.tex} 28\input{platform/keymap-gigabeatf.tex}
29\input{platform/remote-keymap-gigabeat.tex} 29\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 @@
9\edef\UseOption{\UseOption,GIGABEAT_RC_PAD} 9\edef\UseOption{\UseOption,GIGABEAT_RC_PAD}
10\edef\UseOption{\UseOption,HAVEREMOTEKEYMAP} 10\edef\UseOption{\UseOption,HAVEREMOTEKEYMAP}
11 11
12\newcommand{\archosplayerman}{Toshiba} 12\newcommand{\playerman}{Toshiba}
13\newcommand{\archosplayertype}{Gigabeat S Series} 13\newcommand{\playertype}{Gigabeat S Series}
14\newcommand{\archosplayerlongtype}{\archosplayertype} 14\newcommand{\playerlongtype}{\playertype}
15\newcommand{\genericimg}{240x320x16} 15\newcommand{\genericimg}{240x320x16}
16\newcommand{\specimg}{gigabeats} 16\newcommand{\specimg}{gigabeats}
17%Used to name the player, e.g. ...to the \dap 17%Used to name the player, e.g. ...to the \dap
18\newcommand{\dap}{archosplayer} 18\newcommand{\dap}{player}
19%For use when referring to the player. E.g. the \daps\ capacity ... 19%For use when referring to the player. E.g. the \daps\ capacity ...
20\newcommand{\daps}{archosplayer's} 20\newcommand{\daps}{player's}
21\newcommand{\firmwarefilename}{\fname{rockbox.gigabeat}} 21\newcommand{\firmwarefilename}{\fname{rockbox.gigabeat}}
22\newcommand{\firmwareextension}{\fname{gigabeat}} 22\newcommand{\firmwareextension}{\fname{gigabeat}}
23\newcommand{\screenshotsize}{6cm} 23\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 @@
1% $Id$ % 1% $Id$ %
2\def\UseOption{iriverh10} 2\def\UseOption{h10}
3\edef\UseOption{\UseOption,HAVE_RB_BL_ON_DISK} 3\edef\UseOption{\UseOption,HAVE_RB_BL_ON_DISK}
4\edef\UseOption{\UseOption,IRIVER_H10_PAD} 4\edef\UseOption{\UseOption,IRIVER_H10_PAD}
5\edef\UseOption{\UseOption,HAVE_BACKLIGHT} 5\edef\UseOption{\UseOption,HAVE_BACKLIGHT}
@@ -7,19 +7,19 @@
7\edef\UseOption{\UseOption,HAVE_CAR_ADAPTER_MODE} 7\edef\UseOption{\UseOption,HAVE_CAR_ADAPTER_MODE}
8\edef\UseOption{\UseOption,iriver} 8\edef\UseOption{\UseOption,iriver}
9 9
10\newcommand{\archosplayerman}{Iriver} 10\newcommand{\playerman}{Iriver}
11\newcommand{\archosplayertype}{H10} 11\newcommand{\playertype}{H10}
12\newcommand{\archosplayerlongtype}{\archosplayertype{} 20GB} 12\newcommand{\playerlongtype}{\playertype{} 20GB}
13\newcommand{\genericimg}{160x128x16} 13\newcommand{\genericimg}{160x128x16}
14\newcommand{\specimg}{iriverh10} 14\newcommand{\specimg}{h10}
15%Used to name the player, e.g. ...to the \dap 15%Used to name the player, e.g. ...to the \dap
16\newcommand{\dap}{archosplayer} 16\newcommand{\dap}{player}
17%For use when referring to the player. E.g. the \daps\ capacity ... 17%For use when referring to the player. E.g. the \daps\ capacity ...
18\newcommand{\daps}{archosplayer's} 18\newcommand{\daps}{player's}
19\newcommand{\firmwarefilename}{\fname{rockbox.mi4}} 19\newcommand{\firmwarefilename}{\fname{rockbox.mi4}}
20\newcommand{\firmwareextension}{\fname{mi4}} 20\newcommand{\firmwareextension}{\fname{mi4}}
21\newcommand{\screenshotsize}{4cm} 21\newcommand{\screenshotsize}{4cm}
22\newcommand{\disk}{hard disk} 22\newcommand{\disk}{hard disk}
23 23
24% link external keymap file 24% link external keymap file
25\input{platform/keymap-iriverh10.tex} 25\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 @@
1% $Id$ % 1% $Id$ %
2\def\UseOption{iriverh100} 2\def\UseOption{h100}
3\edef\UseOption{\UseOption,HAVE_RB_BL_IN_FLASH} 3\edef\UseOption{\UseOption,HAVE_RB_BL_IN_FLASH}
4\edef\UseOption{\UseOption,IRIVER_H100_PAD} 4\edef\UseOption{\UseOption,IRIVER_H100_PAD}
5\edef\UseOption{\UseOption,HAVE_REMOTE_LCD} 5\edef\UseOption{\UseOption,HAVE_REMOTE_LCD}
@@ -10,21 +10,21 @@
10\edef\UseOption{\UseOption,IRIVER_RC_H100_PAD} 10\edef\UseOption{\UseOption,IRIVER_RC_H100_PAD}
11\edef\UseOption{\UseOption,HAVEREMOTEKEYMAP} 11\edef\UseOption{\UseOption,HAVEREMOTEKEYMAP}
12 12
13\newcommand{\archosplayerman}{Iriver} 13\newcommand{\playerman}{Iriver}
14\newcommand{\archosplayertype}{H100} 14\newcommand{\playertype}{H100}
15\newcommand{\archosplayerlongtype}{iHP100, iHP115, iHP120, iHP140, H120 and H140} 15\newcommand{\playerlongtype}{iHP100, iHP115, iHP120, iHP140, H120 and H140}
16\newcommand{\genericimg}{160x128x2} 16\newcommand{\genericimg}{160x128x2}
17\newcommand{\specimg}{iriverh100} 17\newcommand{\specimg}{h100}
18%Used to name the player, e.g. ...to the \dap 18%Used to name the player, e.g. ...to the \dap
19\newcommand{\dap}{archosplayer} 19\newcommand{\dap}{player}
20%For use when referring to the player. E.g. the \daps\ capacity ... 20%For use when referring to the player. E.g. the \daps\ capacity ...
21\newcommand{\daps}{archosplayer's} 21\newcommand{\daps}{player's}
22\newcommand{\firmwarefilename}{\fname{rockbox.iriver}} 22\newcommand{\firmwarefilename}{\fname{rockbox.iriver}}
23\newcommand{\firmwareextension}{\fname{iriver}} 23\newcommand{\firmwareextension}{\fname{iriver}}
24\newcommand{\screenshotsize}{4cm} 24\newcommand{\screenshotsize}{4cm}
25\newcommand{\disk}{hard disk} 25\newcommand{\disk}{hard disk}
26 26
27% link external keymap file 27% link external keymap file
28\input{platform/keymap-iriverh100_h300.tex} 28\input{platform/keymap-h100_h300.tex}
29\input{platform/remote-keymap-iriverh100.tex} 29\input{platform/remote-keymap-h100.tex}
30 30
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 @@
1% $Id$ % 1% $Id$ %
2\def\UseOption{iriverh10_5gb} 2\def\UseOption{h10_5gb}
3\edef\UseOption{\UseOption,HAVE_RB_BL_ON_DISK} 3\edef\UseOption{\UseOption,HAVE_RB_BL_ON_DISK}
4\edef\UseOption{\UseOption,IRIVER_H10_PAD} 4\edef\UseOption{\UseOption,IRIVER_H10_PAD}
5\edef\UseOption{\UseOption,HAVE_BACKLIGHT} 5\edef\UseOption{\UseOption,HAVE_BACKLIGHT}
@@ -7,19 +7,19 @@
7\edef\UseOption{\UseOption,HAVE_CAR_ADAPTER_MODE} 7\edef\UseOption{\UseOption,HAVE_CAR_ADAPTER_MODE}
8\edef\UseOption{\UseOption,iriver} 8\edef\UseOption{\UseOption,iriver}
9 9
10\newcommand{\archosplayerman}{Iriver} 10\newcommand{\playerman}{Iriver}
11\newcommand{\archosplayertype}{H10} 11\newcommand{\playertype}{H10}
12\newcommand{\archosplayerlongtype}{\archosplayertype{} 5GB and 6GB} 12\newcommand{\playerlongtype}{\playertype{} 5GB and 6GB}
13\newcommand{\genericimg}{128x128x16} 13\newcommand{\genericimg}{128x128x16}
14\newcommand{\specimg}{iriverh10_5gb} 14\newcommand{\specimg}{h10_5gb}
15%Used to name the player, e.g. ...to the \dap 15%Used to name the player, e.g. ...to the \dap
16\newcommand{\dap}{archosplayer} 16\newcommand{\dap}{player}
17%For use when referring to the player. E.g. the \daps\ capacity ... 17%For use when referring to the player. E.g. the \daps\ capacity ...
18\newcommand{\daps}{archosplayer's} 18\newcommand{\daps}{player's}
19\newcommand{\firmwarefilename}{\fname{rockbox.mi4}} 19\newcommand{\firmwarefilename}{\fname{rockbox.mi4}}
20\newcommand{\firmwareextension}{\fname{mi4}} 20\newcommand{\firmwareextension}{\fname{mi4}}
21\newcommand{\screenshotsize}{4cm} 21\newcommand{\screenshotsize}{4cm}
22\newcommand{\disk}{hard disk} 22\newcommand{\disk}{hard disk}
23 23
24% link external keymap file 24% link external keymap file
25\input{platform/keymap-iriverh10.tex} 25\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 @@
1% $Id$ % 1% $Id$ %
2\def\UseOption{iriverh300} 2\def\UseOption{h300}
3\edef\UseOption{\UseOption,HAVE_RB_BL_IN_FLASH} 3\edef\UseOption{\UseOption,HAVE_RB_BL_IN_FLASH}
4\edef\UseOption{\UseOption,IRIVER_H300_PAD} 4\edef\UseOption{\UseOption,IRIVER_H300_PAD}
5\edef\UseOption{\UseOption,HAVE_REMOTE_LCD} 5\edef\UseOption{\UseOption,HAVE_REMOTE_LCD}
@@ -8,20 +8,20 @@
8\edef\UseOption{\UseOption,HAVE_DISK_STORAGE} 8\edef\UseOption{\UseOption,HAVE_DISK_STORAGE}
9\edef\UseOption{\UseOption,iriver} 9\edef\UseOption{\UseOption,iriver}
10 10
11\newcommand{\archosplayerman}{Iriver} 11\newcommand{\playerman}{Iriver}
12\newcommand{\archosplayertype}{H3xx} 12\newcommand{\playertype}{H3xx}
13\newcommand{\archosplayerlongtype}{H320 and H340} 13\newcommand{\playerlongtype}{H320 and H340}
14\newcommand{\genericimg}{220x176x16} 14\newcommand{\genericimg}{220x176x16}
15\newcommand{\specimg}{iriverh300} 15\newcommand{\specimg}{h300}
16%Used to name the player, e.g. ...to the \dap 16%Used to name the player, e.g. ...to the \dap
17\newcommand{\dap}{archosplayer} 17\newcommand{\dap}{player}
18%For use when referring to the player. E.g. the \daps\ capacity ... 18%For use when referring to the player. E.g. the \daps\ capacity ...
19\newcommand{\daps}{archosplayer's} 19\newcommand{\daps}{player's}
20\newcommand{\firmwarefilename}{\fname{rockbox.iriver}} 20\newcommand{\firmwarefilename}{\fname{rockbox.iriver}}
21\newcommand{\firmwareextension}{\fname{iriver}} 21\newcommand{\firmwareextension}{\fname{iriver}}
22\newcommand{\screenshotsize}{6cm} 22\newcommand{\screenshotsize}{6cm}
23\newcommand{\disk}{hard disk} 23\newcommand{\disk}{hard disk}
24 24
25% link external keymap file 25% link external keymap file
26\input{platform/keymap-iriverh100_h300.tex} 26\input{platform/keymap-h100_h300.tex}
27 27
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 @@
6\edef\UseOption{\UseOption,HAVE_DISK_STORAGE} 6\edef\UseOption{\UseOption,HAVE_DISK_STORAGE}
7\edef\UseOption{\UseOption,ipod} 7\edef\UseOption{\UseOption,ipod}
8 8
9\newcommand{\archosplayerman}{Ipod} 9\newcommand{\playerman}{Ipod}
10\newcommand{\archosplayertype}{1G / 2G} 10\newcommand{\playertype}{1G / 2G}
11\newcommand{\archosplayerlongtype}{\archosplayertype} 11\newcommand{\playerlongtype}{\playertype}
12\newcommand{\genericimg}{160x128x2} 12\newcommand{\genericimg}{160x128x2}
13\newcommand{\specimg}{ipod1g2g} 13\newcommand{\specimg}{ipod1g2g}
14%Used to name the player, e.g. ...to the \dap 14%Used to name the player, e.g. ...to the \dap
15\newcommand{\dap}{archosplayer} 15\newcommand{\dap}{player}
16%For use when referring to the player. E.g. the \daps\ capacity ... 16%For use when referring to the player. E.g. the \daps\ capacity ...
17\newcommand{\daps}{archosplayer's} 17\newcommand{\daps}{player's}
18\newcommand{\firmwarefilename}{\fname{rockbox.ipod}} 18\newcommand{\firmwarefilename}{\fname{rockbox.ipod}}
19\newcommand{\firmwareextension}{\fname{ipod}} 19\newcommand{\firmwareextension}{\fname{ipod}}
20\newcommand{\screenshotsize}{4cm} 20\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 @@
6\edef\UseOption{\UseOption,HAVE_DISK_STORAGE} 6\edef\UseOption{\UseOption,HAVE_DISK_STORAGE}
7\edef\UseOption{\UseOption,ipod} 7\edef\UseOption{\UseOption,ipod}
8 8
9\newcommand{\archosplayerman}{Ipod} 9\newcommand{\playerman}{Ipod}
10\newcommand{\archosplayertype}{3G} 10\newcommand{\playertype}{3G}
11\newcommand{\archosplayerlongtype}{\archosplayertype} 11\newcommand{\playerlongtype}{\playertype}
12\newcommand{\genericimg}{160x128x2} 12\newcommand{\genericimg}{160x128x2}
13\newcommand{\specimg}{ipod3g} 13\newcommand{\specimg}{ipod3g}
14%Used to name the player, e.g. ...to the \dap 14%Used to name the player, e.g. ...to the \dap
15\newcommand{\dap}{archosplayer} 15\newcommand{\dap}{player}
16%For use when referring to the player. E.g. the \daps\ capacity ... 16%For use when referring to the player. E.g. the \daps\ capacity ...
17\newcommand{\daps}{archosplayer's} 17\newcommand{\daps}{player's}
18\newcommand{\firmwarefilename}{\fname{rockbox.ipod}} 18\newcommand{\firmwarefilename}{\fname{rockbox.ipod}}
19\newcommand{\firmwareextension}{\fname{ipod}} 19\newcommand{\firmwareextension}{\fname{ipod}}
20\newcommand{\screenshotsize}{4cm} 20\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 @@
6\edef\UseOption{\UseOption,HAVE_DISK_STORAGE} 6\edef\UseOption{\UseOption,HAVE_DISK_STORAGE}
7\edef\UseOption{\UseOption,ipod} 7\edef\UseOption{\UseOption,ipod}
8 8
9\newcommand{\archosplayerman}{Ipod} 9\newcommand{\playerman}{Ipod}
10\newcommand{\archosplayertype}{4G} 10\newcommand{\playertype}{4G}
11\newcommand{\archosplayerlongtype}{\archosplayertype} 11\newcommand{\playerlongtype}{\playertype}
12\newcommand{\genericimg}{160x128x2} 12\newcommand{\genericimg}{160x128x2}
13\newcommand{\specimg}{ipod4g} 13\newcommand{\specimg}{ipod4g}
14%Used to name the player, e.g. ...to the \dap 14%Used to name the player, e.g. ...to the \dap
15\newcommand{\dap}{archosplayer} 15\newcommand{\dap}{player}
16%For use when referring to the player. E.g. the \daps\ capacity ... 16%For use when referring to the player. E.g. the \daps\ capacity ...
17\newcommand{\daps}{archosplayer's} 17\newcommand{\daps}{player's}
18\newcommand{\firmwarefilename}{\fname{rockbox.ipod}} 18\newcommand{\firmwarefilename}{\fname{rockbox.ipod}}
19\newcommand{\firmwareextension}{\fname{ipod}} 19\newcommand{\firmwareextension}{\fname{ipod}}
20\newcommand{\screenshotsize}{4cm} 20\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 @@
6\edef\UseOption{\UseOption,HAVE_DISK_STORAGE} 6\edef\UseOption{\UseOption,HAVE_DISK_STORAGE}
7\edef\UseOption{\UseOption,ipod} 7\edef\UseOption{\UseOption,ipod}
8 8
9\newcommand{\archosplayerman}{Ipod} 9\newcommand{\playerman}{Ipod}
10\newcommand{\archosplayertype}{Color} 10\newcommand{\playertype}{Color}
11\newcommand{\archosplayerlongtype}{\archosplayertype} 11\newcommand{\playerlongtype}{\playertype}
12\newcommand{\genericimg}{220x176x16} 12\newcommand{\genericimg}{220x176x16}
13\newcommand{\specimg}{ipodcolor} 13\newcommand{\specimg}{ipodcolor}
14%Used to name the player, e.g. ...to the \dap 14%Used to name the player, e.g. ...to the \dap
15\newcommand{\dap}{archosplayer} 15\newcommand{\dap}{player}
16%For use when referring to the player. E.g. the \daps\ capacity ... 16%For use when referring to the player. E.g. the \daps\ capacity ...
17\newcommand{\daps}{archosplayer's} 17\newcommand{\daps}{player's}
18\newcommand{\firmwarefilename}{\fname{rockbox.ipod}} 18\newcommand{\firmwarefilename}{\fname{rockbox.ipod}}
19\newcommand{\firmwareextension}{\fname{ipod}} 19\newcommand{\firmwareextension}{\fname{ipod}}
20\newcommand{\screenshotsize}{6cm} 20\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 @@
1% $Id$ % 1% $Id$ %
2\def\UseOption{ipodmini1g} 2\def\UseOption{ipodmini}
3\edef\UseOption{\UseOption,HAVE_RB_BL_ON_DISK} 3\edef\UseOption{\UseOption,HAVE_RB_BL_ON_DISK}
4\edef\UseOption{\UseOption,IPOD_4G_PAD} 4\edef\UseOption{\UseOption,IPOD_4G_PAD}
5\edef\UseOption{\UseOption,HAVE_BACKLIGHT} 5\edef\UseOption{\UseOption,HAVE_BACKLIGHT}
6\edef\UseOption{\UseOption,HAVE_DISK_STORAGE} 6\edef\UseOption{\UseOption,HAVE_DISK_STORAGE}
7\edef\UseOption{\UseOption,ipod} 7\edef\UseOption{\UseOption,ipod}
8 8
9\newcommand{\archosplayerman}{Ipod} 9\newcommand{\playerman}{Ipod}
10\newcommand{\archosplayertype}{Mini} 10\newcommand{\playertype}{Mini}
11\newcommand{\archosplayerlongtype}{\archosplayertype} 11\newcommand{\playerlongtype}{\playertype}
12\newcommand{\genericimg}{138x110x2} 12\newcommand{\genericimg}{138x110x2}
13\newcommand{\specimg}{ipodmini1g} 13\newcommand{\specimg}{ipodmini}
14%Used to name the player, e.g. ...to the \dap 14%Used to name the player, e.g. ...to the \dap
15\newcommand{\dap}{archosplayer} 15\newcommand{\dap}{player}
16%For use when referring to the player. E.g. the \daps\ capacity ... 16%For use when referring to the player. E.g. the \daps\ capacity ...
17\newcommand{\daps}{archosplayer's} 17\newcommand{\daps}{player's}
18\newcommand{\firmwarefilename}{\fname{rockbox.ipod}} 18\newcommand{\firmwarefilename}{\fname{rockbox.ipod}}
19\newcommand{\firmwareextension}{\fname{ipod}} 19\newcommand{\firmwareextension}{\fname{ipod}}
20\newcommand{\screenshotsize}{4cm} 20\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 @@
1% $Id$ % 1% $Id$ %
2\def\UseOption{ipodnano1g} 2\def\UseOption{ipodnano}
3\edef\UseOption{\UseOption,HAVE_RB_BL_ON_DISK} 3\edef\UseOption{\UseOption,HAVE_RB_BL_ON_DISK}
4\edef\UseOption{\UseOption,IPOD_4G_PAD} 4\edef\UseOption{\UseOption,IPOD_4G_PAD}
5\edef\UseOption{\UseOption,HAVE_BACKLIGHT} 5\edef\UseOption{\UseOption,HAVE_BACKLIGHT}
6\edef\UseOption{\UseOption,ipod} 6\edef\UseOption{\UseOption,ipod}
7 7
8\newcommand{\archosplayerman}{Ipod} 8\newcommand{\playerman}{Ipod}
9\newcommand{\archosplayertype}{Nano} 9\newcommand{\playertype}{Nano}
10\newcommand{\archosplayerlongtype}{\archosplayertype{} 1st generation} 10\newcommand{\playerlongtype}{\playertype{} 1st generation}
11\newcommand{\genericimg}{176x132x16} 11\newcommand{\genericimg}{176x132x16}
12\newcommand{\specimg}{ipodnano1g} 12\newcommand{\specimg}{ipodnano}
13%Used to name the player, e.g. ...to the \dap 13%Used to name the player, e.g. ...to the \dap
14\newcommand{\dap}{archosplayer} 14\newcommand{\dap}{player}
15%For use when referring to the player. E.g. the \daps\ capacity ... 15%For use when referring to the player. E.g. the \daps\ capacity ...
16\newcommand{\daps}{archosplayer's} 16\newcommand{\daps}{player's}
17\newcommand{\firmwarefilename}{\fname{rockbox.ipod}} 17\newcommand{\firmwarefilename}{\fname{rockbox.ipod}}
18\newcommand{\firmwareextension}{\fname{ipod}} 18\newcommand{\firmwareextension}{\fname{ipod}}
19\newcommand{\screenshotsize}{4cm} 19\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 @@
7\edef\UseOption{\UseOption,HAVE_CAR_ADAPTER_MODE} 7\edef\UseOption{\UseOption,HAVE_CAR_ADAPTER_MODE}
8\edef\UseOption{\UseOption,ipod} 8\edef\UseOption{\UseOption,ipod}
9 9
10\newcommand{\archosplayerman}{Ipod} 10\newcommand{\playerman}{Ipod}
11\newcommand{\archosplayertype}{Video} 11\newcommand{\playertype}{Video}
12\newcommand{\archosplayerlongtype}{\archosplayertype} 12\newcommand{\playerlongtype}{\playertype}
13\newcommand{\genericimg}{320x240x16} 13\newcommand{\genericimg}{320x240x16}
14\newcommand{\specimg}{ipodvideo} 14\newcommand{\specimg}{ipodvideo}
15%Used to name the player, e.g. ...to the \dap 15%Used to name the player, e.g. ...to the \dap
16\newcommand{\dap}{archosplayer} 16\newcommand{\dap}{player}
17%For use when referring to the player. E.g. the \daps\ capacity ... 17%For use when referring to the player. E.g. the \daps\ capacity ...
18\newcommand{\daps}{archosplayer's} 18\newcommand{\daps}{player's}
19\newcommand{\firmwarefilename}{\fname{rockbox.ipod}} 19\newcommand{\firmwarefilename}{\fname{rockbox.ipod}}
20\newcommand{\firmwareextension}{\fname{ipod}} 20\newcommand{\firmwareextension}{\fname{ipod}}
21\newcommand{\screenshotsize}{8cm} 21\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 @@
1% $Id$ % 1% $Id$ %
2\def\UseOption{iaudiom3} 2\def\UseOption{m3}
3\edef\UseOption{\UseOption,HAVE_RB_BL_IN_FLASH} 3\edef\UseOption{\UseOption,HAVE_RB_BL_IN_FLASH}
4\edef\UseOption{\UseOption,IAUDIO_M3_PAD} 4\edef\UseOption{\UseOption,IAUDIO_M3_PAD}
5\edef\UseOption{\UseOption,IAUDIO_RC_PAD} 5\edef\UseOption{\UseOption,IAUDIO_RC_PAD}
@@ -8,19 +8,19 @@
8\edef\UseOption{\UseOption,iaudio} 8\edef\UseOption{\UseOption,iaudio}
9\edef\UseOption{\UseOption,HAVEREMOTEKEYMAP} 9\edef\UseOption{\UseOption,HAVEREMOTEKEYMAP}
10 10
11\newcommand{\archosplayerman}{Iaudio} 11\newcommand{\playerman}{Iaudio}
12\newcommand{\archosplayertype}{M3} 12\newcommand{\playertype}{M3}
13\newcommand{\archosplayerlongtype}{\archosplayertype} 13\newcommand{\playerlongtype}{\playertype}
14\newcommand{\genericimg}{128x96x2} 14\newcommand{\genericimg}{128x96x2}
15\newcommand{\specimg}{iaudiom3} 15\newcommand{\specimg}{m3}
16%Used to name the player, e.g. ...to the \dap 16%Used to name the player, e.g. ...to the \dap
17\newcommand{\dap}{archosplayer} 17\newcommand{\dap}{player}
18%For use when referring to the player. E.g. the \daps\ capacity ... 18%For use when referring to the player. E.g. the \daps\ capacity ...
19\newcommand{\daps}{archosplayer's} 19\newcommand{\daps}{player's}
20\newcommand{\firmwarefilename}{\fname{rockbox.iaudio}} 20\newcommand{\firmwarefilename}{\fname{rockbox.iaudio}}
21\newcommand{\screenshotsize}{4cm} 21\newcommand{\screenshotsize}{4cm}
22\newcommand{\disk}{hard disk} 22\newcommand{\disk}{hard disk}
23 23
24% link external keymap files 24% link external keymap files
25\input{platform/keymap-iaudiom3.tex} 25\input{platform/keymap-m3.tex}
26\input{platform/remote-keymap-iaudio.tex} 26\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 @@
1% $Id$ % 1% $Id$ %
2\def\UseOption{iaudiom5} 2\def\UseOption{m5}
3\edef\UseOption{\UseOption,HAVE_RB_BL_IN_FLASH} 3\edef\UseOption{\UseOption,HAVE_RB_BL_IN_FLASH}
4\edef\UseOption{\UseOption,IAUDIO_X5_PAD} 4\edef\UseOption{\UseOption,IAUDIO_X5_PAD}
5\edef\UseOption{\UseOption,HAVE_REMOTE_LCD} 5\edef\UseOption{\UseOption,HAVE_REMOTE_LCD}
@@ -8,19 +8,19 @@
8\edef\UseOption{\UseOption,HAVE_CAR_ADAPTER_MODE} 8\edef\UseOption{\UseOption,HAVE_CAR_ADAPTER_MODE}
9\edef\UseOption{\UseOption,iaudio} 9\edef\UseOption{\UseOption,iaudio}
10 10
11\newcommand{\archosplayerman}{Iaudio} 11\newcommand{\playerman}{Iaudio}
12\newcommand{\archosplayertype}{M5} 12\newcommand{\playertype}{M5}
13\newcommand{\archosplayerlongtype}{\archosplayertype} 13\newcommand{\playerlongtype}{\playertype}
14\newcommand{\genericimg}{160x128x2} 14\newcommand{\genericimg}{160x128x2}
15\newcommand{\specimg}{iaudiom5} 15\newcommand{\specimg}{m5}
16%Used to name the player, e.g. ...to the \dap 16%Used to name the player, e.g. ...to the \dap
17\newcommand{\dap}{archosplayer} 17\newcommand{\dap}{player}
18%For use when referring to the player. E.g. the \daps\ capacity ... 18%For use when referring to the player. E.g. the \daps\ capacity ...
19\newcommand{\daps}{archosplayer's} 19\newcommand{\daps}{player's}
20\newcommand{\firmwarefilename}{\fname{rockbox.iaudio}} 20\newcommand{\firmwarefilename}{\fname{rockbox.iaudio}}
21\newcommand{\firmwareextension}{\fname{iaudio}} 21\newcommand{\firmwareextension}{\fname{iaudio}}
22\newcommand{\screenshotsize}{4cm} 22\newcommand{\screenshotsize}{4cm}
23\newcommand{\disk}{hard disk} 23\newcommand{\disk}{hard disk}
24 24
25% link to external keymap file 25% link to external keymap file
26\input{platform/keymap-iaudiomx5.tex} 26\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 @@
7\edef\UseOption{\UseOption,HAVE_BUTTON_LIGHTS} 7\edef\UseOption{\UseOption,HAVE_BUTTON_LIGHTS}
8\edef\UseOption{\UseOption,olympus} 8\edef\UseOption{\UseOption,olympus}
9 9
10\newcommand{\archosplayerman}{Olympus} 10\newcommand{\playerman}{Olympus}
11\newcommand{\archosplayertype}{m:robe 100} 11\newcommand{\playertype}{m:robe 100}
12\newcommand{\archosplayerlongtype}{\archosplayertype} 12\newcommand{\playerlongtype}{\playertype}
13\newcommand{\genericimg}{160x128x1} 13\newcommand{\genericimg}{160x128x1}
14\newcommand{\specimg}{mrobe100} 14\newcommand{\specimg}{mrobe100}
15%Used to name the player, e.g. ...to the \dap 15%Used to name the player, e.g. ...to the \dap
16\newcommand{\dap}{archosplayer} 16\newcommand{\dap}{player}
17%For use when referring to the player. E.g. the \daps\ capacity ... 17%For use when referring to the player. E.g. the \daps\ capacity ...
18\newcommand{\daps}{archosplayer's} 18\newcommand{\daps}{player's}
19\newcommand{\firmwarefilename}{\fname{rockbox.mi4}} 19\newcommand{\firmwarefilename}{\fname{rockbox.mi4}}
20\newcommand{\firmwareextension}{\fname{mi4}} 20\newcommand{\firmwareextension}{\fname{mi4}}
21\newcommand{\screenshotsize}{4cm} 21\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 @@
1% $Id$ % 1% $Id$ %
2%platform file for the Ondio FM 2%platform file for the Ondio FM
3\def\UseOption{archosondiofm} 3\def\UseOption{ondiofm}
4% To not break the current manual 4% To not break the current manual
5\edef\UseOption{\UseOption,ondio} 5\edef\UseOption{\UseOption,ondio}
6\edef\UseOption{\UseOption,ONDIO_PAD} 6\edef\UseOption{\UseOption,ONDIO_PAD}
7\edef\UseOption{\UseOption,archos} 7\edef\UseOption{\UseOption,archos}
8 8
9\newcommand{\archosplayerman}{Archos} 9\newcommand{\playerman}{Archos}
10\newcommand{\archosplayertype}{Ondio} 10\newcommand{\playertype}{Ondio}
11\newcommand{\archosplayerlongtype}{Ondio 128 FM} 11\newcommand{\playerlongtype}{Ondio 128 FM}
12\newcommand{\genericimg}{112x64x1} 12\newcommand{\genericimg}{112x64x1}
13\newcommand{\specimg}{archosondiofm} 13\newcommand{\specimg}{ondiofm}
14%Used to name the player, e.g. ...to the \dap 14%Used to name the player, e.g. ...to the \dap
15\newcommand{\dap}{archosplayer} 15\newcommand{\dap}{player}
16%For use when referring to the player. E.g. the \daps\ capacity ... 16%For use when referring to the player. E.g. the \daps\ capacity ...
17\newcommand{\daps}{archosplayer's} 17\newcommand{\daps}{player's}
18\newcommand{\firmwarefilename}{\fname{ajbrec.ajz}} 18\newcommand{\firmwarefilename}{\fname{ajbrec.ajz}}
19\newcommand{\firmwareextension}{\fname{ajz}} 19\newcommand{\firmwareextension}{\fname{ajz}}
20\newcommand{\screenshotsize}{4cm} 20\newcommand{\screenshotsize}{4cm}
21\newcommand{\disk}{flash storage} 21\newcommand{\disk}{flash storage}
22 22
23% link external keymap file 23% link external keymap file
24\input{platform/keymap-archosondio.tex} 24\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 @@
1% $Id$ % 1% $Id$ %
2%platform file for the Ondio SP 2%platform file for the Ondio SP
3\def\UseOption{archosondiosp} 3\def\UseOption{ondiosp}
4\edef\UseOption{\UseOption,ondio} 4\edef\UseOption{\UseOption,ondio}
5\edef\UseOption{\UseOption,ONDIO_PAD} 5\edef\UseOption{\UseOption,ONDIO_PAD}
6\edef\UseOption{\UseOption,archos} 6\edef\UseOption{\UseOption,archos}
7\edef\UseOption{\UseOption,rombox} 7\edef\UseOption{\UseOption,rombox}
8 8
9\newcommand{\archosplayerman}{Archos} 9\newcommand{\playerman}{Archos}
10\newcommand{\archosplayertype}{Ondio} 10\newcommand{\playertype}{Ondio}
11\newcommand{\archosplayerlongtype}{Ondio 128 SP} 11\newcommand{\playerlongtype}{Ondio 128 SP}
12\newcommand{\genericimg}{112x64x1} 12\newcommand{\genericimg}{112x64x1}
13\newcommand{\specimg}{archosondiosp} 13\newcommand{\specimg}{ondiosp}
14%Used to name the player, e.g. ...to the \dap 14%Used to name the player, e.g. ...to the \dap
15\newcommand{\dap}{archosplayer} 15\newcommand{\dap}{player}
16%For use when referring to the player. E.g. the \daps\ capacity ... 16%For use when referring to the player. E.g. the \daps\ capacity ...
17\newcommand{\daps}{archosplayer's} 17\newcommand{\daps}{player's}
18\newcommand{\firmwarefilename}{\fname{ajbrec.ajz}} 18\newcommand{\firmwarefilename}{\fname{ajbrec.ajz}}
19\newcommand{\firmwareextension}{\fname{ajz}} 19\newcommand{\firmwareextension}{\fname{ajz}}
20\newcommand{\screenshotsize}{4cm} 20\newcommand{\screenshotsize}{4cm}
21\newcommand{\disk}{flash storage} 21\newcommand{\disk}{flash storage}
22 22
23% link external keymap file 23% link external keymap file
24\input{platform/keymap-archosondio.tex} 24\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 @@
1% $Id$ % 1% $Id$ %
2\def\UseOption{archosplayer} 2\def\UseOption{player}
3\edef\UseOption{\UseOption,PLAYER_PAD} 3\edef\UseOption{\UseOption,PLAYER_PAD}
4\edef\UseOption{\UseOption,HAVE_BACKLIGHT} 4\edef\UseOption{\UseOption,HAVE_BACKLIGHT}
5\edef\UseOption{\UseOption,HAVE_DISK_STORAGE} 5\edef\UseOption{\UseOption,HAVE_DISK_STORAGE}
@@ -7,19 +7,19 @@
7\edef\UseOption{\UseOption,archos} 7\edef\UseOption{\UseOption,archos}
8\edef\UseOption{\UseOption,rombox} 8\edef\UseOption{\UseOption,rombox}
9 9
10\newcommand{\archosplayerman}{Archos} 10\newcommand{\playerman}{Archos}
11\newcommand{\archosplayertype}{Studio/Player} 11\newcommand{\playertype}{Studio/Player}
12\newcommand{\archosplayerlongtype}{Jukebox 5000, 6000, Studio 10 and 20} 12\newcommand{\playerlongtype}{Jukebox 5000, 6000, Studio 10 and 20}
13\newcommand{\genericimg}{charx11x1} 13\newcommand{\genericimg}{charx11x1}
14\newcommand{\specimg}{archosplayer} 14\newcommand{\specimg}{player}
15%Used to name the player, e.g. ...to the \dap 15%Used to name the player, e.g. ...to the \dap
16\newcommand{\dap}{archosplayer} 16\newcommand{\dap}{player}
17%For use when referring to the player. E.g. the \daps\ capacity ... 17%For use when referring to the player. E.g. the \daps\ capacity ...
18\newcommand{\daps}{archosplayer's} 18\newcommand{\daps}{player's}
19\newcommand{\firmwarefilename}{\fname{archos.mod}} 19\newcommand{\firmwarefilename}{\fname{archos.mod}}
20\newcommand{\firmwareextension}{\fname{mod}} 20\newcommand{\firmwareextension}{\fname{mod}}
21\newcommand{\screenshotsize}{4cm} 21\newcommand{\screenshotsize}{4cm}
22\newcommand{\disk}{hard disk} 22\newcommand{\disk}{hard disk}
23 23
24% link external keymap file 24% link external keymap file
25\input{platform/keymap-archosplayer.tex} 25\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 @@
1% $Id$ % 1% $Id$ %
2\def\UseOption{archosrecorder} 2\def\UseOption{recorder}
3\edef\UseOption{\UseOption,RECORDER_PAD} 3\edef\UseOption{\UseOption,RECORDER_PAD}
4\edef\UseOption{\UseOption,HAVE_BACKLIGHT} 4\edef\UseOption{\UseOption,HAVE_BACKLIGHT}
5\edef\UseOption{\UseOption,HAVE_DISK_STORAGE} 5\edef\UseOption{\UseOption,HAVE_DISK_STORAGE}
6\edef\UseOption{\UseOption,HAVE_CAR_ADAPTER_MODE} 6\edef\UseOption{\UseOption,HAVE_CAR_ADAPTER_MODE}
7\edef\UseOption{\UseOption,archos} 7\edef\UseOption{\UseOption,archos}
8 8
9\newcommand{\archosplayerman}{Archos} 9\newcommand{\playerman}{Archos}
10\newcommand{\archosplayertype}{Recorder} 10\newcommand{\playertype}{Recorder}
11\newcommand{\archosplayerlongtype}{Recorder 6, 10, 15 and 20} 11\newcommand{\playerlongtype}{Recorder 6, 10, 15 and 20}
12\newcommand{\genericimg}{112x64x1} 12\newcommand{\genericimg}{112x64x1}
13 13
14\newcommand{\specimg}{archosrecorder} 14\newcommand{\specimg}{recorder}
15%Used to name the player, e.g. ...to the \dap 15%Used to name the player, e.g. ...to the \dap
16\newcommand{\dap}{archosplayer} 16\newcommand{\dap}{player}
17%For use when referring to the player. E.g. the \daps\ capacity ... 17%For use when referring to the player. E.g. the \daps\ capacity ...
18\newcommand{\daps}{archosplayer's} 18\newcommand{\daps}{player's}
19\newcommand{\firmwarefilename}{\fname{ajbrec.ajz}} 19\newcommand{\firmwarefilename}{\fname{ajbrec.ajz}}
20\newcommand{\firmwareextension}{\fname{ajz}} 20\newcommand{\firmwareextension}{\fname{ajz}}
21\newcommand{\screenshotsize}{4cm} 21\newcommand{\screenshotsize}{4cm}
22\newcommand{\disk}{hard disk} 22\newcommand{\disk}{hard disk}
23 23
24% link external keymap file 24% link external keymap file
25\input{platform/keymap-archosrecorder.tex} 25\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 @@
1% $Id$ % 1% $Id$ %
2\def\UseOption{archosrecorderv2fm} 2\def\UseOption{recorderv2fm}
3\edef\UseOption{\UseOption,RECORDER_PAD} 3\edef\UseOption{\UseOption,RECORDER_PAD}
4\edef\UseOption{\UseOption,HAVE_BACKLIGHT} 4\edef\UseOption{\UseOption,HAVE_BACKLIGHT}
5\edef\UseOption{\UseOption,HAVE_DISK_STORAGE} 5\edef\UseOption{\UseOption,HAVE_DISK_STORAGE}
6\edef\UseOption{\UseOption,HAVE_CAR_ADAPTER_MODE} 6\edef\UseOption{\UseOption,HAVE_CAR_ADAPTER_MODE}
7\edef\UseOption{\UseOption,archos} 7\edef\UseOption{\UseOption,archos}
8 8
9\newcommand{\archosplayerman}{Archos} 9\newcommand{\playerman}{Archos}
10\newcommand{\archosplayertype}{Recorder V2/FM} 10\newcommand{\playertype}{Recorder V2/FM}
11\newcommand{\archosplayerlongtype}{Recorder V2 and FM} 11\newcommand{\playerlongtype}{Recorder V2 and FM}
12\newcommand{\genericimg}{112x64x1} 12\newcommand{\genericimg}{112x64x1}
13\newcommand{\specimg}{archosrecorderv2fm} 13\newcommand{\specimg}{recorderv2fm}
14%Used to name the player, e.g. ...to the \dap 14%Used to name the player, e.g. ...to the \dap
15\newcommand{\dap}{archosplayer} 15\newcommand{\dap}{player}
16%For use when referring to the player. E.g. the \daps\ capacity ... 16%For use when referring to the player. E.g. the \daps\ capacity ...
17\newcommand{\daps}{archosplayer's} 17\newcommand{\daps}{player's}
18\newcommand{\firmwarefilename}{\fname{ajbrec.ajz}} 18\newcommand{\firmwarefilename}{\fname{ajbrec.ajz}}
19\newcommand{\firmwareextension}{\fname{ajz}} 19\newcommand{\firmwareextension}{\fname{ajz}}
20\newcommand{\screenshotsize}{4cm} 20\newcommand{\screenshotsize}{4cm}
21\newcommand{\disk}{hard disk} 21\newcommand{\disk}{hard disk}
22 22
23% link external keymap file 23% link external keymap file
24\input{platform/keymap-archosrecorder.tex} 24\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 @@
1% $Id$ % 1% $Id$ %
2\def\UseOption{iaudiox5} 2\def\UseOption{x5}
3\edef\UseOption{\UseOption,HAVE_RB_BL_IN_FLASH} 3\edef\UseOption{\UseOption,HAVE_RB_BL_IN_FLASH}
4\edef\UseOption{\UseOption,IAUDIO_X5_PAD} 4\edef\UseOption{\UseOption,IAUDIO_X5_PAD}
5\edef\UseOption{\UseOption,HAVE_REMOTE_LCD} 5\edef\UseOption{\UseOption,HAVE_REMOTE_LCD}
@@ -8,19 +8,19 @@
8\edef\UseOption{\UseOption,HAVE_CAR_ADAPTER_MODE} 8\edef\UseOption{\UseOption,HAVE_CAR_ADAPTER_MODE}
9\edef\UseOption{\UseOption,iaudio} 9\edef\UseOption{\UseOption,iaudio}
10 10
11\newcommand{\archosplayerman}{Iaudio} 11\newcommand{\playerman}{Iaudio}
12\newcommand{\archosplayertype}{X5} 12\newcommand{\playertype}{X5}
13\newcommand{\archosplayerlongtype}{\archosplayertype} 13\newcommand{\playerlongtype}{\playertype}
14\newcommand{\genericimg}{160x128x16} 14\newcommand{\genericimg}{160x128x16}
15\newcommand{\specimg}{iaudiox5} 15\newcommand{\specimg}{x5}
16%Used to name the player, e.g. ...to the \dap 16%Used to name the player, e.g. ...to the \dap
17\newcommand{\dap}{archosplayer} 17\newcommand{\dap}{player}
18%For use when referring to the player. E.g. the \daps\ capacity ... 18%For use when referring to the player. E.g. the \daps\ capacity ...
19\newcommand{\daps}{archosplayer's} 19\newcommand{\daps}{player's}
20\newcommand{\firmwarefilename}{\fname{rockbox.iaudio}} 20\newcommand{\firmwarefilename}{\fname{rockbox.iaudio}}
21\newcommand{\firmwareextension}{\fname{iaudio}} 21\newcommand{\firmwareextension}{\fname{iaudio}}
22\newcommand{\screenshotsize}{4cm} 22\newcommand{\screenshotsize}{4cm}
23\newcommand{\disk}{hard disk} 23\newcommand{\disk}{hard disk}
24 24
25% link external keymap file 25% link external keymap file
26\input{platform/keymap-iaudiomx5.tex} 26\input{platform/keymap-mx5.tex}
diff --git a/manual/plugins/chessbox.tex b/manual/plugins/chessbox.tex
index a4aade54d0..ab7593c893 100644
--- a/manual/plugins/chessbox.tex
+++ b/manual/plugins/chessbox.tex
@@ -23,7 +23,7 @@ you resume the game. The menu also allows the user to reload the last game
23saved, save the current position and start a new game without having to quit 23saved, save the current position and start a new game without having to quit
24the game. 24the game.
25 25
26\opt{archosrecorder,archosrecorderv2fm,ondio}{ 26\opt{recorder,recorderv2fm,ondio}{
27\note{This plugin will stop playback.} 27\note{This plugin will stop playback.}
28} 28}
29 29
diff --git a/manual/plugins/main.tex b/manual/plugins/main.tex
index 1653e3d812..51344123f7 100644
--- a/manual/plugins/main.tex
+++ b/manual/plugins/main.tex
@@ -16,7 +16,7 @@ text files%
16\section{Games} 16\section{Games}
17\opt{lcd_bitmap} 17\opt{lcd_bitmap}
18 {See also the Chip{}-8 emulator in \reference{ref:Chip8emulator} 18 {See also the Chip{}-8 emulator in \reference{ref:Chip8emulator}
19 \opt{archosrecorder,archosrecorderv2fm,iriverh100,iaudiom5,lcd_color} 19 \opt{recorder,recorderv2fm,h100,m5,lcd_color}
20 {and Rockboy in \reference{ref:Rockboy}}.} 20 {and Rockboy in \reference{ref:Rockboy}}.}
21 21
22\opt{lcd_bitmap}{\input{plugins/blackjack.tex}} 22\opt{lcd_bitmap}{\input{plugins/blackjack.tex}}
@@ -39,7 +39,7 @@ text files%
39 39
40\opt{lcd_bitmap}{\input{plugins/goban.tex}} 40\opt{lcd_bitmap}{\input{plugins/goban.tex}}
41 41
42\opt{lcd_non-mono}{\nopt{iriverh10_5gb,ipodmini1g,sansac200}{ 42\opt{lcd_non-mono}{\nopt{h10_5gb,ipodmini,c200}{
43 \input{plugins/invadrox.tex}}} 43 \input{plugins/invadrox.tex}}}
44 44
45{\input{plugins/jackpot.tex}} 45{\input{plugins/jackpot.tex}}
@@ -50,9 +50,9 @@ text files%
50 50
51\opt{lcd_bitmap}{\input{plugins/minesweeper.tex}} 51\opt{lcd_bitmap}{\input{plugins/minesweeper.tex}}
52 52
53\opt{archosplayer}{\input{plugins/nim.tex}} 53\opt{player}{\input{plugins/nim.tex}}
54 54
55\opt{iriverh100,iaudiom5,lcd_color}{\nopt{sansac200}{\input{plugins/pacbox.tex}}} 55\opt{h100,m5,lcd_color}{\nopt{c200}{\input{plugins/pacbox.tex}}}
56 56
57\opt{lcd_bitmap}{\input{plugins/pegbox.tex}} 57\opt{lcd_bitmap}{\input{plugins/pegbox.tex}}
58 58
@@ -133,7 +133,7 @@ the associated file. Viewers are stored in the
133 133
134\opt{swcodec}{\input{plugins/midiplay.tex}} 134\opt{swcodec}{\input{plugins/midiplay.tex}}
135 135
136\opt{archosrecorder,archosrecorderv2fm,ondio}{\input{plugins/movieplayer.tex}} 136\opt{recorder,recorderv2fm,ondio}{\input{plugins/movieplayer.tex}}
137 137
138\opt{lcd_bitmap}{\opt{swcodec}{\input{plugins/mpegplayer.tex}}} 138\opt{lcd_bitmap}{\opt{swcodec}{\input{plugins/mpegplayer.tex}}}
139 139
@@ -141,9 +141,9 @@ the associated file. Viewers are stored in the
141 141
142\opt{lcd_color}{\input{plugins/ppmviewer.tex}} 142\opt{lcd_color}{\input{plugins/ppmviewer.tex}}
143 143
144\opt{archosrecorder,archosrecorderv2fm,ondio}{\input{plugins/rockbox_flash.tex}} 144\opt{recorder,recorderv2fm,ondio}{\input{plugins/rockbox_flash.tex}}
145 145
146\opt{archosrecorder,archosrecorderv2fm,iriverh100,iaudiom5,lcd_color}{\input{plugins/rockboy.tex}} 146\opt{recorder,recorderv2fm,h100,m5,lcd_color}{\input{plugins/rockboy.tex}}
147 147
148{\input{plugins/search.tex}} 148{\input{plugins/search.tex}}
149 149
@@ -153,13 +153,13 @@ the associated file. Viewers are stored in the
153 153
154{\input{plugins/vbrfix.tex}} 154{\input{plugins/vbrfix.tex}}
155 155
156\opt{archosrecorder,archosrecorderv2fm,ondio}{\input{plugins/wavplay.tex}} 156\opt{recorder,recorderv2fm,ondio}{\input{plugins/wavplay.tex}}
157 157
158\opt{lcd_bitmap}{\input{plugins/zxbox.tex}} 158\opt{lcd_bitmap}{\input{plugins/zxbox.tex}}
159 159
160\section{Applications} 160\section{Applications}
161 161
162\opt{archosplayer,archosrecorder,archosrecorderv2fm}{\input{plugins/alpinecdc.tex}} 162\opt{player,recorder,recorderv2fm}{\input{plugins/alpinecdc.tex}}
163 163
164{\input{plugins/batterybenchmark.tex}} 164{\input{plugins/batterybenchmark.tex}}
165 165
@@ -173,9 +173,9 @@ the associated file. Viewers are stored in the
173 173
174{\input{plugins/disktidy.tex}} 174{\input{plugins/disktidy.tex}}
175 175
176\opt{archosplayer}{\input{plugins/euro_converter.tex}} 176\opt{player}{\input{plugins/euro_converter.tex}}
177 177
178\opt{archosrecorder,archosrecorderv2fm,ondio}{\input{plugins/firmware_flash.tex}} 178\opt{recorder,recorderv2fm,ondio}{\input{plugins/firmware_flash.tex}}
179 179
180{\input{plugins/keybox.tex}} 180{\input{plugins/keybox.tex}}
181 181
@@ -191,7 +191,7 @@ the associated file. Viewers are stored in the
191 191
192\opt{lcd_color}{\input{plugins/rockpaint.tex}} 192\opt{lcd_color}{\input{plugins/rockpaint.tex}}
193 193
194\opt{archosrecorder,archosrecorderv2fm,ondio}{\input{plugins/split_editor.tex}} 194\opt{recorder,recorderv2fm,ondio}{\input{plugins/split_editor.tex}}
195 195
196{\input{plugins/stats.tex}} 196{\input{plugins/stats.tex}}
197 197
diff --git a/manual/plugins/mandelbrot.tex b/manual/plugins/mandelbrot.tex
index a2244fbc72..2eb860309a 100644
--- a/manual/plugins/mandelbrot.tex
+++ b/manual/plugins/mandelbrot.tex
@@ -1,7 +1,7 @@
1\subsection{Mandelbrot} 1\subsection{Mandelbrot}
2\screenshot{plugins/images/ss-mandelbrot}{Mandelbrot}{img:mandelbrot} 2\screenshot{plugins/images/ss-mandelbrot}{Mandelbrot}{img:mandelbrot}
3This demonstration draws fractal images from the Mandelbrot set 3This demonstration draws fractal images from the Mandelbrot set
4\opt{archos,iriverh100}{using the greyscale engine}. 4\opt{archos,h100}{using the greyscale engine}.
5\begin{table} 5\begin{table}
6 \begin{btnmap}{}{} 6 \begin{btnmap}{}{}
7 Direction keys 7 Direction keys
diff --git a/manual/plugins/midiplay.tex b/manual/plugins/midiplay.tex
index 6d0937cbfe..95f4a197cb 100644
--- a/manual/plugins/midiplay.tex
+++ b/manual/plugins/midiplay.tex
@@ -9,7 +9,7 @@ containing several \fname{.pat} files and two \fname {.cfg} files. Just
9select a MIDI file with either the \fname{.mid} or \fname{.midi} extension 9select a MIDI file with either the \fname{.mid} or \fname{.midi} extension
10in the file browser to start playback. 10in the file browser to start playback.
11% portalplayer targets 11% portalplayer targets
12\opt{ipod,sansa,iriverh10,iriverh10_5gb,mrobe100}{ 12\opt{ipod,sansa,h10,h10_5gb,mrobe100}{
13\note{Currently playing MIDI files is still in its early stages and you 13\note{Currently playing MIDI files is still in its early stages and you
14might experience ``Buffer miss!'' with many files, except simple ones.} 14might experience ``Buffer miss!'' with many files, except simple ones.}
15} 15}
diff --git a/manual/plugins/pacbox.tex b/manual/plugins/pacbox.tex
index 10fdfae2a3..8c40ef9d14 100644
--- a/manual/plugins/pacbox.tex
+++ b/manual/plugins/pacbox.tex
@@ -29,27 +29,27 @@ found at \url{http://www.mame.net}.
29\begin{table} 29\begin{table}
30 \begin{btnmap}{}{} 30 \begin{btnmap}{}{}
31 \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,IPOD_4G_PAD,% 31 \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,IPOD_4G_PAD,%
32 IPOD_3G_PAD,iriverh10,SANSA_E200_PAD,MROBE100_PAD}{\ButtonRight} 32 IPOD_3G_PAD,h10,SANSA_E200_PAD,MROBE100_PAD}{\ButtonRight}
33 \opt{GIGABEAT_PAD,GIGABEAT_S_PAD}{\ButtonUp} 33 \opt{GIGABEAT_PAD,GIGABEAT_S_PAD}{\ButtonUp}
34 \opt{iriverh10_5gb}{\ButtonScrollUp} 34 \opt{h10_5gb}{\ButtonScrollUp}
35 \opt{HAVEREMOTEKEYMAP}{& } 35 \opt{HAVEREMOTEKEYMAP}{& }
36 & Move Up\\ 36 & Move Up\\
37 \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,IPOD_4G_PAD,% 37 \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,IPOD_4G_PAD,%
38 IPOD_3G_PAD,iriverh10,SANSA_E200_PAD,MROBE100_PAD}{\ButtonLeft} 38 IPOD_3G_PAD,h10,SANSA_E200_PAD,MROBE100_PAD}{\ButtonLeft}
39 \opt{iriverh10_5gb}{\ButtonScrollDown} 39 \opt{h10_5gb}{\ButtonScrollDown}
40 \opt{GIGABEAT_PAD,GIGABEAT_S_PAD}{\ButtonDown} 40 \opt{GIGABEAT_PAD,GIGABEAT_S_PAD}{\ButtonDown}
41 \opt{HAVEREMOTEKEYMAP}{& } 41 \opt{HAVEREMOTEKEYMAP}{& }
42 & Move Down\\ 42 & Move Down\\
43 \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD,MROBE100_PAD}{\ButtonUp} 43 \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD,MROBE100_PAD}{\ButtonUp}
44 \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu} 44 \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu}
45 \opt{iriverh10}{\ButtonScrollUp} 45 \opt{h10}{\ButtonScrollUp}
46 \opt{iriverh10_5gb,GIGABEAT_PAD,GIGABEAT_S_PAD}{\ButtonLeft} 46 \opt{h10_5gb,GIGABEAT_PAD,GIGABEAT_S_PAD}{\ButtonLeft}
47 \opt{HAVEREMOTEKEYMAP}{& } 47 \opt{HAVEREMOTEKEYMAP}{& }
48 & Move Left\\ 48 & Move Left\\
49 \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD,MROBE100_PAD}{\ButtonDown} 49 \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD,MROBE100_PAD}{\ButtonDown}
50 \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonPlay} 50 \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonPlay}
51 \opt{iriverh10}{\ButtonScrollDown} 51 \opt{h10}{\ButtonScrollDown}
52 \opt{iriverh10_5gb,GIGABEAT_PAD,GIGABEAT_S_PAD}{\ButtonRight} 52 \opt{h10_5gb,GIGABEAT_PAD,GIGABEAT_S_PAD}{\ButtonRight}
53 \opt{HAVEREMOTEKEYMAP}{& } 53 \opt{HAVEREMOTEKEYMAP}{& }
54 & Move Right\\ 54 & Move Right\\
55 \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}{\ButtonRec} 55 \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}{\ButtonRec}
diff --git a/manual/plugins/rockboy.tex b/manual/plugins/rockboy.tex
index f04b5d174d..c273f719fd 100644
--- a/manual/plugins/rockboy.tex
+++ b/manual/plugins/rockboy.tex
@@ -64,7 +64,7 @@ the gnuboy emulator. To start a game, open a ROM file saved as \fname{.gb} or
64 & Select\\ 64 & Select\\
65 % 65 %
66 } 66 }
67 \opt{RECORDER_PAD,IRIVER_H100_PAD,iaudiom5}{ 67 \opt{RECORDER_PAD,IRIVER_H100_PAD,m5}{
68 \opt{RECORDER_PAD}{\ButtonOn} 68 \opt{RECORDER_PAD}{\ButtonOn}
69 \opt{IRIVER_H100_PAD,IAUDIO_X5_PAD}{\ButtonHold{} switch} 69 \opt{IRIVER_H100_PAD,IAUDIO_X5_PAD}{\ButtonHold{} switch}
70 \opt{HAVEREMOTEKEYMAP}{& } 70 \opt{HAVEREMOTEKEYMAP}{& }
@@ -100,7 +100,7 @@ the gnuboy emulator. To start a game, open a ROM file saved as \fname{.gb} or
100 Chose whether the original aspect ratio should be kept when scaling 100 Chose whether the original aspect ratio should be kept when scaling
101 the picture to the screen% 101 the picture to the screen%
102 % targets with bigger displays than the original gameboy 102 % targets with bigger displays than the original gameboy
103 \opt{gigabeat,iriverh300,ipodcolor,ipodvideo,sansae200}{ 103 \opt{gigabeat,h300,ipodcolor,ipodvideo,e200}{
104 or whether it should be displayed unscaled% 104 or whether it should be displayed unscaled%
105 }. 105 }.
106 \item[Screen Rotate.] 106 \item[Screen Rotate.]
diff --git a/manual/plugins/snow.tex b/manual/plugins/snow.tex
index 8e3e6e8f5d..ea914295ae 100644
--- a/manual/plugins/snow.tex
+++ b/manual/plugins/snow.tex
@@ -3,7 +3,7 @@
3This demo replicates snow falling on your screen. If you love winter, 3This demo replicates snow falling on your screen. If you love winter,
4you will love this demo. Or maybe not. 4you will love this demo. Or maybe not.
5% 5%
6\opt{archosplayer}{Press \ButtonStop\ to quit.}% 6\opt{player}{Press \ButtonStop\ to quit.}%
7\opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRVER_H300_PAD}{Press \ButtonOff\ to quit.}% 7\opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRVER_H300_PAD}{Press \ButtonOff\ to quit.}%
8\opt{IPOD_4G_PAD,IPOD_3G_PAD}{Press \ButtonMenu\ to quit.}% 8\opt{IPOD_4G_PAD,IPOD_3G_PAD}{Press \ButtonMenu\ to quit.}%
9\opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}% 9\opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}%
diff --git a/manual/plugins/stats.tex b/manual/plugins/stats.tex
index c468cd9749..300eb4da7c 100644
--- a/manual/plugins/stats.tex
+++ b/manual/plugins/stats.tex
@@ -2,7 +2,7 @@
2\screenshot{plugins/images/ss-stats}{The stats-plugin}{} 2\screenshot{plugins/images/ss-stats}{The stats-plugin}{}
3 3
4The stats-plugin simply counts the number of files% 4The stats-plugin simply counts the number of files%
5\nopt{archosplayer}{, music files }% 5\nopt{player}{, music files }%
6and directories on your \dap. 6and directories on your \dap.
7Press % 7Press %
8\opt{PLAYER_PAD}{\ButtonStop}% 8\opt{PLAYER_PAD}{\ButtonStop}%
diff --git a/manual/preamble.tex b/manual/preamble.tex
index e1e192dfe1..1e3ccce95a 100644
--- a/manual/preamble.tex
+++ b/manual/preamble.tex
@@ -41,7 +41,7 @@
41\input{platform/\platform.tex} 41\input{platform/\platform.tex}
42\input{features.tex} 42\input{features.tex}
43 43
44\newcommand{\archosplayername}{\archosplayerman\ \archosplayerlongtype} 44\newcommand{\playername}{\playerman\ \playerlongtype}
45 45
46\hypersetup{% add some values to the pdf properties 46\hypersetup{% add some values to the pdf properties
47 colorlinks = true, 47 colorlinks = true,
@@ -51,7 +51,7 @@
51 urlcolor = blue, 51 urlcolor = blue,
52 pdftitle = {Rockbox user manual}, 52 pdftitle = {Rockbox user manual},
53 pdfauthor = {The Rockbox Team}, 53 pdfauthor = {The Rockbox Team},
54 pdfsubject = {Rockbox user manual for \archosplayername} 54 pdfsubject = {Rockbox user manual for \playername}
55} 55}
56 56
57\newcommand{\fname}[1]{\texttt{#1}} 57\newcommand{\fname}[1]{\texttt{#1}}
@@ -94,7 +94,7 @@
94\fancyhead[L]{{\nouppercase{\textsc{\leftmark}}}} 94\fancyhead[L]{{\nouppercase{\textsc{\leftmark}}}}
95\fancyhead[R]{\iffloatpage{}{\thepage}} 95\fancyhead[R]{\iffloatpage{}{\thepage}}
96\fancyfoot[L]{\textsc{The Rockbox manual}} 96\fancyfoot[L]{\textsc{The Rockbox manual}}
97\fancyfoot[R]{\textsc{\archosplayerman{} \archosplayertype}} 97\fancyfoot[R]{\textsc{\playerman{} \playertype}}
98\fancypagestyle{plain}{} 98\fancypagestyle{plain}{}
99 99
100\renewcommand{\headrulewidth}{\iffloatpage{0pt}{0.4pt}} 100\renewcommand{\headrulewidth}{\iffloatpage{0pt}{0.4pt}}
diff --git a/manual/rockbox_interface/browsing_and_playing.tex b/manual/rockbox_interface/browsing_and_playing.tex
index 9be15adeb1..bdbb97ef5c 100644
--- a/manual/rockbox_interface/browsing_and_playing.tex
+++ b/manual/rockbox_interface/browsing_and_playing.tex
@@ -35,7 +35,7 @@ generated as \fname{<MMC1>}, and will behave exactly as any other directory
35on the \dap{}. 35on the \dap{}.
36} 36}
37 37
38\opt{iriverh10,iriverh10_5gb}{\note{ 38\opt{h10,h10_5gb}{\note{
39If your \dap{} is a MTP model, the Music directory where all your music is stored 39If your \dap{} is a MTP model, the Music directory where all your music is stored
40may be hidden in the \setting{File Browser}. This may be fixed by either 40may be hidden in the \setting{File Browser}. This may be fixed by either
41either changing its properties (on a computer) to not hidden, or by changing 41either changing its properties (on a computer) to not hidden, or by changing
@@ -78,7 +78,7 @@ the \setting{Show Files} setting to all.
78 & If there is an audio file playing, returns to the 78 & If there is an audio file playing, returns to the
79 \setting{While Playing Screen} (WPS) without stopping playback.\\ 79 \setting{While Playing Screen} (WPS) without stopping playback.\\
80 % 80 %
81 \nopt{archosplayer,sansac200}% 81 \nopt{player,c200}%
82 {% 82 {%
83 \ActionTreeStop 83 \ActionTreeStop
84 \opt{HAVEREMOTEKEYMAP}{& \ActionRCTreeStop} 84 \opt{HAVEREMOTEKEYMAP}{& \ActionRCTreeStop}
@@ -317,7 +317,7 @@ can be easily changed by making a text file with the required layout. More
317 \end{table} 317 \end{table}
318} 318}
319 319
320\opt{archosplayer}{ 320\opt{player}{
321 The current text line to be entered or edited is always listed on the first 321 The current text line to be entered or edited is always listed on the first
322 line of the display. The second line of the display can contain the character 322 line of the display. The second line of the display can contain the character
323 selection bar, as in the screenshot above. 323 selection bar, as in the screenshot above.
diff --git a/manual/rockbox_interface/main.tex b/manual/rockbox_interface/main.tex
index 72a1fa5fe4..f8768c3ceb 100644
--- a/manual/rockbox_interface/main.tex
+++ b/manual/rockbox_interface/main.tex
@@ -9,7 +9,7 @@
9% The extension is selected in the preamble, so no further \ifpdfoutput 9% The extension is selected in the preamble, so no further \ifpdfoutput
10% is necessary. 10% is necessary.
11\includegraphics[height=8cm,width=10cm,keepaspectratio=true]{rockbox_interface/images/\specimg-front} 11\includegraphics[height=8cm,width=10cm,keepaspectratio=true]{rockbox_interface/images/\specimg-front}
12\opt{iaudiom3}{% replace with HAVEREMOTEKEYMAP when the h100 file exists or change specimg 12\opt{m3}{% replace with HAVEREMOTEKEYMAP when the h100 file exists or change specimg
13 \end{center} 13 \end{center}
14 % spacing between the two pictures, could possibly be improved 14 % spacing between the two pictures, could possibly be improved
15 \begin{center} 15 \begin{center}
@@ -27,7 +27,7 @@ described in detail in the following paragraph.
27 \wikilink{BlindFAQ}. 27 \wikilink{BlindFAQ}.
28 28
29 % 29 %
30 \opt{iriverh100}{ 30 \opt{h100}{
31 Hold or lay the \dap{} so that the side with the joystick and LCD is facing 31 Hold or lay the \dap{} so that the side with the joystick and LCD is facing
32 towards you, and the curved side is at the top. The joystick functions as 32 towards you, and the curved side is at the top. The joystick functions as
33 the \ButtonUp{}, \ButtonRight{}, \ButtonLeft{}, and \ButtonDown{} buttons when 33 the \ButtonUp{}, \ButtonRight{}, \ButtonLeft{}, and \ButtonDown{} buttons when
@@ -48,7 +48,7 @@ described in detail in the following paragraph.
48 \dap{} hard locks, you can reset it by inserting a paper clip into the hole 48 \dap{} hard locks, you can reset it by inserting a paper clip into the hole
49 where the reset switch is.} 49 where the reset switch is.}
50 % 50 %
51 \opt{iriverh300}{ 51 \opt{h300}{
52 Hold or lay the \dap{} so that the side with the button pad and 52 Hold or lay the \dap{} so that the side with the button pad and
53 LCD is facing towards you. The buttons on the button pad are as follows: top 53 LCD is facing towards you. The buttons on the button pad are as follows: top
54 left corner: \ButtonOn{}, bottom left corner: \ButtonOff{}, top right corner: 54 left corner: \ButtonOn{}, bottom left corner: \ButtonOff{}, top right corner:
@@ -74,7 +74,7 @@ described in detail in the following paragraph.
74 used in Rockbox. 74 used in Rockbox.
75 } 75 }
76 % 76 %
77 \opt{ipod4g,ipodcolor,ipodvideo,ipodmini1g}{ 77 \opt{ipod4g,ipodcolor,ipodvideo,ipodmini}{
78 The main controls on the \dap{} are a slightly indented scroll wheel 78 The main controls on the \dap{} are a slightly indented scroll wheel
79 with a flat round button in the center. Hold the \dap{} with these controls 79 with a flat round button in the center. Hold the \dap{} with these controls
80 facing you. 80 facing you.
@@ -84,7 +84,7 @@ described in detail in the following paragraph.
84 \opt{ipod4g,ipodcolor}{remote connector, headphone jack, \ButtonHold{} 84 \opt{ipod4g,ipodcolor}{remote connector, headphone jack, \ButtonHold{}
85 switch.} 85 switch.}
86 \opt{ipodvideo}{\ButtonHold{} switch, headphone jack.} 86 \opt{ipodvideo}{\ButtonHold{} switch, headphone jack.}
87 \opt{ipodmini1g}{\ButtonHold{} switch, remote connector, headphone jack.} 87 \opt{ipodmini}{\ButtonHold{} switch, remote connector, headphone jack.}
88 88
89 The dock connector that is used to connect your \dap{} to your computer is on 89 The dock connector that is used to connect your \dap{} to your computer is on
90 the bottom panel of the \dap{}. 90 the bottom panel of the \dap{}.
@@ -156,7 +156,7 @@ described in detail in the following paragraph.
156 \ButtonHold{} is off before trying to use your player. 156 \ButtonHold{} is off before trying to use your player.
157 } 157 }
158 % 158 %
159 \opt{ipodnano1g}{ 159 \opt{ipodnano}{
160 The main controls on the \dap{} are a slightly indented wheel with a 160 The main controls on the \dap{} are a slightly indented wheel with a
161 flat round button in the center. Hold the \dap{} with these controls on the 161 flat round button in the center. Hold the \dap{} with these controls on the
162 top surface. There is a \ButtonHold{} switch at one end, and 162 top surface. There is a \ButtonHold{} switch at one end, and
@@ -194,7 +194,7 @@ described in detail in the following paragraph.
194 round crosspad is labelled \ButtonMenu{}. 194 round crosspad is labelled \ButtonMenu{}.
195 } 195 }
196 % 196 %
197 \opt{iriverh10,iriverh10_5gb}{ 197 \opt{h10,h10_5gb}{
198 Hold or lay the \dap{} so that the side with the scroll pad and 198 Hold or lay the \dap{} so that the side with the scroll pad and
199 LCD is facing towards you. In the centre below the lcd is the scroll pad. It 199 LCD is facing towards you. In the centre below the lcd is the scroll pad. It
200 is oriented vertically. Touching the top and bottom half of it acts as the 200 is oriented vertically. Touching the top and bottom half of it acts as the
@@ -207,12 +207,12 @@ described in detail in the following paragraph.
207 hand side is the \ButtonPower{} button. 207 hand side is the \ButtonPower{} button.
208 208
209 On the top panel of the \dap{}, from left to right, you can find the 209 On the top panel of the \dap{}, from left to right, you can find the
210 following: \ButtonHold{} switch, \opt{iriverh10}{reset pin hole, }remote port and 210 following: \ButtonHold{} switch, \opt{h10}{reset pin hole, }remote port and
211 headphone mini jack plug. 211 headphone mini jack plug.
212 212
213 On the bottom panel of the \dap{} is the data cable port.} 213 On the bottom panel of the \dap{} is the data cable port.}
214 % 214 %
215 \opt{gigabeatfx}{ 215 \opt{gigabeatf}{
216 \note{The following description is for the Gigabeat F, but can also apply for the 216 \note{The following description is for the Gigabeat F, but can also apply for the
217 Gigabeat X. The Gigabeat F is slightly larger and more rectangular shaped, while the 217 Gigabeat X. The Gigabeat F is slightly larger and more rectangular shaped, while the
218 Gigabeat X is smaller and has a slightly tapered back.} 218 Gigabeat X is smaller and has a slightly tapered back.}
@@ -285,7 +285,7 @@ described in detail in the following paragraph.
285 bottom of the unit, there is a connector for the docking station or the 285 bottom of the unit, there is a connector for the docking station or the
286 proprietary USB connector for connecting directly to USB.} 286 proprietary USB connector for connecting directly to USB.}
287 % 287 %
288 \opt{iaudiox5,iaudiom5}{ 288 \opt{x5,m5}{
289 The \dap{} is curved so that the end with the screen on it is thicker than the 289 The \dap{} is curved so that the end with the screen on it is thicker than the
290 other end. Hold the \dap{} wih the thick end towards the top and the screen 290 other end. Hold the \dap{} wih the thick end towards the top and the screen
291 facing towards you. Half way up the front of the unit on the right hand side 291 facing towards you. Half way up the front of the unit on the right hand side
@@ -306,14 +306,14 @@ described in detail in the following paragraph.
306 reset by inserting a paper clip. 306 reset by inserting a paper clip.
307 307
308 On the bottom of the unit is the connector for the 308 On the bottom of the unit is the connector for the
309 \archosplayerman{} subpack or dock. On the top of the unit is a charge 309 \playerman{} subpack or dock. On the top of the unit is a charge
310 indicator light, which may feel a bit like a button, but is not. 310 indicator light, which may feel a bit like a button, but is not.
311 311
312 From the top of the \dap{} on the left hand side is the headphone socket, then the 312 From the top of the \dap{} on the left hand side is the headphone socket, then the
313 remote connector. Below this is a cover which protects the \opt{iaudiox5}{USB host 313 remote connector. Below this is a cover which protects the \opt{x5}{USB host
314 connector.}\opt{iaudiom5}{USB and charging connector}.} 314 connector.}\opt{m5}{USB and charging connector}.}
315 % 315 %
316 \opt{sansae200}{ 316 \opt{e200}{
317 Hold the \dap{} with the turning wheel at the front and bottom. On the bottom left 317 Hold the \dap{} with the turning wheel at the front and bottom. On the bottom left
318 of the front of the \dap{} is a raised round button, the \ButtonPower{} button. 318 of the front of the \dap{} is a raised round button, the \ButtonPower{} button.
319 Above and to the left of this, on the outside of the turning wheel are four 319 Above and to the left of this, on the outside of the turning wheel are four
@@ -329,7 +329,7 @@ described in detail in the following paragraph.
329 other buttons have any effect. Just to the left of the \ButtonHold{} switch is a 329 other buttons have any effect. Just to the left of the \ButtonHold{} switch is a
330 small hole which contains the internal microphone.} 330 small hole which contains the internal microphone.}
331 % 331 %
332 \opt{sansac200}{ 332 \opt{c200}{
333 Hold the \dap{} with the buttons on the right and the screen on the left. On 333 Hold the \dap{} with the buttons on the right and the screen on the left. On
334 the right side of the unit, there is a series of four connected buttons that 334 the right side of the unit, there is a series of four connected buttons that
335 form a square. The four sides of the square are the \ButtonUp{}, 335 form a square. The four sides of the square are the \ButtonUp{},
@@ -351,7 +351,7 @@ described in detail in the following paragraph.
351 Immediately above the headphone socket is a lanyard loop and the microphone. 351 Immediately above the headphone socket is a lanyard loop and the microphone.
352 } 352 }
353 % 353 %
354 \opt{sansaclip}{ 354 \opt{clip}{
355 Hold the \dap{} with the controls on the bottom and the screen on the top. The main 355 Hold the \dap{} with the controls on the bottom and the screen on the top. The main
356 controls are a four-way pad with a button in the centre; pressing this centre button 356 controls are a four-way pad with a button in the centre; pressing this centre button
357 functions as \ButtonSelect{}. Going clockwise from the top, the four-way pad contains 357 functions as \ButtonSelect{}. Going clockwise from the top, the four-way pad contains
@@ -369,7 +369,7 @@ described in detail in the following paragraph.
369 above this button is the headphone jack. 369 above this button is the headphone jack.
370 } 370 }
371 % 371 %
372 \opt{archosplayer}{ 372 \opt{player}{
373 The main controls of this player are a four-way button on the right below 373 The main controls of this player are a four-way button on the right below
374 the screen, and two round buttons to the left of it. Hold the \dap{} with 374 the screen, and two round buttons to the left of it. Hold the \dap{} with
375 these controls on the bottom and facing you. 375 these controls on the bottom and facing you.
@@ -384,7 +384,7 @@ described in detail in the following paragraph.
384 the DC-In jack on the right, and the USB connector in the centre. 384 the DC-In jack on the right, and the USB connector in the centre.
385 } 385 }
386 % 386 %
387 \opt{archosrecorder}{ 387 \opt{recorder}{
388 Holding the Jukebox in front of you, there should be three rectangular buttons 388 Holding the Jukebox in front of you, there should be three rectangular buttons
389 in a horizontal line towards the middle of the unit, and below this to the left 389 in a horizontal line towards the middle of the unit, and below this to the left
390 there is a circular four button array with the circular \ButtonPlay{} button 390 there is a circular four button array with the circular \ButtonPlay{} button
@@ -405,7 +405,7 @@ described in detail in the following paragraph.
405 the right. On the bottom of the \dap{} is the Line-In jack on the left, the 405 the right. On the bottom of the \dap{} is the Line-In jack on the left, the
406 DC-In jack on the right, and the USB connector in the centre. 406 DC-In jack on the right, and the USB connector in the centre.
407 } 407 }
408 \opt{archosrecorderv2fm}{ 408 \opt{recorderv2fm}{
409 Holding the Jukebox in front of you, there should be three rectangular buttons 409 Holding the Jukebox in front of you, there should be three rectangular buttons
410 in a horizontal line towards the middle of the unit, and below this centred on the 410 in a horizontal line towards the middle of the unit, and below this centred on the
411 middle button there are four radial arc shaped buttons placed in a cross formation 411 middle button there are four radial arc shaped buttons placed in a cross formation
@@ -441,8 +441,8 @@ To turn on and off your Rockbox enabled \dap{} use the following keys:
441 & Start Rockbox\\ 441 & Start Rockbox\\
442 \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{Long \ButtonOff}% 442 \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{Long \ButtonOff}%
443 \opt{IPOD_4G_PAD,IPOD_3G_PAD}{Long \ButtonPlay}% 443 \opt{IPOD_4G_PAD,IPOD_3G_PAD}{Long \ButtonPlay}%
444 \opt{ONDIO_PAD,archosrecorderv2fm}{Long \ButtonOff}% 444 \opt{ONDIO_PAD,recorderv2fm}{Long \ButtonOff}%
445 \opt{archosrecorder}{Double tap \ButtonOff\ when playback is stopped}% 445 \opt{recorder}{Double tap \ButtonOff\ when playback is stopped}%
446 \opt{PLAYER_PAD}{From the Main Menu, select \textbf{Shutdown}}% 446 \opt{PLAYER_PAD}{From the Main Menu, select \textbf{Shutdown}}%
447 \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD,GIGABEAT_S_PAD,sansaAMS}% 447 \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD,GIGABEAT_S_PAD,sansaAMS}%
448 {Long \ButtonPower}% 448 {Long \ButtonPower}%
@@ -476,11 +476,11 @@ To turn on and off your Rockbox enabled \dap{} use the following keys:
476 performed by inserting a paperclip gently into the Reset hole. 476 performed by inserting a paperclip gently into the Reset hole.
477}% 477}%
478 478
479\nopt{gigabeatfx,iaudiom3,iaudiom5,iaudiox5,archos} 479\nopt{gigabeatf,m3,m5,x5,archos}
480 { 480 {
481 \subsection{Starting the original firmware} 481 \subsection{Starting the original firmware}
482 \label{ref:Dualboot} 482 \label{ref:Dualboot}
483 \opt{ipod4g,ipodcolor,ipodvideo,ipodnano1g,ipodmini1g} 483 \opt{ipod4g,ipodcolor,ipodvideo,ipodnano,ipodmini}
484 { 484 {
485 Rockbox has a dual-boot feature. To boot into the original firmware, shut 485 Rockbox has a dual-boot feature. To boot into the original firmware, shut
486 down the device as described above. Turn on the \ButtonHold{} switch 486 down the device as described above. Turn on the \ButtonHold{} switch
@@ -512,22 +512,22 @@ To turn on and off your Rockbox enabled \dap{} use the following keys:
512 simultaneously until the player hard resets. 512 simultaneously until the player hard resets.
513 } 513 }
514 514
515 \opt{iriverh100,iriverh300} 515 \opt{h100,h300}
516 { 516 {
517 Rockbox has a dual-boot feature. To boot into the original firmware, 517 Rockbox has a dual-boot feature. To boot into the original firmware,
518 when the \dap{} is turned off, press and hold the \ButtonRec{} button, 518 when the \dap{} is turned off, press and hold the \ButtonRec{} button,
519 and then press the \ButtonOn{} button. 519 and then press the \ButtonOn{} button.
520 } 520 }
521 521
522 \opt{iriverh10,iriverh10_5gb} 522 \opt{h10,h10_5gb}
523 { 523 {
524 Rockbox has a dual-boot feature. It loads the original firmware from 524 Rockbox has a dual-boot feature. It loads the original firmware from
525 the file \fname{/System/OF.mi4}. To boot into the original firmware, 525 the file \fname{/System/OF.mi4}. To boot into the original firmware,
526 press and hold the \ButtonLeft{} button while turning on the player. 526 press and hold the \ButtonLeft{} button while turning on the player.
527 \note{The iriver firmware does not shut down properly when you turn it off, 527 \note{The iriver firmware does not shut down properly when you turn it off,
528 it only goes to sleep. To get back into Rockbox when exiting from the 528 it only goes to sleep. To get back into Rockbox when exiting from the
529 iriver firmware, you will need to reset the player by \opt{iriverh10}{inserting a 529 iriver firmware, you will need to reset the player by \opt{h10}{inserting a
530 pin in the reset hole}\opt{iriverh10_5gb}{removing and reinserting the battery}.} 530 pin in the reset hole}\opt{h10_5gb}{removing and reinserting the battery}.}
531 } 531 }
532 532
533 \opt{sansa,sansaAMS} 533 \opt{sansa,sansaAMS}
diff --git a/manual/rockbox_interface/wps.tex b/manual/rockbox_interface/wps.tex
index 362311ddaf..2c8ecfa17d 100644
--- a/manual/rockbox_interface/wps.tex
+++ b/manual/rockbox_interface/wps.tex
@@ -30,7 +30,7 @@ currently playing audio file.
30 \item Peak meter. 30 \item Peak meter.
31 \end{itemize} 31 \end{itemize}
32} 32}
33\opt{archosrecorder,archosrecorderv2fm,ondio}{ 33\opt{recorder,recorderv2fm,ondio}{
34 \note{ 34 \note{
35 \begin{itemize} 35 \begin{itemize}
36 \item The number of lines shown depends on the size of the font used. 36 \item The number of lines shown depends on the size of the font used.
@@ -40,7 +40,7 @@ currently playing audio file.
40 } 40 }
41} 41}
42% 42%
43\opt{archosplayer}{ 43\opt{player}{
44 \note{ 44 \note{
45 \begin{itemize} 45 \begin{itemize}
46 \item Playlist index/Playlist size: Artist {}- Title. 46 \item Playlist index/Playlist size: Artist {}- Title.