diff --git a/manual/getting_started/ipod_install.tex b/manual/getting_started/ipod_install.tex
index a60d8a455d..fa3d06e685 100644
--- a/manual/getting_started/ipod_install.tex
+++ b/manual/getting_started/ipod_install.tex
@@ -17,7 +17,7 @@ step once.
 \begin{enumerate}
 
 \item Make sure you are logged into your computer as Administrator, or a 
-user with Administrator privileges and connect your ipod.
+user with Administrator privileges and connect your \dap{}.
 
 \item Download ipodpatcher.exe from 
 \download{bootloader/ipod/ipodpatcher/win32/ipodpatcher.exe} 
@@ -32,10 +32,10 @@ ipodpatcher.
 
 \item Make sure you have a \fname{rockbox.ipod} file and a 
 \fname{.rockbox} folder in the 
-root of your Ipod's drive and that you have also installed the fonts
-package - see \reference{sec:installing_firmware} for more information.
+root of your \daps{} drive and that you have also installed the fonts
+package -- see \reference{sec:installing_firmware} for more information.
 
-\item Disconnect your ipod in the usual way. The bootloader is now installed. 
+\item Disconnect your \dap{} in the usual way. The bootloader is now installed. 
 
 \end{enumerate}
 
@@ -43,42 +43,44 @@ package - see \reference{sec:installing_firmware} for more information.
 
 \begin{enumerate}
 
-\item Attach your ipod to your Mac and wait for its icon to appear in 
+\item Attach your \dap{} to your Mac and wait for its icon to appear in 
 Finder. If you have configured itunes to open automatically when your
-ipod is attached (the default behaviour), then wait for it to open and
+\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 ipod in itunes.
+is enabled for your \dap{} in itunes.
 
-\item Open up Disk Utility (in Applications $\rightarrow$ Utilities) and click 
-on the name of your ipod (e.g. DAVES IPOD) in the list on the left 
-pane. Then click on the ``unmount'' icon at the top. \warn{NOTE: DO NOT click 
-on the ``eject'' icon.}
+\item\label{subsec:macos_umount} Open up Disk Utility
+(in Applications $\rightarrow$ Utilities) and click 
+on the name of your \dap{} (e.g. DAVES IPOD) in the list on the left 
+pane. Then click on the ``unmount'' icon at the top. \warn{Do \emph{not}
+click on the ``eject'' icon.}
 
 \item Download and open ipodpatcher.dmg from 
 \download{bootloader/ipod/ipodpatcher/macosx/ipodpatcher.dmg} 
 and then double-click on the ipodpatcher icon inside. 
 
 \item If all has gone well, you should see some 
-information displayed about your ipod and a message asking you if you 
+information displayed about your \dap{} and a message asking you if you 
 wish to install the Rockbox bootloader. Press i followed by ENTER, and 
 ipodpatcher will now install the bootloader. After a short time you 
 should see the message ``[INFO] Bootloader installed successfully.'' Press 
 ENTER again to exit ipodpatcher and then quit the Terminal application.
 
-\item \warn{NOTE: If you received a ``Resource busy'' error from 
-ipodpatcher, then this means you didn't complete step 2). Go back to 
-Disk Utility, unmount your ipod and then run ipodpatcher again.}
+\item \warn{If you received a ``Resource busy'' error from 
+ipodpatcher, then this means you didn't complete step 
+\ref{subsec:macos_umount}. Go back to Disk Utility, unmount your
+\dap{} and then run ipodpatcher again.}
 
-\item Your ipod will now automatically reconnect itself to your Mac. 
+\item Your \dap{} will now automatically reconnect itself to your Mac. 
 Wait for it to connect, and then eject and unplug it in the normal way. 
-NOTE: You should unplug your ipod immediately after ejecting it to 
-prevent Rockbox immediately rebooting your ipod into disk mode when it 
-detects that your ipod is attached to a computer. 
+\note{You should unplug your ipod immediately after ejecting it to 
+prevent Rockbox immediately rebooting your \dap{} into disk mode when it 
+detects that your \dap{} is attached to a computer. }
 
 \item Make sure you have a \fname{rockbox.ipod} file and a 
 \fname{.rockbox} folder in the 
-root of your Ipod's drive and that you have also installed the fonts
-package - see \reference{sec:installing_firmware} for more information.
+root of your \daps{} drive and that you have also installed the fonts
+package -- see \reference{sec:installing_firmware} for more information.
 
 \end{enumerate}
 
@@ -92,18 +94,18 @@ binary) or \download{bootloader/ipod/ipodpatcher/linux64amd64/ipodpatcher}
 (64-bit amd64 binary). You can save this anywhere you wish, but the next 
 steps will assume you've saved it in your home directory.
 
-\item Attach your ipod to your computer.
+\item Attach your \dap{} to your computer.
 
 \item Open up a terminal window and type the following commands:
 
-    \begin{code} 
-         cd $HOME
-         chmod +x ipodpatcher
-         ./ipodpatcher
-    \end{code}
+\begin{code} 
+    cd $HOME
+    chmod +x ipodpatcher
+    ./ipodpatcher
+\end{code}
 
-\warn{NOTE: You may need to be the root user in order for ipodpatcher to have
-sufficient permission to perform raw disk access to your ipod.}
+\warn{You may need to be the root user in order for ipodpatcher to have
+sufficient permission to perform raw disk access to your \dap{}.}
 
 \item If all has gone well, you should see some information displayed about
 your ipod and a message asking you if you wish to install the Rockbox 
@@ -113,9 +115,9 @@ installed successfully.'' Press ENTER again to exit ipodpatcher.
 
 \item Make sure you have a \fname{rockbox.ipod} file and a 
 \fname{.rockbox} folder in the 
-root of your Ipod's drive and that you have also installed the fonts
-package - see \reference{sec:installing_firmware} for more information.
+root of your \daps{} drive and that you have also installed the fonts
+package -- see \reference{sec:installing_firmware} for more information.
 
-\item Disconnect your ipod in the usual way. The bootloader is now installed. 
+\item Disconnect your \dap{} in the usual way. The bootloader is now installed. 
 
 \end{enumerate}