6 files changed, 43 insertions, 43 deletions

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