===================================================================
RCS file: /cvs/openbsd/update_openbsd/README.TXT,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- openbsd/update_openbsd/README.TXT	2006/10/13 19:12:23	1.4
+++ openbsd/update_openbsd/README.TXT	2006/10/31 23:13:59	1.5
@@ -3,10 +3,11 @@
 version of the same release.
 
 Now, you can just use "install".  If you are moving between versions it
-will install the new kernel and run mergeslave.  You then need to
-reboot, and run it again.  This will mean you are running it on the same
-version kernel as the available sets and it will install a new kernel
-(just in case it needs to be updated) and then extract the available sets.
+will install the new kernel.  You then need to reboot, and run it again
+and it will run mergeslave after extracting available sets.  This will
+mean you are running it on the same version kernel as the available sets
+and it will install a new kernel (just in case it needs to be updated)
+and then extract the available sets.
 
 The proper way use these scripts manually would be to do the following:
 	get_sets
@@ -16,19 +17,21 @@
 	upgrade /etc.  I still need to test mergeslave to see how that works.
 	reboot
 
+The files in the collection are as follows:
 
-The files in the collection you should use are as follows:
+install
+        This calls get_sets if there are no sets, then call
+        install_kernel, then, if the version of the kernel we are booted
+        off is the same as the sets, it installs the sets, and if it was
+        an upgrade between versions (there was an etcXX.tgz from the
+        previous version downloaded) install mergeslave, then it will
+        tell you to reboot.
 
 get_sets
         This downloads the latest kernels and sets from mp3s.hewus.com.
         It uses installed_sets to only download the kernels and sets
         that are currently installed on the box you are running it on.
 
-install
-	This calls get_sets if there are no sets, then call install_kernel,
-	then, if the version of the kernel we are booted off is the same as
-	the sets, it installs the sets.
-
 install_kernel
         Copies the new kernels from the file set above.  Should only be
         run AFTER running get_sets.  You should reboot after running
@@ -59,4 +62,4 @@
 	I run it like this:
 	$ sudo release.sh clean update system release clean
 
-$RedRiver: README.TXT,v 1.3 2006/10/11 17:51:54 andrew Exp $
+$RedRiver: README.TXT,v 1.4 2006/10/13 18:12:23 andrew Exp $