Usual release distrib/notes churning. ok deraadt@

2 files changed, 13 insertions, 50 deletions

diff --git a/distrib/notes/hppa/contents b/distrib/notes/hppa/contents
index 8679316500d..4ce66e59f74 100644
--- a/distrib/notes/hppa/contents
+++ b/distrib/notes/hppa/contents
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: contents,v 1.25 2011/04/10 13:47:19 miod Exp $
+dnl	$OpenBSD: contents,v 1.26 2011/08/08 20:03:03 miod Exp $
 TopPart
 
 OpenBSDdistsets
@@ -20,22 +20,22 @@ OpenBSDcd
 
 DistributionDescription(ten)
 
-OpenBSDbase(52458159,146213142)
+OpenBSDbase(59761787,169257495)
 
-OpenBSDcomp(77488982,276937735)
+OpenBSDcomp(63473776,191826292)
 
-OpenBSDetc(521522,1579914)
+OpenBSDetc(524596,1579549)
 
-OpenBSDgame(2773000,6124496)
+OpenBSDgame(2759031,6136139)
 
-OpenBSDman(9462561,34570285)
+OpenBSDman(9726759,37465436)
 
-OpenBSDxbase(16196663,51679121)
+OpenBSDxbase(12968324,37008629)
 
-OpenBSDxetc(71847,272358)
+OpenBSDxetc(73454,275908)
 
-OpenBSDxfont(39687900,51387549)
+OpenBSDxfont(39409425,50905227)
 
-OpenBSDxserv(3973954,9747773)
+OpenBSDxserv(6429405,16002867)
 
-OpenBSDxshare(2946601,16054084)
+OpenBSDxshare(3425492,18440335)
diff --git a/distrib/notes/hppa/upgrade b/distrib/notes/hppa/upgrade
index 062366d4e6e..9d3db28f1e2 100644
--- a/distrib/notes/hppa/upgrade
+++ b/distrib/notes/hppa/upgrade
@@ -1,39 +1,2 @@
-dnl	$OpenBSD: upgrade,v 1.8 2010/06/05 19:35:57 miod Exp $
-Warning! Upgrades to OpenBSD OSREV are currently only supported from the
-immediately previous release.  The upgrade process will also work with older
-releases, but might not execute some migration tasks that would be necessary
-for a proper upgrade.  The best solution, whenever possible, is to backup
-your data and reinstall from scratch.
-
-To upgrade OpenBSD OSREV from a previous version, start with the general
-instructions in the section "Installing OpenBSD".
-
-    Warning! If you intend to upgrade an OpenBSD 4.4 system, or an even older
-    version, by booting bsd.rd from the existing OpenBSD system disk, it will
-    be necessary to update your boot blocks first.
-    To do this, replace your existing boot blocks with the xxboot file
-    provided in the OpenBSD/MACHINE OSrev distribution:
-	  # cat xxboot > /usr/mdec/xxboot
-	  # /sbin/disklabel -B /dev/rsd0c
-    (assuming your system disk is sd0). Do NOT use `cp' to copy the boot
-    blocks, as there are several hard links to /usr/mdec/xxboot which need
-    to be preserved for this operation to succeed.
-
-Boot from the LIF image ``lif{:--:}OSrev.fs'', or a RAMDISK kernel ``bsd.rd''.
-When prompted, select the (U)pgrade option rather than the (I)nstall
-option at the prompt in the install process.
-
-The upgrade script will ask you for the existing root partition, and
-will use the existing filesystems defined in /etc/fstab to install the
-new system in.  It will also use your existing network parameters.
-
-From then, the upgrade procedure is very close to the installation
-procedure described earlier in this document.  Note that the upgrade
-procedure will not let you pick the ``etc{:--:}OSrev.tgz'' set, so as to
-preserve your files in `/etc' which you are likely to have customized
-since a previous installation.
-
-However, it is strongly advised that you unpack the etc{:--:}OSrev.tgz set in
-a temporary directory and merge changes by hand, since some components of
-your system may not function correctly until your files in `/etc' are
-updated.
+dnl	$OpenBSD: upgrade,v 1.9 2011/08/08 20:03:03 miod Exp $
+OpenBSDUpgrade({:-the LIF image ``lif{:--:}OSrev.fs'', or a RAMDISK kernel ``bsd.rd''-:})