4 files changed, 2 insertions, 13 deletions

diff --git a/manual/configure_rockbox/recording_settings.tex b/manual/configure_rockbox/recording_settings.tex
index 5fc8f16840..09b5b76b3c 100644
--- a/manual/configure_rockbox/recording_settings.tex
+++ b/manual/configure_rockbox/recording_settings.tex
@@ -91,7 +91,6 @@
   Choose the source of the recording. The options are:
   \opt{recording_digital}{\setting{Digital} (SPDIF), }%
   \opt{recording_mic}{\setting{Microphone}}%
-  \opt{recording_hwcodec}{ and \setting{Line~In}.}%
   \opt{recording_swcodec}{%
       \nopt{radio}{\opt{recording_linein}{ and \setting{Line~In}.}}%
       \opt{radio}{%
diff --git a/manual/getting_started/installation.tex b/manual/getting_started/installation.tex
index 0b3b25a4e8..77a3e326f9 100644
--- a/manual/getting_started/installation.tex
+++ b/manual/getting_started/installation.tex
@@ -243,8 +243,6 @@ still available to you.\\
   various important aspects of Rockbox, such as the different versions
   available.\\}}
 
-\opt{hwcodec}{Rockbox itself comes as a single package. There is no need
-  to install additional software to run Rockbox.}
 \opt{swcodec} {
   \opt{HAVE_RB_BL_ON_DISK}{There are three separate components,
     two of which need to be installed in order to run Rockbox:}
@@ -690,10 +688,8 @@ The new build will be installed over your current build.\\
   data partition.\\}
 }
 
-\nopt{hwcodec}{
-  The bootloader only changes rarely, and should not normally
-  need to be updated.\\
-}
+The bootloader only changes rarely, and should not normally
+need to be updated.\\
 
 \note{If you use Rockbox Utility be aware that it cannot detect manually
         installed components.}
diff --git a/manual/main_menu/recording_screen.tex b/manual/main_menu/recording_screen.tex
index a3c8ca006c..0d1de44c83 100644
--- a/manual/main_menu/recording_screen.tex
+++ b/manual/main_menu/recording_screen.tex
@@ -22,7 +22,6 @@ recording.\\*
 the peak meters to freeze in the process. This is expected behaviour, and
 nothing to worry about. The recording continues during the spin up.\\*}}}
 
-\opt{recording_hwcodec}{The frequency, channels and quality}
 \opt{recording_swcodec}{The frequency and channels} settings are shown in the
 status bar.\\*
 
diff --git a/manual/plugins/pictureflow.tex b/manual/plugins/pictureflow.tex
index 017c42d9b7..1915cc38c9 100644
--- a/manual/plugins/pictureflow.tex
+++ b/manual/plugins/pictureflow.tex
@@ -5,11 +5,6 @@ art. \opt{swcodec}{It is possible to start playback of the selected
 album from PictureFlow. Playback will start from the selected track. The 
 PictureFlow plugin will continue to run while your tracks are played.}
 
-\opt{hwcodec}{
-\note{PictureFlow is a visualisation only. It cannot be used to select and
-play music.  Also, using this plugin will cause playback to stop.}
-}
-
 \subsubsection{Requirements}
 PictureFlow uses both the album art (see \reference{ref:album_art}) and 
 database (see \reference{ref:database}) features of Rockbox.