Make more use of the 'features' system in the manuals (committed in r16304), less stuff to keep in sync manually but keep in mind that changes in config-*.h can now affect the manual

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

46 files changed, 117 insertions, 269 deletions

diff --git a/manual/advanced_topics/main.tex b/manual/advanced_topics/main.tex
index 813ece10fa..bf2fdeab2f 100644
--- a/manual/advanced_topics/main.tex
+++ b/manual/advanced_topics/main.tex
@@ -3,11 +3,11 @@
 
 \section{\label{ref:CustomisingUI}Customising the userinterface}
 \subsection{\label{ref:GettingExtras}Getting Extras}
-\opt{HAVE_LCD_BITMAP}{
+\opt{lcd_bitmap}{
 Rockbox supports custom fonts. A collection of fonts is available for download
 in the font package at \url{http://www.rockbox.org/daily.shtml}}.
 
-\opt{HAVE_LCD_BITMAP}{
+\opt{lcd_bitmap}{
   \subsection{\label{ref:Loadingfonts}Loading Fonts}\index{Fonts}
   Rockbox can load fonts dynamically. Simply copy the \fname{.fnt} file to the
   \dap{} and ``play'' it in the \setting{File Browser}. If you want a font to
@@ -37,7 +37,7 @@ If your language is not yet supported and you want to write your own language
 file find the instructions on the Rockbox website:
 \wikilink{LangFiles}
 
-\opt{HAVE_LCD_COLOR}{
+\opt{lcd_color}{
   \subsection{Changing Colours}
   The colours used in the Rockbox interface can be changed to any combination
   of background and foreground colour you like. To do this go to the
@@ -101,7 +101,7 @@ all the tags that are available.
 \item All characters not preceded by \% are displayed as typed.
 \item Lines beginning with \# are comments and will be ignored.
 \item Maximum file size used is 
-  \opt{HAVE_LCD_BITMAP}{1600}
+  \opt{lcd_bitmap}{1600}
   \opt{player}{400} bytes.
   If you have a bigger WPS file, only the first part of it will be 
   loaded and used.
@@ -225,7 +225,7 @@ displaying images:
     }%
 \end{enumerate}
 
-\optv{SWCODEC}{% This doesn't depend on SWCODEC but we don't have a \noptv
+\optv{swcodec}{% This doesn't depend on swcodec but we don't have a \noptv
                % command.
   Example on background image use:
   \begin{example}
@@ -255,7 +255,7 @@ That is, ``tracknum -- title [artist, album]'', where most fields are only
 displayed if available. Could also be rendered as ``filename'' or ``tracknum --
 title [artist]''.
 
-%\opt{HAVE_LCD_BITMAP}{
+%\opt{lcd_bitmap}{
 %  \begin{verbatim}
 %    %s%?it<%?in<%in. |>%it|%fn>
 %    %s%?ia<%ia|%?d2<%d2|(root)>>
diff --git a/manual/appendix/config_file_options.tex b/manual/appendix/config_file_options.tex
index 61e374a4da..fe9342330f 100644
--- a/manual/appendix/config_file_options.tex
+++ b/manual/appendix/config_file_options.tex
@@ -90,7 +90,7 @@
     cuesheet support
                     & on, off           & N/A\\
 %
-    \opt{SWCODEC}{
+    \opt{swcodec}{
       replaygain    & on, off           & N/A\\
       replaygain type
                     & track, album, track shuffle
@@ -159,7 +159,7 @@
       mdb shape     & 50 to 300         & Hz\\
     }%
 
-    \opt{HAVE_LCD_BITMAP}{
+    \opt{lcd_bitmap}{
       peak meter release
                     & 1 to 126          & ?\\
       peak meter hold
@@ -185,12 +185,12 @@
       invert        & on, off           & N/A\\
     }%
 
-    \opt{SWCODEC}{% This doesn't depend on SWCODEC but using a \nopt here
+    \opt{swcodec}{% This doesn't depend on swcodec but using a \nopt here
                   % causes ondiosp not to build for mysterious reasons.
       backdrop      & /path/filename.bmp    & N/A\\
     }%
 
-    \opt{HAVE_LCD_COLOR}{
+    \opt{lcd_color}{
       foreground color & 000000 to FFFFFF   & RRGGBB\\
       background color & 000000 to FFFFFF   & RRGGBB\\
     }
@@ -226,10 +226,10 @@
                 & on, off               & N/A\\
       }%
     }
-    \opt{CONFIG_RTC}{
+    \opt{rtc}{
       time format & 12hour, 24hour      & N/A\\
     }%
-    \opt{HAVE_RECORDING}{
+    \opt{recording}{
      rec quality & 0 to 7               & 0: small size, 7: high quality\\
      rec frequency
                 & 48, 44, 32, 24, 22, 16 & kHz\\
@@ -249,7 +249,7 @@
      rec directory
                 & /recordings,current   & N/A\\
     }%
-    \opt{CONFIG_TUNER}{
+    \opt{radio}{
       force fm mono
                 & off, on               & N/A\\
     }%
diff --git a/manual/appendix/file_formats.tex b/manual/appendix/file_formats.tex
index 7a4a7ba0dd..580978b518 100644
--- a/manual/appendix/file_formats.tex
+++ b/manual/appendix/file_formats.tex
@@ -10,7 +10,7 @@
   & Directory & \emph{none} & The browser enters that directory \\
 \includegraphics[width=0.37cm]{appendix/images/icon-audio-file.png} 
   & Audio file & 
-  \opt{MASCODEC}{mp3}\opt{SWCODEC}{\emph{various}}
+  \opt{MASCODEC}{mp3}\opt{swcodec}{\emph{various}}
   & Rockbox takes you to the WPS and starts playing the file \\
   \includegraphics[width=0.37cm]{appendix/images/icon-cuesheet.png} 
   & Cuesheet & \fname{.cue} & View a cuesheet file \\
@@ -45,7 +45,7 @@
   & Chip8 game & \fname{.ch8} & Play a Chip8 game \\
 \includegraphics[width=0.37cm]{appendix/images/icon-image-file.png} 
   & Image & \fname{.jpg} & View a JPEG image \\
-\opt{MASCODEC}{\opt{HAVE_LCD_BITMAP}{
+\opt{MASCODEC}{\opt{lcd_bitmap}{
   \includegraphics[width=0.37cm]{appendix/images/icon-movie-file.png} 
     & Rockbox Video & \fname{.rvf} & View a movie (Rockbox format)\\}
 }
diff --git a/manual/appendix/wps_tags.tex b/manual/appendix/wps_tags.tex
index ec867183c0..1036da875c 100644
--- a/manual/appendix/wps_tags.tex
+++ b/manual/appendix/wps_tags.tex
@@ -81,7 +81,7 @@ Example for the \config{\%dN} commands: If the path is
     \opt{player}{
           & This will display a 1 character ``cup'' %
             that empties as the time progresses.}
-    \opt{HAVE_LCD_BITMAP}{
+    \opt{lcd_bitmap}{
          & This will replace the entire line with a progress bar. \\
          & You can set the height, position and width of the progressbar %
            (in pixels): \config{\%pb{\textbar}height{\textbar}leftpos%
@@ -118,12 +118,12 @@ Example for the \config{\%dN} commands: If the path is
   \end{tagmap}
 \end{table}
 
-\opt{SWCODEC}{
+\opt{swcodec}{
 \section{Sound (DSP) settings}
 \begin{table}
   \begin{tagmap}{}{}
     \config{\%sp} & Display current playback pitch \\
-  \opt{SWCODEC}{
+  \opt{swcodec}{
     \config{\%xf} & Crossfade setting, in the order: Off, Shuffle, Skip, Always\\
     \config{\%rg} & ReplayGain value in use (x.y dB). If used as a conditional,
            Replaygain type in use: \config{\%?rg{\textless}Off{\textbar}Track%
@@ -234,7 +234,7 @@ order left -- center -- right. If the aligned texts overlap, they are merged.
 \end{tagmap}
 \end{table}
 
-\opt{CONFIG_RTC}{
+\opt{rtc}{
   \section{Real Time Clock}
   \begin{table}
     \begin{tagmap}{}{}
diff --git a/manual/configure_rockbox/display_options.tex b/manual/configure_rockbox/display_options.tex
index 7906d05581..dc95534fff 100644
--- a/manual/configure_rockbox/display_options.tex
+++ b/manual/configure_rockbox/display_options.tex
@@ -28,7 +28,7 @@
       beginning so that the display can be read to see song information. The
       amount of time is determined by the value of the backlight timeout
       setting, but is no less than 5 seconds.
-      \opt{HAVE_BACKLIGHT_PWM_FADING}{
+      \opt{backlight_fade}{
         \item[Backlight fade in:]
         The amount of time that the backlight will take to fade from off to on
         after a button is pressed. If set to \setting{Off} the backlight will
@@ -46,7 +46,7 @@
       off will only turn the backlight on without having any other effect. When
       disabled the first keypress will \emph{also} perform its appropriate action.
       
-      \opt{HAVE_LCD_SLEEP}{
+      \opt{lcd_sleep}{
         \item[Sleep (After Backlight Off):]
         This setting controls how long rockbox will wait before turning off the
         display after the backlight is turned off. Turning off the display
@@ -54,7 +54,7 @@
         noticeably longer than just turning on the backlight.
       }
       
-      \opt{HAVE_BACKLIGHT_BRIGHTNESS}{
+      \opt{backlight_brightness}{
         \item[Brightness:]
         Changes the brightness of your LCD display.
       }
@@ -67,12 +67,12 @@
         find this menu option again!}
     } % \opt{archos,h1xx,ipodmini,ipod4g,x5}
 
-    \opt{HAVE_LCD_INVERT}{
+    \opt{lcd_invert}{
       \item[LCD Mode:]
       This setting lets you invert the colours of the display.
     }
 
-    \opt{HAVE_LCD_FLIP}{
+    \opt{lcd_flip}{
       \item[Upside Down:]
       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
@@ -131,7 +131,7 @@
     \item[Scroll Start Delay:]
       Controls how many milliseconds Rockbox should wait before a new
       text begins scrolling.
-    \opt{HAVE_LCD_BITMAP}{
+    \opt{lcd_bitmap}{
       \item[Scroll Step Size:]
         Controls how many pixels the text scroll should move for each step.
     }
@@ -148,7 +148,7 @@
       it should use depending of how much it has to scroll left. This setting
       lets you tell Rockbox where that limit is, expressed in percentage of
       line length.
-    \opt{HAVE_LCD_BITMAP}{
+    \opt{lcd_bitmap}{
       \item[Screen Scrolls Out of View:]
         On lists with long entries that do not fit on the screen using 
         \opt{recorder,recorderv2fm,h1xx,h300}{\ButtonOn+\ButtonRight/
@@ -175,7 +175,7 @@
       can be useful on slow displays.
     \end{description}
 %
-  \opt{HAVE_LCD_BITMAP}{
+  \opt{lcd_bitmap}{
     \item[Status/Scrollbar:]
       Settings related to on screen status display and the scrollbar.
       \begin{description}
@@ -194,7 +194,7 @@
       \end{description}
     }
 %
-  \opt{HAVE_LCD_BITMAP}{
+  \opt{lcd_bitmap}{
     \item[Peak Meter:]
       The peak meter can be configured with a number of parameters. 
       \begin{description}
@@ -212,7 +212,7 @@
       \item[Clip Hold Time:]
         The number of seconds that the clipping indicator will be visible
         after clipping is detected.
-      \opt{HAVE_RECORDING}{  
+      \opt{recording}{  
         \item[Clip Counter:]
           Show the number of times the clip indicator went active during
           recording in front of the peakmeters.
diff --git a/manual/configure_rockbox/main.tex b/manual/configure_rockbox/main.tex
index aedd622fe3..52888f2159 100644
--- a/manual/configure_rockbox/main.tex
+++ b/manual/configure_rockbox/main.tex
@@ -19,7 +19,7 @@
 \label{ref:configure_rockbox_themes}
   \input{configure_rockbox/theme_settings.tex}
 
-\opt{HAVE_RECORDING}{
+\opt{recording}{
 \chapter{Recording Settings}
 \label{ref:Recordingsettings}
   \input{configure_rockbox/recording_settings.tex}
diff --git a/manual/configure_rockbox/playback_options.tex b/manual/configure_rockbox/playback_options.tex
index 3794efbb37..b4991f2919 100644
--- a/manual/configure_rockbox/playback_options.tex
+++ b/manual/configure_rockbox/playback_options.tex
@@ -121,7 +121,7 @@ related to audio playback.
       The anti-skip buffer can safely be kept at zero. It will eventually be 
       eliminated.
     }%
-    \opt{SWCODEC}{The anti-skip buffer can be set to various values between
+    \opt{swcodec}{The anti-skip buffer can be set to various values between
       5 seconds and 10 minutes.}%
     
     \note{Having a large anti-skip buffer tends to use more power, and may
@@ -138,7 +138,7 @@ related to audio playback.
     instead of being played immediately. Pausing and stopping playback is
     disabled as well as skipping songs and launching plugins.
 
-    \opt{SWCODEC}{
+    \opt{swcodec}{
     \item[Crossfade. ]
       This setting enables a cross-fader. At the end of a song, the song will 
       fade out as the next song fades in, creating a smooth transition between 
@@ -178,7 +178,7 @@ related to audio playback.
         set on shuffle.}
     }%
     
-    \opt{SWCODEC}{
+    \opt{swcodec}{
     \item[Replaygain. ]This allows you to control the replaygain function.
       The purpose of replaygain is to adjust the volume of the music played
       so that all songs (or albums, depending on your settings) have the
@@ -220,7 +220,7 @@ related to audio playback.
         decibel (dB) value between -12dB and +12dB, in increments of 0.1{}dB.
       \end{description}
     }
-    \opt{SWCODEC}{
+    \opt{swcodec}{
       \item[Beep Volume. ]Controls the volume of the beep that is heard when
         skipping forward or backward between tracks. The beep is disabled when
         set to \setting{Off}.
@@ -267,8 +267,8 @@ related to audio playback.
   \url{http://www.last.fm}. This service was formely known as 
   \emph{Audioscrobbler}. When you enable this option, you'll have to reboot to
   start the logging. The log-file is called 
-  \opt{CONFIG_RTC}{\fname{.scrobbler.log},}%
-  \nopt{CONFIG_RTC}{\fname{.scrobbler-timeless.log},}%
+  \opt{rtc}{\fname{.scrobbler.log},}%
+  \nopt{rtc}{\fname{.scrobbler-timeless.log},}%
   and is to be found in the root directory of your \dap{}.
   \note{See \wikilink{LastFMLog} for a further description, and for tools you 
     can use to submit your Last.fm log.}
diff --git a/manual/configure_rockbox/recording_settings.tex b/manual/configure_rockbox/recording_settings.tex
index b12f5cc80d..ed2c234e77 100644
--- a/manual/configure_rockbox/recording_settings.tex
+++ b/manual/configure_rockbox/recording_settings.tex
@@ -31,7 +31,7 @@
   \end{table}
 }
 
-\opt{SWCODEC}{
+\opt{swcodec}{
   \section{Format}
     Choose which format to save your recording in. The available choices are
     the two uncompressed formats \setting{PCM Wave} and \setting{AIFF}, the
@@ -51,7 +51,7 @@
     \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%
+    \opt{swcodec}{\note{The 11.025kHz setting is not available when using%
       \setting{MPEG Layer 3} format.}
     }%
     \opt{MASCODEC}{
@@ -73,7 +73,7 @@
   Choose the source of the recording. This can be
   \opt{recorder,recorderv2fm,h1xx}{\setting{SPDIF (digital)},}%
   \setting{Mic} or \setting{Line In}.
-  \opt{CONFIG_TUNER}{For recording from the radio see \reference{ref:FMradio}.}
+  \opt{radio}{For recording from the radio see \reference{ref:FMradio}.}
 
 \section{Channels}
   This allows you to select mono or stereo recording. Please note that
diff --git a/manual/configure_rockbox/sound_settings.tex b/manual/configure_rockbox/sound_settings.tex
index ec201f93d3..43976d2067 100644
--- a/manual/configure_rockbox/sound_settings.tex
+++ b/manual/configure_rockbox/sound_settings.tex
@@ -224,7 +224,7 @@ change to customise your listening experience.
   \end{description}
 }
 
-\opt{SWCODEC}{
+\opt{swcodec}{
 \section{Crossfeed}
   Crossfeed attempts to make the experience of listening to music on
   headphones more similar to listening to music with stereo speakers. When you
@@ -280,7 +280,7 @@ change to customise your listening experience.
   if you choose settings which result in a too high output level.
 }
   
-\opt{SWCODEC}{
+\opt{swcodec}{
 \section{\label{ref:EQ}Equalizer}
   \screenshot{configure_rockbox/images/ss-equalizer}{The graphical equalizer}{}
   Rockbox features a parametric equalizer (EQ). As the name suggests, a
@@ -404,7 +404,7 @@ settings.
 \end{description}
 }
 
-\opt{SWCODEC}{
+\opt{swcodec}{
 \section{Dithering}
 This setting controls the dithering and noise shaping functionality of Rockbox.
 
diff --git a/manual/configure_rockbox/system_options.tex b/manual/configure_rockbox/system_options.tex
index 4a75f22fe1..5b7dc8e1f3 100644
--- a/manual/configure_rockbox/system_options.tex
+++ b/manual/configure_rockbox/system_options.tex
@@ -42,7 +42,7 @@
         is currently used in the \dap{}. The two supported battery types are
         ``Alkaline'' or ``NiMH''.}
 
-      \opt{HAVE_USB_CHARGING}{
+      \opt{usb_charging}{
 %TODO: check where it is working correctly (except H300) and append the option to the respective platform file
       \item [Charge During USB Connection: ]This option lets you control whether
         the \dap{} should charge during the USB connection and hence draw the
@@ -52,7 +52,7 @@
 
      \end{description}
 }
-\opt{HAVE_DIRCACHE,HAVE_DISK_STORAGE}{
+\opt{dircache,HAVE_DISK_STORAGE}{
 \subsection{Disk}
     Options relating to the hard disk.
 
@@ -67,7 +67,7 @@
       afterwards.
     }
 
-    \opt{HAVE_DIRCACHE}{
+    \opt{dircache}{
     \item [Directory Cache: ]Rockbox has the ability to cache the contents of
       your drive in RAM. The \setting{Directory Cache} takes a small amount of
       memory away from Rockbox that would otherwise be used to buffer music,
@@ -82,9 +82,9 @@
       background.}
     }
   \end{description}
-} % \opt{HAVE_DIRCACHE,HAVE_DISK_STORAGE}
+} % \opt{dircache,HAVE_DISK_STORAGE}
 
-\opt{CONFIG_RTC}{
+\opt{rtc}{
   \subsection{Time and Date}
   Time related menu options.
     \begin{description}
@@ -101,7 +101,7 @@ recording. Settings are either \setting{Off} or \setting{1} to \setting{10}
 minutes in 1 minute steps. Then \setting{15,30,45} and \setting{60} minutes are
 available.
 
-\opt{HAVE_RTC_ALARM}{
+\opt{alarm}{
 \subsection{Wake-Up Alarm}
 % TODO this isn't quite right for all targets, I think
     This option turns the \dap{} off and then starts it up again at the
@@ -113,7 +113,7 @@ available.
     again before the alarm occurs, the alarm will be cancelled. Using this
     option disables the \setting{Sleep Timer}.
 
-  \opt{HAVE_RECORDING,CONFIG_TUNER}{
+  \opt{recording,radio}{
     \subsection{Alarm Wake up Screen}
     This option controls what the \dap{} does when it is woken up by the alarm.
   }
diff --git a/manual/configure_rockbox/theme_settings.tex b/manual/configure_rockbox/theme_settings.tex
index 4b0639bbd2..c6c3fab279 100644
--- a/manual/configure_rockbox/theme_settings.tex
+++ b/manual/configure_rockbox/theme_settings.tex
@@ -66,7 +66,7 @@ customize the visual apperance of Rockbox.
     This option allows you to clear the backdrops that you set.
 }%
 
-\opt{HAVE_LCD_BITMAP}{
+\opt{lcd_bitmap}{
 \item[Line Selector Type.]
   This option allows you to select which type of line selector to use.
   \begin{description}
@@ -74,7 +74,7 @@ customize the visual apperance of Rockbox.
       A small arrow to the left of the menu text.
     \item[Bar (inverse):]
       A bar with inverted foreground and background colour.
-\opt{HAVE_LCD_COLOR}{
+\opt{lcd_color}{
     \item[Bar (Solid Colour):]
       A bar with a solid colour, the colour is set in the \setting{Colours}
       submenu.
@@ -85,7 +85,7 @@ customize the visual apperance of Rockbox.
   \end{description}
 }
 
-\opt{HAVE_LCD_COLOR}{
+\opt{lcd_color}{
   \item[Colours.]
     The options in this menu sets the colours for visual elements in Rockbox.
     \begin{description}
@@ -109,5 +109,5 @@ customize the visual apperance of Rockbox.
     \item[Reset Colours:]
       Resets the LCD display to Rockbox's default colours.
     \end{description}
-}% HAVE_LCD_COLOR
+}% lcd_color
 \end{description}
diff --git a/manual/configure_rockbox/voice.tex b/manual/configure_rockbox/voice.tex
index 905736fd98..5f1183c625 100644
--- a/manual/configure_rockbox/voice.tex
+++ b/manual/configure_rockbox/voice.tex
@@ -16,7 +16,7 @@
     \begin{itemize}
     \item Setting the Sound Option \setting{Channels} to \setting{Karaoke} may 
       disable voice menus.
-    \item Plugins \opt{CONFIG_RTC}{and the wake up alarm} do not support
+    \item Plugins \opt{rtc}{and the wake up alarm} do not support
       voice features.
     \end{itemize}
 
diff --git a/manual/getting_started/installation.tex b/manual/getting_started/installation.tex
index c556419ff1..990b757148 100644
--- a/manual/getting_started/installation.tex
+++ b/manual/getting_started/installation.tex
@@ -25,7 +25,7 @@ installation options.
 
 \opt{MASCODEC}{Rockbox itself comes as a single package. There is no need
   to install additional software for running Rockbox.}
-\opt{SWCODEC} {
+\opt{swcodec} {
   \opt{HAVE_RB_BL_ON_DISK}{There are three separate components,
     two of which need to be installed in order to run Rockbox.}
   \opt{HAVE_RB_BL_IN_FLASH}{There are two separate components of Rockbox
@@ -198,7 +198,7 @@ you want to install and get the version for your \dap{}.
       of known critical bugs. The current stable release of Rockbox, version
       2.5, is available at \url{http://www.rockbox.org/download/}.
   }
-  \opt{SWCODEC}{
+  \opt{swcodec}{
       There has not yet been a stable release for the \playername{}. Until
       there is a stable release for \playername{}, use a current build.
   }
@@ -275,7 +275,7 @@ structure that Rockbox needs.
 
 % This has nothing to do with swcodec, just that these players need our own
 % bootloader so we can decide where we want the main binary.
-\opt{SWCODEC}{
+\opt{swcodec}{
   \note{
     If the contents of the \fname{.zip} file are extracted correctly, you will
     have a directory called \fname{/.rockbox}, which contains all the files needed
@@ -312,7 +312,7 @@ structure that Rockbox needs.
   }
 }
 
-\opt{SWCODEC}{
+\opt{swcodec}{
   \subsubsection{Installing the bootloader}
   \opt{h1xx,h300}{\input{getting_started/iriver_install.tex}}
   \opt{ipod}{\input{getting_started/ipod_install.tex}}
diff --git a/manual/main_menu/fmradio.tex b/manual/main_menu/fmradio.tex
index d51c4d61d2..1e1b8a2613 100644
--- a/manual/main_menu/fmradio.tex
+++ b/manual/main_menu/fmradio.tex
@@ -13,7 +13,7 @@
 
 \screenshot{main_menu/images/ss-fm-radio-screen}{The FM radio screen}{}
   This menu option switches to the radio screen.
-  The FM radio has the ability \opt{HAVE_RECORDING}{to record and } to
+  The FM radio has the ability \opt{recording}{to record and } to
   remember station frequency settings (presets).
   \opt{MASCODEC}{\note{The radio will shorten battery life, because the
       MAS-chip is set to record mode for instant recordings.}
diff --git a/manual/main_menu/main.tex b/manual/main_menu/main.tex
index 56c4b7f32d..6bc08fe780 100644
--- a/manual/main_menu/main.tex
+++ b/manual/main_menu/main.tex
@@ -112,9 +112,9 @@ The \setting{Recording Settings} menu allows you to configure settings related
 to recording. The details of this menu are covered in detail in 
 \reference{ref:Recordingsettings}.
 
-\opt{HAVE_RECORDING}{\input{main_menu/recording_screen.tex}}
+\opt{recording}{\input{main_menu/recording_screen.tex}}
 
-\opt{CONFIG_TUNER}{\input{main_menu/fmradio.tex}}
+\opt{radio}{\input{main_menu/fmradio.tex}}
 
 \section{\label{ref:playlistoptions}Playlist}
   This menu allows you to work with playlists. Playlists can be created in 
@@ -177,7 +177,7 @@ pages of information.}
   The \setting{Sleep Timer} powers off your \dap{} after playing for a given
   time. It can be set from \setting{Off} to 5 hours in 5 minute steps.
   The \setting{Sleep Timer} is reset on boot.
-  \opt{HAVE_RTC_ALARM}{Using this option disables the \setting{Wake up alarm}.}
+  \opt{alarm}{Using this option disables the \setting{Wake up alarm}.}
 
 \item[Debug (Keep Out!):]
   This sub menu is intended to be used \emph{only} by Rockbox developers.
diff --git a/manual/main_menu/recording_screen.tex b/manual/main_menu/recording_screen.tex
index 2e6daa556e..55a3325655 100644
--- a/manual/main_menu/recording_screen.tex
+++ b/manual/main_menu/recording_screen.tex
@@ -15,12 +15,12 @@ affect the recorded sound. If enabled in the peak meter settings, a counter in
 front of the peak meters shows the number of times the clip indicator was
 activated during recording. The counter is reset to zero when starting a new
 recording.
-\opt{SWCODEC}{
+\opt{swcodec}{
 \note{When you start a recording, the hard disk will spin up. This will cause
 the peak meters to freeze in the process. This is expected behaviour, and
 nothing to worry about. The recording continues during the spin up.}}
 \opt{MASCODEC}{The frequency, channels and quality}
-\opt{SWCODEC}{The frequency and channels} settings are shown on the last line.
+\opt{swcodec}{The frequency and channels} settings are shown on the last line.
 
 The controls for this screen are:
 \begin{table}
diff --git a/manual/platform/c200.tex b/manual/platform/c200.tex
index c6ea23aeaf..b0e586e94b 100644
--- a/manual/platform/c200.tex
+++ b/manual/platform/c200.tex
@@ -1,18 +1,10 @@
 % $Id$ %
 \def\UseOption{c200}
 \edef\UseOption{\UseOption,HAVE_RB_BL_ON_DISK}
-\edef\UseOption{\UseOption,HAVE_LCD_BITMAP}
-\edef\UseOption{\UseOption,HAVE_LCD_FLIP}
-\edef\UseOption{\UseOption,CONFIG_TUNER}
-\edef\UseOption{\UseOption,CONFIG_RTC}
-\edef\UseOption{\UseOption,SWCODEC}
 \edef\UseOption{\UseOption,SANSA_C200_PAD}
-\edef\UseOption{\UseOption,HAVE_LCD_COLOR}
 \edef\UseOption{\UseOption,HAVE_BACKLIGHT}
-\edef\UseOption{\UseOption,HAVE_BACKLIGHT_BRIGHTNESS}
 \edef\UseOption{\UseOption,HAVE_CAR_ADAPTER_MODE}
 \edef\UseOption{\UseOption,HAVE_BUTTON_LIGHTS}
-\edef\UseOption{\UseOption,HAVE_RECORDING}
 \edef\UseOption{\UseOption,sansa}
 
 \newcommand{\playerman}{Sansa}
diff --git a/manual/platform/e200.tex b/manual/platform/e200.tex
index faaa87512a..b3ee602674 100644
--- a/manual/platform/e200.tex
+++ b/manual/platform/e200.tex
@@ -1,18 +1,8 @@
 % $Id$ %
 \def\UseOption{e200}
 \edef\UseOption{\UseOption,HAVE_RB_BL_ON_DISK}
-\edef\UseOption{\UseOption,HAVE_LCD_BITMAP}
-\edef\UseOption{\UseOption,HAVE_LCD_INVERT}
-\edef\UseOption{\UseOption,HAVE_LCD_FLIP}
-\edef\UseOption{\UseOption,HAVE_LCD_SLEEP}
-\edef\UseOption{\UseOption,HAVE_RECORDING}
-\edef\UseOption{\UseOption,CONFIG_TUNER}
-\edef\UseOption{\UseOption,CONFIG_RTC}
-\edef\UseOption{\UseOption,SWCODEC}
 \edef\UseOption{\UseOption,SANSA_E200_PAD}
-\edef\UseOption{\UseOption,HAVE_LCD_COLOR}
 \edef\UseOption{\UseOption,HAVE_BACKLIGHT}
-\edef\UseOption{\UseOption,HAVE_BACKLIGHT_BRIGHTNESS}
 \edef\UseOption{\UseOption,HAVE_CAR_ADAPTER_MODE}
 \edef\UseOption{\UseOption,HAVE_BUTTON_LIGHTS}
 \edef\UseOption{\UseOption,sansa}
diff --git a/manual/platform/gigabeatf.tex b/manual/platform/gigabeatf.tex
index e7bac745df..a972ab159f 100644
--- a/manual/platform/gigabeatf.tex
+++ b/manual/platform/gigabeatf.tex
@@ -1,14 +1,8 @@
 % $Id$ %
 \def\UseOption{gigabeatf}
 \edef\UseOption{\UseOption,HAVE_RB_BL_ON_DISK}
-\edef\UseOption{\UseOption,HAVE_LCD_BITMAP}
-\edef\UseOption{\UseOption,SWCODEC}
-\edef\UseOption{\UseOption,CONFIG_RTC}
 \edef\UseOption{\UseOption,GIGABEAT_PAD}
-\edef\UseOption{\UseOption,HAVE_LCD_COLOR}
 \edef\UseOption{\UseOption,HAVE_BACKLIGHT}
-\edef\UseOption{\UseOption,HAVE_BACKLIGHT_BRIGHTNESS}
-\edef\UseOption{\UseOption,HAVE_DIRCACHE}
 \edef\UseOption{\UseOption,HAVE_DISK_STORAGE}
 \edef\UseOption{\UseOption,HAVE_CAR_ADAPTER_MODE}
 \edef\UseOption{\UseOption,HAVE_BUTTON_LIGHTS}
diff --git a/manual/platform/h10.tex b/manual/platform/h10.tex
index 928fefe291..0caf8fe571 100644
--- a/manual/platform/h10.tex
+++ b/manual/platform/h10.tex
@@ -1,18 +1,8 @@
 % $Id$ %
 \def\UseOption{h10}
 \edef\UseOption{\UseOption,HAVE_RB_BL_ON_DISK}
-\edef\UseOption{\UseOption,HAVE_LCD_BITMAP}
-\edef\UseOption{\UseOption,HAVE_LCD_INVERT}
-\edef\UseOption{\UseOption,HAVE_LCD_FLIP}
-\edef\UseOption{\UseOption,HAVE_LCD_SLEEP}
-\edef\UseOption{\UseOption,HAVE_LCD_COLOR}
-\edef\UseOption{\UseOption,CONFIG_TUNER}
-\edef\UseOption{\UseOption,CONFIG_RTC}
-\edef\UseOption{\UseOption,HAVE_RTC_ALARM}
-\edef\UseOption{\UseOption,SWCODEC}
 \edef\UseOption{\UseOption,IRIVER_H10_PAD}
 \edef\UseOption{\UseOption,HAVE_BACKLIGHT}
-\edef\UseOption{\UseOption,HAVE_DIRCACHE}
 \edef\UseOption{\UseOption,HAVE_DISK_STORAGE}
 \edef\UseOption{\UseOption,HAVE_CAR_ADAPTER_MODE}
 \edef\UseOption{\UseOption,iriver}
diff --git a/manual/platform/h10_5gb.tex b/manual/platform/h10_5gb.tex
index cded5815e2..132c84865f 100644
--- a/manual/platform/h10_5gb.tex
+++ b/manual/platform/h10_5gb.tex
@@ -1,15 +1,8 @@
 % $Id$ %
 \def\UseOption{h10_5gb}
 \edef\UseOption{\UseOption,HAVE_RB_BL_ON_DISK}
-\edef\UseOption{\UseOption,HAVE_LCD_BITMAP}
-\edef\UseOption{\UseOption,HAVE_LCD_COLOR}
-\edef\UseOption{\UseOption,CONFIG_RTC}
-\edef\UseOption{\UseOption,CONFIG_TUNER}
-\edef\UseOption{\UseOption,HAVE_RTC_ALARM}
-\edef\UseOption{\UseOption,SWCODEC}
 \edef\UseOption{\UseOption,IRIVER_H10_PAD}
 \edef\UseOption{\UseOption,HAVE_BACKLIGHT}
-\edef\UseOption{\UseOption,HAVE_DIRCACHE}
 \edef\UseOption{\UseOption,HAVE_DISK_STORAGE}
 \edef\UseOption{\UseOption,HAVE_CAR_ADAPTER_MODE}
 \edef\UseOption{\UseOption,iriver}
diff --git a/manual/platform/h1xx.tex b/manual/platform/h1xx.tex
index 903d726412..2c0c616a60 100644
--- a/manual/platform/h1xx.tex
+++ b/manual/platform/h1xx.tex
@@ -1,17 +1,9 @@
 % $Id$ %
 \def\UseOption{h1xx}
 \edef\UseOption{\UseOption,HAVE_RB_BL_IN_FLASH}
-\edef\UseOption{\UseOption,HAVE_LCD_BITMAP}
-\edef\UseOption{\UseOption,HAVE_LCD_INVERT}
-\edef\UseOption{\UseOption,HAVE_LCD_FLIP}
-\edef\UseOption{\UseOption,HAVE_RECORDING}
-\edef\UseOption{\UseOption,CONFIG_TUNER}
-\edef\UseOption{\UseOption,SWCODEC}
 \edef\UseOption{\UseOption,IRIVER_H100_PAD}
 \edef\UseOption{\UseOption,HAVE_REMOTE_LCD}
 \edef\UseOption{\UseOption,HAVE_BACKLIGHT}
-\edef\UseOption{\UseOption,HAVE_BACKLIGHT_PWM_FADING}
-\edef\UseOption{\UseOption,HAVE_DIRCACHE}
 \edef\UseOption{\UseOption,HAVE_DISK_STORAGE}
 \edef\UseOption{\UseOption,HAVE_CAR_ADAPTER_MODE}
 \edef\UseOption{\UseOption,iriver}
diff --git a/manual/platform/h300.tex b/manual/platform/h300.tex
index 07441e0452..02b1f6def9 100644
--- a/manual/platform/h300.tex
+++ b/manual/platform/h300.tex
@@ -1,21 +1,11 @@
 % $Id$ %
 \def\UseOption{h300}
 \edef\UseOption{\UseOption,HAVE_RB_BL_IN_FLASH}
-\edef\UseOption{\UseOption,HAVE_LCD_BITMAP}
-\edef\UseOption{\UseOption,HAVE_LCD_FLIP}
-\edef\UseOption{\UseOption,HAVE_RECORDING}
-\edef\UseOption{\UseOption,CONFIG_TUNER}
-\edef\UseOption{\UseOption,CONFIG_RTC}
-\edef\UseOption{\UseOption,SWCODEC}
 \edef\UseOption{\UseOption,IRIVER_H300_PAD}
-\edef\UseOption{\UseOption,HAVE_LCD_COLOR}
 \edef\UseOption{\UseOption,HAVE_REMOTE_LCD}
 \edef\UseOption{\UseOption,HAVE_BACKLIGHT}
-\edef\UseOption{\UseOption,HAVE_BACKLIGHT_BRIGHTNESS}
-\edef\UseOption{\UseOption,HAVE_DIRCACHE}
 \edef\UseOption{\UseOption,HAVE_CAR_ADAPTER_MODE}
 \edef\UseOption{\UseOption,HAVE_DISK_STORAGE}
-\edef\UseOption{\UseOption,HAVE_USB_CHARGING}
 \edef\UseOption{\UseOption,iriver}
 
 \newcommand{\playerman}{Iriver}
diff --git a/manual/platform/ipod1g2g.tex b/manual/platform/ipod1g2g.tex
index c35e60553d..23a01d3cf9 100644
--- a/manual/platform/ipod1g2g.tex
+++ b/manual/platform/ipod1g2g.tex
@@ -1,15 +1,8 @@
 % $Id: ipod3g.tex 13422 2007-05-19 19:21:52Z christi $ %
 \def\UseOption{ipod1g2g}
 \edef\UseOption{\UseOption,HAVE_RB_BL_ON_DISK}
-\edef\UseOption{\UseOption,HAVE_LCD_BITMAP}
-\edef\UseOption{\UseOption,HAVE_LCD_INVERT}
-\edef\UseOption{\UseOption,HAVE_LCD_FLIP}
-\edef\UseOption{\UseOption,CONFIG_RTC}
-\edef\UseOption{\UseOption,HAVE_RTC_ALARM}
-\edef\UseOption{\UseOption,SWCODEC}
 \edef\UseOption{\UseOption,IPOD_3G_PAD}
 \edef\UseOption{\UseOption,HAVE_BACKLIGHT}
-\edef\UseOption{\UseOption,HAVE_DIRCACHE}
 \edef\UseOption{\UseOption,HAVE_DISK_STORAGE}
 \edef\UseOption{\UseOption,ipod}
 
diff --git a/manual/platform/ipod3g.tex b/manual/platform/ipod3g.tex
index 553658d476..9c2d566a50 100644
--- a/manual/platform/ipod3g.tex
+++ b/manual/platform/ipod3g.tex
@@ -1,15 +1,8 @@
 % $Id$ %
 \def\UseOption{ipod3g}
 \edef\UseOption{\UseOption,HAVE_RB_BL_ON_DISK}
-\edef\UseOption{\UseOption,HAVE_LCD_BITMAP}
-\edef\UseOption{\UseOption,HAVE_LCD_INVERT}
-\edef\UseOption{\UseOption,HAVE_LCD_FLIP}
-\edef\UseOption{\UseOption,CONFIG_RTC}
-\edef\UseOption{\UseOption,HAVE_RTC_ALARM}
-\edef\UseOption{\UseOption,SWCODEC}
 \edef\UseOption{\UseOption,IPOD_3G_PAD}
 \edef\UseOption{\UseOption,HAVE_BACKLIGHT}
-\edef\UseOption{\UseOption,HAVE_DIRCACHE}
 \edef\UseOption{\UseOption,HAVE_DISK_STORAGE}
 \edef\UseOption{\UseOption,ipod}
 
diff --git a/manual/platform/ipod4g.tex b/manual/platform/ipod4g.tex
index ae24e0f4a5..a9164f3dcd 100644
--- a/manual/platform/ipod4g.tex
+++ b/manual/platform/ipod4g.tex
@@ -1,15 +1,8 @@
 % $Id$ %
 \def\UseOption{ipod4g}
 \edef\UseOption{\UseOption,HAVE_RB_BL_ON_DISK}
-\edef\UseOption{\UseOption,HAVE_LCD_BITMAP}
-\edef\UseOption{\UseOption,HAVE_LCD_INVERT}
-\edef\UseOption{\UseOption,HAVE_LCD_FLIP}
-\edef\UseOption{\UseOption,CONFIG_RTC}
-\edef\UseOption{\UseOption,HAVE_RTC_ALARM}
-\edef\UseOption{\UseOption,SWCODEC}
 \edef\UseOption{\UseOption,IPOD_4G_PAD}
 \edef\UseOption{\UseOption,HAVE_BACKLIGHT}
-\edef\UseOption{\UseOption,HAVE_DIRCACHE}
 \edef\UseOption{\UseOption,HAVE_DISK_STORAGE}
 \edef\UseOption{\UseOption,ipod}
 
diff --git a/manual/platform/ipodcolor.tex b/manual/platform/ipodcolor.tex
index 8d4a64b7fa..07e130fd85 100644
--- a/manual/platform/ipodcolor.tex
+++ b/manual/platform/ipodcolor.tex
@@ -1,14 +1,8 @@
 % $Id$ %
 \def\UseOption{ipodcolor}
 \edef\UseOption{\UseOption,HAVE_RB_BL_ON_DISK}
-\edef\UseOption{\UseOption,HAVE_LCD_BITMAP}
-\edef\UseOption{\UseOption,CONFIG_RTC}
-\edef\UseOption{\UseOption,HAVE_RTC_ALARM}
-\edef\UseOption{\UseOption,SWCODEC}
 \edef\UseOption{\UseOption,IPOD_4G_PAD}
-\edef\UseOption{\UseOption,HAVE_LCD_COLOR}
 \edef\UseOption{\UseOption,HAVE_BACKLIGHT}
-\edef\UseOption{\UseOption,HAVE_DIRCACHE}
 \edef\UseOption{\UseOption,HAVE_DISK_STORAGE}
 \edef\UseOption{\UseOption,ipod}
 
diff --git a/manual/platform/ipodmini.tex b/manual/platform/ipodmini.tex
index 2c1f6613a5..966f907d08 100644
--- a/manual/platform/ipodmini.tex
+++ b/manual/platform/ipodmini.tex
@@ -1,16 +1,8 @@
 % $Id$ %
 \def\UseOption{ipodmini}
 \edef\UseOption{\UseOption,HAVE_RB_BL_ON_DISK}
-\edef\UseOption{\UseOption,HAVE_LCD_BITMAP}
-\edef\UseOption{\UseOption,HAVE_LCD_INVERT}
-\edef\UseOption{\UseOption,HAVE_LCD_FLIP}
-\edef\UseOption{\UseOption,CONFIG_RTC}
-\edef\UseOption{\UseOption,HAVE_RTC_ALARM}
-\edef\UseOption{\UseOption,SWCODEC}
 \edef\UseOption{\UseOption,IPOD_4G_PAD}
 \edef\UseOption{\UseOption,HAVE_BACKLIGHT}
-\edef\UseOption{\UseOption,HAVE_BACKLIGHT_PWM_FADING}
-\edef\UseOption{\UseOption,HAVE_DIRCACHE}
 \edef\UseOption{\UseOption,HAVE_DISK_STORAGE}
 \edef\UseOption{\UseOption,ipod}
 
diff --git a/manual/platform/ipodnano.tex b/manual/platform/ipodnano.tex
index 76337c38dc..fad6f73027 100644
--- a/manual/platform/ipodnano.tex
+++ b/manual/platform/ipodnano.tex
@@ -1,16 +1,8 @@
 % $Id$ %
 \def\UseOption{ipodnano}
 \edef\UseOption{\UseOption,HAVE_RB_BL_ON_DISK}
-\edef\UseOption{\UseOption,HAVE_LCD_BITMAP}
-\edef\UseOption{\UseOption,CONFIG_RTC}
-\edef\UseOption{\UseOption,HAVE_RTC_ALARM}
-\edef\UseOption{\UseOption,SWCODEC}
 \edef\UseOption{\UseOption,IPOD_4G_PAD}
-\edef\UseOption{\UseOption,HAVE_LCD_COLOR}
 \edef\UseOption{\UseOption,HAVE_BACKLIGHT}
-\edef\UseOption{\UseOption,HAVE_BACKLIGHT_BRIGHTNESS}
-\edef\UseOption{\UseOption,HAVE_BACKLIGHT_PWM_FADING}
-\edef\UseOption{\UseOption,HAVE_DIRCACHE}
 \edef\UseOption{\UseOption,ipod}
 
 \newcommand{\playerman}{Ipod}
diff --git a/manual/platform/ipodvideo.tex b/manual/platform/ipodvideo.tex
index 2ce9a25e76..8096aec181 100644
--- a/manual/platform/ipodvideo.tex
+++ b/manual/platform/ipodvideo.tex
@@ -1,16 +1,8 @@
 % $Id$ %
 \def\UseOption{ipodvideo}
 \edef\UseOption{\UseOption,HAVE_RB_BL_ON_DISK}
-\edef\UseOption{\UseOption,HAVE_LCD_BITMAP}
-\edef\UseOption{\UseOption,CONFIG_RTC}
-\edef\UseOption{\UseOption,HAVE_RTC_ALARM}
-\edef\UseOption{\UseOption,SWCODEC}
 \edef\UseOption{\UseOption,IPOD_4G_PAD}
-\edef\UseOption{\UseOption,HAVE_LCD_COLOR}
 \edef\UseOption{\UseOption,HAVE_BACKLIGHT}
-\edef\UseOption{\UseOption,HAVE_BACKLIGHT_BRIGHTNESS}
-\edef\UseOption{\UseOption,HAVE_BACKLIGHT_PWM_FADING}
-\edef\UseOption{\UseOption,HAVE_DIRCACHE}
 \edef\UseOption{\UseOption,HAVE_DISK_STORAGE}
 \edef\UseOption{\UseOption,HAVE_CAR_ADAPTER_MODE}
 \edef\UseOption{\UseOption,ipod}
diff --git a/manual/platform/m5.tex b/manual/platform/m5.tex
index 9e96dcb095..c5dae6e0f0 100644
--- a/manual/platform/m5.tex
+++ b/manual/platform/m5.tex
@@ -1,16 +1,9 @@
 % $Id$ %
 \def\UseOption{m5}
 \edef\UseOption{\UseOption,HAVE_RB_BL_IN_FLASH}
-\edef\UseOption{\UseOption,HAVE_LCD_BITMAP}
-\edef\UseOption{\UseOption,HAVE_LCD_INVERT}
-\edef\UseOption{\UseOption,HAVE_LCD_FLIP}
-\edef\UseOption{\UseOption,HAVE_RECORDING}
-\edef\UseOption{\UseOption,CONFIG_RTC}
-\edef\UseOption{\UseOption,SWCODEC}
 \edef\UseOption{\UseOption,IAUDIO_X5_PAD}
 \edef\UseOption{\UseOption,HAVE_REMOTE_LCD}
 \edef\UseOption{\UseOption,HAVE_BACKLIGHT}
-\edef\UseOption{\UseOption,HAVE_DIRCACHE}
 \edef\UseOption{\UseOption,HAVE_DISK_STORAGE}
 \edef\UseOption{\UseOption,HAVE_CAR_ADAPTER_MODE}
 \edef\UseOption{\UseOption,iaudio}
diff --git a/manual/platform/mrobe100.tex b/manual/platform/mrobe100.tex
index a7b6be23d8..90413aa477 100644
--- a/manual/platform/mrobe100.tex
+++ b/manual/platform/mrobe100.tex
@@ -1,12 +1,8 @@
 % $Id: mrobe100.tex 15972 2007-12-25 19:55:22Z pixelma $ %

 \def\UseOption{mrobe100}

 \edef\UseOption{\UseOption,HAVE_RB_BL_ON_DISK}

-\edef\UseOption{\UseOption,HAVE_LCD_BITMAP}

-\edef\UseOption{\UseOption,SWCODEC}

-\edef\UseOption{\UseOption,CONFIG_RTC}

 \edef\UseOption{\UseOption,MROBE100_PAD}

 \edef\UseOption{\UseOption,HAVE_BACKLIGHT}

-\edef\UseOption{\UseOption,HAVE_DIRCACHE}

 \edef\UseOption{\UseOption,HAVE_DISK_STORAGE}

 \edef\UseOption{\UseOption,HAVE_BUTTON_LIGHTS}

 \edef\UseOption{\UseOption,olympus}

diff --git a/manual/platform/ondiofm.tex b/manual/platform/ondiofm.tex
index 64a72c90ea..7e14067f4b 100644
--- a/manual/platform/ondiofm.tex
+++ b/manual/platform/ondiofm.tex
@@ -3,11 +3,6 @@
 \def\UseOption{ondiofm}
 % To not break the current manual
 \edef\UseOption{\UseOption,ondio}
-\edef\UseOption{\UseOption,HAVE_LCD_BITMAP}
-\edef\UseOption{\UseOption,HAVE_LCD_INVERT}
-\edef\UseOption{\UseOption,HAVE_LCD_FLIP}
-\edef\UseOption{\UseOption,HAVE_RECORDING}
-\edef\UseOption{\UseOption,CONFIG_TUNER}
 \edef\UseOption{\UseOption,MASCODEC}
 \edef\UseOption{\UseOption,ONDIO_PAD}
 \edef\UseOption{\UseOption,BATTERY_TYPES}
diff --git a/manual/platform/ondiosp.tex b/manual/platform/ondiosp.tex
index c07cab2de0..5b15aca1d4 100644
--- a/manual/platform/ondiosp.tex
+++ b/manual/platform/ondiosp.tex
@@ -2,9 +2,6 @@
 %platform file for the Ondio SP
 \def\UseOption{ondiosp}
 \edef\UseOption{\UseOption,ondio}
-\edef\UseOption{\UseOption,HAVE_LCD_BITMAP}
-\edef\UseOption{\UseOption,HAVE_LCD_INVERT}
-\edef\UseOption{\UseOption,HAVE_LCD_FLIP}
 \edef\UseOption{\UseOption,MASCODEC}
 \edef\UseOption{\UseOption,ONDIO_PAD}
 \edef\UseOption{\UseOption,BATTERY_TYPES}
diff --git a/manual/platform/recorder.tex b/manual/platform/recorder.tex
index fedfba651e..c601ae2357 100644
--- a/manual/platform/recorder.tex
+++ b/manual/platform/recorder.tex
@@ -1,10 +1,5 @@
 % $Id$ %
 \def\UseOption{recorder}
-\edef\UseOption{\UseOption,HAVE_LCD_BITMAP}
-\edef\UseOption{\UseOption,HAVE_LCD_INVERT}
-\edef\UseOption{\UseOption,HAVE_LCD_FLIP}
-\edef\UseOption{\UseOption,HAVE_RECORDING}
-\edef\UseOption{\UseOption,CONFIG_RTC}
 \edef\UseOption{\UseOption,MASCODEC}
 \edef\UseOption{\UseOption,RECORDER_PAD}
 \edef\UseOption{\UseOption,HAVE_BACKLIGHT}
diff --git a/manual/platform/recorderv2fm.tex b/manual/platform/recorderv2fm.tex
index 501d513e55..7190e51117 100644
--- a/manual/platform/recorderv2fm.tex
+++ b/manual/platform/recorderv2fm.tex
@@ -1,12 +1,5 @@
 % $Id$ %
 \def\UseOption{recorderv2fm}
-\edef\UseOption{\UseOption,HAVE_LCD_BITMAP}
-\edef\UseOption{\UseOption,HAVE_LCD_INVERT}
-\edef\UseOption{\UseOption,HAVE_LCD_FLIP}
-\edef\UseOption{\UseOption,HAVE_RECORDING}
-\edef\UseOption{\UseOption,CONFIG_TUNER}
-\edef\UseOption{\UseOption,CONFIG_RTC}
-\edef\UseOption{\UseOption,HAVE_RTC_ALARM}
 \edef\UseOption{\UseOption,MASCODEC}
 \edef\UseOption{\UseOption,RECORDER_PAD}
 \edef\UseOption{\UseOption,HAVE_BACKLIGHT}
diff --git a/manual/platform/x5.tex b/manual/platform/x5.tex
index de2faf0a12..173bc45e10 100644
--- a/manual/platform/x5.tex
+++ b/manual/platform/x5.tex
@@ -1,20 +1,9 @@
 % $Id$ %
 \def\UseOption{x5}
 \edef\UseOption{\UseOption,HAVE_RB_BL_IN_FLASH}
-\edef\UseOption{\UseOption,HAVE_LCD_BITMAP}
-\edef\UseOption{\UseOption,HAVE_LCD_INVERT}
-\edef\UseOption{\UseOption,HAVE_LCD_FLIP}
-\edef\UseOption{\UseOption,HAVE_LCD_SLEEP}
-\edef\UseOption{\UseOption,HAVE_RECORDING}
-\edef\UseOption{\UseOption,CONFIG_TUNER}
-\edef\UseOption{\UseOption,CONFIG_RTC}
-\edef\UseOption{\UseOption,SWCODEC}
 \edef\UseOption{\UseOption,IAUDIO_X5_PAD}
-\edef\UseOption{\UseOption,HAVE_LCD_COLOR}
 \edef\UseOption{\UseOption,HAVE_REMOTE_LCD}
 \edef\UseOption{\UseOption,HAVE_BACKLIGHT}
-\edef\UseOption{\UseOption,HAVE_BACKLIGHT_BRIGHTNESS}
-\edef\UseOption{\UseOption,HAVE_DIRCACHE}
 \edef\UseOption{\UseOption,HAVE_DISK_STORAGE}
 \edef\UseOption{\UseOption,HAVE_CAR_ADAPTER_MODE}
 \edef\UseOption{\UseOption,iaudio}
diff --git a/manual/plugins/bounce.tex b/manual/plugins/bounce.tex
index c9de06f310..ba79bf37f9 100644
--- a/manual/plugins/bounce.tex
+++ b/manual/plugins/bounce.tex
@@ -1,7 +1,7 @@
 \subsection{Bounce}
 \screenshot{plugins/images/ss-bounce}{Bounce}{img:bounce}
 This demo is of the word ``Rockbox'' bouncing across the screen.
-\opt{CONFIG_RTC}{There is also an analogue clock in the background.}
+\opt{rtc}{There is also an analogue clock in the background.}
 In \setting{Scroll mode} the bouncing text is replaced by a different one
 scrolling from right to left.
 
diff --git a/manual/plugins/jpegviewer.tex b/manual/plugins/jpegviewer.tex
index fba38e4044..e1e3559dac 100644
--- a/manual/plugins/jpegviewer.tex
+++ b/manual/plugins/jpegviewer.tex
@@ -1,9 +1,9 @@
 % $Id$ %
 \subsection{JPEG viewer}
 Open a JPEG file in the \setting{File Browser} to view it%
-\nopt{HAVE_LCD_COLOR}{ using Rockbox's 
+\nopt{lcd_color}{ using Rockbox's 
 greyscale library}.
-\opt{SWCODEC}{
+\opt{swcodec}{
   \note{When an audio file is playing the size of the image is limited as 
   the decoding process needs to share memory with audio tracks. To be able to
   view a bigger file you may need to stop playback.}
diff --git a/manual/plugins/main.tex b/manual/plugins/main.tex
index 74b1008de9..65c5c7463a 100644
--- a/manual/plugins/main.tex
+++ b/manual/plugins/main.tex
@@ -13,86 +13,86 @@ text files, chip8 games), or from the \setting{Open with} option on the
 \setting{Context Menu}.
 
 \section{Games}
-\opt{HAVE_LCD_BITMAP}
+\opt{lcd_bitmap}
     {See also the Chip{}-8 emulator in \reference{ref:Chip8emulator}
-    \opt{recorder,recorderv2fm,h1xx,m5,HAVE_LCD_COLOR}
+    \opt{recorder,recorderv2fm,h1xx,m5,lcd_color}
     {and Rockboy in \reference{ref:Rockboy}}.}
 
-\opt{HAVE_LCD_BITMAP}{\input{plugins/blackjack.tex}}
+\opt{lcd_bitmap}{\input{plugins/blackjack.tex}}
 
-\opt{HAVE_LCD_BITMAP}{\input{plugins/brickmania.tex}}
+\opt{lcd_bitmap}{\input{plugins/brickmania.tex}}
 
-\opt{HAVE_LCD_BITMAP}{\input{plugins/bubbles.tex}}
+\opt{lcd_bitmap}{\input{plugins/bubbles.tex}}
 
-\opt{HAVE_LCD_BITMAP}{\input{plugins/chessbox.tex}}
+\opt{lcd_bitmap}{\input{plugins/chessbox.tex}}
 
-\opt{SWCODEC}{\input{plugins/doom.tex}}
+\opt{swcodec}{\input{plugins/doom.tex}}
 
 {\input{plugins/flipit.tex}}
 
 \opt{player}{\input{plugins/jackpot.tex}}
 
-\opt{HAVE_LCD_BITMAP}{\input{plugins/jewels.tex}}
+\opt{lcd_bitmap}{\input{plugins/jewels.tex}}
 
-\opt{HAVE_LCD_BITMAP}{\input{plugins/minesweeper.tex}}
+\opt{lcd_bitmap}{\input{plugins/minesweeper.tex}}
 
 \opt{player}{\input{plugins/nim.tex}}
 
-\opt{h1xx,m5,HAVE_LCD_COLOR}{\input{plugins/pacbox.tex}}
+\opt{h1xx,m5,lcd_color}{\input{plugins/pacbox.tex}}
 
-\opt{HAVE_LCD_BITMAP}{\input{plugins/pong.tex}}
+\opt{lcd_bitmap}{\input{plugins/pong.tex}}
 
-\opt{HAVE_LCD_BITMAP}{\input{plugins/robotfindskitten.tex}}
+\opt{lcd_bitmap}{\input{plugins/robotfindskitten.tex}}
 
 {\input{plugins/rockblox.tex}}
 
-\opt{HAVE_LCD_BITMAP}{\input{plugins/sliding.tex}}
+\opt{lcd_bitmap}{\input{plugins/sliding.tex}}
 
-\opt{HAVE_LCD_BITMAP}{\input{plugins/snake.tex}}
+\opt{lcd_bitmap}{\input{plugins/snake.tex}}
 
-\opt{HAVE_LCD_BITMAP}{\input{plugins/snake2.tex}}
+\opt{lcd_bitmap}{\input{plugins/snake2.tex}}
 
-\opt{HAVE_LCD_BITMAP}{\input{plugins/sokoban.tex}}
+\opt{lcd_bitmap}{\input{plugins/sokoban.tex}}
 
-\opt{HAVE_LCD_BITMAP}{\input{plugins/solitaire.tex}}
+\opt{lcd_bitmap}{\input{plugins/solitaire.tex}}
 
-\opt{HAVE_LCD_BITMAP}{\input{plugins/spacerocks.tex}}
+\opt{lcd_bitmap}{\input{plugins/spacerocks.tex}}
 
-\opt{HAVE_LCD_BITMAP}{\input{plugins/star.tex}}
+\opt{lcd_bitmap}{\input{plugins/star.tex}}
 
-\opt{HAVE_LCD_BITMAP}{\input{plugins/sudoku.tex}}
+\opt{lcd_bitmap}{\input{plugins/sudoku.tex}}
 
-\opt{HAVE_LCD_BITMAP}{\input{plugins/wormlet.tex}}
+\opt{lcd_bitmap}{\input{plugins/wormlet.tex}}
 
-\opt{HAVE_LCD_BITMAP}{\input{plugins/xobox.tex}}
+\opt{lcd_bitmap}{\input{plugins/xobox.tex}}
 
 \section{Demos}
 
-\opt{HAVE_LCD_BITMAP}{\input{plugins/bounce.tex}}
+\opt{lcd_bitmap}{\input{plugins/bounce.tex}}
 
 {\input{plugins/credits.tex}}
 
 {\input{plugins/cube.tex}}
 
-\opt{HAVE_LCD_BITMAP}{\input{plugins/demystify.tex}}
+\opt{lcd_bitmap}{\input{plugins/demystify.tex}}
 
-\opt{HAVE_LCD_BITMAP}{\input{plugins/fire.tex}}
+\opt{lcd_bitmap}{\input{plugins/fire.tex}}
 
 {\input{plugins/logo.tex}}
 
-\opt{HAVE_LCD_BITMAP}{\input{plugins/mandelbrot.tex}}
+\opt{lcd_bitmap}{\input{plugins/mandelbrot.tex}}
 
 {\input{plugins/mosaic.tex}}
 
-\opt{HAVE_LCD_BITMAP}{\input{plugins/oscilloscope.tex}}
+\opt{lcd_bitmap}{\input{plugins/oscilloscope.tex}}
 
-\opt{HAVE_LCD_BITMAP}{\input{plugins/plasma.tex}}
+\opt{lcd_bitmap}{\input{plugins/plasma.tex}}
 
 {\input{plugins/snow.tex}}
 
-\opt{HAVE_LCD_BITMAP}{\input{plugins/starfield.tex}}
+\opt{lcd_bitmap}{\input{plugins/starfield.tex}}
 
-\opt{HAVE_LCD_BITMAP}{\input{plugins/vumeter.tex}}
+\opt{lcd_bitmap}{\input{plugins/vumeter.tex}}
 
 \section{\label{ref:Viewersplugins}Viewers}
 
@@ -101,17 +101,17 @@ They cannot be run directly but are started by ``playing''
 the associated file. Viewers are stored in the
 \textbf{/.rockbox/viewers/ }directory.
 
-\opt{HAVE_LCD_BITMAP}{\input{plugins/chip8emulator.tex}}
+\opt{lcd_bitmap}{\input{plugins/chip8emulator.tex}}
 
-\opt{HAVE_LCD_BITMAP}{\input{plugins/jpegviewer.tex}}
+\opt{lcd_bitmap}{\input{plugins/jpegviewer.tex}}
 
 \opt{recorder,recorderv2fm,ondio}{\input{plugins/movieplayer.tex}}
 
-\opt{HAVE_LCD_COLOR}{\input{plugins/mpegplayer.tex}}
+\opt{lcd_color}{\input{plugins/mpegplayer.tex}}
 
 \opt{recorder,recorderv2fm,ondio}{\input{plugins/rockbox_flash.tex}}
 
-\opt{recorder,recorderv2fm,h1xx,m5,HAVE_LCD_COLOR}{\input{plugins/rockboy.tex}}
+\opt{recorder,recorderv2fm,h1xx,m5,lcd_color}{\input{plugins/rockboy.tex}}
 
 {\input{plugins/search.tex}}
 
@@ -129,13 +129,13 @@ the associated file. Viewers are stored in the
 
 {\input{plugins/batterybenchmark.tex}}
 
-\opt{HAVE_LCD_BITMAP}{\input{plugins/calculator.tex}}
+\opt{lcd_bitmap}{\input{plugins/calculator.tex}}
 
 \opt{recorder,recorderv2fm}{\input{plugins/calendar.tex}}
 
 {\input{plugins/chess_clock.tex}}
 
-\opt{CONFIG_RTC}{\input{plugins/clock.tex}}
+\opt{rtc}{\input{plugins/clock.tex}}
 
 {\input{plugins/dice.tex}}
 
@@ -153,4 +153,4 @@ the associated file. Viewers are stored in the
 
 {\input{plugins/stopwatch.tex}}
 
-\opt{HAVE_LCD_BITMAP}{\input{plugins/text_editor.tex}}
+\opt{lcd_bitmap}{\input{plugins/text_editor.tex}}
diff --git a/manual/plugins/oscilloscope.tex b/manual/plugins/oscilloscope.tex
index 2167b2f8ea..23e6c81031 100644
--- a/manual/plugins/oscilloscope.tex
+++ b/manual/plugins/oscilloscope.tex
@@ -4,7 +4,7 @@
 
 This demo shows the shape of the sound samples that make up the music
 being played.
-\opt{SWCODEC}{
+\opt{swcodec}{
   At faster speed rates, the \dap\ is less responsive
   to user input and music may start to skip.
 }
diff --git a/manual/plugins/plasma.tex b/manual/plugins/plasma.tex
index cc4c9208df..8475459ff1 100644
--- a/manual/plugins/plasma.tex
+++ b/manual/plugins/plasma.tex
@@ -9,7 +9,7 @@ Plasma is a demo displaying a 80's style retro plasma effect.
     \opt{IRIVER_H10_PAD}{\ButtonScrollUp\ / \ButtonScrollDown}
     \nopt{IPOD_4G_PAD,IPOD_3G_PAD,IRIVER_H10_PAD}{\ButtonUp\ / \ButtonDown}
     & Adjust frequency\\
-    \opt{HAVE_LCD_COLOR}{
+    \opt{lcd_color}{
         \opt{IRIVER_H300_PAD,IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}
             {\ButtonSelect}
         \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD}{\ButtonPlay}
diff --git a/manual/plugins/starfield.tex b/manual/plugins/starfield.tex
index ca2d9218f9..88f29d3dd8 100644
--- a/manual/plugins/starfield.tex
+++ b/manual/plugins/starfield.tex
@@ -12,7 +12,7 @@ Starfield simulation (like the classic screensaver).
         {\ButtonUp\ / \ButtonDown}
     \opt{IRIVER_H10_PAD}{\ButtonScrollUp\ / \ButtonScrollDown}
     & Increase / decrease speed\\
-    \opt{HAVE_LCD_COLOR}{%
+    \opt{lcd_color}{%
         \opt{IRIVER_H300_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonSelect}%
         \opt{IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD,IRIVER_H10_PAD}{\ButtonPlay}%
         & Change colours\\%
diff --git a/manual/rockbox_interface/main.tex b/manual/rockbox_interface/main.tex
index 3247bcbcc5..65813cbb61 100644
--- a/manual/rockbox_interface/main.tex
+++ b/manual/rockbox_interface/main.tex
@@ -118,7 +118,7 @@ paragraph.
 
   On the curved top it has the headphone jack to the left,
   the \ButtonOff{} button is in the middle%
-  \opt{HAVE_RECORDING}{ and the line in jack to the right}.
+  \opt{recording}{ and the line in jack to the right}.
   Apart from the already mentioned MMC slot you will find the USB connector on
   the \daps{} right side. Placed on the upper side of the device right below
   the flat display there is the main button pad of the \dap{}. A strong deepening
diff --git a/manual/rockbox_interface/tagcache.tex b/manual/rockbox_interface/tagcache.tex
index 1b5bc9106e..149fbeaa97 100644
--- a/manual/rockbox_interface/tagcache.tex
+++ b/manual/rockbox_interface/tagcache.tex
@@ -4,7 +4,7 @@
 \subsection{Introduction}
 This chapter describes the Rockbox music database system. Using the information
 contained in the tags (ID3v1, ID3v2%
-  \opt{SWCODEC}{, Vorbis Comments, Apev2, etc.}%
+  \opt{swcodec}{, Vorbis Comments, Apev2, etc.}%
 ) in your audio files, Rockbox builds and maintains a database of the music
 files on your player and allows you to browse them by Artist, Album and Genre.
 
@@ -32,7 +32,7 @@ its subdirectories will be scanned and added to the database.
 \subsection{\label{ref:databasemenu}The Database Menu}
 
 \begin{description}
-  \opt{SWCODEC}{
+  \opt{swcodec}{
   \item[Load To Ram.]
     The database can either be kept on disk (to save memory), or
     loaded into RAM (for fast browsing). Setting this to \setting{Yes} loads
@@ -48,7 +48,7 @@ its subdirectories will be scanned and added to the database.
 \item[Auto Update.]
   If \setting{Auto update} is set to \setting{on}, each time the \dap{}
   boots, the database will automatically be updated.
-  \opt{SWCODEC}{
+  \opt{swcodec}{
     \note{The \setting{Auto Update} will only check for deleted files if the
       \setting{Directory Cache} (\setting{Settings $\rightarrow$ General
       Settings $\rightarrow$ System $\rightarrow$ Disk $\rightarrow$
@@ -67,7 +67,7 @@ its subdirectories will be scanned and added to the database.
 
 \item[Update Now.]
   \setting{Update now} causes the database to detect new and deleted files
-  \opt{SWCODEC}{
+  \opt{swcodec}{
     \note{Unlike the \setting{Auto Update} function, \setting{Update Now}
       will update the database regardless of whether the \setting{Directory Cache}
       is enabled. Thus, an update using \setting{Update now} may take a long
diff --git a/manual/rockbox_interface/wps.tex b/manual/rockbox_interface/wps.tex
index 478bdeae8f..03ec1562e5 100644
--- a/manual/rockbox_interface/wps.tex
+++ b/manual/rockbox_interface/wps.tex
@@ -3,7 +3,7 @@
 The While Playing Screen (WPS) displays various pieces of information about the
 currently playing audio file.
 %
-\opt{HAVE_LCD_BITMAP}{%
+\opt{lcd_bitmap}{%
   The appearance of the WPS can be configured using WPS configuration files.
   The items shown depend on your configuration -- all item can be turned on
   or off independently. Refer to \reference{ref:wps_tags} for details on how
@@ -11,7 +11,7 @@ currently playing audio file.
   \begin{itemize}
     \nopt{ondio}{
     \item Status bar: The Status bar shows Battery level, charger status, 
-      volume, play mode, repeat mode, shuffle mode\opt{CONFIG_RTC}{ and clock}.
+      volume, play mode, repeat mode, shuffle mode\opt{rtc}{ and clock}.
       In contrast to all other items, the status bar is always at the top of
       the screen.
     }
@@ -115,11 +115,11 @@ your WPS (While Playing Screen).
 \end{table}
 
 
-\opt{HAVE_LCD_BITMAP}{
+\opt{lcd_bitmap}{
   \subsection{\label{ref:peak_meter}Peak Meter}
   The peak meter can be displayed on the While Playing Screen and consists of
   several indicators. 
-  \opt{HAVE_RECORDING}{
+  \opt{recording}{
     For a picture of the peak meter, please see the While
     Recording Screen in \reference{ref:while_recording_screen}.
   }
@@ -242,7 +242,7 @@ function in the file browser's \setting{Context Menu}.
   }
 }
 
-\opt{SWCODEC}{
+\opt{swcodec}{
   \subsubsection{Graphical EQ}
   This is a shortcut to the \setting{Equalizer}. See \reference{ref:EQ}.