12 files changed, 18 insertions, 18 deletions
diff --git a/manual/getting_started/installation.tex b/manual/getting_started/installation.tex
index 49091c304c..96be3269d8 100644
--- a/manual/getting_started/installation.tex
+++ b/manual/getting_started/installation.tex
@@ -67,14 +67,14 @@ software.
 \opt{SWCODEC}{
   \subsection{Introduction}
   
-  \opt{HAVE_FIRMWARE_ON_DISK}{There are three separate components of Rockbox, 
+  \opt{HAVE_RB_BL_ON_DISK}{There are three separate components of Rockbox, 
   two of which need to be installed in order to run Rockbox.}
   
-  \opt{HAVE_FIRMWARE_IN_FLASH}{There are two separate components of Rockbox 
+  \opt{HAVE_RB_BL_IN_FLASH}{There are two separate components of Rockbox 
   that need to be installed in order to run Rockbox.}
   
   \begin{description}
-  \opt{HAVE_FIRMWARE_ON_DISK}{    
+  \opt{HAVE_RB_BL_ON_DISK}{    
   \item[The \playerman{} bootloader]
     The \playerman{} bootloader is the program that tells your \dap{} how to boot 
     and load the remaining firmware from disk. It is also responsible for the
@@ -85,20 +85,20 @@ software.
     in order to install Rockbox.}
     
   \item[The Rockbox bootloader.] \index{Bootloader}
-    \opt{HAVE_FIRMWARE_ON_DISK}{The Rockbox bootloader is loaded from disk by 
+    \opt{HAVE_RB_BL_ON_DISK}{The Rockbox bootloader is loaded from disk by 
     the \playerman{} bootloader. It is responsible for loading the Rockbox 
     firmware and for providing the dual boot function. It directly replaces the
     \playerman{} firmware on the \daps{} disk.}
-    \opt{HAVE_FIRMWARE_IN_FLASH}{
+    \opt{HAVE_RB_BL_IN_FLASH}{
     The bootloader is the program that tells your 
     \dap{} how to boot and load other components of Rockbox. This is the 
     component of Rockbox that is installed to the flash memory of your 
     \playerman.}
   
   \item[The Rockbox firmware.] 
-    \opt{HAVE_FIRMWARE_IN_FLASH}{Unlike the \playerman{} firmware, which runs 
+    \opt{HAVE_RB_BL_IN_FLASH}{Unlike the \playerman{} firmware, which runs 
     entirely from flash memory, }
-    \opt{HAVE_FIRMWARE_ON_DISK}{Similar to the \playerman{} firmware, }
+    \opt{HAVE_RB_BL_ON_DISK}{Similar to the \playerman{} firmware, }
     most of the Rockbox code is contained in a 
     ``build'' that resides on your \daps{} hard drive. This makes it easy to 
     update Rockbox. The build consists of a file named \firmwarefilename{} and a
diff --git a/manual/platform/h10.tex b/manual/platform/h10.tex
index 8faef39d88..2a1fdbe4a7 100644
--- a/manual/platform/h10.tex
+++ b/manual/platform/h10.tex
@@ -1,6 +1,6 @@
 % $Id$ %
 \def\UseOption{h10}
-\edef\UseOption{\UseOption,HAVE_FIRMWARE_ON_DISK}
+\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}
diff --git a/manual/platform/h10_5gb.tex b/manual/platform/h10_5gb.tex
index 3f4d46833e..c9a06a1e1f 100644
--- a/manual/platform/h10_5gb.tex
+++ b/manual/platform/h10_5gb.tex
@@ -1,6 +1,6 @@
 % $Id$ %
 \def\UseOption{h10_5gb}
-\edef\UseOption{\UseOption,HAVE_FIRMWARE_ON_DISK}
+\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}
diff --git a/manual/platform/h1xx.tex b/manual/platform/h1xx.tex
index de3623a305..a3de98ca19 100644
--- a/manual/platform/h1xx.tex
+++ b/manual/platform/h1xx.tex
@@ -1,6 +1,6 @@
 % $Id$ %
 \def\UseOption{h1xx}
-\edef\UseOption{\UseOption,HAVE_FIRMWARE_IN_FLASH}
+\edef\UseOption{\UseOption,HAVE_RB_BL_IN_FLASH}
 \edef\UseOption{\UseOption,HAVE_LCD_BITMAP}
 \edef\UseOption{\UseOption,HAVE_RECORDING}
 \edef\UseOption{\UseOption,CONFIG_TUNER}
diff --git a/manual/platform/h300.tex b/manual/platform/h300.tex
index 4b71ef240c..1a0820551a 100644
--- a/manual/platform/h300.tex
+++ b/manual/platform/h300.tex
@@ -1,6 +1,6 @@
 % $Id$ %
 \def\UseOption{h300}
-\edef\UseOption{\UseOption,HAVE_FIRMWARE_IN_FLASH}
+\edef\UseOption{\UseOption,HAVE_RB_BL_IN_FLASH}
 \edef\UseOption{\UseOption,HAVE_LCD_BITMAP}
 \edef\UseOption{\UseOption,HAVE_RECORDING}
 \edef\UseOption{\UseOption,CONFIG_TUNER}
diff --git a/manual/platform/ipod3g.tex b/manual/platform/ipod3g.tex
index 31c9e3852a..09ef4d1cb0 100644
--- a/manual/platform/ipod3g.tex
+++ b/manual/platform/ipod3g.tex
@@ -1,6 +1,6 @@
 % $Id$ %
 \def\UseOption{ipod3g}
-\edef\UseOption{\UseOption,HAVE_FIRMWARE_ON_DISK}
+\edef\UseOption{\UseOption,HAVE_RB_BL_ON_DISK}
 \edef\UseOption{\UseOption,HAVE_LCD_BITMAP}
 \edef\UseOption{\UseOption,CONFIG_RTC}
 \edef\UseOption{\UseOption,SWCODEC}
diff --git a/manual/platform/ipod4g.tex b/manual/platform/ipod4g.tex
index 9285a5d5db..6712eaf3ed 100644
--- a/manual/platform/ipod4g.tex
+++ b/manual/platform/ipod4g.tex
@@ -1,6 +1,6 @@
 % $Id$ %
 \def\UseOption{ipod4g}
-\edef\UseOption{\UseOption,HAVE_FIRMWARE_ON_DISK}
+\edef\UseOption{\UseOption,HAVE_RB_BL_ON_DISK}
 \edef\UseOption{\UseOption,HAVE_LCD_BITMAP}
 \edef\UseOption{\UseOption,CONFIG_RTC}
 \edef\UseOption{\UseOption,SWCODEC}
diff --git a/manual/platform/ipodcolor.tex b/manual/platform/ipodcolor.tex
index 6bdb4d5855..dee6a38149 100644
--- a/manual/platform/ipodcolor.tex
+++ b/manual/platform/ipodcolor.tex
@@ -1,6 +1,6 @@
 % $Id$ %
 \def\UseOption{ipodcolor}
-\edef\UseOption{\UseOption,HAVE_FIRMWARE_ON_DISK}
+\edef\UseOption{\UseOption,HAVE_RB_BL_ON_DISK}
 \edef\UseOption{\UseOption,HAVE_LCD_BITMAP}
 \edef\UseOption{\UseOption,CONFIG_RTC}
 \edef\UseOption{\UseOption,SWCODEC}
diff --git a/manual/platform/ipodmini.tex b/manual/platform/ipodmini.tex
index b3df423998..038df0ed91 100644
--- a/manual/platform/ipodmini.tex
+++ b/manual/platform/ipodmini.tex
@@ -1,6 +1,6 @@
 % $Id$ %
 \def\UseOption{ipodmini}
-\edef\UseOption{\UseOption,HAVE_FIRMWARE_ON_DISK}
+\edef\UseOption{\UseOption,HAVE_RB_BL_ON_DISK}
 \edef\UseOption{\UseOption,HAVE_LCD_BITMAP}
 \edef\UseOption{\UseOption,CONFIG_RTC}
 \edef\UseOption{\UseOption,SWCODEC}
diff --git a/manual/platform/ipodnano.tex b/manual/platform/ipodnano.tex
index d7518d1592..c7e2273f88 100644
--- a/manual/platform/ipodnano.tex
+++ b/manual/platform/ipodnano.tex
@@ -1,6 +1,6 @@
 % $Id$ %
 \def\UseOption{ipodnano}
-\edef\UseOption{\UseOption,HAVE_FIRMWARE_ON_DISK}
+\edef\UseOption{\UseOption,HAVE_RB_BL_ON_DISK}
 \edef\UseOption{\UseOption,HAVE_LCD_BITMAP}
 \edef\UseOption{\UseOption,CONFIG_RTC}
 \edef\UseOption{\UseOption,SWCODEC}
diff --git a/manual/platform/ipodvideo.tex b/manual/platform/ipodvideo.tex
index 3d7aec2b7e..3224ff29ac 100644
--- a/manual/platform/ipodvideo.tex
+++ b/manual/platform/ipodvideo.tex
@@ -1,6 +1,6 @@
 % $Id$ %
 \def\UseOption{ipodvideo}
-\edef\UseOption{\UseOption,HAVE_FIRMWARE_ON_DISK}
+\edef\UseOption{\UseOption,HAVE_RB_BL_ON_DISK}
 \edef\UseOption{\UseOption,HAVE_LCD_BITMAP}
 \edef\UseOption{\UseOption,CONFIG_RTC}
 \edef\UseOption{\UseOption,SWCODEC}
diff --git a/manual/platform/x5.tex b/manual/platform/x5.tex
index fb70a23336..71929a6626 100644
--- a/manual/platform/x5.tex
+++ b/manual/platform/x5.tex
@@ -1,6 +1,6 @@
 % $Id$ %
 \def\UseOption{x5}
-\edef\UseOption{\UseOption,HAVE_FIRMWARE_IN_FLASH}
+\edef\UseOption{\UseOption,HAVE_RB_BL_IN_FLASH}
 \edef\UseOption{\UseOption,HAVE_LCD_BITMAP}
 \edef\UseOption{\UseOption,HAVE_RECORDING}
 \edef\UseOption{\UseOption,CONFIG_TUNER}