Correct reset and disk mode combinations for 1G - 3G iPods. Closes FS#11011.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24966 a1c6a512-1295-4272-9138-f99709370657

2 files changed, 17 insertions, 14 deletions

diff --git a/manual/getting_started/installation.tex b/manual/getting_started/installation.tex
index 826189f..c481a6f 100644
--- a/manual/getting_started/installation.tex
+++ b/manual/getting_started/installation.tex
@@ -124,17 +124,19 @@ follow the instructions at
 
   \opt{ipod}{
     If you have Itunes installed and it is configured to open automatically
-    when your \dap{} is attached (the default behaviour), 
-    then wait for it to open and then quit it. You
-    also need to ensure the ``Enable use as disk'' option is enabled for
-    your \dap{} in Itunes. Your \dap{} should then enter disk mode
-    automatically when connected to a computer via \nopt{ipod1g2g}{USB.}\opt{ipod1g2g}{Firewire.}
-    If your computer does not recognise your \dap{}, you may
-    need to enter disk mode manually. Disconnect your \dap{} from the
-    computer. Hard reset the \dap{} by pressing and holding the \ButtonMenu{} and
-    \ButtonSelect{} buttons simultaneously. As soon as the \dap{} resets, press
-    and hold the \ButtonSelect{} and \ButtonPlay{} buttons simultaneously. Your
-    \dap{} should enter disk mode and you can try reconnecting to the computer.
+    when your \dap{} is attached (the default behaviour), then wait for it to
+    open and then quit it. You also need to ensure the ``Enable use as disk''
+    option is enabled for your \dap{} in Itunes. Your \dap{} should then enter
+    disk mode automatically when connected to a computer via
+    \nopt{ipod1g2g}{USB.}\opt{ipod1g2g}{Firewire.} If your computer does not
+    recognise your \dap{}, you may need to enter disk mode manually. Disconnect
+    your \dap{} from the computer. Hard reset the \dap{} by pressing and
+    holding the \ButtonMenu{} and \nopt{IPOD_3G_PAD}{\ButtonSelect{}}%
+    \opt{IPOD_3G_PAD}{\ButtonPlay{}} buttons simultaneously. As soon as the
+    \dap{} resets, press and hold the \nopt{IPOD_3G_PAD}{\ButtonSelect{} and
+    \ButtonPlay{}}\opt{IPOD_3G_PAD}{\ButtonLeft{} and \ButtonRight{}} buttons
+    simultaneously. Your \dap{} should enter disk mode and you can try
+    reconnecting to the computer.
   }
   \opt{x5}{
     When instructed to connect/disconnect the USB cable, always use
@@ -527,8 +529,8 @@ to speak file and folder names.
 \nopt{ipod,gigabeats,cowond2}{When
 you turn the unit on, Rockbox should load.}
 \opt{ipod}{Hard reset the Ipod by holding
-  \opt{IPOD_4G_PAD}{\ButtonMenu{}+\ButtonSelect{}}%
-  \opt{IPOD_3G_PAD}{\ButtonMenu{}+\ButtonPlay{}}
+  \opt{IPOD_4G_PAD}{\ButtonMenu{} and \ButtonSelect{} simultaneously}%
+  \opt{IPOD_3G_PAD}{\ButtonMenu{} and \ButtonPlay{} simultaneously}
   for a couple of seconds until the \dap{} resets. Now Rockbox should load.
 }
 
diff --git a/manual/rockbox_interface/main.tex b/manual/rockbox_interface/main.tex
index 0cf077d..7769ac8 100644
--- a/manual/rockbox_interface/main.tex
+++ b/manual/rockbox_interface/main.tex
@@ -513,7 +513,8 @@ To turn on and off your Rockbox enabled \dap{} use the following keys:
   In the unlikely event of a software failure, hardware poweroff or reset can be
   performed by holding down \opt{PLAYER_PAD}{\ButtonStop}\opt{RECORDER_PAD,ONDIO_PAD}
   {\ButtonOff}\opt{GIGABEAT_PAD}{the battery switch}\opt{IPOD_4G_PAD}
-  {\ButtonMenu + \ButtonSelect}\opt{IPOD_3G_PAD}{\ButtonMenu + \ButtonPlay}
+  {\ButtonMenu{} and \ButtonSelect{} simultaneously}%
+  \opt{IPOD_3G_PAD}{\ButtonMenu{} and \ButtonPlay{} simultaneously}%
   \opt{SANSA_E200_PAD,SANSA_C200_PAD,IAUDIO_X5_PAD,IAUDIO_M5_PAD}
   {\ButtonPower} until the \dap{} shuts off or reboots.
 }%