5 files changed, 20 insertions, 20 deletions

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}}%