===================================================================
RCS file: /cvs/openbsd/update_openbsd/README.TXT,v
retrieving revision 1.3
retrieving revision 1.9
diff -u -r1.3 -r1.9
--- openbsd/update_openbsd/README.TXT	2006/10/11 18:51:54	1.3
+++ openbsd/update_openbsd/README.TXT	2010/02/10 20:57:07	1.9
@@ -1,53 +1,26 @@
-This is a collection of scripts to make upgrading OpenBSD easier.  It
-supports upgrading to a new version as well as just upgrading to a newer
-version of the same release.
+This is a shell script to make upgrading OpenBSD easier.  It supports
+upgrading to a new version as well as just upgrading to a newer 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.
+Generally, just run update_openbsd.  However, you probably want to create a
+config file to set the mirror you would like to use (ftp or http) as well.
+See update_openbsdrc.example
 
-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
+If you are moving between versions it will install the new kernel and ask you
+to reboot.  After you reboot, you will need to run it again.
 
+If you are installing a release of the same version, it will install the
+latest kernel, extract available sets, and then run sysmerge or attempt to run
+mergemaster and finally update installed packages.
 
-The files in the collection you should use are as follows:
+Also included is a copy of release.sh
+	This is the OpenBSD - Release Building Shell Script
+	from FenderQ.com - Internet Security Solutions
+	http://www.fenderq.com/release.sh
 
-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.
+	Slightly modified to make it do what I want.
 
-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.
+	I run release.sh like this:
+	$ sudo release.sh update full-release
 
-install_kernel
-        Copies the new kernels from the file set above.  Should only be
-        run AFTER running get_sets.  You should reboot after running
-        this
-
-install_sets
-        Extracts the new sets to the correct directories.  Most of them
-        to /, but it extracts etc??.tgz to /tmp.  You should upgrade
-        /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.
-
-
-$RedRiver: README.TXT,v 1.2 2006/06/30 22:30:06 andrew Exp $
+$AFresh1: README.TXT,v 1.8 2008/08/12 22:18:18 andrew Exp $