Reverted r23881 mistakenly committed to branch.v3.4

git-svn-id: svn://svn.rockbox.org/rockbox/branches/v3_4@23882 a1c6a512-1295-4272-9138-f99709370657

1 files changed, 6 insertions, 6 deletions

diff --git a/manual/appendix/file_formats.tex b/manual/appendix/file_formats.tex
index 2ca8582388..cbf1ab2c07 100644
--- a/manual/appendix/file_formats.tex
+++ b/manual/appendix/file_formats.tex
@@ -25,9 +25,9 @@
     the first file \\
 \includegraphics[width=0.37cm]{appendix/images/icon-rolo.png} 
   & Rockbox firmware & 
-    \opt{archosplayer}{\fname{.mod}}\opt{archosrecorder,archosrecorderv2fm,archosondiofm,archosondiosp}{\fname{.ajz}}%
-    \opt{iriverh100,iriverh300}{\fname{.iriver}}\opt{ipod}{\fname{.ipod}}\opt{iaudio}{\fname{.iaudio}}%
-    \opt{iriverh10,iriverh10_5gb,sansa}{\fname{.mi4}}\opt{gigabeat}{\fname{.gigabeat}}%
+    \opt{player}{\fname{.mod}}\opt{recorder,recorderv2fm,ondiofm,ondiosp}{\fname{.ajz}}%
+    \opt{h100,h300}{\fname{.iriver}}\opt{ipod}{\fname{.ipod}}\opt{iaudio}{\fname{.iaudio}}%
+    \opt{h10,h10_5gb,sansa}{\fname{.mi4}}\opt{gigabeat}{\fname{.gigabeat}}%
     \opt{sansaAMS}{\fname{.sansa}}
   & Load the new firmware with ROLO \\
 \includegraphics[width=0.37cm]{appendix/images/icon-wps.png} 
@@ -100,16 +100,16 @@
     Apple Lossless & \fname{.m4a, .mp4} & \\
     Wavpack & \fname{.wv} & \\
     Shorten & \fname{.shn} & Seeking not supported.\\
-    \opt{iriverh100,iriverh300,iaudiox5,iaudiom5,iaudiom3}{
+    \opt{h100,h300,x5,m5,m3}{
       Monkey's Audio & \fname{.ape, .mac} & -c1000 and -c2000 files decode
       fast enough to be useful.}
-    \opt{gigabeatfx}{
+    \opt{gigabeatf}{
       Monkey's Audio & \fname{.ape, .mac} & -c1000 to -c3000
       files decode fast enough to be useful.}
     \opt{gigabeats}{
       Monkey's Audio & \fname{.ape, .mac} & -c1000 to -c4000 files decode
       fast enough to be useful.}
-    \opt{ipod,iriverh10,iriverh10_5gb,mrobe100,sansa}{
+    \opt{ipod,h10,h10_5gb,mrobe100,sansa}{
       Monkey's Audio & \fname{.ape, .mac} & Only -c1000 files decode fast
       enough to be useful.}
     \\