2 files changed, 81 insertions, 23 deletions

diff --git a/manual/getting_started/installation.tex b/manual/getting_started/installation.tex
index 582937f9ed..2fee2594c0 100644
--- a/manual/getting_started/installation.tex
+++ b/manual/getting_started/installation.tex
@@ -11,7 +11,7 @@ before beginning there are a few things it is important to know.
 follow the instructions at 
 \url{http://www.rockbox.org/twiki/bin/view/Main/SansaE200RInstallation}.}}
 
-\opt{ipodnano,ipodvideo,e200,c200}{
+\opt{ipodnano,ipodvideo,e200,c200,e200v2}{
 \begin{description}  
 \item[Supported hardware versions.] 
     \opt{ipodnano}{
@@ -28,7 +28,7 @@ follow the instructions at
     For information on identifying which Ipod you own, see this page on Apple's 
     website: \url{http://www.info.apple.com/kbnum/n61688}.
   }
-  \opt{e200,c200}{
+  \opt{c200}{
     The \playertype{} is available in multiple versions, not
     all of which run Rockbox.  Rockbox doesn't run on the
     newer v2 models. They can be identified
@@ -36,6 +36,13 @@ follow the instructions at
     Settings $\rightarrow$ Info. The v1
     firmware is named 01.xx.xx, while the v2 firmware begins with 03.
   }
+  \opt{e200,e200v2}{
+    The \playertype{} is available in multiple versions, and you need to make
+    sure which you have by checking the Sandisk firmware version number under 
+    Settings $\rightarrow$ Info. The v1 firmware is named 01.xx.xx, while the
+    v2 firmware begins with 03. Make sure that you are following the
+    instructions from the correct manual.
+}  
 \end{description}
 }
 
@@ -46,6 +53,14 @@ follow the instructions at
 \end{description}
 }
 
+\opt{sansaAMS}{
+\begin{description}  
+  \item[DRM capability.] It is possible that installation of the bootloader
+  may lead to you \emph{permanently} losing the ability to playback files
+  with DRM.
+\end{description}
+}
+
 \nopt{gigabeats}{
 \begin{description}  
 
@@ -83,11 +98,12 @@ follow the instructions at
     is intended to be used for USB OTG connections only (digital cameras, memory
     sticks, etc.).
   }    
-  \opt{sansa}{The following steps require you to change the setting in
+  \opt{sansa,e200v2}{
+    \note{The following steps require you to change the setting in
     \setting{Settings $\rightarrow$ USB Mode} to \setting{MSC} from within the
-    original firmware.
+    original firmware.}
 
-    \warn{Never extract files to your \dap{} while it is in recovery mode.}
+    \nopt{e200v2}{\warn{Never extract files to your \dap{} while it is in recovery mode.}}
   }
   \opt{h10,h10_5gb}{
     The installation requires you to use UMS mode and so
@@ -338,8 +354,9 @@ data partiton.}}
 60GB/80GB models.  You must ensure you download the correct version for your 
 \dap{}.}}
 
-\item Connect your \dap{} to the computer via USB
-  \opt{ipod3g,ipod4g,ipodmini,ipodcolor}{ or Firewire} as described in
+\item Connect your \dap{} to the computer via USB 
+  \opt{sansa,sansaAMS,h10,h10_5gb}{ in MSC mode }
+  \opt{ipod3g,ipod4g,ipodmini,ipodcolor}{ or Firewire }as described in
   the manual that came with your \dap{}.
 
 \item Take the \fname{.zip} file that you downloaded and use
@@ -376,6 +393,7 @@ structure that Rockbox needs.\\}
   \opt{h10,h10_5gb}{\input{getting_started/h10_install.tex}}
   \opt{gigabeatf}{\input{getting_started/gigabeat_install.tex}}
   \opt{sansa}{\input{getting_started/sansa_install.tex}}
+  \opt{sansaAMS}{\input{getting_started/sansaAMS_install.tex}}
   \opt{mrobe100}{\input{getting_started/mrobe100_install.tex}}
 }}
 
@@ -593,6 +611,10 @@ completely follow the manual uninstallation instructions below.}}
     }
 }
 
+    \opt{sansaAMS}{
+      Copy an unmodified original firmware to your player and update it.
+}
+
 \nopt{gigabeats}{
   If you wish to clean up your disk, you may also wish to delete the
   \fname{.rockbox} directory and its contents.
diff --git a/manual/getting_started/sansaAMS_install.tex b/manual/getting_started/sansaAMS_install.tex
index 9f2e25c64b..c46c4d6166 100644
--- a/manual/getting_started/sansaAMS_install.tex
+++ b/manual/getting_started/sansaAMS_install.tex
@@ -1,35 +1,71 @@
 % $Id: %
 
-In order to make your \playertype{} load and execute the Rockbox
-firmware you have just installed, you will need to install the
-Rockbox bootloader. Unless bugs are found in the bootloader code, or
-significant new features are added, you will only have to perform this
-step once.
+In order to install the bootloader, you will need to download the following
+files:
 
-These steps use the mkamsboot tool. Source code is available in the
-Rockbox SVN repository
-(\url{http://svn.rockbox.org/viewvc.cgi/trunk/rbutil/mkamsboot/}).
+\begin{itemize}
+  \item An original firmware (OF) from 
+    \opt{e200v2}{
+      \url{http://forums.sandisk.com/sansa/board/message?board.id=e200&thread.id=13548}}
+    \opt{fuse}{
+      \url{http://forums.sandisk.com/sansa/board/message?board.id=sansafuse&thread.id=23276}}
+
+  \item The bootloader: 
+    \opt{e200v2}{\download{bootloader/sandisk-sansa/e200v2/bootloader-e200v2.sansa}}
+    \opt{fuze}{\download{bootloader/sandisk-sansa/fuze/bootloader-fuze.sansa}}
+
+  \item The version of mkamsboot for your operating system from
+    \download{bootloader/sandisk-sansa/mkamsboot/}
+\end{itemize}
 
 \subsection{Bootloader installation from Windows}
 
 \begin{enumerate}
 
-% Will add when I have required install instructions %
+\item Create a folder called ``rbinstall'' on your desktop, and then extract
+  the OF, the bootloader and mkamsboot into it.
 
-\end{enumerate}
+\item Open a new command prompt, and navigate to the ``rbinstall'' folder.
 
-\subsection{Bootloader installation from Mac OS X}
+\item Run mkamsboot.exe, passing the name of the OF and bootloader files that
+  you downloaded, in addition to a name for the output file.
 
-\begin{enumerate}
+  \begin{code} 
+    \opt{fuze}{mkamsboot.exe fuzea.bin bootloader-fuze.bin patched.bin}
+    \opt{e200v2}{mkamsboot.exe e200pe.bin bootloader-e200v2.bin patched.bin}
+  \end{code}
+ 
+  If mkamsboot.exe does not report success, then retry or abort.
 
-% Same as above %
+\item Copy the output file (``patched.bin'' in the example given above) to the
+  root of the device and rename it to the same name as the OF file you downloaded earlier 
+  \opt{fuze}{(``fuzea.bin''} \opt{e200v2}{(``e200pe.bin''} above).
 
+\item Safely eject the device, unplug USB and wait for the firmware update to finish.
 \end{enumerate}
 
-\subsection{Bootloader installation from Linux}
+\subsection{Bootloader installation from Mac OS X and Linux}
 
 \begin{enumerate}
 
-% Lather rinse repeat %
+\item Create a folder called ``rbinstall'' in your home directory, and then
+  extract the OF, the bootloader and mkamsboot into it.
+
+\item Open a new terminal, and navigate to the ``rbinstall'' folder.
 
-\end{enumerate}
\ No newline at end of file
+\item Run mkamsboot, passing the name of the OF and bootloader files that
+  you downloaded, in addition to a name for the output file.
+
+  \begin{code} 
+    \opt{fuze}{./mkamsboot fuzea.bin bootloader-fuze.bin patched.bin}
+    \opt{e200v2}{./mkamsboot e200pe.bin bootloader-e200v2.bin patched.bin}
+  \end{code}
+ 
+  If mkamsboot does not report success, then retry or abort.
+
+\item Copy the output file (``patched.bin'' in the example given above) to the
+  root of the device and rename it to the same name as the OF file you downloaded earlier 
+  \opt{fuze}{(``fuzea.bin''} \opt{e200v2}{(``e200pe.bin''} above).
+
+\item Safely eject the device, unplug USB and wait for the firmware update to finish.
+\end{enumerate}