4 files changed, 24 insertions, 24 deletions

diff --git a/manual/appendix/appendix.tex b/manual/appendix/appendix.tex
index 9aeadba56d..f06d8380e6 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
   do that. The MAS chip is programmable, but we have no access to the chip 
   documentation.
 }
-\nopt{h300,x5}{
+\nopt{iriverh300,iaudiox5}{
 \item Interfacing with other USB devices (like cameras) or 2 player games over USB\\
   The USB system demands that there is a master that talks to a slave. The
   \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 d0fa073635..41b90e6a32 100644
--- a/manual/appendix/config_file_options.tex
+++ b/manual/appendix/config_file_options.tex
@@ -13,25 +13,25 @@
     \midrule\localendhead % endhead breaks with htlatex
     volume      & \opt{masd}{-78 to +18}%
                   \opt{masf}{-100 -to +12}%
-                  \opt{h100,h300}{-84 to 0}%
-                  \opt{ipodnano}{-72 to +6}%
+                  \opt{iriverh100,iriverh300}{-84 to 0}%
+                  \opt{ipodnano1g}{-72 to +6}%
                   \opt{ipodvideo}{-57 to +6}%
-                  \opt{x5}{-73 to +6}
-                  \opt{e200}{-74 to +6}
+                  \opt{iaudiox5}{-73 to +6}
+                  \opt{sansae200}{-74 to +6}
                   \opt{ipodcolor}{-74 to +6}%
                                         & dB\\
-    \nopt{x5}{%
+    \nopt{iaudiox5}{%
       bass      & \opt{masd}{-15 to +15}%
                   \opt{masf}{-12 to +12}%
-                  \opt{h100,h300}{0 to +24}%
+                  \opt{iriverh100,iriverh300}{0 to +24}%
                   \opt{ipod}{-6 to +9}%
-                  \opt{e200}{-24 to +24}%
+                  \opt{sansae200}{-24 to +24}%
                                         & dB\\
       treble    & \opt{masd}{-15 to +15}%
                   \opt{masf}{-12 to +12}%
-                  \opt{h100,h300}{0 to +6}%
+                  \opt{iriverh100,iriverh300}{0 to +6}%
                   \opt{ipod}{-6 to +9}%
-                  \opt{e200}{-24 to +24}%
+                  \opt{sansae200}{-24 to +24}%
                                         & dB\\
     }%
     balance         & -100 to +100      & \%\\
@@ -299,7 +299,7 @@
                 & on, off               & N/A\\
       remote iconset & /path/filename.bmp & N/A\\
       remote viewers iconset & /path/filename.bmp & N/A\\
-      \opt{h100,h300}{
+      \opt{iriverh100,iriverh300}{
         remote reduce ticking
                 & on, off               & N/A\\
       }%
@@ -333,7 +333,7 @@
       force fm mono
                 & off, on               & N/A\\
     }%
-    \opt{player}{
+    \opt{archosplayer}{
       jump scroll
                 & 0 to 5                & N/A\\
       jump scroll delay
diff --git a/manual/appendix/file_formats.tex b/manual/appendix/file_formats.tex
index cbf1ab2c07..2ca8582388 100644
--- a/manual/appendix/file_formats.tex
+++ b/manual/appendix/file_formats.tex
@@ -25,9 +25,9 @@
     the first file \\
 \includegraphics[width=0.37cm]{appendix/images/icon-rolo.png} 
   & Rockbox firmware & 
-    \opt{player}{\fname{.mod}}\opt{recorder,recorderv2fm,ondiofm,ondiosp}{\fname{.ajz}}%
-    \opt{h100,h300}{\fname{.iriver}}\opt{ipod}{\fname{.ipod}}\opt{iaudio}{\fname{.iaudio}}%
-    \opt{h10,h10_5gb,sansa}{\fname{.mi4}}\opt{gigabeat}{\fname{.gigabeat}}%
+    \opt{archosplayer}{\fname{.mod}}\opt{archosrecorder,archosrecorderv2fm,archosondiofm,archosondiosp}{\fname{.ajz}}%
+    \opt{iriverh100,iriverh300}{\fname{.iriver}}\opt{ipod}{\fname{.ipod}}\opt{iaudio}{\fname{.iaudio}}%
+    \opt{iriverh10,iriverh10_5gb,sansa}{\fname{.mi4}}\opt{gigabeat}{\fname{.gigabeat}}%
     \opt{sansaAMS}{\fname{.sansa}}
   & Load the new firmware with ROLO \\
 \includegraphics[width=0.37cm]{appendix/images/icon-wps.png} 
@@ -100,16 +100,16 @@
     Apple Lossless & \fname{.m4a, .mp4} & \\
     Wavpack & \fname{.wv} & \\
     Shorten & \fname{.shn} & Seeking not supported.\\
-    \opt{h100,h300,x5,m5,m3}{
+    \opt{iriverh100,iriverh300,iaudiox5,iaudiom5,iaudiom3}{
       Monkey's Audio & \fname{.ape, .mac} & -c1000 and -c2000 files decode
       fast enough to be useful.}
-    \opt{gigabeatf}{
+    \opt{gigabeatfx}{
       Monkey's Audio & \fname{.ape, .mac} & -c1000 to -c3000
       files decode fast enough to be useful.}
     \opt{gigabeats}{
       Monkey's Audio & \fname{.ape, .mac} & -c1000 to -c4000 files decode
       fast enough to be useful.}
-    \opt{ipod,h10,h10_5gb,mrobe100,sansa}{
+    \opt{ipod,iriverh10,iriverh10_5gb,mrobe100,sansa}{
       Monkey's Audio & \fname{.ape, .mac} & Only -c1000 files decode fast
       enough to be useful.}
     \\
diff --git a/manual/appendix/wps_tags.tex b/manual/appendix/wps_tags.tex
index 7c4fd5418a..828a379d23 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.
 \begin{table}
   \begin{tagmap}{}{}
     \config{\%pb} & Progress Bar\\
-    \opt{player}{
+    \opt{archosplayer}{
           & This will display a one character ``cup''
             that empties as the time progresses.}
     \opt{lcd_bitmap}{
@@ -120,13 +120,13 @@ produce the information for the next file to be played.
          & You can set the position, width and height of the progressbar %
            (in pixels) and load a custom image for it: %
            \config{\%pb{\textbar}image.bmp{\textbar}x{\textbar}y{\textbar}width{\textbar}height{\textbar}}} \\
-    \opt{player}{%
+    \opt{archosplayer}{%
     \config{\%pf} & Full-line progress bar \& time display\\
     }%
     \config{\%px} & Percentage Played In Song\\
     \config{\%pc} & Current Time In Song\\
     \config{\%pe} & Total Number of Playlist Entries\\
-    \nopt{player}{%
+    \nopt{archosplayer}{%
     \config{\%pm} & Peak Meter. The entire line is used as %
                     volume peak meter.\\%
     }%
@@ -202,7 +202,7 @@ produce the information for the next file to be played.
 \begin{table}
   \begin{tagmap}{}{}
     \config{\%mm} & Repeat mode, 0-4, in the order: Off, All, One, Shuffle
-           \opt{player,recorder,recorderv2fm}{, A-B}\\
+           \opt{archosplayer,archosrecorder,archosrecorderv2fm}{, A-B}\\
   \end{tagmap}
 \end{table}
 Example: \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
 multiple targets, some with and some without a clock. By using this tag as a
 conditional it is possible to display current date and time on those targets that
 support this
-\opt{rtc}{ (like the \playertype)},
+\opt{rtc}{ (like the \archosplayertype)},
 or alternate information on those that do not
-\nopt{rtc}{ (like the \playertype)}%
+\nopt{rtc}{ (like the \archosplayertype)}%
 .
 
 Example: