1 files changed, 17 insertions, 17 deletions

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.
   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{archosplayer,archosrecorder,archosrecorderv2fm,ondio,iaudiox5,iaudiom5,ipodnano1g,ipodvideo,
-       ipodcolor,ipod1g2g,iriverh10,iriverh10_5gb,sansa,sansaAMS,gigabeats,gigabeatfx}{
+  \opt{player,recorder,recorderv2fm,ondio,x5,m5,ipodnano,ipodvideo,
+       ipodcolor,ipod1g2g,h10,h10_5gb,sansa,sansaAMS,gigabeats,gigabeatf}{
   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{archosplayer}{minimum of -78 dB to a maximum of +18 dB.}%
-  \opt{archosrecorder,archosrecorderv2fm,ondio}{minimum of -100 dB to a maximum of +12 dB.}%
-  \opt{iriverh100,iriverh300}{minimum of -84 dB to a maximum of 0 dB.}%
-  \opt{iaudiox5,iaudiom5,ipod3g,ipod4g,gigabeatfx,mrobe100}{minimum of -73 dB to a maximum of +6 dB.}%
-  \opt{ipodnano1g}{minimum of -72 dB to a maximum of +6 dB.}%
+  \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{ipodnano}{minimum of -72 dB to a maximum of +6 dB.}%
   \opt{ipodvideo}{minimum of -57 dB to a maximum of +6 dB.}%
-  \opt{ipodcolor,ipod1g2g,iriverh10,iriverh10_5gb,sansa,sansaAMS}{minimum of -74 dB to a maximum
+  \opt{ipodcolor,ipod1g2g,h10,h10_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{gigabeatfx}{minimum of -74 dB to a maximum of +6 dB.}%
+  \opt{gigabeatf}{minimum of -74 dB to a maximum of +6 dB.}%
 
 \section{Bass}
   This setting emphasises
-  \nopt{iriverh100,iriverh300}{or suppresses}
+  \nopt{h100,h300}{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{iriverh100,iriverh300}{The minimum setting is 0 dB and the maximum is 24 dB.}%
-  \opt{ipodnano1g,ipodcolor}{The minimum setting is -6 dB and the maximum is 9 dB.}%
+  \opt{h100,h300}{The minimum setting is 0 dB and the maximum is 24 dB.}%
+  \opt{ipodnano,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{iaudiox5,sansa,sansaAMS,iriverh10,iriverh10_5gb}{The minimum setting is -24 dB and the maximum is 24 dB.}
+  \opt{x5,sansa,sansaAMS,h10,h10_5gb}{The minimum setting is -24 dB and the maximum is 24 dB.}
 
 \opt{ipodvideo}{
 \section{Bass Cutoff}
@@ -50,15 +50,15 @@ change to customise your listening experience.
 
 \section{Treble}
   This setting emphasises
-  \nopt{iriverh100,iriverh300}{or suppresses}
+  \nopt{h100,h300}{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{iriverh100,iriverh300}{The minimum setting is 0 dB and the maximum is 6 dB.}%
-  \opt{ipodnano1g,ipodcolor}{The minimum setting is -6 dB and the maximum is 9 dB.}%
+  \opt{h100,h300}{The minimum setting is 0 dB and the maximum is 6 dB.}%
+  \opt{ipodnano,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{iaudiox5,sansa,sansaAMS,iriverh10,iriverh10_5gb}{The minimum setting is -24 dB and the maximum is 24 dB.}
+  \opt{x5,sansa,sansaAMS,h10,h10_5gb}{The minimum setting is -24 dB and the maximum is 24 dB.}
 
 \opt{ipodvideo}{
 \section{Treble Cutoff}