Pick up the target rename completion in the manual started in r27823 ... this time taking care of the Iriver targets. This fixes a few issues with wrongly in- or excluded parts (e.g. pacbox missing from the H100 manual, invadrox wrongly included in the small H10 manual as the plugin's main.tex already used the new names without making sure they are there). If possible replace 'target name' \opts with sensible feature \opts. Fix small mistakes and break too long lines discovered along the way.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29075 a1c6a512-1295-4272-9138-f99709370657

20 files changed, 113 insertions, 99 deletions

diff --git a/manual/advanced_topics/main.tex b/manual/advanced_topics/main.tex
index 08ecdfd063..749109e3a3 100644
--- a/manual/advanced_topics/main.tex
+++ b/manual/advanced_topics/main.tex
@@ -225,7 +225,7 @@ are discussed below.
   the last number giving the colour depth in bits) when
   designing your own WPS, or if you use a WPS designed for another target.
   \opt{HAVE_REMOTE_LCD}{The resolution of the remote is
-      \opt{h100,h300}{128$\times$64$\times$1}%
+      \opt{iriverh100,iriverh300}{128$\times$64$\times$1}%
       \opt{iaudiox5,iaudiom5,iaudiom3}{128$\times$96$\times$2}
       pixels.
   }
@@ -622,10 +622,10 @@ Rockbox is able to load and start another firmware file without rebooting.
 You just ``play'' a file with the extension %
 \opt{recorder,recorderv2fm,ondio}{\fname{.ajz}.} %
 \opt{player}{\fname{.mod}.} %
-\opt{h100,h300}{\fname{.iriver}.} %
+\opt{iriverh100,iriverh300}{\fname{.iriver}.} %
 \opt{ipod}{\fname{.ipod}.} %
 \opt{iaudio}{\fname{.iaudio}.} %
-\opt{sansa,h10,h10_5gb,vibe500}{\fname{.mi4}.} %
+\opt{sansa,iriverh10,iriverh10_5gb,vibe500}{\fname{.mi4}.} %
 \opt{sansaAMS}{\fname{.sansa}.} %
 \opt{gigabeatf,gigabeats}{\fname{.gigabeat}.} %
 This can be used to test new firmware versions without deleting your
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.}
     }
diff --git a/manual/configure_rockbox/display_options.tex b/manual/configure_rockbox/display_options.tex
index ed200795fb..a6bd439661 100644
--- a/manual/configure_rockbox/display_options.tex
+++ b/manual/configure_rockbox/display_options.tex
@@ -91,7 +91,7 @@
     }
     \end{description}
 %
-  \opt{HAVE_REMOTE_LCD}{
+  \opt{remote}{
     \item[Remote-LCD Settings.]
     This sub menu contains settings that relate to the display of the remote.
       \begin{description}
@@ -125,7 +125,7 @@
          Displays the screen so that the top of the display is nearest 
          the buttons. This is sometimes useful when carrying the \dap\ in a
          pocket for easy access to the headphone socket.
-       \opt{h100,h300}{
+       \opt{remote_ticking}{
          \item[Reduce Ticking.]
            Enable this option if you can hear a ticking sound in your headphones
            when using your remote.
@@ -148,7 +148,7 @@
         Defines the number of pixels the text should move for each step, as used
         by the Scroll Speed setting.
     }
-    \opt{HAVE_REMOTE_LCD}{
+    \opt{remote}{
       \item[Remote Scrolling Options.]
         The options here have the same effect on the remote LCD as the options
         mentioned above have on the main LCD.
diff --git a/manual/configure_rockbox/recording_settings.tex b/manual/configure_rockbox/recording_settings.tex
index b044df2332..d6c35eae1f 100644
--- a/manual/configure_rockbox/recording_settings.tex
+++ b/manual/configure_rockbox/recording_settings.tex
@@ -44,7 +44,7 @@
   \section{Frequency}
    \nopt{sansa,ipodnano,ipodcolor,ipod4g}{
     Choose the recording frequency (sample rate).
-    \opt{h100,h300}
+    \opt{iriverh100,iriverh300}
         {44.1~kHz, 22.05~kHz and 11.025~kHz}
     \opt{iaudiom3,iaudiom5,iaudiox5,vibe500}
         {88.2~kHz, 44.1~kHz, 22.05~kHz and 11.025~kHz}
@@ -67,7 +67,7 @@
       MPEG~1 for 48~kHz, 44.1~kHz and 32~kHz.\\
       MPEG~2 for 24~kHz, 22.05~kHz and 16~kHz.\\
     }
-    \opt{recorder,recorderv2fm,h100}
+    \opt{recording_digital}
       {\note{You cannot change the sample rate for digital recordings.}
     }
    } % nopt sansa
@@ -254,7 +254,7 @@
   
 More information can be found at \wikilink{VolumeTriggeredRecording}.
   
-\opt{h100,h300}{%
+\opt{agc}{%
   \section{Automatic Gain Control}
     The \setting{Automatic Gain Control} has five different presets for
     automatically controlling the gain while recording.
diff --git a/manual/configure_rockbox/sound_settings.tex b/manual/configure_rockbox/sound_settings.tex
index 406cc3679b..3e71c45cae 100644
--- a/manual/configure_rockbox/sound_settings.tex
+++ b/manual/configure_rockbox/sound_settings.tex
@@ -10,7 +10,7 @@ change to customise your listening experience.
   where 0~dB is a reference that indicates the maximum volume that the \dap{}
   can produce without possible distortion (clipping). All values lower than
   this reference will be negative and yield a progressively softer volume.
-  \nopt{h100,h300,ondavx777}{%
+  \nopt{iriverh100,iriverh300,ondavx777}{%
       Values higher than 0~dB are available and can be used to raise the
       volume more than would otherwise be possible. These volume levels will
       ordinarily lead to distorted sound, but might work nicely for music that has
@@ -19,12 +19,12 @@ change to customise your listening experience.
   The volume can be adjusted from a
   \opt{player}{minimum of -78~dB to a maximum of +18~dB.}%
   \opt{recorder,recorderv2fm,ondio}{minimum of -100~dB to a maximum of +12~dB.}%
-  \opt{h100,h300}{minimum of -84~dB to a maximum of 0~dB.}%
+  \opt{iriverh100,iriverh300}{minimum of -84~dB to a maximum of 0~dB.}%
   \opt{iaudiom3,iaudiom5,iaudiox5,ipod3g,ipod4g,gigabeatf,mrobe100,mpiohd200}{%
       minimum of -73~dB to a maximum of +6~dB.}%
   \opt{ipodnano}{minimum of -72~dB to a maximum of +6~dB.}%
   \opt{ipodvideo,cowond2}{minimum of -89~dB to a maximum of +6~dB.}%
-  \opt{ipodnano2g,ipodcolor,ipod1g2g,h10,h10_5gb,sansa,sansaAMS}{minimum of 
+  \opt{ipodnano2g,ipodcolor,ipod1g2g,iriverh10,iriverh10_5gb,sansa,sansaAMS}{minimum of 
       -74~dB to a maximum of +6~dB.}%
   \opt{gigabeats}{minimum of -90~dB to a maximum of +6~dB.}%
   \opt{gigabeatf,vibe500}{minimum of -74~dB to a maximum of +6~dB.}%
@@ -35,16 +35,16 @@ change to customise your listening experience.
 \nopt{gigabeats}{  
 \section{Bass}
   This setting emphasises
-  \nopt{h100,h300}{or suppresses}
+  \nopt{iriverh100,iriverh300}{or suppresses}
   the lower (bass) frequencies in the sound. A value of 0~dB means that bass
   sounds are unaltered (flat response).
   \opt{masd}{The minimum setting is -15~dB and the maximum is 15~dB.}%
   \opt{masf}{The minimum setting is -12~dB and the maximum is 12~dB.}%
-  \opt{h100,h300}{The minimum setting is 0~dB and the maximum is 24~dB.}%
+  \opt{iriverh100,iriverh300}{The minimum setting is 0~dB and the maximum is 24~dB.}%
   \opt{ipodnano,ipodnano2g,ipodcolor,mpiohd200}{%
       The minimum setting is -6~dB and the maximum is 9~dB.}%
   \opt{ipodvideo}{The minimum setting is -12~dB and the maximum is 12~dB.}%
-  \opt{iaudiom3,iaudiom5,iaudiox5,sansa,sansaAMS,h10,h10_5gb,vibe500}{%
+  \opt{iaudiom3,iaudiom5,iaudiox5,sansa,sansaAMS,iriverh10,iriverh10_5gb,vibe500}{%
       The minimum setting is -24~dB and the maximum is 24~dB.}
 
 \opt{ipodvideo}{
@@ -57,16 +57,16 @@ change to customise your listening experience.
 
 \section{Treble}
   This setting emphasises
-  \nopt{h100,h300}{or suppresses}
+  \nopt{iriverh100,iriverh300}{or suppresses}
   the higher (treble) frequencies in the sound. A value of 0~dB means that
   treble sounds are unaltered (flat response).
   \opt{masd}{The minimum setting is -15~dB and the maximum is 15~dB.}%
   \opt{masf}{The minimum setting is -12~dB and the maximum is 12~dB.}%
-  \opt{h100,h300}{The minimum setting is 0~dB and the maximum is 6~dB.}%
+  \opt{iriverh100,iriverh300}{The minimum setting is 0~dB and the maximum is 6~dB.}%
   \opt{ipodnano,ipodnano2g,ipodcolor,mpiohd200}{%
       The minimum setting is -6~dB and the maximum is 9~dB.}%
   \opt{ipodvideo}{The minimum setting is -12~dB and the maximum is 12~dB.}%
-  \opt{iaudiom3,iaudiom5,iaudiox5,sansa,sansaAMS,h10,h10_5gb,vibe500}{%
+  \opt{iaudiom3,iaudiom5,iaudiox5,sansa,sansaAMS,iriverh10,iriverh10_5gb,vibe500}{%
       The minimum setting is -24~dB and the maximum is 24~dB.}
 
 \opt{ipodvideo}{
diff --git a/manual/configure_rockbox/system_options.tex b/manual/configure_rockbox/system_options.tex
index 16f4003de5..f6854e49f1 100644
--- a/manual/configure_rockbox/system_options.tex
+++ b/manual/configure_rockbox/system_options.tex
@@ -34,7 +34,7 @@
       \opt{player,recorder}{1500~mAh}%
       \opt{recorderv2fm}{2200~mAh}%
       \opt{ondiosp,ondiofm,vibe500}{1000~mAh}%
-      \opt{h100,h300}{1300~mAh}%
+      \opt{iriverh100,iriverh300}{1300~mAh}%
       \opt{mpiohd200}{850~mAh}%
       \opt{ipodmini}{400~mAh (1G) or 630~mAh (2G)}%
       \opt{ipodcolor}{700~mAh}%
diff --git a/manual/configure_rockbox/theme_settings.tex b/manual/configure_rockbox/theme_settings.tex
index 9bcba6f435..3ae86ac61d 100644
--- a/manual/configure_rockbox/theme_settings.tex
+++ b/manual/configure_rockbox/theme_settings.tex
@@ -22,10 +22,10 @@ customize the visual apperance of Rockbox.
   \opt{iaudiom5}{\url{http://themes.rockbox.org/index.php?target=m5}}%
   \opt{iaudiox5}{\url{http://themes.rockbox.org/index.php?target=x5}}%
   \opt{iaudiom3}{\url{http://themes.rockbox.org/index.php?target=m3}}%
-  \opt{h100}{\url{http://themes.rockbox.org/index.php?target=h100}}%
-  \opt{h300}{\url{http://themes.rockbox.org/index.php?target=h300}}%
-  \opt{h10_5gb}{\url{http://themes.rockbox.org/index.php?target=h10_5gb}}%
-  \opt{h10}{\url{http://themes.rockbox.org/index.php?target=h10}}%
+  \opt{iriverh100}{\url{http://themes.rockbox.org/index.php?target=h100}}%
+  \opt{iriverh300}{\url{http://themes.rockbox.org/index.php?target=h300}}%
+  \opt{iriverh10_5gb}{\url{http://themes.rockbox.org/index.php?target=h10_5gb}}%
+  \opt{iriverh10}{\url{http://themes.rockbox.org/index.php?target=h10}}%
   \opt{ipod1g2g}{\url{http://themes.rockbox.org/index.php?target=ipod1g2g}}%
   \opt{ipod3g}{\url{http://themes.rockbox.org/index.php?target=ipod3g}}%
   \opt{ipod4g}{\url{http://themes.rockbox.org/index.php?target=ipod4g}}%
diff --git a/manual/getting_started/h10_install.tex b/manual/getting_started/h10_install.tex
index ff72f6661e..38e780a1ca 100644
--- a/manual/getting_started/h10_install.tex
+++ b/manual/getting_started/h10_install.tex
@@ -1,17 +1,27 @@
 \subsubsection{Installation}
 \begin{enumerate}
   \item Download 
-  \opt{h10}{\url{http://download.rockbox.org/bootloader/iriver/H10_20GC.mi4}}
-  \opt{h10_5gb}{
+  \opt{iriverh10}{\url{http://download.rockbox.org/bootloader/iriver/H10_20GC.mi4}}
+  \opt{iriverh10_5gb}{
     \begin{itemize}
-      \item \url{http://download.rockbox.org/bootloader/iriver/H10.mi4} if your \dap{} is UMS or
-      \item \url{http://download.rockbox.org/bootloader/iriver/H10_5GB-MTP/H10.mi4} if it is MTP.
+        \item \url{http://download.rockbox.org/bootloader/iriver/H10.mi4} if your \dap{} is UMS or
+        \item \url{http://download.rockbox.org/bootloader/iriver/H10_5GB-MTP/H10.mi4} if it is MTP.
     \end{itemize}}
-  \item Connect your \playertype{} to the computer using UMS mode and the UMS trick\opt{h10_5gb}{ if necessary}.
-  \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{}.
-    \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}.}}
-    \note{You should keep a safe backup of this file for use if you ever wish to switch back to the \playerman{} firmware.}
-    \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.}
+    \item Connect your \playertype{} to the computer using UMS mode and the UMS trick%
+        \opt{iriverh10_5gb}{ if necessary}.
+    \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 \playertype{}.
+        \opt{iriverh10_5gb}{\note{If you have a Pure model \playertype{} (which
+            does not have an 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}.}}
+    \note{You should keep a safe backup of this file for use if you ever wish
+        to switch back to the \playerman{} firmware.}
+    \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.}
 
-  \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{}.
+  \item Copy the \opt{iriverh10}{\fname{H10\_20GC.mi4}}\opt{iriverh10_5gb}{\fname{H10.mi4}
+      (or \fname{H10EMP.mi4} if you have a \playertype{} Pure)} file you
+      downloaded to the System directory on your \dap{}.
 \end{enumerate}
diff --git a/manual/getting_started/installation.tex b/manual/getting_started/installation.tex
index c270e8bb4c..10d13b6e12 100644
--- a/manual/getting_started/installation.tex
+++ b/manual/getting_started/installation.tex
@@ -93,7 +93,7 @@ follow the instructions at
     \end{itemize}
 \end{description}
 }
-\opt{h300}{
+\opt{iriverh300}{
 \begin{description}  
   \item[DRM capability.] If your \dap{} has a US firmware, then by installing Rockbox you will
   \emph{permanently} lose the ability to playback files with DRM.
@@ -161,14 +161,15 @@ follow the instructions at
     \setting{MSC} from within the original firmware.}
   }
 
-  \opt{h10,h10_5gb}{
+  \opt{iriverh10,iriverh10_5gb}{
     The installation requires you to use UMS mode and so
     may require use of the UMS trick, whereby it is possible to force a MTP
     \playertype{} to start up in UMS mode as follows:
       \begin{enumerate}
-        \item Ensure the \dap{} is fully powered off by \opt{h10}{using a pin to
-        push the small reset button inside the hole between the Hold switch and
-        remote control connector.}\opt{h10_5gb}{removing the battery and putting it back in again.}
+        \item Ensure the \dap{} is fully powered off by \opt{iriverh10}{using
+          a pin to push the small reset button inside the hole between the
+          \ButtonHold{} switch and remote control connector.}\opt{iriverh10_5gb}{removing
+          the battery and putting it back in again.}
         \item Connect your \playertype{} to the computer using the data cable.
         \item Hold \ButtonRight{} and push \ButtonPower{} to turn the \dap{} on.
         \item Continue holding \ButtonRight{} until the USB Connected screen appears.
@@ -319,7 +320,7 @@ letter the \dap{} gets assigned, on other systems this is a path in the
 filesystem.\\*
 
 
-\opt{h100,h300}{
+\opt{iriverh100,iriverh300}{
   Rockbox Utility will ask you for a compatible copy of the original
   firmware. This is because for legal reasons we cannot distribute
   the bootloader directly. Instead, we have to patch the Iriver firmware
@@ -330,13 +331,13 @@ filesystem.\\*
   \wikilink{IriverBoot}.
  
   Supported Iriver firmware versions currently include 
-  \opt{h100}{1.63US, 1.63EU, 1.63K, 1.65US, 1.65EU, 1.65K, 1.66US, 
+  \opt{iriverh100}{1.63US, 1.63EU, 1.63K, 1.65US, 1.65EU, 1.65K, 1.66US, 
     1.66EU and 1.66K. Note that the H140 uses the same firmware as the H120;
     H120 and H140 owners should use the firmware called \fname{ihp\_120.hex}.
     Likewise, the iHP110 and iHP115 use the same firmware, called 
     \fname{ihp\_100.hex}. Be sure to use the correct firmware file for 
     your player.}
-    \opt{h300}{1.28K, 1.28EU, 1.28J, 1.29K, 1.29J and 1.30EU.
+    \opt{iriverh300}{1.28K, 1.28EU, 1.28J, 1.29K, 1.29J and 1.30EU.
     \note{The US \playername{} firmware is not supported and cannot be
     patched to be used with the bootloader. If you wish to install Rockbox
     on a US \playername{}, you must first install a non-US version of the
@@ -444,7 +445,7 @@ data partiton.}}
 correct version for your \dap{}.}}
 
 \item Connect your \dap{} to the computer via USB 
-  \opt{sansa,sansaAMS,h10,h10_5gb,vibe500}{ in MSC mode }
+  \opt{sansa,sansaAMS,iriverh10,iriverh10_5gb,vibe500}{ in MSC mode }
   \opt{ipod3g,ipod4g,ipodmini,ipodcolor}{ or Firewire }as described in
   the manual that came with your \dap{}.
 
@@ -483,11 +484,11 @@ structure that Rockbox needs.\\}
 \opt{swcodec}{%
     \nopt{gigabeats}{%
     \subsubsection{Installing the bootloader}
-        \opt{h100,h300}{\input{getting_started/iriver_install.tex}}
+        \opt{iriverh100,iriverh300}{\input{getting_started/iriver_install.tex}}
         \opt{mpiohd200}{\input{getting_started/mpio_install.tex}}
         \opt{ipod}{\input{getting_started/ipod_install.tex}}
         \opt{iaudio}{\input{getting_started/iaudio_install.tex}}
-        \opt{h10,h10_5gb}{\input{getting_started/h10_install.tex}}
+        \opt{iriverh10,iriverh10_5gb}{\input{getting_started/h10_install.tex}}
         \opt{gigabeatf}{\input{getting_started/gigabeat_install.tex}}
         \opt{sansa}{\input{getting_started/sansa_install.tex}}
         \opt{sansaAMS}{\input{getting_started/sansaAMS_install.tex}}
@@ -526,7 +527,7 @@ structure that Rockbox needs.\\}
   \end{itemize}
 }
 
-\opt{h10,h10_5gb,ipod,mrobe100,sansa,archos,sansaAMS,cowond2,vibe500,ondavx777}{
+\opt{iriverh10,iriverh10_5gb,ipod,mrobe100,sansa,archos,sansaAMS,cowond2,vibe500,ondavx777}{
   Safely eject / unmount the USB drive, unplug the cable and restart.
 }
 
@@ -534,7 +535,7 @@ structure that Rockbox needs.\\}
   Safely eject / unmount your \dap{}.
 }
 
-\opt{h100,h300}{
+\opt{iriverh100,iriverh300}{
   \begin{itemize}
   \item Safely eject / unmount your \dap{}.
   
@@ -665,7 +666,7 @@ You can uninstall Rockbox automatically by using Rockbox Utility. If you
 installed Rockbox manually you can still use Rockbox Utility for uninstallation
 but will not be able to do this selectively.
 
-\opt{h100,h300}{\note{Rockbox Utility cannot uninstall the bootloader due to
+\opt{iriverh100,iriverh300}{\note{Rockbox Utility cannot uninstall the bootloader due to
 the fact that it requires a flashing procedure. To uninstall the bootloader
 completely follow the manual uninstallation instructions below.}}
 
@@ -677,14 +678,15 @@ completely follow the manual uninstallation instructions below.}}
   \fname{\firmwarefilename} file.
 }
 
-\opt{h10,h10_5gb}{
+\opt{iriverh10,iriverh10_5gb}{
   If you would like to go back to using the original \playerman{} software,
   connect the \dap{} to your computer, and delete the
-  \opt{h10}{\fname{H10\_20GC.mi4}}\opt{h10_5gb}{\fname{H10.mi4}} file and rename
-  \fname{OF.mi4} to \opt{h10}{\fname{H10\_20GC.mi4}}\opt{h10_5gb}{\fname{H10.mi4}}
-  in the \fname{System} directory on your \playertype{}. As in the installation,
-  it may be necessary to first put your device into UMS mode.
-}
+  \opt{iriverh10}{\fname{H10\_20GC.mi4}}\opt{iriverh10_5gb}{\fname{H10.mi4}}
+      file and rename \fname{OF.mi4} to \opt{iriverh10}{\fname{H10\_20GC.mi4}}%
+      \opt{iriverh10_5gb}{\fname{H10.mi4}} in the \fname{System} directory on
+      your \playertype{}. As in the installation, it may be necessary to first
+      put your device into UMS mode.
+  }
 
 \opt{vibe500}{
   If you would like to go back to using the original \playerman{} software,
@@ -726,18 +728,18 @@ completely follow the manual uninstallation instructions below.}}
   and insert the charger. The original firmware will automatically be flashed.
 }
 
-\opt{h100,h300}{
+\opt{iriverh100,iriverh300}{
     If you want to remove the Rockbox bootloader, simply flash an unpatched
     \playerman{} firmware. Be aware that doing so will also remove the bootloader
     USB mode. As that mode can come in quite handy (especially if you experience
    disk errors) it is recommended to keep the bootloader. It also
     gives you the possibility of trying Rockbox anytime later by simply
     installing the distribution files.
-    \opt{h100}{
+    \opt{iriverh100}{
       The Rockbox bootloader will automatically start the original firmware if
       the \fname{.rockbox} directory has been deleted.
     }
-    \opt{h300}{
+    \opt{iriverh300}{
       Although if you retain the Rockbox bootloader, you will need to hold the
       \ButtonRec{} button each time you want to start the original firmware.
     }
@@ -792,7 +794,7 @@ completely follow the manual uninstallation instructions below.}}
   please ensure that you are either logged in as an administrator (Windows), or
   you have root rights (Linux)}
 
-\opt{h100,h300}{
+\opt{iriverh100,iriverh300}{
   \item[Immediately loading original firmware.]
   If the original firmware is immediately
   loaded without the Rockbox bootloader appearing first, then the Rockbox bootloader
@@ -800,11 +802,11 @@ completely follow the manual uninstallation instructions below.}}
   the update if the filename is correct, including case. Make sure that the patched
   Iriver firmware is called \fname{.hex}.}
 
-\nopt{h100,h300,mpiohd200}{\item[``File Not Found'']}
-\opt{h100,h300,mpiohd200}{\item[``-1 error'']}
+\nopt{iriverh100,iriverh300,mpiohd200}{\item[``File Not Found'']}
+\opt{iriverh100,iriverh300,mpiohd200}{\item[``-1 error'']}
   If you receive a
-  \nopt{h100,h300,mpiohd200}{``File Not Found''}
-  \opt{h100,h300,mpiohd200}{``-1 error''} 
+  \nopt{iriverh100,iriverh300,mpiohd200}{``File Not Found''}
+  \opt{iriverh100,iriverh300,mpiohd200}{``-1 error''} 
   from the bootloader, then the bootloader cannot find the Rockbox firmware. 
   This is usually a result of not extracting the contents of the \fname{.zip} 
   file to the proper location, and should not happen when Rockbox has been
diff --git a/manual/platform/iriverh10.tex b/manual/platform/iriverh10.tex
index f032df70a6..460c269ce5 100644
--- a/manual/platform/iriverh10.tex
+++ b/manual/platform/iriverh10.tex
@@ -1,5 +1,5 @@
 % $Id$ %
-\def\UseOption{h10}
+\def\UseOption{iriverh10}
 \edef\UseOption{\UseOption,HAVE_RB_BL_ON_DISK}
 \edef\UseOption{\UseOption,IRIVER_H10_PAD}
 \edef\UseOption{\UseOption,HAVE_BACKLIGHT}
diff --git a/manual/platform/iriverh100.tex b/manual/platform/iriverh100.tex
index 509a676c0a..4b05e460e1 100644
--- a/manual/platform/iriverh100.tex
+++ b/manual/platform/iriverh100.tex
@@ -1,5 +1,5 @@
 % $Id$ %
-\def\UseOption{h100}
+\def\UseOption{iriverh100}
 \edef\UseOption{\UseOption,HAVE_RB_BL_IN_FLASH}
 \edef\UseOption{\UseOption,IRIVER_H100_PAD}
 \edef\UseOption{\UseOption,HAVE_REMOTE_LCD}
diff --git a/manual/platform/iriverh10_5gb.tex b/manual/platform/iriverh10_5gb.tex
index 0624290f85..14adcfedd0 100644
--- a/manual/platform/iriverh10_5gb.tex
+++ b/manual/platform/iriverh10_5gb.tex
@@ -1,5 +1,5 @@
 % $Id$ %
-\def\UseOption{h10_5gb}
+\def\UseOption{iriverh10_5gb}
 \edef\UseOption{\UseOption,HAVE_RB_BL_ON_DISK}
 \edef\UseOption{\UseOption,IRIVER_H10_PAD}
 \edef\UseOption{\UseOption,HAVE_BACKLIGHT}
diff --git a/manual/platform/iriverh300.tex b/manual/platform/iriverh300.tex
index 354287c5c5..1a5ac37654 100644
--- a/manual/platform/iriverh300.tex
+++ b/manual/platform/iriverh300.tex
@@ -1,5 +1,5 @@
 % $Id$ %
-\def\UseOption{h300}
+\def\UseOption{iriverh300}
 \edef\UseOption{\UseOption,HAVE_RB_BL_IN_FLASH}
 \edef\UseOption{\UseOption,IRIVER_H300_PAD}
 \edef\UseOption{\UseOption,HAVE_REMOTE_LCD}
diff --git a/manual/plugins/metronome.tex b/manual/plugins/metronome.tex
index 6b7fde92f0..458d7a2298 100644
--- a/manual/plugins/metronome.tex
+++ b/manual/plugins/metronome.tex
@@ -25,7 +25,7 @@ on the appropriate button.
         \opt{HAVEREMOTEKEYMAP}{& \PluginRCUp{} / \PluginRCDown}
         & Adjust volume \\
 
-    \opt{h100,h300,e200}{
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,SANSA_E200_PAD}{
       \ButtonRec
         \opt{HAVEREMOTEKEYMAP}{& }
         & Sync tap \\}
diff --git a/manual/plugins/pacbox.tex b/manual/plugins/pacbox.tex
index afb4387679..4ad03234d1 100644
--- a/manual/plugins/pacbox.tex
+++ b/manual/plugins/pacbox.tex
@@ -27,31 +27,33 @@ found at \url{http://www.mame.net}.
 
 \subsubsection{Keys}
 \begin{btnmap}
+    % 20GB H10 and 5/6GB H10 have different direction key mappings to match the
+    % orientation of the playing field on their different displays - don't use *_PAD !
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,IPOD_4G_PAD,%
-        IPOD_3G_PAD,h10,MROBE100_PAD,SANSA_FUZE_PAD}{\ButtonRight}
+        IPOD_3G_PAD,iriverh10,MROBE100_PAD,SANSA_FUZE_PAD}{\ButtonRight}
     \opt{GIGABEAT_PAD,GIGABEAT_S_PAD,SANSA_E200_PAD,PBELL_VIBE500_PAD}{\ButtonUp}
-    \opt{h10_5gb}{\ButtonScrollUp}
+    \opt{iriverh10_5gb}{\ButtonScrollUp}
     \opt{COWON_D2_PAD}{\TouchTopMiddle}
       \opt{HAVEREMOTEKEYMAP}{& }
     & Move Up\\
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,IPOD_4G_PAD,%
-    IPOD_3G_PAD,h10,MROBE100_PAD,SANSA_FUZE_PAD}{\ButtonLeft}
-    \opt{h10_5gb}{\ButtonScrollDown}
+    IPOD_3G_PAD,iriverh10,MROBE100_PAD,SANSA_FUZE_PAD}{\ButtonLeft}
+    \opt{iriverh10_5gb}{\ButtonScrollDown}
     \opt{GIGABEAT_PAD,GIGABEAT_S_PAD,SANSA_E200_PAD,PBELL_VIBE500_PAD}{\ButtonDown}
     \opt{COWON_D2_PAD}{\TouchBottomMiddle}
       \opt{HAVEREMOTEKEYMAP}{& }
     & Move Down\\
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,MROBE100_PAD,SANSA_FUZE_PAD}{\ButtonUp}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu}
-    \opt{h10}{\ButtonScrollUp}
-    \opt{h10_5gb,GIGABEAT_PAD,GIGABEAT_S_PAD,SANSA_E200_PAD,PBELL_VIBE500_PAD}{\ButtonLeft}
+    \opt{iriverh10}{\ButtonScrollUp}
+    \opt{iriverh10_5gb,GIGABEAT_PAD,GIGABEAT_S_PAD,SANSA_E200_PAD,PBELL_VIBE500_PAD}{\ButtonLeft}
     \opt{COWON_D2_PAD}{\TouchMidLeft}
       \opt{HAVEREMOTEKEYMAP}{& }
     & Move Left\\
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,MROBE100_PAD,SANSA_FUZE_PAD}{\ButtonDown}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonPlay}
-    \opt{h10}{\ButtonScrollDown}
-    \opt{h10_5gb,GIGABEAT_PAD,GIGABEAT_S_PAD,SANSA_E200_PAD,PBELL_VIBE500_PAD}{\ButtonRight}
+    \opt{iriverh10}{\ButtonScrollDown}
+    \opt{iriverh10_5gb,GIGABEAT_PAD,GIGABEAT_S_PAD,SANSA_E200_PAD,PBELL_VIBE500_PAD}{\ButtonRight}
     \opt{COWON_D2_PAD}{\TouchMidRight}
       \opt{HAVEREMOTEKEYMAP}{& }
     & Move Right\\
diff --git a/manual/plugins/rockboy.tex b/manual/plugins/rockboy.tex
index a363a89f7b..a30d07ccdb 100644
--- a/manual/plugins/rockboy.tex
+++ b/manual/plugins/rockboy.tex
@@ -82,7 +82,7 @@ the gnuboy emulator. To start a game, open a ROM file saved as \fname{.gb} or
         \opt{IRIVER_H100_PAD,IAUDIO_X5_PAD}{\ButtonHold{} switch}
               \opt{HAVEREMOTEKEYMAP}{& }
         & Cycle display scaling modes\\
-    %
+    %  defined for the Recorders and targets with 160x128x2 displays (H100, M5)
     }
     \opt{RECORDER_PAD,IRIVER_H300_PAD}{\ButtonOff}
     \opt{IRIVER_H100_PAD}{\ButtonMode}
@@ -115,7 +115,7 @@ the gnuboy emulator. To start a game, open a ROM file saved as \fname{.gb} or
         Choose whether the original aspect ratio should be kept when scaling
         the picture to the screen%
         % targets with bigger displays than the original gameboy
-        \opt{gigabeat,h300,ipodcolor,ipodvideo,e200,e200v2}{
+        \opt{gigabeat,iriverh300,ipodcolor,ipodvideo,e200,e200v2}{
             or whether it should be displayed unscaled%
         }.
         \item[Screen Rotate.]
diff --git a/manual/rockbox_interface/browsing_and_playing.tex b/manual/rockbox_interface/browsing_and_playing.tex
index ee256ec1a3..d8fc30e395 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
 on the \dap{}.
 }
 
-\opt{h10,h10_5gb}{\note{
+\opt{iriverh10,iriverh10_5gb}{\note{
 If your \dap{} is a MTP model, the Music directory where all your music is stored
 may be hidden in the \setting{File Browser}. This may be fixed by either
 either changing its properties (on a computer) to not hidden, or by changing
diff --git a/manual/rockbox_interface/main.tex b/manual/rockbox_interface/main.tex
index 5d04b76ede..cb6fda7e84 100644
--- a/manual/rockbox_interface/main.tex
+++ b/manual/rockbox_interface/main.tex
@@ -9,7 +9,7 @@
 % The extension is selected in the preamble, so no further \ifpdfoutput
 % is necessary.
 \includegraphics[height=8cm,width=10cm,keepaspectratio=true]{rockbox_interface/images/\specimg-front}
-\opt{iaudiom3,h100}{% replace with HAVEREMOTEKEYMAP when all images exist or change specimg
+\opt{iaudiom3,iriverh100}{% replace with HAVEREMOTEKEYMAP when all images exist or change specimg
   \end{center}
   % spacing between the two pictures, could possibly be improved
   \begin{center}
@@ -42,7 +42,7 @@ detail in the following paragraph.
   \wikilink{BlindFAQ}.
   
   %
-  \opt{h100}{
+  \opt{iriverh100}{
   Hold or lay the \dap{} so that the side with the joystick and LCD is facing
   towards you, and the curved side is at the top. The joystick functions as
   the \ButtonUp{}, \ButtonRight{}, \ButtonLeft{}, and \ButtonDown{} buttons when
@@ -63,7 +63,7 @@ detail in the following paragraph.
   \dap{} hard locks, you can reset it by inserting a paper clip into the hole
   where the reset switch is.}
   % 
-  \opt{h300}{
+  \opt{iriverh300}{
   Hold or lay the \dap{} so that the side with the button pad and
   LCD is facing towards you.  The buttons on the button pad are as follows:  top 
   left corner: \ButtonOn{}, bottom left corner: \ButtonOff{}, top right corner: 
@@ -231,7 +231,7 @@ detail in the following paragraph.
   round crosspad is labelled \ButtonMenu{}.
   }
   %
-  \opt{h10,h10_5gb}{
+  \opt{iriverh10,iriverh10_5gb}{
   Hold or lay the \dap{} so that the side with the scroll pad and
   LCD is facing towards you. In the centre below the lcd is the scroll pad. It
   is oriented vertically. Touching the top and bottom half of it acts as the 
@@ -244,8 +244,8 @@ detail in the following paragraph.
   hand side is the \ButtonPower{} button.
 
   On the top panel of the \dap{}, from left to right, you can find the 
-  following: \ButtonHold{} switch, \opt{h10}{reset pin hole, }remote port and
-  headphone mini jack plug. 
+  following: \ButtonHold{} switch, \opt{iriverh10}{reset pin hole, }remote port
+  and headphone mini jack plug. 
   
   On the bottom panel of the \dap{} is the data cable port.}
   %
@@ -528,6 +528,7 @@ To turn on and off your Rockbox enabled \dap{} use the following keys:
           ,GIGABEAT_PAD,MROBE100_PAD,GIGABEAT_S_PAD,sansaAMS,PBELL_VIBE500_PAD%
           }{\ButtonPower}%
       \opt{COWON_D2_PAD} {\ButtonPower{}, then \ButtonHold}%
+      \opt{ONDA_VX777_PAD} {\ButtonPower{}}%
           &
       \opt{HAVEREMOTEKEYMAP}{
           \opt{IRIVER_RC_H100_PAD}{\ButtonRCOn}%
@@ -615,7 +616,7 @@ To turn on and off your Rockbox enabled \dap{} use the following keys:
     simultaneously until the player hard resets.
     }
 
-  \opt{h100,h300}
+  \opt{iriverh100,iriverh300}
     {
     Rockbox has a dual-boot feature. To boot into the original firmware,
     when the \dap{} is turned off, press and hold the \ButtonRec{} button,
@@ -631,15 +632,16 @@ To turn on and off your Rockbox enabled \dap{} use the following keys:
     and Shutdown. Select the option you need with \ButtonRew{} and \ButtonFF{}
     and confirm with long \ButtonPlay{}.
     }
-  \opt{h10,h10_5gb}
+  \opt{iriverh10,iriverh10_5gb}
     {
     Rockbox has a dual-boot feature. It loads the original firmware from
     the file \fname{/System/OF.mi4}. To boot into the original firmware,
     press and hold the \ButtonLeft{} button while turning on the player.
     \note{The iriver firmware does not shut down properly when you turn it off,
     it only goes to sleep. To get back into Rockbox when exiting from the
-    iriver firmware, you will need to reset the player by \opt{h10}{inserting a
-    pin in the reset hole}\opt{h10_5gb}{removing and reinserting the battery}.}
+    iriver firmware, you will need to reset the player by \opt{iriverh10}{%
+    inserting a pin in the reset hole}\opt{iriverh10_5gb}{removing and
+    reinserting the battery}.}
     }
     
   \opt{sansa,sansaAMS}