From 1535529cc33e421218e9fa21f82a1f34ad9a9a7a Mon Sep 17 00:00:00 2001
From: Nils Wallménius <nils@rockbox.org>
Date: Tue, 20 Mar 2007 11:59:01 +0000
Subject: Make changes to installation chapter to reflect that the
 rockbox.whatever file is now by default inside the .rockbox directory (for
 swcodec targets)

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12850 a1c6a512-1295-4272-9138-f99709370657
---
 manual/getting_started/installation.tex | 50 ++++++++++++++++++++++++---------
 1 file changed, 36 insertions(+), 14 deletions(-)

(limited to 'manual')

diff --git a/manual/getting_started/installation.tex b/manual/getting_started/installation.tex
index 45568769b8..ae6088746a 100644
--- a/manual/getting_started/installation.tex
+++ b/manual/getting_started/installation.tex
@@ -132,9 +132,9 @@ software.
     \opt{HAVE_RB_BL_ON_DISK}{Similar to the \playerman{} firmware, }
     most of the Rockbox code is contained in a
     ``build'' that resides on your \daps{} drive. This makes it easy to
-    update Rockbox. The build consists of a file named \firmwarefilename{} and a
-    directory called \fname{.rockbox}, both of which are located in the root
-    directory of your \daps{} drive.
+    update Rockbox. The build consists of a directory called
+    \fname{.rockbox} containg all of Rockbox' files, which is located in the
+    root of your \daps{} drive.
 
   \end{description}
 
@@ -208,14 +208,28 @@ drive. Do not try to create a separate directory or folder on your \dap{} for
 the Rockbox files! The \fname{.zip} file already contains the internal
 directory structure that Rockbox needs.
 
-\note{
-  If the contents of the \fname{.zip} file are extracted correctly, you will
-  have a file called \fname{\firmwarefilename} in the main folder of your
-  \daps{} drive, and also a folder called \fname{/.rockbox}, which contains a
-  number of other folders and system files needed by Rockbox. If you receive a
-  ``-1'' error when you start Rockbox, you have not extracted the contents of
-  the \fname{.zip} file to the proper location.
-	}
+\opt{archos}{
+  \note{
+    If the contents of the \fname{.zip} file are extracted correctly, you will
+    have a file called \fname{\firmwarefilename} in the main folder of your
+    \daps{} drive, and also a folder called \fname{/.rockbox}, which contains a
+    number of other folders and system files needed by Rockbox. If you receive a
+     ``-1'' error when you start Rockbox, you have not extracted the contents of
+    the \fname{.zip} file to the proper location.
+  }
+}
+
+% This has nothing to do with swcodec, just that these players need our own
+% bootloader so we can decide where we want the main binary.
+\opt{SWCODEC}{
+  \note{
+    If the contents of the \fname{.zip} file are extracted correctly, you will
+    have a folder called \fname{/.rockbox}, which contains all the files needed
+    by Rockbox, in the main folder of your \daps{} drive. If you receive a
+    ``-1'' error when you start Rockbox, you have not extracted the contents of
+    the \fname{.zip} file to the proper location.
+  }
+}
 
 \opt{SWCODEC}{
   \subsection{Installing the boot loader}
@@ -268,9 +282,17 @@ The new build will be installed over your current build.
 
 \section{Uninstalling Rockbox}\index{Installation!uninstall}
 
-If you would like to go back to using the original \playerman{} software,
-connect the \dap{} to your computer, and delete the
-\fname{\firmwarefilename} file.
+\opt{archos}{
+  If you would like to go back to using the original \playerman{} software,
+  connect the \dap{} to your computer, and delete the
+  \fname{\firmwarefilename} file.
+}
+
+\opt{SWCODEC}{
+  If you would like to go back to using the original \playerman{} software,
+  connect the \dap{} to your computer, and delete the
+  \fname{/.rockbox/\firmwarefilename} file.
+}
 
 \opt{h10,h10_5gb}{
   Next, put the \opt{h10}{\fname{H10\_20GC.mi4}}\opt{h10_5gb}{\fname{H10.mi4}}
-- 
cgit