Accept FS #8323 by David Bishop: always use the term bootloader

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

4 files changed, 36 insertions, 36 deletions

diff --git a/manual/advanced_topics/archos-flashing.tex b/manual/advanced_topics/archos-flashing.tex
index 3f72158471..747fd5c0a4 100644
--- a/manual/advanced_topics/archos-flashing.tex
+++ b/manual/advanced_topics/archos-flashing.tex
@@ -19,14 +19,14 @@ Now, you can add Rockbox to the built-in software.
 \end{description}
 
 By reprogramming the firmware, we can boot much faster. \playerman\ has an 
-unnecessary slow boot loader, versus the boot time for Rockbox is much faster 
+unnecessary slow bootloader, versus the boot time for Rockbox is much faster 
 than the disk spin-up, in fact it has to wait for the disk. Your boot time will 
 be as quick as a disk spin-up (e.g. 4 seconds from power-up until resuming 
 playback).
 
 \subsection{Method}
 
-The replaced firmware will host a boot loader and 2 images. This is possible by 
+The replaced firmware will host a bootloader and 2 images. This is possible by 
 compression. The first is the \emph{permanent} backup, not to be changed any 
 more.The second is the default one to be started, the first is only used when 
 you hold the \opt{recorder,recorderv2fm}{\ButtonFOne}\opt{ondio}{\ButtonLeft}\opt{player}{\ButtonLeft} -key during start. Like supplied here, the first image 
@@ -57,7 +57,7 @@ There are two programming tools supplied:
 
 The non-user tools are in the \fname{flash} subdirectory of the CVS source 
 files. There's an authoring tool which composed the firmware file with the 
-boot loader and the 2 images. The boot loader project, a firmware extraction 
+bootloader and the 2 images. The bootloader project, a firmware extraction 
 tool, the plugin sources, and the tools for the UART boot feature: a monitor 
 program for the box and a PC tool to drive it. Feel free to review the sources 
 for all of it, but be careful when fooling around with powerful toys!
@@ -138,7 +138,7 @@ Long version, step by step procedure:
   you want to restore the flash contents.
 \item Download the correct package for you model. Copy one or two files of it to 
   your box: \fname{firmware\_*.bin} (name depends on your model) into the root 
-  directory (the initial firmware for your model, with the boot loader and the 
+  directory (the initial firmware for your model, with the bootloader and the 
   Archos image). There now is also a \_norom variant, copy both, the plugin will 
   decide which one is required for your box.
 \item Enter the debug menu and select the hardware info screen. Check your flash 
@@ -230,7 +230,7 @@ and now preferred one. Use this if available.
 
 If you like or have to, you can also flash the Archos image as the second one. 
 E.g. in case Rockbox from flash doesn't work for you. This way you keep the dual 
-boot loader and you can easily try different later. The \fname{.ucl} of the Archos
+bootloader and you can easily try different later. The \fname{.ucl} of the Archos
 firmware is included in the package.
 
 \subsection{Restoring the original firmware}
@@ -253,7 +253,7 @@ There are two variants of how the boxes starts, therefore the normal and the
 \_norom firmware files. The vast majority of the \daps\ all have the same boot 
 ROM content, differentiation comes later by flash content. Rockbox identifies 
 this boot ROM with a CRC value of 0x222F in the hardware info screen. \opt{recorder,recorderv2fm}{Some recorders have the boot ROM disabled (it might be unprogrammed) and start directly from a flash mirror at address zero. They need the new 
-  \_norom firmware that has a slightly different boot loader.}
+  \_norom firmware that has a slightly different bootloader.}
 Without a boot ROM  there is no UART boot safety net. To compensate for that as 
 much as possible the MiniMon monitor is included, it starts with \opt{recorder,recorderv2fm}{\ButtonFThree+\ButtonOn}\opt{ondio}{\ButtonRight+\ButtonOff}\opt{player}{\ButtonRight+\ButtonOn}.
 Using that the box can be reprogrammed via serial if the first 2000 bytes of the
diff --git a/manual/getting_started/iaudio_install.tex b/manual/getting_started/iaudio_install.tex
index cdab94b925..7d66947aa2 100644
--- a/manual/getting_started/iaudio_install.tex
+++ b/manual/getting_started/iaudio_install.tex
@@ -1,7 +1,7 @@
 \fixme{This is merely a copy of the wiki page IaudioBoot, so this section needs
 a more natural language and also error checking by Iaudio owners.}
 
-The \playername{} has a built-in boot loader which performs the
+The \playername{} has a built-in bootloader which performs the
 firmware update, and can also access the hard drive via USB. Therefore the
 Rockbox bootloader can be very minimalistic, without USB mode.
 This also makes it less dangerous to install the Rockbox bootloader, as you can
diff --git a/manual/getting_started/installation.tex b/manual/getting_started/installation.tex
index 6a97fdaa94..fc40929b30 100644
--- a/manual/getting_started/installation.tex
+++ b/manual/getting_started/installation.tex
@@ -27,24 +27,24 @@ installation options.
 
 \begin{description}
 \opt{HAVE_RB_BL_ON_DISK}{
-\item[The \playerman{} boot loader.]
-  The \playerman{} boot loader is the program that tells your \dap{} how to boot
+\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
   disk mode on your \dap{}.
 
-  This boot loader is stored in special flash memory in your \playerman{}.
+  This bootloader is stored in special flash memory in your \playerman{}.
   It is already installed on your \dap{}, so it is never necessary to modify
   this in order to install Rockbox.}
 
-\item[The Rockbox boot loader.] \index{Boot loader}
-  \opt{HAVE_RB_BL_ON_DISK}{The Rockbox boot loader is loaded from disk by
-  the \playerman{} boot loader. It is responsible for loading the Rockbox
+\item[The Rockbox bootloader.] \index{Bootloader}
+  \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{gigabeat}{\note{Dual boot does not currently work on the gigabeat.}}}
 
   \opt{HAVE_RB_BL_IN_FLASH}{
-  The boot loader is the program that tells your
+  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.}
@@ -303,7 +303,7 @@ structure that Rockbox needs.
 }
 
 \opt{SWCODEC}{
-  \subsubsection{Installing the boot loader}
+  \subsubsection{Installing the bootloader}
   \opt{h1xx,h300}{\input{getting_started/iriver_install.tex}}
   \opt{ipod}{\input{getting_started/ipod_install.tex}}
   \opt{m5,x5}{\input{getting_started/iaudio_install.tex}}
@@ -413,17 +413,17 @@ completely follow the manual uninstallation instructions below.}}
 \opt{h1xx,h300}{
   \note{
     If you want to remove the Rockbox bootloader, simply flash an unpatched
-    \playerman{} firmware. Be aware that doing so will also remove the boot
-    loader USB mode. As that mode can come in quite handy (especially when
-    having disk errors) it is recommended to keep the boot loader. It also
+    \playerman{} firmware. Be aware that doing so will also remove the bootloader
+    USB mode. As that mode can come in quite handy (especially when
+    having disk errors) it is recommended to keep the bootloader. It also
     gives you the possibility of trying Rockbox anytime later by simply
     installing the distribution files.
     \opt{h1xx}{
-      The Rockbox bootlaoder will automatically start the original firmware if
+      The Rockbox bootloader will automatically start the original firmware if
       the \fname{.rockbox} directory has been deleted.
     }%
     \opt{h300}{%
-      Although if you retain the Rockbox boot loader, you will need to hold the
+      Although if you retain the Rockbox bootloader, you will need to hold the
       \ButtonRec{} button each time you want to start the original firmware.
     }
   }
diff --git a/manual/getting_started/iriver_install.tex b/manual/getting_started/iriver_install.tex
index bc57617e0d..de3c8c0552 100644
--- a/manual/getting_started/iriver_install.tex
+++ b/manual/getting_started/iriver_install.tex
@@ -1,11 +1,11 @@
 % $Id$ %
 
-  Installing the boot loader is the trickiest part of the installation.
-  The Rockbox boot loader allows users to boot into either the Rockbox 
+  Installing the bootloader is the trickiest part of the installation.
+  The Rockbox bootloader allows users to boot into either the Rockbox 
   firmware or the \playerman{} firmware. For legal reasons, we cannot distribute 
-  the boot loader. Instead, we have developed a program that will patch the 
-  Iriver firmware with the Rockbox boot loader. These instructions will explain 
-  how to download and patch the Iriver firmware with the Rockbox boot loader 
+  the bootloader. Instead, we have developed a program that will patch the 
+  Iriver firmware with the Rockbox bootloader. These instructions will explain 
+  how to download and patch the Iriver firmware with the Rockbox bootloader 
   and install it on your jukebox.
 
 
@@ -22,7 +22,7 @@
     your player.}
   \opt{IRIVER_H300_PAD}{1.28K, 1.28EU, 1.28J, 1.29K, 1.29J and 1.30EU.
     \note{The US \playername{} firmware is not supported and cannot be
-    patched to be used with the boot loader. If you wish to install Rockbox
+    patched to be used with the bootloader. If you wish to install Rockbox
     on a US \playername, you must first install a non-US version of the
     original firmware and then install one of the supported versions patched
     with the Rockbox bootloader. 
@@ -53,7 +53,7 @@
   to the \fname{.hex} file that you previously downloaded to your desktop.
   %
   \item Click \setting{Patch}. The firmware patcher will patch the
-    original firmware to include the Rockbox boot loader. The \fname{.hex}
+    original firmware to include the Rockbox bootloader. The \fname{.hex}
     file on your desktop is now a modified version of the original
     \fname{.hex} file.
   %
@@ -68,7 +68,7 @@
     or that it is connected to the power adaptor. Interrupting the next step
     due to a power failure most likely will brick your \dap{}.}
   %
-  \item Update your \daps{} firmware with the patched boot loader. To do this, turn
+  \item Update your \daps{} firmware with the patched bootloader. To do this, turn
     the jukebox on. Press and hold the
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonSelect{} button }%
     to enter the main menu, and navigate to \setting{General $\rightarrow$ Firmware 
@@ -79,24 +79,24 @@
     firmware update is complete the player will turn itself off. (The update
     firmware process usually takes a minute or so.)
     
-    You have now installed the Rockbox boot loader.
+    You have now installed the Rockbox bootloader.
 \end{enumerate}
 
-\note{If you install the Rockbox boot loader but do not install the
-  Rockbox firmware the Rockbox boot loader will load the Iriver firmware when the
+\note{If you install the Rockbox bootloader but do not install the
+  Rockbox firmware the Rockbox bootloader will load the Iriver firmware when the
   jukebox is turned on.
   To load the \playerman{} firmware press and hold \ButtonRec{} before
   powering up the \dap{} until the \playerman{} logo appears.
   }
 
-\note{The boot loader has a built-in ``boot loader USB mode''. This function
+\note{The bootloader has a built-in ``bootloader USB mode''. This function
   switches to USB mode when the \dap{} is connected to a computer upon
   power-up. This way you can access the \daps{} hard disk without the need
   to boot any firmware (which is also useful when your hard disk is 
-  damaged). The screen will simply display the text ``boot loader USB mode''.
-  After you disconnect the \dap{} from USB the boot loader will
-  continue booting Rockbox. As in boot loader USB mode the firmware
+  damaged). The screen will simply display the text ``bootloader USB mode''.
+  After you disconnect the \dap{} from USB the bootloader will
+  continue booting Rockbox. As in bootloader USB mode the firmware
   itself hasn't been loaded this is also a simple way of updating Rockbox.
-  After the disconnect the boot loader will load the updated version of
+  After the disconnect the bootloader will load the updated version of
   Rockbox.
 }