summaryrefslogtreecommitdiffstats
path: root/manual
diff options
context:
space:
mode:
authorMichael DiFebbo <medifebbo@rockbox.org>2007-01-02 23:22:44 +0000
committerMichael DiFebbo <medifebbo@rockbox.org>2007-01-02 23:22:44 +0000
commit6f3914d7cebf63b7d064ca02216649b1644164e4 (patch)
treeefeb2e7ccff16963bc0a452394df98e582f09d05 /manual
parentda8059fca5a5228c4fc51ce6840a529db4f6f32a (diff)
downloadrockbox-6f3914d7cebf63b7d064ca02216649b1644164e4.tar.gz
rockbox-6f3914d7cebf63b7d064ca02216649b1644164e4.tar.bz2
rockbox-6f3914d7cebf63b7d064ca02216649b1644164e4.zip
Whoops. That file shouldn't have been changed.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11888 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'manual')
-rwxr-xr-xmanual/getting_started/ipod_install.tex26
1 files changed, 2 insertions, 24 deletions
diff --git a/manual/getting_started/ipod_install.tex b/manual/getting_started/ipod_install.tex
index 4158d155ca..43fe580b18 100755
--- a/manual/getting_started/ipod_install.tex
+++ b/manual/getting_started/ipod_install.tex
@@ -134,39 +134,17 @@ 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.