Added a note to the ipod installation instructions explaining that Rockbox requires the ipod to be formatted in the FAT32 file system, not HFS+.

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

2 files changed, 48 insertions, 14 deletions

diff --git a/manual/getting_started/installation.tex b/manual/getting_started/installation.tex
index 80c01224e9..87b895d4db 100644
--- a/manual/getting_started/installation.tex
+++ b/manual/getting_started/installation.tex
@@ -46,21 +46,20 @@ software.
   your \dap{}.
 
   \opt{ipod}{
-    \note{Your \dap{} should enter disk mode automatically when connected to a
-      computer via USB. If your computer does not recognise your \dap{}, you
-      may need to enter the disk mode manually. Disconnect your \dap{} from the
-      computer. Reset the \dap{} by pressing and holding the \ButtonMenu{} and
-      \ButtonSelect{} buttons simultaneously. As soon as the \dap{} resets,
-      press and hold the \ButtonMenu{} and \ButtonPlay{} buttons
-      simultaneously. Your \dap{} should enter disk mode, and you can try
-      reconnecting to the computer.
-    }
-    \opt{ipod3g,ipod4g,ipodcolor,ipodmini}{
-      \note{\index{Firewire}Firewire detection is not supported in Rockbox at
-        the moment. Please use USB only.}
-    }
+    Your \dap{} should enter disk mode automatically when connected to a 
+    computer via USB. If your computer does not recognise your \dap{}, you may 
+    need to enter the disk mode manually. Disconnect your \dap{} from the 
+    computer. Reset the \dap{} by pressing and holding the \ButtonMenu{} and 
+    \ButtonSelect{} buttons simultaneously. As soon as the \dap{} resets, press 
+    and hold the \ButtonMenu{} and \ButtonPlay{} buttons simultaneously. Your 
+    \dap{} should enter disk mode, and you can try reconnecting to the computer. 
+  }  
+         
+  \opt{ipod3g,ipod4g,ipodcolor,ipodmini}{
+    \note{\index{Firewire}Firewire detection is not supported in Rockbox at 
+    the moment. Please use USB only.} 
   }
-
+    
 \item[Text editor.]  As you will see in the following chapters, Rockbox is
   highly configurable. In addition to saving configurations within Rockbox,
   Rockbox also allows you to create customised configuration files. If you
@@ -69,6 +68,17 @@ software.
 
 \end{description}
 
+\opt{ipod}{
+  \note{In addition to the requirements described above, Rockbox only works on 
+  Ipods formatted with the FAT32 filesystem (i.e., Ipods initialised by iTunes 
+  for Windows). It does not work with the HFS+ filesystem (i.e. Ipods 
+  initialised by iTunes for the Mac). More information and instructions for 
+  converting an Ipod to FAT32 can be found on the 
+  \url{http://www.rockbox.org/twiki/bin/view/Main/IpodConversionToFAT32} wiki 
+  page on the Rockbox web site.  Note that after conversion, you can still use 
+  a FAT32 Ipod on a Mac. 
+  } 
+}
 
 \section{Installing Rockbox}\label{sec:installing_rockbox}
 \index{Installation}
diff --git a/manual/getting_started/ipod_install.tex b/manual/getting_started/ipod_install.tex
index 3db63aced8..4158d155ca 100755
--- a/manual/getting_started/ipod_install.tex
+++ b/manual/getting_started/ipod_install.tex
@@ -134,15 +134,39 @@ you wish. Note that these files should be saved onto your computer's hard disk,
  
   \item Install the bootloader.
     Windows users should now type:
+<<<<<<< ipod_install.tex
+      \begin{code}
+        \opt{ipodvideo}{ipodpatcher [device] -a bootloader-ipodvideo.ipod}%
+        \opt{ipodnano}{ipodpatcher [device] -a bootloader-ipodnano.ipod}%
+        \opt{ipodmini}{ipodpatcher [device] -a bootloader-ipodmini1g.ipod}%
+        \opt{ipodcolor}{ipodpatcher [device] -a bootloader-ipodcolor.ipod}%
+        \opt{ipod4g}{ipodpatcher [device] -a bootloader-ipod4g.ipod}%
+        \opt{ipod3g}{ipodpatcher [device] -a bootloader-ipod3g.ipod}%
+      \end{code}
+    
+=======
     \begin{code}
     ipodpatcher [device] -a \bootloaderfile
     \end{code}
     %
+>>>>>>> 1.27
     and Mac OS X/Unix users should type:
+<<<<<<< ipod_install.tex
+      \begin{code}
+        \opt{ipodvideo}{./ipodpatcher [device] -a bootloader-ipodvideo.ipod}%
+        \opt{ipodnano}{./ipodpatcher [device] -a bootloader-ipodnano.ipod}% 
+        \opt{ipodmini}{./ipodpatcher [device] -a bootloader-ipodmini1g.ipod}% 
+        \opt{ipodcolor}{./ipodpatcher [device] -a bootloader-ipodcolor.ipod}%
+        \opt{ipod4g}{./ipodpatcher [device] -a bootloader-ipod4g.ipod}%
+        \opt{ipod3g}{./ipodpatcher [device] -a bootloader-ipod3g.ipod}%
+      \end{code}
+    
+=======
     \begin{code}
     ./ipodpatcher [device] -a \bootloaderfile
     \end{code}
 
+>>>>>>> 1.27
   Replace [device] with the number (Windows users) or device name (Mac OS X/Unix 
   users) you've been using to access your ipod.