===================================================================
RCS file: /cvs/openbsd/update_openbsd/README.TXT,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- openbsd/update_openbsd/README.TXT	2006/11/29 16:50:03	1.7
+++ openbsd/update_openbsd/README.TXT	2008/08/12 23:18:18	1.8
@@ -1,69 +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.  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.
+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
-	cd /dev && ./MAKEDEV all
-	upgrade /etc.
-		mergeslave should work
-		but you should still read through the upgrade faq
-	pkg_add -ui -F update -F updatedepends
-	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.
 
-The files in the collection are as follows:
+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.
 
-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_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.
-
-release.sh
+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
 
 	Slightly modified to make it do what I want.
 
-	I run it like this:
-	$ sudo release.sh clean update system release clean
+	I run release.sh like this:
+	$ sudo release.sh update full-release
 
-$RedRiver: README.TXT,v 1.6 2006/11/29 16:45:33 andrew Exp $
+$RedRiver: README.TXT,v 1.7 2006/11/29 16:50:03 andrew Exp $