3 files changed, 10 insertions, 12 deletions

diff --git a/manual/appendix/appendix.tex b/manual/appendix/appendix.tex
index cc3b87b97e..dba06c4cc1 100644
--- a/manual/appendix/appendix.tex
+++ b/manual/appendix/appendix.tex
@@ -91,7 +91,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,iaudiox5}{
+\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 4ee8f00faf..9c477db901 100644
--- a/manual/appendix/config_file_options.tex
+++ b/manual/appendix/config_file_options.tex
@@ -13,24 +13,22 @@
     \midrule\localendhead % endhead breaks with htlatex
     volume      & \opt{masd}{-78 to +18}%
                   \opt{masf}{-100 -to +12}%
-                  \opt{h100,h300}{-84 to 0}%
+                  \opt{iriverh100,iriverh300}{-84 to 0}%
                   \opt{ipodnano}{-72 to +6}%
-                  \opt{ipodnano2g}{-74 to +6}%
                   \opt{ipodvideo,cowond2}{-89 to +6}%
                   \opt{iaudiom3,iaudiom5,iaudiox5}{-73 to +6}
-                  \opt{e200,e200v2}{-74 to +6}
-                  \opt{ipodcolor,vibe500}{-74 to +6}%
+                  \opt{e200,e200v2,ipodcolor,vibe500,ipodnano2g}{-74 to +6}%
                                         & dB\\
     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{iaudiom3,iaudiom5,iaudiox5,e200,e200v2,vibe500}{%
                       -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{iaudiom3,iaudiom5,iaudiox5,e200,e200v2,vibe500}{%
                       -24 to +24}%
@@ -325,7 +323,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\\
       }%
diff --git a/manual/appendix/file_formats.tex b/manual/appendix/file_formats.tex
index 03a41bb41b..c19d43a01d 100644
--- a/manual/appendix/file_formats.tex
+++ b/manual/appendix/file_formats.tex
@@ -49,7 +49,7 @@
   \includegraphics[width=0.37cm]{appendix/images/icon-rolo.png} 
   & Rockbox firmware & \fname{.ipod} & Load the new firmware with ROLO \\
 }
-\opt{h100,h300}{
+\opt{iriverh100,iriverh300}{
   \includegraphics[width=0.37cm]{appendix/images/icon-rolo.png} 
   & Rockbox firmware & \fname{.iriver} & Load the new firmware with ROLO \\
 }
@@ -62,7 +62,7 @@
 \includegraphics[width=0.37cm]{appendix/images/icon-playlist.png}
   & Playlist & \fname{.m3u, .m3u8} & Load the playlist and start playing 
     the first file \\
-\opt{h10,h10_5gb,sansa,vibe500}{
+\opt{iriverh10,iriverh10_5gb,sansa,vibe500}{
   \includegraphics[width=0.37cm]{appendix/images/icon-rolo.png} 
   & Rockbox firmware & \fname{.mi4} & Load the new firmware with ROLO \\
 }
@@ -130,13 +130,13 @@
                                   &                     & IEEE float 32/64 bit\\
                                   &                     & ITU-T G.711 a-low/$\mu$-low\\
                                   &                     & QuickTime IMA ADPCM\\
-    \opt{gigabeatf,h100,h300,iaudiox5,iaudiom5,iaudiom3,ipodnano2g,clipv1}{
+    \opt{gigabeatf,iriverh100,iriverh300,iaudiox5,iaudiom5,iaudiom3,ipodnano2g,clipv1}{
       Monkey's Audio & \fname{.ape, .mac} & -c1000 to -c3000
       files decode fast enough to be useful.}
     \opt{gigabeats}{
       Monkey's Audio & \fname{.ape, .mac} & }
     \nopt{ipodnano2g}{
-      \opt{ipod,h10,h10_5gb,mrobe100,sansa,vibe500}{
+      \opt{ipod,iriverh10,iriverh10_5gb,mrobe100,sansa,vibe500}{
         Monkey's Audio & \fname{.ape, .mac} & Only -c1000 files decode fast
         enough to be useful.}
     }