update documentation

3 files changed, 60 insertions, 14 deletions

diff --git a/BUGS.txt b/BUGS.txt
index a33bfd1..9d18332 100644
--- a/BUGS.txt
+++ b/BUGS.txt
@@ -1,16 +1,14 @@
 
 Caveats/Known Issues:
 
-  - Camera doesn't work
+- Camera doesn't work
   https://bugzilla.redhat.com/show_bug.cgi?id=498900
 
-  - SD boots sometimes fail (mount: unknown filesystem type: 'jffs2')
+- SD boots sometimes fail (mount: unknown filesystem type: 'jffs2')
   https://bugzilla.redhat.com/show_bug.cgi?id=500196
 
-
-  - Power management is disabled (XO is configured not to sleep since
-    rtcwake never wakes up)
-
+- Power management is disabled (XO is configured not to sleep since
+  rtcwake never wakes up)
 
 Please reply or comment on the Fedora/Redhat bug report if you see any
 of these.
diff --git a/README.txt b/README.txt
index 8854fd7..26f1563 100644
--- a/README.txt
+++ b/README.txt
@@ -1,7 +1,18 @@
-Downloading - Quick Start
+Instructions for experts:
+------------
+either:  copy-nand u:\soasxo??.img
+or:  cat soasxo??.removable.tar.lzma | lzma -dc - | tar xf - -O - > /dev/sdX
+
+
+Quick Start for normal people:
 -------------
 
-The easiest way to use Sugar-on-a-Stick on your XO is:
+Create a removable drive with Sugar for use on your XO.
+
+You need to have an unlocked XO first.  See instructions here for
+unlocking:
+
+http://wiki.laptop.org/go/Activation_and_Developer_Keys#Disable_the_security_system
 
 1) Download the right sized-image:
 
@@ -9,8 +20,45 @@ The easiest way to use Sugar-on-a-Stick on your XO is:
 
 **** THIS WILL ERASE EVERYTHING ON YOUR REMOVABLE DRIVE ****
 
-dd if=soas-v1-strawberry-xo-4g of=/dev/sdX
+ cat soasxoXX.removable.tar.lzma | lzma -dc - | tar xf - -O - > /dev/sdX
+
+Replace the "XX" with the right filename, and replace the "/dev/sdX"
+with the name of your removable device (the _whole device_, NOT a
+partition like /dev/sda1)
+
+3) When this is done, eject the device and be sure all data were
+   written:
+
+ eject /dev/sdX ; sync ; sync
+
+4) Plug the stick/card into your XO-1 and power it on.
+
+
+
+Replace your XO operating system
+-------------
+
+There is another way - you can replace your XO's operating system:
+
+**** THIS WILL ERASE EVERYTHING ON YOUR XO laptop ****
+
+1) Download the latest files:
+
+soasxo.img
+soasxo.crc
+
+2) Copy it to a removable drive
+
+3) Plug in your removable drive and press "Esc" after powering up your
+XO.
+
+4a) If your removable drive is a USB drive, type:
+
+copy-nand u:\soasxo.img
+
+4b) If your removable drive is a SD card, type:
 
-3) Plug the stick/card into your XO-1 and power it on.
+copy-nand sd:\soasxo.img
 
+5) When the process completes, remove your drive and reboot the XO.
 
diff --git a/announce b/announce
index b448f00..042dca3 100755
--- a/announce
+++ b/announce
@@ -25,9 +25,11 @@ Package changes:
 
 $(<$builddir/$buildname.tree.package-changes.txt)
 
-Download from:
+Download from http://people.sugarlabs.org/~mtd/soas-xo1
 
-http://people.sugarlabs.org/~mtd/soas-xo1
+$(<BUGS.txt)
+
+Installation instructions: http://people.sugarlabs.org/~mtd/soas-xo1/README.txt
 
 Files:
 
@@ -41,8 +43,6 @@ $buildname.plc - ... NANDblast'ing
 $buildname.removable.img.tar.lzma - for:
  cat $buildname.removable.tar.lzma | lzma -dc - | tar xf - -O - > /dev/sdX
 
-$(<BUGS.txt)
-
 EOF
 
 mail -s "New SoaS-on-XO-1 build done: $buildname" $recipients < $announcefile