===================================================================
RCS file: /cvs/openbsd/update_openbsd/README.TXT,v
retrieving revision 1.1
retrieving revision 1.5
diff -u -r1.1 -r1.5
--- openbsd/update_openbsd/README.TXT	2006/06/30 21:01:17	1.1
+++ openbsd/update_openbsd/README.TXT	2006/10/31 23:13:59	1.5
@@ -2,11 +2,31 @@
 supports upgrading to a new version as well as just upgrading to a newer
 version of the same release.
 
-Eventually I will steal and modify mergeslave to make updating /etc easier.
-        http://www.xs4all.nl/~hanb/software/OpenBSD-binary-upgrade/
+Now, you can just use "install".  If you are moving between versions it
+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 files in the collection you should use are as follows:
+The proper way use these scripts manually would be to do the following:
+	get_sets
+	install_kernel
+	reboot
+	install_sets
+	upgrade /etc.  I still need to test mergeslave to see how that works.
+	reboot
 
+The files in the collection 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
@@ -23,9 +43,23 @@
         /etc after you have run this, as well as upgrading packages with
         pkg_add -ui then reboot.
 
+mergeslave
+        This is a modified version of mergeslave.  You should only use
+        it if upgrading between versions, not -stable upgrades.
+	http://www.xs4all.nl/~hanb/software/OpenBSD-binary-upgrade/
+
 installed_sets
         This is a helper script that returns a list of the sets that are
         currently installed on the box you are running it on.
 
+release.sh
+	This is the OpenBSD - Release Building Shell Script
+	from FenderQ.com - Internet Security Solutions
+	http://www.fenderq.com/release.sh
 
-$RedRiver$
+	Slightly modified to make it do what I want.
+
+	I run it like this:
+	$ sudo release.sh clean update system release clean
+
+$RedRiver: README.TXT,v 1.4 2006/10/13 18:12:23 andrew Exp $