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

3 files changed, 32 insertions, 32 deletions

diff --git a/manual/rockbox_interface/browsing_and_playing.tex b/manual/rockbox_interface/browsing_and_playing.tex
index 9be15adeb1..bdbb97ef5c 100644
--- a/manual/rockbox_interface/browsing_and_playing.tex
+++ b/manual/rockbox_interface/browsing_and_playing.tex
@@ -35,7 +35,7 @@ generated as \fname{<MMC1>}, and will behave exactly as any other directory
 on the \dap{}.
 }
 
-\opt{iriverh10,iriverh10_5gb}{\note{
+\opt{h10,h10_5gb}{\note{
 If your \dap{} is a MTP model, the Music directory where all your music is stored
 may be hidden in the \setting{File Browser}. This may be fixed by either
 either changing its properties (on a computer) to not hidden, or by changing
@@ -78,7 +78,7 @@ the \setting{Show Files} setting to all.
          & If there is an audio file playing, returns to the
          \setting{While Playing Screen} (WPS) without stopping playback.\\
       %
-      \nopt{archosplayer,sansac200}%
+      \nopt{player,c200}%
         {%
           \ActionTreeStop 
           \opt{HAVEREMOTEKEYMAP}{& \ActionRCTreeStop}
@@ -317,7 +317,7 @@ can be easily changed by making a text file with the required layout.  More
   \end{table}
 }
 
-\opt{archosplayer}{
+\opt{player}{
   The current text line to be entered or edited is always listed on the first
   line of the display. The second line of the display can contain the character
   selection bar, as in the screenshot above.
diff --git a/manual/rockbox_interface/main.tex b/manual/rockbox_interface/main.tex
index 72a1fa5fe4..f8768c3ceb 100644
--- a/manual/rockbox_interface/main.tex
+++ b/manual/rockbox_interface/main.tex
@@ -9,7 +9,7 @@
 % The extension is selected in the preamble, so no further \ifpdfoutput
 % is necessary.
 \includegraphics[height=8cm,width=10cm,keepaspectratio=true]{rockbox_interface/images/\specimg-front}
-\opt{iaudiom3}{% replace with HAVEREMOTEKEYMAP when the h100 file exists or change specimg
+\opt{m3}{% replace with HAVEREMOTEKEYMAP when the h100 file exists or change specimg
   \end{center}
   % spacing between the two pictures, could possibly be improved
   \begin{center}
@@ -27,7 +27,7 @@ described in detail in the following paragraph.
   \wikilink{BlindFAQ}.
   
   %
-  \opt{iriverh100}{
+  \opt{h100}{
   Hold or lay the \dap{} so that the side with the joystick and LCD is facing
   towards you, and the curved side is at the top. The joystick functions as
   the \ButtonUp{}, \ButtonRight{}, \ButtonLeft{}, and \ButtonDown{} buttons when
@@ -48,7 +48,7 @@ described in detail in the following paragraph.
   \dap{} hard locks, you can reset it by inserting a paper clip into the hole
   where the reset switch is.}
   % 
-  \opt{iriverh300}{
+  \opt{h300}{
   Hold or lay the \dap{} so that the side with the button pad and
   LCD is facing towards you.  The buttons on the button pad are as follows:  top 
   left corner: \ButtonOn{}, bottom left corner: \ButtonOff{}, top right corner: 
@@ -74,7 +74,7 @@ described in detail in the following paragraph.
   used in Rockbox. 
   }
   %
-  \opt{ipod4g,ipodcolor,ipodvideo,ipodmini1g}{ 
+  \opt{ipod4g,ipodcolor,ipodvideo,ipodmini}{ 
   The main controls on the \dap{} are a slightly indented scroll wheel 
   with a flat round button in the center. Hold the \dap{} with these controls 
   facing you. 
@@ -84,7 +84,7 @@ described in detail in the following paragraph.
   \opt{ipod4g,ipodcolor}{remote connector, headphone jack, \ButtonHold{} 
     switch.}
   \opt{ipodvideo}{\ButtonHold{} switch, headphone jack.}
-  \opt{ipodmini1g}{\ButtonHold{} switch, remote connector, headphone jack.}     
+  \opt{ipodmini}{\ButtonHold{} switch, remote connector, headphone jack.}       
 
   The dock connector that is used to connect your \dap{} to your computer is on 
   the bottom panel of the \dap{}.
@@ -156,7 +156,7 @@ described in detail in the following paragraph.
   \ButtonHold{} is off before trying to use your player. 
   }
   %
-  \opt{ipodnano1g}{
+  \opt{ipodnano}{
   The main controls on the \dap{} are a slightly indented wheel with a
   flat round button in the center. Hold the \dap{} with these controls on the
   top surface. There is a \ButtonHold{} switch at one end, and
@@ -194,7 +194,7 @@ described in detail in the following paragraph.
   round crosspad is labelled \ButtonMenu{}.
   }
   %
-  \opt{iriverh10,iriverh10_5gb}{
+  \opt{h10,h10_5gb}{
   Hold or lay the \dap{} so that the side with the scroll pad and
   LCD is facing towards you. In the centre below the lcd is the scroll pad. It
   is oriented vertically. Touching the top and bottom half of it acts as the 
@@ -207,12 +207,12 @@ described in detail in the following paragraph.
   hand side is the \ButtonPower{} button.
 
   On the top panel of the \dap{}, from left to right, you can find the 
-  following: \ButtonHold{} switch, \opt{iriverh10}{reset pin hole, }remote port and
+  following: \ButtonHold{} switch, \opt{h10}{reset pin hole, }remote port and
   headphone mini jack plug. 
   
   On the bottom panel of the \dap{} is the data cable port.}
   %
-  \opt{gigabeatfx}{
+  \opt{gigabeatf}{
   \note{The following description is for the Gigabeat F, but can also apply for the
   Gigabeat X. The Gigabeat F is slightly larger and more rectangular shaped, while the
   Gigabeat X is smaller and has a slightly tapered back.}
@@ -285,7 +285,7 @@ described in detail in the following paragraph.
   bottom of the unit, there is a connector for the docking station or the 
   proprietary USB connector for connecting directly to USB.}
   %
-  \opt{iaudiox5,iaudiom5}{
+  \opt{x5,m5}{
   The \dap{} is curved so that the end with the screen on it is thicker than the 
   other end.  Hold the \dap{} wih the thick end towards the top and the screen
   facing towards you.  Half way up the front of the unit on the right hand side
@@ -306,14 +306,14 @@ described in detail in the following paragraph.
   reset by inserting a paper clip.
   
   On the bottom of the unit is the connector for the 
-  \archosplayerman{} subpack or dock.  On the top of the unit is a charge 
+  \playerman{} subpack or dock.  On the top of the unit is a charge 
   indicator light, which may feel a bit like a button, but is not.
   
   From the top of the \dap{} on the left hand side is the headphone socket, then the 
-  remote connector.  Below this is a cover which protects the \opt{iaudiox5}{USB host
-  connector.}\opt{iaudiom5}{USB and charging connector}.}
+  remote connector.  Below this is a cover which protects the \opt{x5}{USB host
+  connector.}\opt{m5}{USB and charging connector}.}
   %
-  \opt{sansae200}{
+  \opt{e200}{
   Hold the \dap{} with the turning wheel at the front and bottom.  On the bottom left
   of the front of the \dap{} is a raised round button, the \ButtonPower{} button.
   Above and to the left of this, on the outside of the turning wheel are four 
@@ -329,7 +329,7 @@ described in detail in the following paragraph.
   other buttons have any effect.  Just to the left of the \ButtonHold{} switch is a
   small hole which contains the internal microphone.}
   %
-  \opt{sansac200}{
+  \opt{c200}{
   Hold the \dap{} with the buttons on the right and the screen on the left. On
   the right side of the unit, there is a series of four connected buttons that
   form a square. The four sides of the square are the \ButtonUp{},
@@ -351,7 +351,7 @@ described in detail in the following paragraph.
   Immediately above the headphone socket is a lanyard loop and the microphone.
   }
   %
-  \opt{sansaclip}{
+  \opt{clip}{
   Hold the \dap{} with the controls on the bottom and the screen on the top. The main
   controls are a four-way pad with a button in the centre; pressing this centre button
   functions as \ButtonSelect{}. Going clockwise from the top, the four-way pad contains
@@ -369,7 +369,7 @@ described in detail in the following paragraph.
   above this button is the headphone jack.
   }
   %
-  \opt{archosplayer}{
+  \opt{player}{
   The main controls of this player are a four-way button on the right below
   the screen, and two round buttons to the left of it. Hold the \dap{} with
   these controls on the bottom and facing you.
@@ -384,7 +384,7 @@ described in detail in the following paragraph.
   the DC-In jack on the right, and the USB connector in the centre.
   }
   %
-  \opt{archosrecorder}{
+  \opt{recorder}{
   Holding the Jukebox in front of you, there should be three rectangular buttons
   in a horizontal line towards the middle of the unit, and below this to the left
   there is a circular four button array with the circular \ButtonPlay{} button
@@ -405,7 +405,7 @@ described in detail in the following paragraph.
   the right. On the bottom of the \dap{} is the Line-In jack on the left, the
   DC-In jack on the right, and the USB connector in the centre.
   }
-  \opt{archosrecorderv2fm}{
+  \opt{recorderv2fm}{
   Holding the Jukebox in front of you, there should be three rectangular buttons
   in a horizontal line towards the middle of the unit, and below this centred on the
   middle button there are four radial arc shaped buttons placed in a cross formation
@@ -441,8 +441,8 @@ To turn on and off your Rockbox enabled \dap{} use the following keys:
       & Start Rockbox\\
       \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{Long \ButtonOff}%
       \opt{IPOD_4G_PAD,IPOD_3G_PAD}{Long \ButtonPlay}%
-      \opt{ONDIO_PAD,archosrecorderv2fm}{Long \ButtonOff}%
-      \opt{archosrecorder}{Double tap \ButtonOff\ when playback is stopped}%
+      \opt{ONDIO_PAD,recorderv2fm}{Long \ButtonOff}%
+      \opt{recorder}{Double tap \ButtonOff\ when playback is stopped}%
       \opt{PLAYER_PAD}{From the Main Menu, select \textbf{Shutdown}}%
       \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD,GIGABEAT_S_PAD,sansaAMS}%
           {Long \ButtonPower}%
@@ -476,11 +476,11 @@ To turn on and off your Rockbox enabled \dap{} use the following keys:
   performed by inserting a paperclip gently into the Reset hole.
 }%
 
-\nopt{gigabeatfx,iaudiom3,iaudiom5,iaudiox5,archos}
+\nopt{gigabeatf,m3,m5,x5,archos}
   {
   \subsection{Starting the original firmware}
   \label{ref:Dualboot}
-  \opt{ipod4g,ipodcolor,ipodvideo,ipodnano1g,ipodmini1g}
+  \opt{ipod4g,ipodcolor,ipodvideo,ipodnano,ipodmini}
     {
     Rockbox has a dual-boot feature. To boot into the original firmware, shut
     down the device as described above. Turn on the \ButtonHold{} switch
@@ -512,22 +512,22 @@ To turn on and off your Rockbox enabled \dap{} use the following keys:
     simultaneously until the player hard resets.
     }
 
-  \opt{iriverh100,iriverh300}
+  \opt{h100,h300}
     {
     Rockbox has a dual-boot feature. To boot into the original firmware,
     when the \dap{} is turned off, press and hold the \ButtonRec{} button,
     and then press the \ButtonOn{} button.
     }
 
-  \opt{iriverh10,iriverh10_5gb}
+  \opt{h10,h10_5gb}
     {
     Rockbox has a dual-boot feature. It loads the original firmware from
     the file \fname{/System/OF.mi4}. To boot into the original firmware,
     press and hold the \ButtonLeft{} button while turning on the player.
     \note{The iriver firmware does not shut down properly when you turn it off,
     it only goes to sleep. To get back into Rockbox when exiting from the
-    iriver firmware, you will need to reset the player by \opt{iriverh10}{inserting a
-    pin in the reset hole}\opt{iriverh10_5gb}{removing and reinserting the battery}.}
+    iriver firmware, you will need to reset the player by \opt{h10}{inserting a
+    pin in the reset hole}\opt{h10_5gb}{removing and reinserting the battery}.}
     }
     
   \opt{sansa,sansaAMS}
diff --git a/manual/rockbox_interface/wps.tex b/manual/rockbox_interface/wps.tex
index 362311ddaf..2c8ecfa17d 100644
--- a/manual/rockbox_interface/wps.tex
+++ b/manual/rockbox_interface/wps.tex
@@ -30,7 +30,7 @@ currently playing audio file.
   \item Peak meter.
   \end{itemize}
 }
-\opt{archosrecorder,archosrecorderv2fm,ondio}{
+\opt{recorder,recorderv2fm,ondio}{
   \note{
   \begin{itemize}
   \item The number of lines shown depends on the size of the font used.
@@ -40,7 +40,7 @@ currently playing audio file.
   }
 }
 %
-\opt{archosplayer}{
+\opt{player}{
   \note{
   \begin{itemize}
   \item Playlist index/Playlist size: Artist {}- Title.