merge some fixes from the release branch that also apply to trunk

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

3 files changed, 7 insertions, 5 deletions

diff --git a/manual/configure_rockbox/sound_settings.tex b/manual/configure_rockbox/sound_settings.tex
index 3aa612a2da..c0116e40d7 100644
--- a/manual/configure_rockbox/sound_settings.tex
+++ b/manual/configure_rockbox/sound_settings.tex
@@ -20,12 +20,11 @@ change to customise your listening experience.
   \opt{player}{minimum of -78 dB to a maximum of +18 dB.}%
   \opt{recorder,recorderv2fm,ondio}{minimum of -100 dB to a maximum of +12 dB.}%
   \opt{h1xx,h300}{minimum of -84 dB to a maximum of 0 dB.}%
-  \opt{x5,m5}{minimum of -73 dB to a maximum of +6 dB.}%
+  \opt{x5,m5,ipod3g,ipod4g,gigabeatf,mrobe100}{minimum of -73 dB to a maximum of +6 dB.}%
   \opt{ipodnano}{minimum of -72 dB to a maximum of +6 dB.}%
   \opt{ipodvideo}{minimum of -57 dB to a maximum of +6 dB.}%
   \opt{ipodcolor,ipod1g2g,h10,h10_5gb,sansa}{minimum of -74 dB to a maximum
   of +6 db.}%
-  \opt{ipod3g,ipod4g,gigabeatf,mrobe100}{\fixme{add correct volume range.}}
 
 \section{Bass}
   This setting emphasises
diff --git a/manual/configure_rockbox/system_options.tex b/manual/configure_rockbox/system_options.tex
index 7282ea32ba..2a2121858f 100644
--- a/manual/configure_rockbox/system_options.tex
+++ b/manual/configure_rockbox/system_options.tex
@@ -21,7 +21,11 @@
       \opt{h1xx,h300}{1300mAh}%
       \opt{ipodmini}{400mAh (1G) or 630mAh (2G)}%
       \opt{ipodcolor}{700mAh}%
-      \opt{ipodnano,ipodvideo,ipod4g,ipod3g}{\fixme{unknown}}%
+      \opt{ipodnano}{300mAh}%
+      \opt{ipodvideo}{400mAh (30GB) or 600mAh (60/80GB)}%
+      \opt{ipod4g}{630mAh}%
+      \opt{ipod3g}{630mAh}%
+      \opt{ipod1g2g}{1200mAh}%
       \opt{m5,x5}{950mAh}%
       , which is the capacity value for the standard
       \opt{archos}{batteries}\nopt{archos}{battery} shipped with the \dap.
diff --git a/manual/getting_started/installation.tex b/manual/getting_started/installation.tex
index a55faf915a..7ad203723c 100644
--- a/manual/getting_started/installation.tex
+++ b/manual/getting_started/installation.tex
@@ -174,8 +174,7 @@ For manual installation and customization additional software is required.
 
 \subsection{Automated Installation}
 
-\opt{mrobe100}{\fixme{NOTE: The m:robe 100 is only supported in rbutil version 
-1.05 or greater which may not be available on the download site yet.}} 
+\opt{mrobe100}
 
 To automatically install Rockbox, download the official installer and
 housekeeping tool \textsc{Rockbox Utility}. It allows you to: