2 files changed, 49 insertions, 50 deletions

diff --git a/manual/getting_started/installation.tex b/manual/getting_started/installation.tex
index 7bdcb3587b..c56a2d0d81 100644
--- a/manual/getting_started/installation.tex
+++ b/manual/getting_started/installation.tex
@@ -135,7 +135,7 @@ software.
     most of the Rockbox code is contained in a
     ``build'' that resides on your \daps{} drive. This makes it easy to
     update Rockbox. The build consists of a directory called
-    \fname{.rockbox} containg all of Rockbox' files, which is located in the
+    \fname{.rockbox} containing all of Rockbox' files, which is located in the
     root of your \daps{} drive.
 
   \end{description}
@@ -309,15 +309,14 @@ The new build will be installed over your current build.
   connect the \dap{} to your computer, and delete the
   \fname{\firmwarefilename} file.
 }
+\nopt{gigabeat,x5,archos}
+  {
+  \note{The Rockbox bootloader can start the original firmware on your \dap.
+  (See \reference{ref:Dualboot} for more information.)}}
 
-\opt{SWCODEC}{
+\opt{h10,h10_5gb}{
   If you would like to go back to using the original \playerman{} software,
   connect the \dap{} to your computer, and delete the
-  \fname{/.rockbox/\firmwarefilename} file.
-}
-
-\opt{h10,h10_5gb}{
-  Next, delete the 
   \opt{h10}{\fname{H10\_20GC.mi4}}\opt{h10_5gb}{\fname{H10.mi4}} file and rename
   \fname{OF.mi4} to \opt{h10}{\fname{H10\_20GC.mi4}}\opt{h10_5gb}{\fname{H10.mi4}}
   in the \fname{System} directory on your \playertype{}. As in the installation,
@@ -325,53 +324,50 @@ The new build will be installed over your current build.
 }
 
 \opt{e200}{
-  You then need to follow the instructions to install the bootloader, but when 
-  prompted by sansapatcher, enter 'u' for uninstall, instead of 'i' for install.
-  As in the installation, it may be necessary to first put your device into UMS
-  mode.
+  If you would like to go back to using the original \playerman{} software,
+  connect the \dap{} to your computer, and follow the instructions to install
+  the bootloader, but when prompted by sansapatcher, enter 'u' for uninstall,
+  instead of 'i' for install. As in the installation, it may be necessary to
+  first put your device into UMS mode.
 }
 
 \optv{ipod}{
-  You then need to follow the instructions to install the bootloader, but when 
-  prompted by ipodpatcher, enter 'u' for uninstall, instead of 'i' for install.
+  If you would like to go back to using the original \playerman{} software,
+  connect the \dap{} to your computer, and follow the instructions to install
+  the bootloader, but when prompted by ipodpatcher, enter 'u' for uninstall,
+  instead of 'i' for install.
 }
 
 \opt{m5,x5}{
-  Download the original \playername{} firmware from the \playerman{} web site.
-  And copy it to the \fname{FIRMWARE} directory on your \playername{}. Turn off the
-  \dap{}, remove the USB cable and insert the charger. The original
-  firmware will automatically be flashed.
+  If you would like to go back to using the original \playerman{} software,
+  connect the \dap{} to your computer, download the original \playername{}
+  firmware from the \playerman{} web site. And copy it to the \fname{FIRMWARE}
+  directory on your \playername{}. Turn off the \dap{}, remove the USB cable
+  and insert the charger. The original firmware will automatically be flashed.
 }
 
-If you wish to clean up your disk, you may also wish to delete the
-\fname{.rockbox} folder and its contents.
-\nopt{m5,x5}{Turn the \playerman{} off.}
-
-\opt{h300}{Press and hold the \ButtonRec{} button.}
-
-\nopt{m5,x5}{Turn the \dap{} back on and the original \playerman{} software
-  will load.}
-
-\opt{h1xx}{
+\opt{h1xx,h300}{
   \note{
-    There's no need to remove the installed boot loader. If you want to remove
-    it, 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 gives you the possibility of trying Rockbox anytime
-    later by simply installing the distribution files.
+    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
+    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 \fname{.rockbox} folder has been deleted.
+    }%
+    \opt{h300}{%
+      Although if you retain the Rockbox boot loader, you will need to hold the
+      \ButtonRec{} button each time you want to start the original firmware.
+    }
   }
 }
 
-\opt{h300}{
-  \note{
-    There's no need to remove the installed boot loader, although if you
-    retain the Rockbox boot loader, you will need to hold the \ButtonRec{}
-    button each time you want to start the original firmware. If you want to
-    remove it 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), you may wish to keep the
-    boot loader. It also gives you the possibility of trying Rockbox anytime
-    later by simply installing a new build.
-  }
+If you wish to clean up your disk, you may also wish to delete the
+\fname{.rockbox} folder and its contents.
+\nopt{m5,x5}{Turn the \playerman{} off.
+  Turn the \dap{} back on and the original \playerman{} software will load.
 }
+
diff --git a/manual/getting_started/ipod_install.tex b/manual/getting_started/ipod_install.tex
index d76f9f5683..0e672d7048 100644
--- a/manual/getting_started/ipod_install.tex
+++ b/manual/getting_started/ipod_install.tex
@@ -30,8 +30,9 @@ install the bootloader. After a short time you should see the message
 ``[INFO] Bootloader installed successfully.'' Press ENTER again to exit
 ipodpatcher.
 
-\item Make sure you have a \fname{.rockbox} folder in the
-root of your \daps{} drive and that you have also installed the fonts
+\item Make sure that you have correctly extracted a build of Rockbox so that
+you have a \fname{/.rockbox}, which contains all the files needed by Rockbox
+in the root of your \daps{} drive and that you have also installed the fonts
 package -- see \reference{sec:installing_firmware} for more information.
 
 \item Disconnect your \dap{} in the usual way. The bootloader is now installed. 
@@ -76,8 +77,9 @@ Wait for it to connect, and then eject and unplug it in the normal way.
 prevent Rockbox immediately rebooting your \dap{} into disk mode when it 
 detects that your \dap{} is attached to a computer. }
 
-\item Make sure you have a \fname{.rockbox} folder in the
-root of your \daps{} drive and that you have also installed the fonts
+\item Make sure that you have correctly extracted a build of Rockbox so that
+you have a \fname{/.rockbox}, which contains all the files needed by Rockbox
+in the root of your \daps{} drive and that you have also installed the fonts
 package -- see \reference{sec:installing_firmware} for more information.
 
 \end{enumerate}
@@ -111,8 +113,9 @@ bootloader. Press i followed by ENTER, and ipodpatcher will now install the
 bootloader. After a short time you should see the message ``[INFO] Bootloader
 installed successfully.'' Press ENTER again to exit ipodpatcher.
 
-\item Make sure you have a \fname{.rockbox} folder in the
-root of your \daps{} drive and that you have also installed the fonts
+\item Make sure that you have correctly extracted a build of Rockbox so that
+you have a \fname{/.rockbox}, which contains all the files needed by Rockbox
+in the root of your \daps{} drive and that you have also installed the fonts
 package -- see \reference{sec:installing_firmware} for more information.
 
 \item Disconnect your \dap{} in the usual way. The bootloader is now installed.