6 files changed, 8 insertions, 27 deletions

diff --git a/manual/configure_rockbox/display_options.tex b/manual/configure_rockbox/display_options.tex
index e482417f0b..4978753444 100755
--- a/manual/configure_rockbox/display_options.tex
+++ b/manual/configure_rockbox/display_options.tex
@@ -194,10 +194,8 @@
     \opt{lcd_bitmap}{
       \item[Screen Scrolls Out of View.]
         Screens can be manually scrolled horizontally by pressing
-        \opt{RECORDER_PAD}{\ButtonOn+\ButtonRight/\ButtonLeft}%
-        \opt{ONDIO_PAD}{\ButtonMenu+\ButtonRight/\ButtonLeft}%
         \opt{IRIVER_H10_PAD}{Long \ButtonRew/\ButtonFF}%
-        \nopt{RECORDER_PAD,ONDIO_PAD,IRIVER_H10_PAD,MPIO_HD200_PAD,MPIO_HD300_PAD%
+        \nopt{IRIVER_H10_PAD,MPIO_HD200_PAD,MPIO_HD300_PAD%
               ,touchscreen}{%
             Long \ButtonRight/\ButtonLeft}.
         Setting this option to \setting{Yes}
diff --git a/manual/configure_rockbox/playback_options.tex b/manual/configure_rockbox/playback_options.tex
index 53ca4a1658..8554abdcfa 100644
--- a/manual/configure_rockbox/playback_options.tex
+++ b/manual/configure_rockbox/playback_options.tex
@@ -42,7 +42,7 @@ you to configure settings related to audio playback.
         Setting the End Point (B) is done accordingly using
         \ActionWpsAbSetBNextDir{}.  To reset the markers press \ActionWpsAbReset{}.
     }%
-    \opt{ipod,IAUDIO_X5_PAD,ONDIO_PAD,PLAYER_PAD,PBELL_VIBE500_PAD}{%
+    \opt{ipod,IAUDIO_X5_PAD,PBELL_VIBE500_PAD}{%
         To set the Start Point (A) press \ActionWpsBrowse{}. The following
         press of \ActionWpsBrowse{} will set the End Point (B), and a third
         successive \ActionWpsBrowse{} will reset the markers.
diff --git a/manual/configure_rockbox/recording_settings.tex b/manual/configure_rockbox/recording_settings.tex
index 0175631cf7..5fc8f16840 100644
--- a/manual/configure_rockbox/recording_settings.tex
+++ b/manual/configure_rockbox/recording_settings.tex
@@ -165,12 +165,11 @@
     Resets the location where the recorded files are saved to the root of your
     \daps{} drive.
 
-\nopt{ondio}{
-  \section{Clipping Light}
+\section{Clipping Light}
     Causes the backlight to flash on when clipping has been detected.\\
     Options: \setting{Off}, \setting{Main unit only},
     \setting{Main and remote unit}, \setting{Remote unit only}.
-}
+
 \section{Trigger}
   When you record a source you often are only interested in the sound and not
   the silence in between. The recording trigger provides you with a
diff --git a/manual/configure_rockbox/sound_settings.tex b/manual/configure_rockbox/sound_settings.tex
index f9f0a747dd..fd5efa189b 100644
--- a/manual/configure_rockbox/sound_settings.tex
+++ b/manual/configure_rockbox/sound_settings.tex
@@ -17,8 +17,6 @@ change to customise your listening experience.
       an otherwise low volume level.
   }
   The volume can be adjusted from a
-  \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{iriverh100,iriverh300}{minimum of -84~dB to a maximum of 0~dB.}%
   \opt{iaudiom3,iaudiom5,iaudiox5,ipod3g,ipod4g,gigabeatf,mrobe100,mpiohd200}{%
       minimum of -73~dB to a maximum of +6~dB.}%
diff --git a/manual/configure_rockbox/system_options.tex b/manual/configure_rockbox/system_options.tex
index 7c3300b875..28d1c1a577 100755
--- a/manual/configure_rockbox/system_options.tex
+++ b/manual/configure_rockbox/system_options.tex
@@ -4,14 +4,12 @@
 \nopt{sansa,fuzeplus}%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}
+  Options relating to the battery
   in the \dap.
   \begin{description}
     \item [Battery Capacity.] This setting can be used to tell Rockbox what
       capacity (in mAh) the battery being used has. The default is
-      \opt{player,recorder}{1500~mAh}%
-      \opt{recorderv2fm}{2200~mAh}%
-      \opt{ondiosp,ondiofm,vibe500}{1000~mAh}%
+      \opt{vibe500}{1000~mAh}%
       \opt{iriverh100,iriverh300}{1300~mAh}%
       \opt{mpiohd200}{850~mAh}%
       \opt{ipodmini}{400~mAh (1G) or 630~mAh (2G)}%
@@ -28,8 +26,7 @@
       \opt{mrobe100}{720~mAh}%
       \opt{samsungyh920,samsungyh925}{900~mAh}%
       \opt{samsungyh820}{650~mAh}%
-      , which is the capacity value for the standard
-      \opt{archos}{batteries}\nopt{archos}{battery} shipped with the \dap.
+      , which is the capacity value for the standard battery shipped with the \dap.
         Rockbox uses this value for runtime estimation, not battery percentage
         calculation. Changing this setting has no effect whatsoever on
         actual battery life. This setting only affects the accuracy of the
@@ -118,7 +115,6 @@ This sub menu relates to limits in the Rockbox operating system.
     Entries in File Browser} or \setting{Max Playlist Size} to take effect
     while \setting{Glyphs To Cache} will affect the next font load.}
 % TODO: this needs to be rewritten in another style, it lets you mix sound from another source into the music
-\opt{player}{
   \subsection{Line In} This option activates the line-in port on \dap, which is
     off by default. This is useful for such applications as:
     \begin{itemize}
@@ -126,7 +122,6 @@ This sub menu relates to limits in the Rockbox operating system.
     \item laptop $\rightarrow$ \dap $\rightarrow$ human
     \item LAN party computer $\rightarrow$ \dap $\rightarrow$ human
     \end{itemize}
-}
 \opt{quickscreen}{
   \subsection{Use Shortcuts Menu Instead of Quick Screen} This option
   activates the shortcuts menu instead of opening the quick screen when enabled.
diff --git a/manual/configure_rockbox/theme_settings.tex b/manual/configure_rockbox/theme_settings.tex
index 9677e663ae..2cbe57b014 100644
--- a/manual/configure_rockbox/theme_settings.tex
+++ b/manual/configure_rockbox/theme_settings.tex
@@ -14,11 +14,6 @@ customize the visual appearance of Rockbox.
 
   There are a number of themes that ship with Rockbox. If none of
   these suit your needs, many more can be downloaded from 
-  \opt{player}{\url{http://themes.rockbox.org/index.php?target=player}}%
-  \opt{recorder}{\url{http://themes.rockbox.org/index.php?target=fmrecorder}}%
-  \opt{recorderv2fm}{\url{http://themes.rockbox.org/index.php?target=fmrecorder}}%
-  \opt{ondiofm}{\url{http://themes.rockbox.org/index.php?target=ondiofm}}%
-  \opt{ondiosp}{\url{http://themes.rockbox.org/index.php?target=ondiosp}}%
   \opt{iaudiom5}{\url{http://themes.rockbox.org/index.php?target=m5}}%
   \opt{iaudiox5}{\url{http://themes.rockbox.org/index.php?target=x5}}%
   \opt{iaudiom3}{\url{http://themes.rockbox.org/index.php?target=m3}}%
@@ -56,7 +51,7 @@ customize the visual appearance of Rockbox.
   \item[Font.]
     Browse the installed fonts on your \dap{}. Selecting one will activate it.
     See \reference{ref:Loadingfonts} for further details about fonts.
-} % \nopt{player}
+}
 
 \item[While Playing Screen.]
   Opens the \setting{File Browser} in the \fname{/.rockbox/wps} directory and
@@ -106,10 +101,6 @@ customize the visual appearance of Rockbox.
         \item[Remote Status Bar.] Allows you to choose where to display the 
         statusbar on the remote display.
       }
-      \opt{RECORDER_PAD}{
-       \item[Button Bar.] Enables or disables the button bar prompts for the
-         ``F''-keys at the bottom of the screen.
-      }
       \item[Volume Display.] Controls whether the volume is displayed as a
         graphic or a numeric value on the Status Bar. If you select a numeric
         display, volume is displayed in decibels.  See \reference{ref:volume}