diff options
author | Marianne Arnold <pixelma@rockbox.org> | 2010-08-16 09:43:48 +0000 |
---|---|---|
committer | Marianne Arnold <pixelma@rockbox.org> | 2010-08-16 09:43:48 +0000 |
commit | 5b47b89d16fe2cef7654dba1edaa5043196c9e14 (patch) | |
tree | 8848a014b828469c4209149ef42e945c274dd7a9 /manual/getting_started/installation.tex | |
parent | e8bbbdffd41d140e442f184a11b194af61a263d8 (diff) | |
download | rockbox-5b47b89d16fe2cef7654dba1edaa5043196c9e14.tar.gz rockbox-5b47b89d16fe2cef7654dba1edaa5043196c9e14.zip |
First step of completing the target rename in the manual. Some target specific options were already renamed in the rest of the source (e.g. see r23883) but not where they are actually set - in the platform files - leading to parts included or excluded incorrectly. The problem exists for more targets, this commit deals with the supported Iaudios first. Rename 'x5' to 'iaudiox5' (do the same for 'm5' and 'm3'), fix small errors or add missing info related to them along the way, use more appropriate options and simplify code a bit where possible.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27823 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'manual/getting_started/installation.tex')
-rw-r--r-- | manual/getting_started/installation.tex | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/manual/getting_started/installation.tex b/manual/getting_started/installation.tex index 2ee4f84c29..179210e7f4 100644 --- a/manual/getting_started/installation.tex +++ b/manual/getting_started/installation.tex | |||
@@ -149,7 +149,7 @@ follow the instructions at | |||
149 | simultaneously. Your \dap{} should enter disk mode and you can try | 149 | simultaneously. Your \dap{} should enter disk mode and you can try |
150 | reconnecting to the computer. | 150 | reconnecting to the computer. |
151 | } | 151 | } |
152 | \opt{x5}{ | 152 | \opt{iaudiox5}{ |
153 | When instructed to connect/disconnect the USB cable, always use | 153 | When instructed to connect/disconnect the USB cable, always use |
154 | the USB port through the subpack, not the side `USB Host' port. The side port | 154 | the USB port through the subpack, not the side `USB Host' port. The side port |
155 | is intended to be used for USB OTG connections only (digital cameras, memory | 155 | is intended to be used for USB OTG connections only (digital cameras, memory |
@@ -268,7 +268,7 @@ still available to you.\\ | |||
268 | \dap{} how to load and start other components of Rockbox and for providing | 268 | \dap{} how to load and start other components of Rockbox and for providing |
269 | the dual boot function. This is the component of Rockbox that is installed | 269 | the dual boot function. This is the component of Rockbox that is installed |
270 | to the flash memory of your \playerman. | 270 | to the flash memory of your \playerman. |
271 | \opt{iaudio}{\note{Dual boot does not currently work on the \playertype{}.}}} | 271 | \opt{iaudiom3,iaudiom5,iaudiox5}{\note{Dual boot does not currently work on the \playertype.}}} |
272 | 272 | ||
273 | \item[The Rockbox firmware.] | 273 | \item[The Rockbox firmware.] |
274 | \opt{HAVE_RB_BL_IN_FLASH}{Unlike the \playerman{} firmware, which runs | 274 | \opt{HAVE_RB_BL_IN_FLASH}{Unlike the \playerman{} firmware, which runs |
@@ -476,7 +476,7 @@ structure that Rockbox needs.\\} | |||
476 | \subsubsection{Installing the bootloader} | 476 | \subsubsection{Installing the bootloader} |
477 | \opt{h100,h300}{\input{getting_started/iriver_install.tex}} | 477 | \opt{h100,h300}{\input{getting_started/iriver_install.tex}} |
478 | \opt{ipod}{\input{getting_started/ipod_install.tex}} | 478 | \opt{ipod}{\input{getting_started/ipod_install.tex}} |
479 | \opt{m3,m5,x5}{\input{getting_started/iaudio_install.tex}} | 479 | \opt{iaudio}{\input{getting_started/iaudio_install.tex}} |
480 | \opt{h10,h10_5gb}{\input{getting_started/h10_install.tex}} | 480 | \opt{h10,h10_5gb}{\input{getting_started/h10_install.tex}} |
481 | \opt{gigabeatf}{\input{getting_started/gigabeat_install.tex}} | 481 | \opt{gigabeatf}{\input{getting_started/gigabeat_install.tex}} |
482 | \opt{sansa}{\input{getting_started/sansa_install.tex}} | 482 | \opt{sansa}{\input{getting_started/sansa_install.tex}} |
@@ -503,7 +503,7 @@ structure that Rockbox needs.\\} | |||
503 | \end{itemize} | 503 | \end{itemize} |
504 | } | 504 | } |
505 | 505 | ||
506 | \opt{m3,m5,x5}{ | 506 | \opt{iaudiom3,iaudiom5,iaudiox5}{ |
507 | After installing you \emph{need} to power-cycle the | 507 | After installing you \emph{need} to power-cycle the |
508 | \dap{} by doing the following steps. | 508 | \dap{} by doing the following steps. |
509 | \begin{itemize} | 509 | \begin{itemize} |
@@ -600,7 +600,7 @@ you turn the unit on, Rockbox should load.} | |||
600 | } | 600 | } |
601 | } | 601 | } |
602 | 602 | ||
603 | \opt{m3}{ | 603 | \opt{iaudiom3}{ |
604 | \fixme{Add a note about the charging trick and place it here?} | 604 | \fixme{Add a note about the charging trick and place it here?} |
605 | } | 605 | } |
606 | 606 | ||
@@ -630,7 +630,7 @@ The new build will be installed over your current build.\\ | |||
630 | 630 | ||
631 | \section{Uninstalling Rockbox}\index{Installation!uninstall} | 631 | \section{Uninstalling Rockbox}\index{Installation!uninstall} |
632 | 632 | ||
633 | \nopt{gigabeatf,m5,x5,archos,mrobe100,gigabeats}{ | 633 | \nopt{gigabeatf,iaudiom3,iaudiom5,iaudiox5,archos,mrobe100,gigabeats}{ |
634 | \note{The Rockbox bootloader allows you to choose between Rockbox and | 634 | \note{The Rockbox bootloader allows you to choose between Rockbox and |
635 | the original firmware. (See \reference{ref:Dualboot} for more information.)} | 635 | the original firmware. (See \reference{ref:Dualboot} for more information.)} |
636 | } | 636 | } |
@@ -695,7 +695,7 @@ completely follow the manual uninstallation instructions below.}} | |||
695 | instead of \texttt{i} for install. | 695 | instead of \texttt{i} for install. |
696 | } | 696 | } |
697 | 697 | ||
698 | \opt{m5,x5}{ | 698 | \opt{iaudiom3,iaudiom5,iaudiox5}{ |
699 | If you would like to go back to using the original \playerman{} software, | 699 | If you would like to go back to using the original \playerman{} software, |
700 | connect the \dap{} to your computer, download the original \playername{} | 700 | connect the \dap{} to your computer, download the original \playername{} |
701 | firmware from the \playerman{} website, and copy it to the \fname{FIRMWARE} | 701 | firmware from the \playerman{} website, and copy it to the \fname{FIRMWARE} |
@@ -727,7 +727,7 @@ completely follow the manual uninstallation instructions below.}} | |||
727 | \nopt{gigabeats}{ | 727 | \nopt{gigabeats}{ |
728 | If you wish to clean up your disk, you may also wish to delete the | 728 | If you wish to clean up your disk, you may also wish to delete the |
729 | \fname{.rockbox} directory and its contents. | 729 | \fname{.rockbox} directory and its contents. |
730 | \nopt{m5,x5}{Turn the \playerman{} off. | 730 | \nopt{iaudiom3,iaudiom5,iaudiox5}{Turn the \playerman{} off. |
731 | Turn the \dap{} back on and the original \playerman{} software will load.} | 731 | Turn the \dap{} back on and the original \playerman{} software will load.} |
732 | } | 732 | } |
733 | 733 | ||