===================================================================
RCS file: /cvs/openbsd/update_openbsd/README.TXT,v
retrieving revision 1.1
retrieving revision 1.4
diff -u -r1.1 -r1.4
--- openbsd/update_openbsd/README.TXT	2006/06/30 21:01:17	1.1
+++ openbsd/update_openbsd/README.TXT	2006/10/13 19:12:23	1.4
@@ -2,9 +2,21 @@
 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 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.
 
+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 you should use are as follows:
 
 get_sets
@@ -12,6 +24,11 @@
         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
@@ -23,9 +40,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.3 2006/10/11 17:51:54 andrew Exp $