5 files changed, 64 insertions, 64 deletions

diff --git a/manual/configure_rockbox/display_options.tex b/manual/configure_rockbox/display_options.tex
index 823a313adc..9ea7e4713c 100644
--- a/manual/configure_rockbox/display_options.tex
+++ b/manual/configure_rockbox/display_options.tex
@@ -70,12 +70,12 @@
       }
     } % \opt{HAVE_BACKLIGHT}
     
-    \opt{archos,iriverh100,ipodmini1g,ipod3g,ipod4g,iaudiox5}{
+    \opt{archos,h100,ipodmini,ipod3g,ipod4g,x5}{
       \item[Contrast:]
       Changes the contrast of your LCD display.
       \warn{Setting the contrast too dark or too light can make it hard to
         find this menu option again!}
-    } % \opt{archos,iriverh100,ipodmini1g,ipod4g,iaudiox5}
+    } % \opt{archos,h100,ipodmini,ipod4g,x5}
 
     \opt{lcd_invert}{
       \item[LCD Mode:]
@@ -124,7 +124,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{iriverh100,iriverh300}{
+       \opt{h100,h300}{
          \item[Reduce Ticking:]
            Enable this option if you can hear a ticking sound in your headphones
            when using your remote.
@@ -163,11 +163,11 @@
     \opt{lcd_bitmap}{
       \item[Screen Scrolls Out of View:]
         Screens can be manually scrolled horizontally by pressing
-        \opt{archosrecorder,archosrecorderv2fm}{\ButtonOn+\ButtonRight/\ButtonLeft}
+        \opt{recorder,recorderv2fm}{\ButtonOn+\ButtonRight/\ButtonLeft}
         \opt{ondio}{\ButtonMenu+\ButtonRight/\ButtonLeft}
-        \opt{sansac200,sansae200,iriverh100,iriverh300,ipod1g2g,ipod3g,ipod4g,ipodcolor,ipodmini1g,ipodnano1g,
-        ipodvideo,iaudiox5,mrobe100,gigabeatfx,gigabeats}
-        {Long \ButtonRight/\ButtonLeft}\opt{iriverh10,iriverh10_5gb}{Long \ButtonRew/\ButtonFF}.
+        \opt{c200,e200,h100,h300,ipod1g2g,ipod3g,ipod4g,ipodcolor,ipodmini,ipodnano,
+        ipodvideo,x5,mrobe100,gigabeatf,gigabeats}
+        {Long \ButtonRight/\ButtonLeft}\opt{h10,h10_5gb}{Long \ButtonRew/\ButtonFF}.
         Setting this option to \setting{Yes}
         will keep the list entries at their fixed positions and allow them to be
         scrolled out of view, whereas \setting{No} will only scroll those entries
@@ -176,7 +176,7 @@
         Defines the number of pixels the horizontal manual screen scroll should move
         for each step.
     }
-    \opt{archosplayer}{
+    \opt{player}{
       \item[Jump Scroll:]
         This setting makes text scroll a page at a time instead of a character
         at a time. If set to \setting{One time}, \setting{2}, \setting{3} or
diff --git a/manual/configure_rockbox/recording_settings.tex b/manual/configure_rockbox/recording_settings.tex
index e8f1fdac12..27db3e86ce 100644
--- a/manual/configure_rockbox/recording_settings.tex
+++ b/manual/configure_rockbox/recording_settings.tex
@@ -45,8 +45,8 @@
    \nopt{sansa}{
     Choose the recording frequency (sample rate).
     \opt{masf}{48kHz, 44.1kHz, 32kHz, 24kHz, 22.05kHz, 16kHz}
-    \opt{iriverh100,iriverh300}{44.1kHz, 22.05kHz and 11.025kHz}
-    \opt{iaudiox5}{88.2kHz, 44.1kHz, 22.05kHz and 11.025kHz}
+    \opt{h100,h300}{44.1kHz, 22.05kHz and 11.025kHz}
+    \opt{x5}{88.2kHz, 44.1kHz, 22.05kHz and 11.025kHz}
     are available. Higher sample rates use up more disk space, but give better
     sound quality.
     \opt{swcodec}{\note{The 11.025kHz setting is not available when using%
@@ -58,19 +58,19 @@
       MPEG v1 for 48, 44.1 and 32\\
       MPEG v2 for 24, 22.05 and 16\\
     }
-    \opt{archosrecorder,archosrecorderv2fm,iriverh100}
+    \opt{recorder,recorderv2fm,h100}
       {\note{You cannot change the sample rate for digital recordings.}
     }
    } % nopt e200  
-   \opt{sansae200}{ 
+   \opt{e200}{ 
        Recordings can only be made at a 22.05kHz frequency (sample rate)
          on this \dap. 
     } % opt e200
 
 \section{Source}
   Choose the source of the recording. The options are: 
-  \opt{archosrecorder,archosrecorderv2fm,iriverh100}{\setting{SPDIF (digital)}, }%
-  \nopt{ipodnano1g,ipodvideo}{\setting{Mic}}%
+  \opt{recorder,recorderv2fm,h100}{\setting{SPDIF (digital)}, }%
+  \nopt{ipodnano,ipodvideo}{\setting{Mic}}%
   \nopt{sansa}{, and {\setting{Line In}}}. %
   \opt{radio}{For recording from the radio see \reference{ref:FMradio}.}
 
@@ -228,7 +228,7 @@
   
 More information can be found at \wikilink{VolumeTriggeredRecording}.
   
-\opt{iriverh100,iriverh300}{%
+\opt{h100,h300}{%
   \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 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}
diff --git a/manual/configure_rockbox/system_options.tex b/manual/configure_rockbox/system_options.tex
index d1cf61061a..52c42e0ccf 100644
--- a/manual/configure_rockbox/system_options.tex
+++ b/manual/configure_rockbox/system_options.tex
@@ -15,19 +15,19 @@
   \begin{description}
     \item [Battery Capacity: ]This setting can be used to tell Rockbox what
       capacity (in mAh) the battery being used has. The default is
-      \opt{archosplayer,archosrecorder}{1500mAh}%
-      \opt{archosrecorderv2fm}{2200mAh}%
-      \opt{archosondiosp,archosondiofm}{1000mAh}%
-      \opt{iriverh100,iriverh300}{1300mAh}%
-      \opt{ipodmini1g}{400mAh (1G) or 630mAh (2G)}%
+      \opt{player,recorder}{1500mAh}%
+      \opt{recorderv2fm}{2200mAh}%
+      \opt{ondiosp,ondiofm}{1000mAh}%
+      \opt{h100,h300}{1300mAh}%
+      \opt{ipodmini}{400mAh (1G) or 630mAh (2G)}%
       \opt{ipodcolor}{700mAh}%
-      \opt{ipodnano1g}{300mAh}%
+      \opt{ipodnano}{300mAh}%
       \opt{ipodvideo}{400mAh (30GB) or 600mAh (60/80GB)}%
       \opt{ipod4g}{630mAh}%
       \opt{ipod3g}{630mAh}%
       \opt{ipod1g2g}{1200mAh}%
-      \opt{iaudiom5,iaudiox5}{950mAh}%
-      \opt{gigabeatfx}{2000mAh}%
+      \opt{m5,x5}{950mAh}%
+      \opt{gigabeatf}{2000mAh}%
       \opt{gigabeats}{700mAh}%
       , which is the capacity value for the standard
       \opt{archos}{batteries}\nopt{archos}{battery} shipped with the \dap.
@@ -37,9 +37,9 @@
         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{iaudiom5}{M5L}\opt{iaudiox5}{X5L} set the value
+        value. If your dap{} is an \opt{m5}{M5L}\opt{x5}{X5L} set the value
         to 2250mAh for more accuracy in the runtime estimation.}
-      \opt{ipod,sansa}{This value is fairly meaningless in the \archosplayerman{}
+      \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.}
 
@@ -117,7 +117,7 @@ This sub menu relates to limits in the Rockbox operating system.
   \end{description}
 
 % TODO: this needs to be rewritten in another style, it lets you mix sound from another source into the music
-\opt{archosplayer}{
+\opt{player}{
   \subsection{Line In} This option activates the line in port on \dap, which is
     off by default. This is useful for such applications as:
     \begin{itemize}
@@ -161,7 +161,7 @@ this option \setting{On}. If it is not required, then turning this setting
 } 
 
 \opt{HAVE_BUTTON_LIGHTS}{
-  \opt{sansae200}{
+  \opt{e200}{
   \subsection{Wheel Light Timeout}
     This setting controls the amount of time the wheel lights shine after a
     button press or wheel turn. If set to \setting{Off}, the LEDs will not
@@ -169,7 +169,7 @@ this option \setting{On}. If it is not required, then turning this setting
     never shut off. If set to a time (1 to 120 seconds), the wheel will stay
     lit for that amount of time after a button press or wheel turn.
   }
-  \nopt{sansae200}{
+  \nopt{e200}{
   \subsection{Button Light Timeout}
     This setting controls the amount of time the button lights shine after a
     button press. If set to \setting{Off}, the LEDs will not light when a
@@ -177,7 +177,7 @@ this option \setting{On}. If it is not required, then turning this setting
     If set to a time (1 to 120 seconds), the buttons will stay lit for
     that amount of time after a button press.
   }
-  \opt{gigabeatfx}{
+  \opt{gigabeatf}{
     \subsection{Button Light Brightness}
       Changes the brightness of the button lights.
   }
diff --git a/manual/configure_rockbox/theme_settings.tex b/manual/configure_rockbox/theme_settings.tex
index 2acb88c454..b87c0f8583 100644
--- a/manual/configure_rockbox/theme_settings.tex
+++ b/manual/configure_rockbox/theme_settings.tex
@@ -14,28 +14,28 @@ customize the visual apperance of Rockbox.
 
   There are a number of themes that ship with Rockbox. If none of
   these suit your needs, many more can be downloaded from 
-  \opt{archosplayer}{\url{http://themes.rockbox.org/index.php?target=player}}%
-  \opt{archosrecorder}{\url{http://themes.rockbox.org/index.php?target=fmrecorder}}%
-  \opt{archosrecorderv2fm}{\url{http://themes.rockbox.org/index.php?target=fmrecorder}}%
-  \opt{archosondiofm}{\url{http://themes.rockbox.org/index.php?target=ondiofm}}%
-  \opt{archosondiosp}{\url{http://themes.rockbox.org/index.php?target=ondiosp}}%
-  \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{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{player}{\url{http://themes.rockbox.org/index.php?target=player}}%
+  \opt{recorder}{\url{http://themes.rockbox.org/index.php?target=fmrecorder}}%
+  \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{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{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}}%
   \opt{ipodcolor}{\url{http://themes.rockbox.org/index.php?target=ipodcolor}}%
   \opt{ipodvideo}{\url{http://themes.rockbox.org/index.php?target=ipodvideo}}%
-  \opt{ipodmini1g}{\url{http://themes.rockbox.org/index.php?target=ipodmini}}%
-  \opt{ipodnano1g}{\url{http://themes.rockbox.org/index.php?target=ipodnano}}%
-  \opt{sansae200}{\url{http://themes.rockbox.org/index.php?target=e200}}%
-  \opt{sansac200}{\url{http://themes.rockbox.org/index.php?target=c200}}%
-  \opt{gigabeatfx}{\url{http://themes.rockbox.org/index.php?target=gigabeatf}}%
+  \opt{ipodmini}{\url{http://themes.rockbox.org/index.php?target=ipodmini}}%
+  \opt{ipodnano}{\url{http://themes.rockbox.org/index.php?target=ipodnano}}%
+  \opt{e200}{\url{http://themes.rockbox.org/index.php?target=e200}}%
+  \opt{c200}{\url{http://themes.rockbox.org/index.php?target=c200}}%
+  \opt{gigabeatf}{\url{http://themes.rockbox.org/index.php?target=gigabeatf}}%
   \opt{gigabeats}{\url{http://themes.rockbox.org/index.php?target=gigabeats}}%
   \opt{mrobe100}{\url{http://themes.rockbox.org/index.php?target=mrobe100}}%
   .
@@ -49,7 +49,7 @@ customize the visual apperance of Rockbox.
   \item[Font.]
     Browse the installed fonts on your \dap{}. Selecting one will activate it.
     See \reference{ref:Loadingfonts} for further details about fonts.
-} % \nopt{archosplayer}
+} % \nopt{player}
 
 \item[While Playing Screen.]
   Opens the \setting{File Browser} in the \fname{/.rockbox/wps} directory and