4 files changed, 9 insertions, 8 deletions

diff --git a/manual/configure_rockbox/display_options.tex b/manual/configure_rockbox/display_options.tex
index 9ea7e4713c..d06ab81bbd 100644
--- a/manual/configure_rockbox/display_options.tex
+++ b/manual/configure_rockbox/display_options.tex
@@ -166,7 +166,7 @@
         \opt{recorder,recorderv2fm}{\ButtonOn+\ButtonRight/\ButtonLeft}
         \opt{ondio}{\ButtonMenu+\ButtonRight/\ButtonLeft}
         \opt{c200,e200,h100,h300,ipod1g2g,ipod3g,ipod4g,ipodcolor,ipodmini,ipodnano,
-        ipodvideo,x5,mrobe100,gigabeatf,gigabeats}
+        ipodvideo,x5,mrobe100,gigabeatf,gigabeats,e200v2}
         {Long \ButtonRight/\ButtonLeft}\opt{h10,h10_5gb}{Long \ButtonRew/\ButtonFF}.
         Setting this option to \setting{Yes}
         will keep the list entries at their fixed positions and allow them to be
diff --git a/manual/configure_rockbox/recording_settings.tex b/manual/configure_rockbox/recording_settings.tex
index 27db3e86ce..67be4f2547 100644
--- a/manual/configure_rockbox/recording_settings.tex
+++ b/manual/configure_rockbox/recording_settings.tex
@@ -42,7 +42,7 @@
 }
 
   \section{Frequency}
-   \nopt{sansa}{
+   \nopt{sansa,sansaAMS}{
     Choose the recording frequency (sample rate).
     \opt{masf}{48kHz, 44.1kHz, 32kHz, 24kHz, 22.05kHz, 16kHz}
     \opt{h100,h300}{44.1kHz, 22.05kHz and 11.025kHz}
@@ -62,7 +62,7 @@
       {\note{You cannot change the sample rate for digital recordings.}
     }
    } % nopt e200  
-   \opt{e200}{ 
+   \opt{e200,e200v2}{ 
        Recordings can only be made at a 22.05kHz frequency (sample rate)
          on this \dap. 
     } % opt e200
@@ -71,7 +71,7 @@
   Choose the source of the recording. The options are: 
   \opt{recorder,recorderv2fm,h100}{\setting{SPDIF (digital)}, }%
   \nopt{ipodnano,ipodvideo}{\setting{Mic}}%
-  \nopt{sansa}{, and {\setting{Line In}}}. %
+  \nopt{sansa}{\nopt{sansaAMS}{, and {\setting{Line In}}}}. %
   \opt{radio}{For recording from the radio see \reference{ref:FMradio}.}
 
 \section{Channels}
diff --git a/manual/configure_rockbox/system_options.tex b/manual/configure_rockbox/system_options.tex
index 3c70f4a313..ec1dd052a0 100644
--- a/manual/configure_rockbox/system_options.tex
+++ b/manual/configure_rockbox/system_options.tex
@@ -8,7 +8,7 @@
     screen it was when the \dap{} was shut off.
 
 \nopt{sansa}%will probably be there on Sansas one day -  exclude it the simple way without specific option
-{
+{\nopt{sansaAMS}{
   \subsection{Battery}
   Options relating to the \opt{archos}{batteries}\nopt{archos}{battery}
   in the \dap.
@@ -56,7 +56,7 @@
       }
 
      \end{description}
-}
+}}
 \opt{dircache,HAVE_DISK_STORAGE}{
 \subsection{Disk}
     Options relating to the hard disk.
@@ -161,7 +161,7 @@ this option \setting{On}. If it is not required, then turning this setting
 } 
 
 \opt{HAVE_BUTTON_LIGHTS}{
-  \opt{e200}{
+  \opt{e200,e200v2}{
   \subsection{Wheel Light Timeout}
     This setting controls the amount of time the wheel lights shine after a
     button press or wheel turn. If set to \setting{Off}, the LEDs will not
@@ -169,7 +169,7 @@ this option \setting{On}. If it is not required, then turning this setting
     never shut off. If set to a time (1 to 120 seconds), the wheel will stay
     lit for that amount of time after a button press or wheel turn.
   }
-  \nopt{e200}{
+  \nopt{e200,e200v2}{
   \subsection{Button Light Timeout}
     This setting controls the amount of time the button lights shine after a
     button press. If set to \setting{Off}, the LEDs will not light when a
diff --git a/manual/configure_rockbox/theme_settings.tex b/manual/configure_rockbox/theme_settings.tex
index b87c0f8583..5db6013a39 100644
--- a/manual/configure_rockbox/theme_settings.tex
+++ b/manual/configure_rockbox/theme_settings.tex
@@ -34,6 +34,7 @@ customize the visual apperance of Rockbox.
   \opt{ipodmini}{\url{http://themes.rockbox.org/index.php?target=ipodmini}}%
   \opt{ipodnano}{\url{http://themes.rockbox.org/index.php?target=ipodnano}}%
   \opt{e200}{\url{http://themes.rockbox.org/index.php?target=e200}}%
+  \opt{e200v2}{\url{http://themes.rockbox.org/index.php?target=e200v2}}%
   \opt{c200}{\url{http://themes.rockbox.org/index.php?target=c200}}%
   \opt{gigabeatf}{\url{http://themes.rockbox.org/index.php?target=gigabeatf}}%
   \opt{gigabeats}{\url{http://themes.rockbox.org/index.php?target=gigabeats}}%