1 files changed, 15 insertions, 30 deletions

diff --git a/manual/getting_started/installation.tex b/manual/getting_started/installation.tex
index 5766c222eb..0b3b25a4e8 100644
--- a/manual/getting_started/installation.tex
+++ b/manual/getting_started/installation.tex
@@ -286,20 +286,18 @@ still available to you.\\
 \end{description}
 }
 
-\nopt{player} {
-    Apart from the required parts there are some addons you might be interested
-    in installing.
-    \begin{description}
-    \item[Fonts.] Rockbox can load custom fonts. The fonts are
-        distributed as a separate package and thus need to be installed
-        separately. They are not required to run Rockbox itself but
-        a lot of themes require the fonts package to be installed.
-
-    \item[Themes.] The appearance of Rockbox can be customised by themes. Depending
-        on your taste you might want to install additional themes to change
-        the look of Rockbox.
-    \end{description}
-}
+Apart from the required parts there are some addons you might be interested
+in installing.
+\begin{description}
+\item[Fonts.] Rockbox can load custom fonts. The fonts are
+    distributed as a separate package and thus need to be installed
+    separately. They are not required to run Rockbox itself but
+    a lot of themes require the fonts package to be installed.
+
+\item[Themes.] The appearance of Rockbox can be customised by themes. Depending
+    on your taste you might want to install additional themes to change
+    the look of Rockbox.
+\end{description}
 
 \subsection{Automated Installation}
 
@@ -310,7 +308,7 @@ housekeeping tool \caps{Rockbox Utility}. It allows you to:
         (``Minimal Installation'').
 \item Automatically install all suggested components (``Complete Installation'').
 \item Selectively install optional components.
-\nopt{player}{\item Install additional fonts and themes.}
+\item Install additional fonts and themes.
 \item Install voice files and generate talk clips.
 \item Uninstall all components you installed using Rockbox Utility.
 \end{itemize}
@@ -492,13 +490,6 @@ create a separate directory on your \dap{} for the Rockbox
 files! The \fname{.zip} file already contains the internal
 structure that Rockbox needs.\\}
 
-\opt{archos}{
- If the contents of the \fname{.zip} file are extracted correctly, you will
- have a file called \fname{\firmwarefilename} in the main directory of your
- \daps{} drive, and also a directory called \fname{.rockbox}, which contains a
- number of other directories and system files needed by Rockbox.
-}
-
 % This has nothing to do with swcodec, just that these players need our own
 % bootloader so we can decide where we want the main binary.
 \opt{swcodec}{
@@ -559,7 +550,7 @@ structure that Rockbox needs.\\}
   \end{itemize}
 }
 
-\opt{iriverh10,iriverh10_5gb,ipod,mrobe100,sansa,archos,cowond2,vibe500,ondavx777,samsungyh}{
+\opt{iriverh10,iriverh10_5gb,ipod,mrobe100,sansa,cowond2,vibe500,ondavx777,samsungyh}{
   Safely eject / unmount the USB drive, unplug the cable and restart.
 }
 
@@ -709,7 +700,7 @@ The new build will be installed over your current build.\\
 
 \section{Uninstalling Rockbox}\index{Installation!uninstall}
 
-\nopt{gigabeatf,iaudiom3,iaudiom5,iaudiox5,archos,mrobe100,gigabeats,fuzeplus}{
+\nopt{gigabeatf,iaudiom3,iaudiom5,iaudiox5,mrobe100,gigabeats,fuzeplus}{
   \note{The Rockbox bootloader allows you to choose between Rockbox and 
   the original firmware. (See \reference{ref:Dualboot} for more information.)}
 }
@@ -727,12 +718,6 @@ completely follow the manual uninstallation instructions below.}}
 
 \subsection{Manual Uninstallation}
 
-\opt{archos}{
-  If you would like to go back to using the original \playerman{} software,
-  connect the \dap{} to your computer, and delete the
-  \fname{\firmwarefilename} file.
-}
-
 \opt{iriverh10,iriverh10_5gb,mrobe100,vibe500,samsungyh}{
   If you would like to go back to using the original \playerman{} software,
   connect the \dap{} to your computer, and delete the