Use the generated feature to control inclusion of sections about different battery types, add 'battery type' to config file options

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

4 files changed, 4 insertions, 3 deletions

diff --git a/manual/appendix/config_file_options.tex b/manual/appendix/config_file_options.tex
index 8835909ae8..3021d5477d 100644
--- a/manual/appendix/config_file_options.tex
+++ b/manual/appendix/config_file_options.tex
@@ -83,6 +83,9 @@
     brightness      & \fixme{device a way to get ranges from config-*.h} & N/A\\
     disk spindown   & 3 to 254          & seconds\\
     battery capacity & \fixme{device a way to get ranges from config-*.h} & mAh\\
+    \opt{battery_types}{
+      battery type  & alkaline, nimh    & N/A\\
+    }
     \opt{HAVE_CAR_ADAPTER_MODE}{
       car adapter mode & on, off & N/A\\
     }
diff --git a/manual/configure_rockbox/system_options.tex b/manual/configure_rockbox/system_options.tex
index 44a4c7e646..7282ea32ba 100644
--- a/manual/configure_rockbox/system_options.tex
+++ b/manual/configure_rockbox/system_options.tex
@@ -37,7 +37,7 @@
         family at present, and work is on-going into finding a better way to
         determine battery life.}
 
-      \opt{BATTERY_TYPES}{%Ondios only (currently), following the lang features.txt
+      \opt{battery_types}{
       \item [Battery Type: ]This setting tells Rockbox which type of battery
         is currently used in the \dap{}. The two supported battery types are
         ``Alkaline'' or ``NiMH''.}
diff --git a/manual/platform/ondiofm.tex b/manual/platform/ondiofm.tex
index 1960afdd34..7980213bb3 100644
--- a/manual/platform/ondiofm.tex
+++ b/manual/platform/ondiofm.tex
@@ -5,7 +5,6 @@
 \edef\UseOption{\UseOption,ondio}
 \edef\UseOption{\UseOption,MASCODEC}
 \edef\UseOption{\UseOption,ONDIO_PAD}
-\edef\UseOption{\UseOption,BATTERY_TYPES}
 \edef\UseOption{\UseOption,archos}
 
 \newcommand{\playerman}{Archos}
diff --git a/manual/platform/ondiosp.tex b/manual/platform/ondiosp.tex
index 48641710e0..e965d506c9 100644
--- a/manual/platform/ondiosp.tex
+++ b/manual/platform/ondiosp.tex
@@ -4,7 +4,6 @@
 \edef\UseOption{\UseOption,ondio}
 \edef\UseOption{\UseOption,MASCODEC}
 \edef\UseOption{\UseOption,ONDIO_PAD}
-\edef\UseOption{\UseOption,BATTERY_TYPES}
 \edef\UseOption{\UseOption,archos}
 
 \newcommand{\playerman}{Archos}