2 files changed, 9 insertions, 7 deletions

diff --git a/manual/appendix/config_file_options.tex b/manual/appendix/config_file_options.tex
index f37e0b753b..53ae5d5b35 100644
--- a/manual/appendix/config_file_options.tex
+++ b/manual/appendix/config_file_options.tex
@@ -10,8 +10,8 @@
     \toprule
     \textbf{Setting} & \textbf{Allowed Values} & \textbf{Unit}\\
     \midrule\localendhead % endhead breaks with htlatex
-    volume      & \opt{player}{-78 to +18}%
-                  \opt{recorder,recorderv2fm,ondiosp,ondiofm}{-100 -to +12}%
+    volume      & \opt{masd}{-78 to +18}%
+                  \opt{masf}{-100 -to +12}%
                   \opt{h100,h300}{-84 to 0}%
                   \opt{ipodnano}{-72 to +6}%
                   \opt{ipodvideo}{-57 to +6}%
@@ -20,12 +20,14 @@
                   \opt{ipodcolor}{-74 to +6}%
                                         & dB\\
     \nopt{x5}{%
-      bass      & \opt{MASCODEC}{-15 to +15}%
+      bass      & \opt{masd}{-15 to +15}%
+                  \opt{masf}{-12 to +12}%
                   \opt{h100,h300}{0 to +24}%
                   \opt{ipod}{-6 to +9}%
                   \opt{e200}{-24 to +24}%
                                         & dB\\
-      treble    & \opt{MASCODEC}{-15 to +15}%
+      treble    & \opt{masd}{-15 to +15}%
+                  \opt{masf}{-12 to +12}%
                   \opt{h100,h300}{0 to +6}%
                   \opt{ipod}{-6 to +9}%
                   \opt{e200}{-24 to +24}%
@@ -200,7 +202,7 @@
       tagcache\_ram & on, off           & N/A\\
     }%
 
-    \opt{recorder,recorderv2fm}{
+    \opt{masf}{
       loudness      & 0 to 17           & N/A\\
       superbass     & on, off           & N/A\\
       auto volume   & off, 20ms, 2s, 4s, 8s
diff --git a/manual/appendix/file_formats.tex b/manual/appendix/file_formats.tex
index 07226eaed8..8103037364 100644
--- a/manual/appendix/file_formats.tex
+++ b/manual/appendix/file_formats.tex
@@ -10,7 +10,7 @@
   & Directory & \emph{none} & Enter the directory \\
 \includegraphics[width=0.37cm]{appendix/images/icon-audio-file.png} 
   & Audio file & 
-  \opt{MASCODEC}{\fname{.mp2, .mp3}}%
+  \opt{masd,masf}{\fname{.mp2, .mp3}}%
   \opt{swcodec}{\emph{various}\newline%
   (see \ref{ref:Supportedaudioformats}})%
   % do NOT use \reference{} here as that will break the table.
@@ -55,7 +55,7 @@
  \includegraphics[width=0.37cm]{appendix/images/icon-movie-file.png}
  & Video & \fname{.mpg, .mpeg, .mpv, .m2v} & Play the MPEG1/2 video \\
 }
-\opt{MASCODEC}{\opt{lcd_bitmap}{
+\opt{masf}{\opt{lcd_bitmap}{
   \includegraphics[width=0.37cm]{appendix/images/icon-movie-file.png} 
     & Rockbox Video & \fname{.rvf} & View the movie (Rockbox format)\\}
 }