Make the Iaudio uninstall instruction appear in the right place and make it a little nicer, make some minor tweaks to other install and uninstallinstructions

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

2 files changed, 27 insertions, 25 deletions

diff --git a/manual/getting_started/iaudio_install.tex b/manual/getting_started/iaudio_install.tex
index 68792fb97b..774006f567 100644
--- a/manual/getting_started/iaudio_install.tex
+++ b/manual/getting_started/iaudio_install.tex
@@ -1,30 +1,23 @@
 \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 \playerman{} \playername{} has a builtin boot loader which performs the 
-firmware update, and can also access the hard drive via USB. Therefore the 
+The \playername{} has a builtin boot loader 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
-always restore it using the iAudio bootloader.
+always restore it using the \playerman{} bootloader.
 
-\note{The current bootloader is not prepared to coexist with the original 
-firmware. It replaces the original firmware. Therefore it is only useful to 
-developers at this point.}
+\note{The current bootloader is not prepared to coexist with the original
+firmware. It replaces the original firmware.}
 
 \subsubsection{Installation}
 \begin{itemize}
-\item Download the bootloader binary from 
-\url{http://download.rockbox.org/bootloader/iaudio/}. Use \fname{x5v\_fw.bin}
-file if your \dap{} is a X5V. If it is a X5, use the \fname{x5\_fw.bin} file.
-\item Copy it to the \fname{FIRMWARE} directory on your X5.
-\item Turn the X5 off, remove the USB cable and insert the charger. The X5 will
-automatically upgrade the flash with the Rockbox bootloader.
-\end{itemize}
-
-\subsubsection{Restoring the original firmware}
-\begin{itemize}
-\item Download the original X5 firmware from the iAudio web site.
-\item Copy it to the \fname{FIRMWARE} directory on your X5
-\item Turn the X5 off, remove the USB cable and insert the charger. The X5 will
-automatically upgrade the flash with the original firmware.
+\item Download the Rockbox bootloader binary from 
+\url{http://download.rockbox.org/bootloader/iaudio/}.
+  \opt{x5}{Use the \fname{x5v\_fw.bin} file if your \dap{} is a X5V. If it is a X5,
+    use the \fname{x5\_fw.bin} file.}
+  \opt{m5}{Use the \fname{m5\_fw.bin} file.}
+\item Copy it to the \fname{FIRMWARE} directory on your \dap{}.
+\item Turn the \dap{} off, remove the USB cable and insert the charger. The
+Rockbox bootloader will automatically be flashed.
 \end{itemize}
diff --git a/manual/getting_started/installation.tex b/manual/getting_started/installation.tex
index cbb32b9397..45568769b8 100644
--- a/manual/getting_started/installation.tex
+++ b/manual/getting_started/installation.tex
@@ -268,8 +268,8 @@ The new build will be installed over your current build.
 
 \section{Uninstalling Rockbox}\index{Installation!uninstall}
 
-If you would like to go back to using the original \playerman{} software, then
-connect the \playerman{} to your computer, and delete the
+If you would like to go back to using the original \playerman{} software,
+connect the \dap{} to your computer, and delete the
 \fname{\firmwarefilename} file.
 
 \opt{h10,h10_5gb}{
@@ -291,12 +291,21 @@ connect the \playerman{} to your computer, and delete the
   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 wish to clean up your disk, you may also wish to delete the
-\fname{.rockbox} folder and its contents. Turn the \playerman{} off.
+\fname{.rockbox} folder and its contents.
+\nopt{m5,x5}{Turn the \playerman{} off.}
 
 \opt{h300}{Press and hold the \ButtonRec{} button.}
 
-Turn the \dap{} back on and the original \playerman{} software will load.
+\nopt{m5,x5}{Turn the \dap{} back on and the original \playerman{} software
+  will load.}
 
 \opt{h1xx}{
   \note{
@@ -311,7 +320,7 @@ Turn the \dap{} back on and the original \playerman{} software will load.
 
 \opt{h300}{
   \note{
-    There's no need to remove the installed boot loader, although you if you
+    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