First step of completing the target rename in the manual. Some target specific options were already renamed in the rest of the source (e.g. see r23883) but not where they are actually set - in the platform files - leading to parts included or excluded incorrectly. The problem exists for more targets, this commit deals with the supported Iaudios first. Rename 'x5' to 'iaudiox5' (do the same for 'm5' and 'm3'), fix small errors or add missing info related to them along the way, use more appropriate options and simplify code a bit where possible.

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

3 files changed, 24 insertions, 18 deletions

diff --git a/manual/configure_rockbox/sound_settings.tex b/manual/configure_rockbox/sound_settings.tex
index 542f13b248..4ce6bea6d5 100644
--- a/manual/configure_rockbox/sound_settings.tex
+++ b/manual/configure_rockbox/sound_settings.tex
@@ -10,21 +10,22 @@ 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.
-  \opt{player,recorder,recorderv2fm,ondio,x5,m5,ipodnano,ipodnano2g,ipodvideo,
-       ipodcolor,ipod1g2g,h10,h10_5gb,sansa,sansaAMS,gigabeats,gigabeatf,vibe500}{
-  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
-  an otherwise low volume level.}
+  \nopt{h100,h300,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
+      an otherwise low volume level.
+  }
   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{x5,m5,ipod3g,ipod4g,gigabeatf,mrobe100}{minimum of -73~dB to a maximum of +6~dB.}%
+  \opt{iaudiom3,iaudiom5,iaudiox5,ipod3g,ipod4g,gigabeatf,mrobe100}{%
+      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 
-  -74~dB to a maximum of +6~dB.}%
+      -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.}%
   \opt{ipodvideo}{\\Remark: Lowering the volume below -57~dB will also affect the line-out 
@@ -41,7 +42,8 @@ change to customise your listening experience.
   \opt{h100,h300}{The minimum setting is 0~dB and the maximum is 24~dB.}%
   \opt{ipodnano,ipodnano2g,ipodcolor}{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{x5,sansa,sansaAMS,h10,h10_5gb,vibe500}{The minimum setting is -24~dB and the maximum is 24~dB.}
+  \opt{iaudiom3,iaudiom5,iaudiox5,sansa,sansaAMS,h10,h10_5gb,vibe500}{%
+      The minimum setting is -24~dB and the maximum is 24~dB.}
 
 \opt{ipodvideo}{
 \section{Bass Cutoff}
@@ -61,7 +63,8 @@ change to customise your listening experience.
   \opt{h100,h300}{The minimum setting is 0~dB and the maximum is 6~dB.}%
   \opt{ipodnano,ipodnano2g,ipodcolor}{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{x5,sansa,sansaAMS,h10,h10_5gb,vibe500}{The minimum setting is -24~dB and the maximum is 24~dB.}
+  \opt{iaudiom3,iaudiom5,iaudiox5,sansa,sansaAMS,h10,h10_5gb,vibe500}{%
+      The minimum setting is -24~dB and the maximum is 24~dB.}
 
 \opt{ipodvideo}{
 \section{Treble Cutoff}
diff --git a/manual/configure_rockbox/system_options.tex b/manual/configure_rockbox/system_options.tex
index ac39db60b6..62825bdb3f 100644
--- a/manual/configure_rockbox/system_options.tex
+++ b/manual/configure_rockbox/system_options.tex
@@ -42,7 +42,7 @@
       \opt{ipod4g}{630~mAh}%
       \opt{ipod3g}{630~mAh}%
       \opt{ipod1g2g}{1200~mAh}%
-      \opt{m5,x5}{950~mAh}%
+      \opt{iaudiom3,iaudiom5,iaudiox5}{950~mAh}%
       \opt{gigabeatf}{2000~mAh}%
       \opt{gigabeats}{700~mAh}%
       \opt{cowond2}{1600~mAh}%
@@ -52,10 +52,13 @@
         calculation. Changing this setting has no effect whatsoever on
         actual battery life. This setting only affects the accuracy of the
         runtime estimation as shown on screen.
-      \opt{iaudio}{Rockbox does not automatically distinguish between the
-        ``L'' models and the ``simple'' models which determine the default
-        value. If your dap{} is an \opt{m5}{M5L}\opt{x5}{X5L} set the value
-        to 2250~mAh for more accuracy in the runtime estimation.}
+      \opt{iaudiom3,iaudiom5,iaudiox5}{Rockbox does not automatically distinguish
+        between the ``L'' models and the ``simple'' models which determine the
+        default value. If your dap{} is an
+            \opt{iaudiom3}{M3L}%
+            \opt{iaudiom5}{M5L}%
+            \opt{iaudiox5}{X5L}
+        set the value to 2250~mAh for more accuracy in the runtime estimation.}
       \opt{ipod,sansa}{This value is fairly meaningless in the \playerman{}
         family at present, and work is on-going into finding a better way to
         determine battery life.}
diff --git a/manual/configure_rockbox/theme_settings.tex b/manual/configure_rockbox/theme_settings.tex
index 35cf716828..9bcba6f435 100644
--- a/manual/configure_rockbox/theme_settings.tex
+++ b/manual/configure_rockbox/theme_settings.tex
@@ -19,9 +19,9 @@ customize the visual apperance of Rockbox.
   \opt{recorderv2fm}{\url{http://themes.rockbox.org/index.php?target=fmrecorder}}%
   \opt{ondiofm}{\url{http://themes.rockbox.org/index.php?target=ondiofm}}%
   \opt{ondiosp}{\url{http://themes.rockbox.org/index.php?target=ondiosp}}%
-  \opt{m5}{\url{http://themes.rockbox.org/index.php?target=m5}}%
-  \opt{x5}{\url{http://themes.rockbox.org/index.php?target=x5}}%
-  \opt{m3}{\url{http://themes.rockbox.org/index.php?target=m3}}%
+  \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}}%