5 files changed, 28 insertions, 9 deletions
diff --git a/manual/getting_started/installation.tex b/manual/getting_started/installation.tex
index e5bf71365c..6a22bbdb4b 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,ipodnano2g,ipodvideo,e200,c200,e200v2}{
+\opt{ipodnano,ipodnano2g,ipodvideo,e200,c200,e200v2,clip}{
 \begin{description}  
 \item[Supported hardware versions.] 
     \opt{ipodnano,ipodnano2g}{
@@ -42,7 +42,15 @@ follow the instructions at
     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.
-}  
+}
+  \opt{clip}{
+    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 by checking the Sandisk firmware version number under 
+    Settings $\rightarrow$ System Info. The v1 firmware is named 01.xx.xx,
+    while the v2 firmware begins with 02.  In addition, Rockbox does not
+    run on the Clip+.
+}
 \end{description}
 }
 
@@ -98,12 +106,12 @@ follow the instructions at
     is intended to be used for USB OTG connections only (digital cameras, memory
     sticks, etc.).
   }    
-  \opt{sansa,e200v2}{
+  \opt{sansa,e200v2,clip}{
     \note{The following steps require you to change the setting in
     \setting{Settings $\rightarrow$ USB Mode} to \setting{MSC} from within the
     original firmware.}
 
-    \nopt{e200v2}{\warn{Never extract files to your \dap{} while it is in recovery mode.}}
+    \nopt{e200v2,clip}{\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
@@ -238,8 +246,9 @@ housekeeping tool \caps{Rockbox Utility}. It allows you to:
 Prebuilt binaries for Windows, Linux and Mac OS X are
 available at the \wikilink{RockboxUtility} wiki page.\\
 
-\opt{gigabeats}{\note{Rockbox Utility does not currently support the Gigabeat S
-and you will therefore need to follow the manual install instructions below.\\}}
+\opt{gigabeats,clip}{\note{Rockbox Utility does not currently support the 
+\playertype{} and you will therefore need to follow the manual install
+instructions below.\\}}
 
 When first starting \caps{Rockbox Utility} run ``Autodetect'',
 found in the configuration dialog (File $\rightarrow$ Configure). Autodetection
@@ -428,7 +437,7 @@ structure that Rockbox needs.\\}
   \end{itemize}
 }
 
-\opt{h10,h10_5gb,ipod,mrobe100,sansa,archos}{
+\opt{h10,h10_5gb,ipod,mrobe100,sansa,archos,sansaAMS}{
   Safely eject / unmount the USB drive, unplug the cable and restart.
 }
 
diff --git a/manual/getting_started/sansaAMS_install.tex b/manual/getting_started/sansaAMS_install.tex
index 06ef577c44..7ef2eedf17 100644
--- a/manual/getting_started/sansaAMS_install.tex
+++ b/manual/getting_started/sansaAMS_install.tex
@@ -9,10 +9,13 @@ files:
       \url{http://forums.sandisk.com/sansa/board/message?board.id=e200&thread.id=13548}}
     \opt{fuze}{
       \url{http://forums.sandisk.com/sansa/board/message?board.id=sansafuse&thread.id=23276}}
+    \opt{clip}{
+      \url{http://forums.sandisk.com/sansa/board/message?board.id=clip&thread.id=15109}}
 
   \item The bootloader: 
     \opt{e200v2}{\download{bootloader/sandisk-sansa/e200v2/bootloader-e200v2.sansa}}
     \opt{fuze}{\download{bootloader/sandisk-sansa/fuze/bootloader-fuze.sansa}}
+    \opt{clip}{\download{bootloader/sandisk-sansa/clip/bootloader-clip.sansa}}
 
   \item The version of mkamsboot for your operating system from
     \download{bootloader/sandisk-sansa/mkamsboot/}
@@ -33,13 +36,15 @@ files:
   \begin{code} 
     \opt{fuze}{mkamsboot.exe fuzea.bin bootloader-fuze.sansa patched.bin}
     \opt{e200v2}{mkamsboot.exe e200pe.bin bootloader-e200v2.sansa patched.bin}
+    \opt{clip}{mkamsboot.exe m300a.bin bootloader-clip.sansa patched.bin}
   \end{code}
  
   If mkamsboot.exe 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).
+  \opt{fuze}{(``fuzea.bin''} \opt{e200v2}{(``e200pe.bin''}
+  \opt{clip}{(``m300a.bin''} above).
 
 \item Safely eject the device, unplug USB and wait for the firmware update to finish.
 \end{enumerate}
@@ -59,13 +64,15 @@ files:
   \begin{code} 
     \opt{fuze}{./mkamsboot fuzea.bin bootloader-fuze.sansa patched.bin}
     \opt{e200v2}{./mkamsboot e200pe.bin bootloader-e200v2.sansa patched.bin}
+    \opt{clip}{./mkamsboot m300a.bin bootloader-clip.sansa 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).
+  \opt{fuze}{(``fuzea.bin''} \opt{e200v2}{(``e200pe.bin''}
+  \opt{clip}{(``m300a.bin''} above).
 
 \item Safely eject the device, unplug USB and wait for the firmware update to finish.
 \end{enumerate}
diff --git a/manual/platform/clip.tex b/manual/platform/clip.tex
index c6811b6316..15c251735e 100644
--- a/manual/platform/clip.tex
+++ b/manual/platform/clip.tex
@@ -5,6 +5,7 @@
 \edef\UseOption{\UseOption,HAVE_CAR_ADAPTER_MODE}
 \edef\UseOption{\UseOption,HAVE_BUTTON_LIGHTS}
 \edef\UseOption{\UseOption,sansaAMS}
+\edef\UseOption{\UseOption,HAVE_RB_BL_ON_DISK}
 
 \newcommand{\playerman}{Sansa}
 \newcommand{\playertype}{Clip}
diff --git a/manual/platform/e200v2.tex b/manual/platform/e200v2.tex
index 7aa32d337b..d68f298be0 100644
--- a/manual/platform/e200v2.tex
+++ b/manual/platform/e200v2.tex
@@ -5,6 +5,7 @@
 \edef\UseOption{\UseOption,HAVE_CAR_ADAPTER_MODE}
 \edef\UseOption{\UseOption,HAVE_BUTTON_LIGHTS}
 \edef\UseOption{\UseOption,sansaAMS}
+\edef\UseOption{\UseOption,HAVE_RB_BL_ON_DISK}
 
 \newcommand{\playerman}{Sansa}
 \newcommand{\playertype}{e200v2 Series}
diff --git a/manual/platform/fuze.tex b/manual/platform/fuze.tex
index 887d62ea89..d11752bd0b 100644
--- a/manual/platform/fuze.tex
+++ b/manual/platform/fuze.tex
@@ -5,6 +5,7 @@
 \edef\UseOption{\UseOption,HAVE_CAR_ADAPTER_MODE}
 \edef\UseOption{\UseOption,HAVE_BUTTON_LIGHTS}
 \edef\UseOption{\UseOption,sansaAMS}
+\edef\UseOption{\UseOption,HAVE_RB_BL_ON_DISK}
 
 \newcommand{\playerman}{Sansa}
 \newcommand{\playertype}{Fuze}