Usual release distrib/notes churning. ok deraadt@

25 files changed, 253 insertions, 321 deletions

diff --git a/distrib/notes/INSTALL b/distrib/notes/INSTALL
index 3fcd8ed7e6b..febc2195b43 100644
--- a/distrib/notes/INSTALL
+++ b/distrib/notes/INSTALL
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: INSTALL,v 1.44 2010/06/29 19:13:10 miod Exp $
+dnl	$OpenBSD: INSTALL,v 1.45 2011/08/08 20:03:03 miod Exp $
 include(INCLUDE/../m4.common)dnl
 includeit(features)dnl
 INSTALLATION NOTES for OpenBSD/MACHINE OSREV
@@ -107,10 +107,9 @@ access to source code so that you can recompile pieces of the system.
 
 A few methods are provided.  If you have an OpenBSD CD-ROM, the source
 code is provided.  Otherwise, you can get the pieces over the Internet
-using anonymous CVS, CTM, CVSync or FTP.  For more information, see
+using anonymous CVS, CVSync or FTP.  For more information, see
 
 	http://www.OpenBSD.org/anoncvs.html
-	http://www.OpenBSD.org/ctm.html
 	http://www.OpenBSD.org/cvsync.html
 	http://www.OpenBSD.org/ftp.html
 
@@ -185,10 +184,12 @@ be sent by mail to:
 
 	bugs@OpenBSD.org
 
-Use of 'sendbug' is encouraged, however, because bugs reported with it
-are entered into the OpenBSD bugs database, and thus can't slip through
-the cracks.
-
+dnl uncomment when this is true again...
+dnl
+dnl Use of 'sendbug' is encouraged, however, because bugs reported with it
+dnl are entered into the OpenBSD bugs database, and thus can't slip through
+dnl the cracks.
+dnl 
 As a favor, please avoid mailing huge documents or files to the
 mailing lists.  Instead, put the material you would have sent up
 for FTP somewhere, then mail the appropriate list about it, or, if
diff --git a/distrib/notes/alpha/contents b/distrib/notes/alpha/contents
index fbc39680271..311cf77889a 100644
--- a/distrib/notes/alpha/contents
+++ b/distrib/notes/alpha/contents
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: contents,v 1.51 2011/04/10 13:47:19 miod Exp $
+dnl	$OpenBSD: contents,v 1.52 2011/08/08 20:03:03 miod Exp $
 TopPart
 
 OpenBSDfloppy
@@ -40,22 +40,22 @@ dnl boot, bootxx, netboot
 dnl
 DistributionDescription(ten)
 
-OpenBSDbase(60760324,192597963)
+OpenBSDbase(64284940,208752874)
 
-OpenBSDcomp(114298536,387558556)
+OpenBSDcomp(116220098,390941173)
 
-OpenBSDetc(521775,1580449)
+OpenBSDetc(524882,1580160)
 
-OpenBSDgame(2843660,6584584)
+OpenBSDgame(2838915,6602967)
 
-OpenBSDman(9462666,34570287)
+OpenBSDman(9537631,36674867)
 
-OpenBSDxbase(19241840,68771843)
+OpenBSDxbase(18494197,64265190)
 
-OpenBSDxetc(73209,279003)
+OpenBSDxetc(74665,282516)
 
-OpenBSDxfont(39688253,51387549)
+OpenBSDxfont(39409644,50905227)
 
-OpenBSDxserv(8688562,23969796)
+OpenBSDxserv(4810943,12907245)
 
-OpenBSDxshare(2946475,16054084)
+OpenBSDxshare(3425554,18440347)
diff --git a/distrib/notes/alpha/install b/distrib/notes/alpha/install
index 2c65619c597..6608dddebe9 100644
--- a/distrib/notes/alpha/install
+++ b/distrib/notes/alpha/install
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: install,v 1.35 2010/03/16 17:23:09 miod Exp $
+dnl	$OpenBSD: install,v 1.36 2011/08/08 20:03:03 miod Exp $
 OpenBSDInstallPrelude
 
 There are several ways to install OpenBSD onto a disk.  The easiest way is
@@ -99,7 +99,8 @@ OpenBSDInstallPart2
 	Boot your machine from the installation media as described above.
 
 	It will take a while to load the miniroot image, especially from
-	a slow network connection or a CD-ROM, most likely more than a minute.
+	a slow network connection or a CD-ROM, most likely more than a
+	minute.
 	If some action doesn't eventually happen, or the spinning cursor
 	has stopped and nothing further has happened, either your boot
 	media is bad, your diskless setup is incorrect, or you may have
diff --git a/distrib/notes/amd64/contents b/distrib/notes/amd64/contents
index 064738809af..940e53d6ca4 100644
--- a/distrib/notes/amd64/contents
+++ b/distrib/notes/amd64/contents
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: contents,v 1.28 2011/04/10 13:47:19 miod Exp $
+dnl	$OpenBSD: contents,v 1.29 2011/08/08 20:03:03 miod Exp $
 TopPart
 
 OpenBSDfloppy
@@ -47,22 +47,22 @@ dnl useful for the installation.
 
 DistributionDescription(ten)
 
-OpenBSDbase(55087015,174553690)
+OpenBSDbase(59712136,184352350)
 
-OpenBSDcomp(111000124,372270909)
+OpenBSDcomp(65743681,249418349)
 
-OpenBSDetc(521747,1581075)
+OpenBSDetc(524814,1580671)
 
-OpenBSDgame(2707238,6169264)
+OpenBSDgame(2712261,6176911)
 
-OpenBSDman(9462369,34569066)
+OpenBSDman(9726358,37465438)
 
-OpenBSDxbase(17235114,57926677)
+OpenBSDxbase(12721216,41624603)
 
-OpenBSDxetc(71689,275162)
+OpenBSDxetc(73038,278557)
 
-OpenBSDxfont(39688247,51387549)
+OpenBSDxfont(39409049,50905227)
 
-OpenBSDxserv(21365582,59308909)
+OpenBSDxserv(24714888,62881393)
 
-OpenBSDxshare(2946115,16054055)
+OpenBSDxshare(3424704,18440335)
diff --git a/distrib/notes/amd64/hardware b/distrib/notes/amd64/hardware
index 212a1d04a03..ae39dc44055 100644
--- a/distrib/notes/amd64/hardware
+++ b/distrib/notes/amd64/hardware
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: hardware,v 1.105 2009/04/09 16:02:24 jsg Exp $
+dnl	$OpenBSD: hardware,v 1.106 2011/08/08 20:03:03 miod Exp $
 OpenBSD/MACHINE OSREV should work on all Athlon 64-based and
 compatible designs.
 
@@ -887,28 +887,3 @@ dnl		XR16850-based ports (only in the pccom driver)
 		    Winbond W83627HF, W83627THF, W83627DHG, W83627EHF, W83637HF
 		    Winbond W83697HF, W83781D, W83782D, W83783S, W83791D, W83792D
 		    Winbond W83793G
-
-ACPI notice:
-
-	OpenBSD supports the ACPI information provided by many modern
-	machine BIOSes.  On a minority of systems, this ACPI information
-	may be misleading or misinterpreted.
-
-	This might cause various drivers to misbehave in more or less
-	fatal ways, most problems being interrupt-related (interrupt
-	storms slowing the machine down, or a device not getting any
-	interrupts at all).
-
-	If your system seems to misbehave under OpenBSD, you might want
-	to try booting the kernel with ACPI support disabled.
-
-	To do so, boot with the -c flag at the initial bootloader prompt.
-	After the kernel loads, at the UKC> prompt, enter "disable acpi"
-	followed by "quit". This will disable ACPI support.
-
-	If disabling ACPI helps, it is possible to make this behaviour
-	permanent with the userland config(8) utility. In any case,
-	please open a bug report with sendbug(1), giving as many
-	details as possible, including the dmesg(8) output for both ACPI
-	and ACPI-disabled kernels, as well as the output from acpidump(8)
-	and pcidump(8).
diff --git a/distrib/notes/armish/contents b/distrib/notes/armish/contents
index d9ed8ecf885..dbd6c9df1cd 100644
--- a/distrib/notes/armish/contents
+++ b/distrib/notes/armish/contents
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: contents,v 1.9 2011/04/10 13:47:19 miod Exp $
+dnl	$OpenBSD: contents,v 1.10 2011/08/08 20:03:03 miod Exp $
 TopPart
 
 OpenBSDdistsets
@@ -11,22 +11,22 @@ dnl OpenBSDcd
 
 DistributionDescription(ten)
 
-OpenBSDbase(56389686,167758358)
+OpenBSDbase(56110085,164323261)
 
-OpenBSDcomp(88675105,252176109)
+OpenBSDcomp(58949094,179178993)
 
-OpenBSDetc(525342,1595961)
+OpenBSDetc(524930,1579708)
 
-OpenBSDgame(2668047,5974672)
+OpenBSDgame(2674449,6026167)
 
-OpenBSDman(9463622,34570289)
+OpenBSDman(9727249,37463799)
 
-OpenBSDxbase(16448303,47676560)
+OpenBSDxbase(12074974,34730235)
 
-OpenBSDxetc(70388,269310)
+OpenBSDxetc(72075,272997)
 
-OpenBSDxfont(39687385,51387549)
+OpenBSDxfont(39411218,50905227)
 
-OpenBSDxserv(5339706,13900698)
+OpenBSDxserv(5822728,14550464)
 
-OpenBSDxshare(2947726,16054084)
+OpenBSDxshare(3426479,18440335)
diff --git a/distrib/notes/hp300/contents b/distrib/notes/hp300/contents
index 94c69aac52f..c6c7102c142 100644
--- a/distrib/notes/hp300/contents
+++ b/distrib/notes/hp300/contents
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: contents,v 1.45 2011/04/10 13:47:19 miod Exp $
+dnl	$OpenBSD: contents,v 1.46 2011/08/08 20:03:03 miod Exp $
 TopPart
 
 OpenBSDdistsets
@@ -14,22 +14,22 @@ OpenBSDrd
 
 DistributionDescription(ten)
 
-OpenBSDbase(49864698,160453569)
+OpenBSDbase(54999379,185722248)
 
-OpenBSDcomp(59112072,199026782)
+OpenBSDcomp(62491392,210376327)
 
-OpenBSDetc(513941,1531164)
+OpenBSDetc(525399,1579217)
 
-OpenBSDgame(2650805,6304930)
+OpenBSDgame(2643588,6316587)
 
-OpenBSDman(7717166,28070472)
+OpenBSDman(9048012,34754033)
 
-OpenBSDxbase(8630302,26192133)
+OpenBSDxbase(12703446,40592321)
 
-OpenBSDxetc(76556,310135)
+OpenBSDxetc(72084,283580)
 
-OpenBSDxfont(35587566,43728442)
+OpenBSDxfont(39422362,50905227)
 
-OpenBSDxserv(5679605,17122207)
+OpenBSDxserv(2875774,8677998)
 
-OpenBSDxshare(2743456,14667503)
+OpenBSDxshare(3439444,18465957)
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''-:})
diff --git a/distrib/notes/i386/contents b/distrib/notes/i386/contents
index 601ab15a022..6cab2493c61 100644
--- a/distrib/notes/i386/contents
+++ b/distrib/notes/i386/contents
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: contents,v 1.67 2011/04/10 13:47:19 miod Exp $
+dnl	$OpenBSD: contents,v 1.68 2011/08/08 20:03:03 miod Exp $
 TopPart
 
 OpenBSDfloppy
@@ -60,22 +60,22 @@ useful for the installation.
 
 DistributionDescription(ten)
 
-OpenBSDbase(50547479,156432514)
+OpenBSDbase(55199075,166826041)
 
-OpenBSDcomp(92638541,259614258)
+OpenBSDcomp(58616242,177297610)
 
-OpenBSDetc(522599,1584148)
+OpenBSDetc(524962,1580960)
 
-OpenBSDgame(2617941,5982324)
+OpenBSDgame(2629385,6072219)
 
-OpenBSDman(9462469,34569064)
+OpenBSDman(9726399,37465436)
 
-OpenBSDxbase(15550078,45083202)
+OpenBSDxbase(11570649,33993820)
 
-OpenBSDxetc(70041,268806)
+OpenBSDxetc(71701,272529)
 
-OpenBSDxfont(39684618,51387549)
+OpenBSDxfont(39408895,50905227)
 
-OpenBSDxserv(19878969,52803806)
+OpenBSDxserv(23678372,57497808)
 
-OpenBSDxshare(2946147,16054055)
+OpenBSDxshare(3424914,18440335)
diff --git a/distrib/notes/i386/hardware b/distrib/notes/i386/hardware
index 27efef9b70f..ed401f9a1d4 100644
--- a/distrib/notes/i386/hardware
+++ b/distrib/notes/i386/hardware
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: hardware,v 1.282 2009/05/16 23:51:43 sthen Exp $
+dnl	$OpenBSD: hardware,v 1.283 2011/08/08 20:03:03 miod Exp $
 OpenBSD/MACHINE OSREV works across a broad range of standard PCs and
 clones, with a wide variety of processors and I/O bus architectures.  It
 can be expected to install and run with minimal difficulties on most
@@ -1198,28 +1198,3 @@ PCI BIOS, or autoconfigured.
 
 Hardware not listed in the above table doesn't need any specific
 configuration.
-
-ACPI notice:
-
-	OpenBSD supports the ACPI information provided by many modern
-	machine BIOSes.  On a minority of systems, this ACPI information
-	may be misleading or misinterpreted.
-
-	This might cause various drivers to misbehave in more or less
-	fatal ways, most problems being interrupt-related (interrupt
-	storms slowing the machine down, or a device not getting any
-	interrupts at all).
-
-	If your system seems to misbehave under OpenBSD, you might want
-	to try booting the kernel with ACPI support disabled.
-
-	To do so, boot with the -c flag at the initial bootloader prompt.
-	After the kernel loads, at the UKC> prompt, enter "disable acpi"
-	followed by "quit". This will disable ACPI support.
-
-	If disabling ACPI helps, it is possible to make this behaviour
-	permanent with the userland config(8) utility. In any case,
-	please open a bug report with sendbug(1), giving as many
-	details as possible, including the dmesg(8) output for both ACPI
-	and ACPI-disabled kernels, as well as the output from acpidump(8)
-	and pcidump(8).
diff --git a/distrib/notes/landisk/contents b/distrib/notes/landisk/contents
index af36a540ae3..eb4168614ce 100644
--- a/distrib/notes/landisk/contents
+++ b/distrib/notes/landisk/contents
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: contents,v 1.9 2011/04/10 13:47:19 miod Exp $
+dnl	$OpenBSD: contents,v 1.10 2011/08/08 20:03:03 miod Exp $
 TopPart
 
 dnl can't use OpenBSDminiroot here - comment is inappropriate
@@ -17,22 +17,22 @@ dnl XXX describe boot, mbr, and xxboot. Or stop providing them?
 
 DistributionDescription(ten)
 
-OpenBSDbase(51236989,148500391)
+OpenBSDbase(54364515,163133964)
 
-OpenBSDcomp(98713865,284081714)
+OpenBSDcomp(100695026,287526433)
 
-OpenBSDetc(521537,1579207)
+OpenBSDetc(524911,1579306)
 
-OpenBSDgame(2670450,5877296)
+OpenBSDgame(2666738,5901087)
 
-OpenBSDman(9463287,34565141)
+OpenBSDman(9538745,36673230)
 
-OpenBSDxbase(16144169,45256398)
+OpenBSDxbase(15688400,42297709)
 
-OpenBSDxetc(70811,269605)
+OpenBSDxetc(72325,273112)
 
-OpenBSDxfont(39687230,51387549)
+OpenBSDxfont(39415542,50905227)
 
-OpenBSDxserv(1878360,4086946)
+OpenBSDxserv(2278237,4975382)
 
-OpenBSDxshare(2949041,16053850)
+OpenBSDxshare(3427159,18440347)
diff --git a/distrib/notes/loongson/contents b/distrib/notes/loongson/contents
index 57575cdab60..e7dd15443e2 100644
--- a/distrib/notes/loongson/contents
+++ b/distrib/notes/loongson/contents
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: contents,v 1.7 2011/04/10 13:47:19 miod Exp $
+dnl	$OpenBSD: contents,v 1.8 2011/08/08 20:03:03 miod Exp $
 TopPart
 
 OpenBSDdistsets
@@ -9,26 +9,28 @@ OpenBSDrd
 dnl not yet...
 dnl OpenBSDcd
 
+OpenBSDminiroot
+
 	boot		The OpenBSD/MACHINE bootloader.
 
 DistributionDescription(ten)
 
-OpenBSDbase(56815681,198860931)
+OpenBSDbase(55794212,195476342)
 
-OpenBSDcomp(76547924,269340459)
+OpenBSDcomp(52384272,207488467)
 
-OpenBSDetc(520657,1415328)
+OpenBSDetc(524721,1579254)
 
-OpenBSDgame(2783627,6680728)
+OpenBSDgame(2768586,6671543)
 
-OpenBSDman(9461489,34562433)
+OpenBSDman(9727207,37465444)
 
-OpenBSDxbase(14474638,52124493)
+OpenBSDxbase(11355064,41112914)
 
-OpenBSDxetc(71850,278151)
+OpenBSDxetc(72921,280808)
 
-OpenBSDxfont(39687242,51387549)
+OpenBSDxfont(39410096,50905227)
 
-OpenBSDxserv(5253685,16860217)
+OpenBSDxserv(5559322,17479306)
 
-OpenBSDxshare(2946824,16053948)
+OpenBSDxshare(3425893,18440335)
diff --git a/distrib/notes/m4.common b/distrib/notes/m4.common
index bb7f58ddc34..b35e1bb6bba 100644
--- a/distrib/notes/m4.common
+++ b/distrib/notes/m4.common
@@ -1,5 +1,5 @@
 dnl
-dnl	$OpenBSD: m4.common,v 1.94 2011/05/28 06:25:41 jmc Exp $
+dnl	$OpenBSD: m4.common,v 1.95 2011/08/08 20:03:03 miod Exp $
 dnl
 dnl Copyright (c) 2004 Todd T. Fries <todd@OpenBSD.org>
 dnl
@@ -457,10 +457,17 @@ ifelse(MDTZ,,,
 	of the installation.
 -:})dnl
 
+dnl install.sh ask whether to use DUIDs before the md_prep_disklabel loop
+	The installation program will now tell you which disks it can
+	install on, and ask you which it should use.
+	Reply with the name of your root disk.
+
+	You will the be asked if you want to use DUID notation in
+	/etc/fstab, instead of traditional device names. You are strongly
+	advised to use DUIDs, as they allow you to move your disks to
+	different controllers, or change their bus identifiers, without
+	having to modify /etc/fstab every time your configuration changes.-:})dnl
 dnl install.sh md_prep_disklabel loop
-	The installation program will now tell you which disks
-	it can install on, and ask you which it should use.
-	Reply with the name of your root disk.-:})dnl
 dnl
 dnl OpenBSDInstallMBRPart1
 dnl Describes MBR partitioning. So much to save four lines of text
@@ -750,15 +757,21 @@ ifelse(MDTZ,,dnl
 	For this work properly, it is expected that you have installed at
 	least the "base{:--:}OSrev", "etc{:--:}OSrev", and "bsd" distribution sets.
 -:})dnl
+dnl install.sh finish_up()
 
 	The installation program will then proceed to save the system
 	configuration, create all the device nodes needed by the installed
-	system, and will install bootblocks on the root disk.ifelse(MDSMP,,,{:-
-
+	system, and will install bootblocks on the root disk.
+ifelse(MDSMP,,,{:-
 	On multiprocessor systems, if the bsd.mp kernel has been installed,
 	it will be renamed to `bsd', which is the default kernel the boot
 	blocks look for.  The single processor kernel, `bsd', will be
-	available as `bsd.sp'.-:})-:})dnl
+	available as `bsd.sp'.
+-:})
+	Finally, you will be asked whether you would like to install
+	non-free firmware files (which can't be tightly integrated to
+	the OpenBSD system) on first boot, by invoking fw_update(8) on
+	the next boot.-:})dnl
 dnl
 define({:-OpenBSDCongratulations-:},{:-
 Congratulations, you have successfully installed OpenBSD OSREV.  When you
@@ -796,8 +809,12 @@ define({:-OpenBSDUpgrade-:},
 {:-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.
+for a proper upgrade.
+
+The best solution, whenever possible, is to backup your data and reinstall
+from scratch. As a minimum, if the toolchain (the ``comp'' set) was installed,
+you should remove all files within /usr/{:-include-:} before attempting to
+upgrade.
 
 To upgrade OpenBSD OSREV from a previous version, start with the general
 instructions in the section "Installing OpenBSD".
diff --git a/distrib/notes/mac68k/contents b/distrib/notes/mac68k/contents
index ca7220b07e3..a4ce5a26afe 100644
--- a/distrib/notes/mac68k/contents
+++ b/distrib/notes/mac68k/contents
@@ -1,45 +1,45 @@
-dnl	$OpenBSD: contents,v 1.53 2011/04/10 13:47:19 miod Exp $
+dnl	$OpenBSD: contents,v 1.54 2011/08/08 20:03:03 miod Exp $
 TopPart
 
 OpenBSDdistsets
 
 OpenBSDbsd
 
-	bsdsbc		A slightly different GENERIC MACHINE kernel, using
-			a different SCSI driver for some MACHINE models, which
-			may allow some otherwise incompatible SCSI devices to
-			function with OpenBSD/MACHINE.
-
+dnl	bsdsbc		A slightly different GENERIC MACHINE kernel, using
+dnl			a different SCSI driver for some MACHINE models, which
+dnl			may allow some otherwise incompatible SCSI devices to
+dnl			function with OpenBSD/MACHINE.
+dnl
 OpenBSDrd
 
-	bsdsbc.rd	A slightly different RAMDISK kernel, using
-			a different SCSI driver for some MACHINE models, which
-			may allow some otherwise incompatible SCSI devices to
-			function with OpenBSD/MACHINE.
-
+dnl	bsdsbc.rd	A slightly different RAMDISK kernel, using
+dnl			a different SCSI driver for some MACHINE models, which
+dnl			may allow some otherwise incompatible SCSI devices to
+dnl			function with OpenBSD/MACHINE.
+dnl
 	utils/		The OpenBSD/MACHINE boot program for Mac OS.
 
 DistributionDescription(ten)
 
-OpenBSDbase(49888006,160478255)
+OpenBSDbase(55006013,185741778)
 
-OpenBSDcomp(59123843,199085530)
+OpenBSDcomp(62501585,210417096)
 
-OpenBSDetc(511799,1522575)
+OpenBSDetc(525305,1578964)
 
-OpenBSDgame(2650734,6304930)
+OpenBSDgame(2643560,6316587)
 
-OpenBSDman(7716948,28069759)
+OpenBSDman(9047685,34754033)
 
-OpenBSDxbase(8764728,26625934)
+OpenBSDxbase(12728397,40731032)
 
-OpenBSDxetc(75961,302749)
+OpenBSDxetc(72076,283538)
 
-OpenBSDxfont(35585999,43728442)
+OpenBSDxfont(39421217,50905227)
 
-OpenBSDxserv(3007361,8684510)
+OpenBSDxserv(2841706,8539272)
 
-OpenBSDxshare(2769658,14738551)
+OpenBSDxshare(3439224,18465957)
 
 The directory '../OSREV/MACHINE/utils' contains the OpenBSD/MACHINE boot
 program, used to load the OpenBSD kernel. This program is distributed
diff --git a/distrib/notes/macppc/contents b/distrib/notes/macppc/contents
index 116ad6527dd..d8260955880 100644
--- a/distrib/notes/macppc/contents
+++ b/distrib/notes/macppc/contents
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: contents,v 1.29 2011/04/10 13:47:19 miod Exp $
+dnl	$OpenBSD: contents,v 1.30 2011/08/08 20:03:04 miod Exp $
 TopPart
 
 OpenBSDdistsets
@@ -19,22 +19,22 @@ dnl	bsd.tbxi
 
 DistributionDescription(ten)
 
-OpenBSDbase(64911680,192663921)
+OpenBSDbase(63264670,186428577)
 
-OpenBSDcomp(115033112,293000559)
+OpenBSDcomp(68825743,195051394)
 
-OpenBSDetc(525185,1595888)
+OpenBSDetc(524730,1579634)
 
-OpenBSDgame(2761854,6248780)
+OpenBSDgame(2711483,6123027)
 
-OpenBSDman(9462528,34570289)
+OpenBSDman(9726641,37465440)
 
-OpenBSDxbase(18457502,52439624)
+OpenBSDxbase(12535646,36575474)
 
-OpenBSDxetc(72929,276292)
+OpenBSDxetc(72271,274064)
 
-OpenBSDxfont(39687332,51387549)
+OpenBSDxfont(39409145,50905227)
 
-OpenBSDxserv(6179148,16456110)
+OpenBSDxserv(6379232,16788351)
 
-OpenBSDxshare(2946146,16054055)
+OpenBSDxshare(3425321,18440335)
diff --git a/distrib/notes/mvme68k/contents b/distrib/notes/mvme68k/contents
index 80e1aa651eb..06b5d26be17 100644
--- a/distrib/notes/mvme68k/contents
+++ b/distrib/notes/mvme68k/contents
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: contents,v 1.36 2011/04/10 13:47:19 miod Exp $
+dnl	$OpenBSD: contents,v 1.37 2011/08/08 20:03:04 miod Exp $
 TopPart
 
 OpenBSDdistsets
@@ -25,22 +25,22 @@ Useful Media" for more information.
 
 DistributionDescription(ten)
 
-OpenBSDbase(49804334,160362444)
+OpenBSDbase(54944587,185630263)
 
-OpenBSDcomp(59120349,199074790)
+OpenBSDcomp(62494802,210398287)
 
-OpenBSDetc(510472,1358753)
+OpenBSDetc(524329,1415131)
 
-OpenBSDgame(2650789,6304930)
+OpenBSDgame(2643490,6316277)
 
-OpenBSDman(7719291,28082392)
+OpenBSDman(9046212,34747670)
 
-OpenBSDxbase(8764728,26625934)
+OpenBSDxbase(12703446,40592321)
 
-OpenBSDxetc(75961,302749)
+OpenBSDxetc(72084,283580)
 
-OpenBSDxfont(35585999,43728442)
+OpenBSDxfont(39422362,50905227)
 
-OpenBSDxserv(1157054,2810482)
+OpenBSDxserv(2875774,8677998)
 
-OpenBSDxshare(2769658,14738551)
+OpenBSDxshare(3439444,18465957)
diff --git a/distrib/notes/mvme88k/contents b/distrib/notes/mvme88k/contents
index 9aff6532f51..7f8c2e48daf 100644
--- a/distrib/notes/mvme88k/contents
+++ b/distrib/notes/mvme88k/contents
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: contents,v 1.22 2011/04/10 13:47:19 miod Exp $
+dnl	$OpenBSD: contents,v 1.23 2011/08/08 20:03:04 miod Exp $
 TopPart
 
 OpenBSDdistsets
@@ -25,24 +25,22 @@ They can also be used to configure an NFS server to support installation
 over the network. See the section "Getting the OpenBSD system onto Useful
 Media" for more information.
 
-DistributionDescription(ten)
+DistributionDescription(nine)
 
-OpenBSDbase(98225864,250099534)
+OpenBSDbase(111592787,289544652)
 
-OpenBSDcomp(44528998,159071371)
+OpenBSDcomp(45172845,160062120)
 
-OpenBSDetc(520365,1414374)
+OpenBSDetc(517197,1398294)
 
-OpenBSDgame(7470697,15820092)
+OpenBSDgame(7717499,16299724)
 
-OpenBSDman(8943018,32544085)
+OpenBSDman(8667903,31135532)
 
-OpenBSDxbase(84008254,169047294)
+OpenBSDxbase(92386620,182726169)
 
-OpenBSDxetc(983696,2021991)
+OpenBSDxetc(1127648,2178064)
 
-OpenBSDxfont(35583966,43705666)
+OpenBSDxfont(39419350,50905227)
 
-OpenBSDxserv(5450524,16155272)
-
-OpenBSDxshare(2746787,14575968)
+OpenBSDxshare(3044434,16035723)
diff --git a/distrib/notes/sgi/contents b/distrib/notes/sgi/contents
index 08ee343ae18..ca96c39204b 100644
--- a/distrib/notes/sgi/contents
+++ b/distrib/notes/sgi/contents
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: contents,v 1.16 2011/04/10 13:47:19 miod Exp $
+dnl	$OpenBSD: contents,v 1.17 2011/08/08 20:03:04 miod Exp $
 TopPart
 
 OpenBSDdistsets
@@ -46,22 +46,22 @@ dnl can't use OpenBSDcd because of the multiple bsd.rd
 
 DistributionDescription(ten)
 
-OpenBSDbase(57812231,199409896)
+OpenBSDbase(57051101,196747310)
 
-OpenBSDcomp(80391925,269302068)
+OpenBSDcomp(54181303,207433625)
 
-OpenBSDetc(522296,1582807)
+OpenBSDetc(524615,1579604)
 
-OpenBSDgame(2802507,6681864)
+OpenBSDgame(2790750,6672247)
 
-OpenBSDman(9463394,34570283)
+OpenBSDman(9726715,37465303)
 
-OpenBSDxbase(14689775,52232809)
+OpenBSDxbase(11475488,41144106)
 
-OpenBSDxetc(71782,278151)
+OpenBSDxetc(72938,280808)
 
-OpenBSDxfont(39687135,51387549)
+OpenBSDxfont(39409663,50905227)
 
-OpenBSDxserv(5313289,16861856)
+OpenBSDxserv(5610334,17450845)
 
-OpenBSDxshare(2946827,16054084)
+OpenBSDxshare(3425419,18440335)
diff --git a/distrib/notes/sgi/features b/distrib/notes/sgi/features
index c4c4b61b18f..c5f51acaea6 100644
--- a/distrib/notes/sgi/features
+++ b/distrib/notes/sgi/features
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: features,v 1.2 2009/10/10 18:40:43 miod Exp $
+dnl	$OpenBSD: features,v 1.3 2011/08/08 20:03:04 miod Exp $
 dnl
 dnl This file lists almost all the conditional features of this port,
 dnl which are used to provide accurate installation notes.
@@ -21,7 +21,7 @@ dnl (i.e. md_consoleinfo is not empty)
 define({:-MDSERCONS-:},)dnl
 dnl
 dnl define if SMP kernels are provided
-define({:-MDSMP-:},)dnl
+define({:-MDSMP-:},1)dnl
 dnl
 dnl define if shared libraries are provided
 define({:-MDSO-:},1)dnl
diff --git a/distrib/notes/socppc/contents b/distrib/notes/socppc/contents
index 17af40dbf5e..5ee42d17ff8 100644
--- a/distrib/notes/socppc/contents
+++ b/distrib/notes/socppc/contents
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: contents,v 1.12 2011/04/10 13:47:19 miod Exp $
+dnl	$OpenBSD: contents,v 1.13 2011/08/08 20:03:04 miod Exp $
 TopPart
 
 OpenBSDdistsets
@@ -23,22 +23,22 @@ OpenBSDrd
 
 DistributionDescription(ten)
 
-OpenBSDbase(64487064,191906776)
+OpenBSDbase(62813592,185491973)
 
-OpenBSDcomp(114929725,292831942)
+OpenBSDcomp(68830716,195029553)
 
-OpenBSDetc(520810,1577864)
+OpenBSDetc(524638,1579405)
 
-OpenBSDgame(2761953,6248736)
+OpenBSDgame(2711558,6123027)
 
-OpenBSDman(9451132,34526185)
+OpenBSDman(9727512,37465440)
 
-OpenBSDxbase(18457502,52439624)
+OpenBSDxbase(12533695,36566976)
 
-OpenBSDxetc(72929,276292)
+OpenBSDxetc(72299,274064)
 
-OpenBSDxfont(39687332,51387549)
+OpenBSDxfont(39410283,50905227)
 
-OpenBSDxserv(6179148,16456110)
+OpenBSDxserv(5722932,15079763)
 
-OpenBSDxshare(2946146,16054055)
+OpenBSDxshare(3426162,18440335)
diff --git a/distrib/notes/sparc/contents b/distrib/notes/sparc/contents
index 5b686c537d4..7696a0aa34d 100644
--- a/distrib/notes/sparc/contents
+++ b/distrib/notes/sparc/contents
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: contents,v 1.65 2011/06/15 21:36:48 miod Exp $
+dnl	$OpenBSD: contents,v 1.66 2011/08/08 20:03:04 miod Exp $
 TopPart
 
 OpenBSDminiroot
@@ -36,22 +36,22 @@ OpenBSDfloppydesc(single,The)
 
 DistributionDescription(ten)
 
-OpenBSDbase(45929137,141612692)
+OpenBSDbase(53878520,163471615)
 
-OpenBSDcomp(72521000,271071175)
+OpenBSDcomp(58787002,183321005)
 
-OpenBSDetc(525789,1600492)
+OpenBSDetc(525487,1584118)
 
-OpenBSDgame(2680091,6024824)
+OpenBSDgame(2684031,6061655)
 
-OpenBSDman(9190523,33495239)
+OpenBSDman(9726710,37459493)
 
-OpenBSDxbase(14360510,48764218)
+OpenBSDxbase(11462017,34180756)
 
-OpenBSDxetc(70281,273108)
+OpenBSDxetc(71791,276824)
 
-OpenBSDxfont(39687298,51387549)
+OpenBSDxfont(39418059,50905227)
 
-OpenBSDxserv(4204254,11524572)
+OpenBSDxserv(5452314,14174320)
 
-OpenBSDxshare(2949399,16054189)
+OpenBSDxshare(3436800,18458554)
diff --git a/distrib/notes/sparc64/contents b/distrib/notes/sparc64/contents
index 3738022f5a4..42b8a78e191 100644
--- a/distrib/notes/sparc64/contents
+++ b/distrib/notes/sparc64/contents
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: contents,v 1.46 2011/04/10 13:47:19 miod Exp $
+dnl	$OpenBSD: contents,v 1.47 2011/08/08 20:03:04 miod Exp $
 TopPart
 
 OpenBSDminiroot
@@ -48,22 +48,22 @@ OpenBSDfloppydesc(two,Each,s)
 
 DistributionDescription(ten)
 
-OpenBSDbase(55449822,181758993)
+OpenBSDbase(59371059,189836289)
 
-OpenBSDcomp(113595853,367921807)
+OpenBSDcomp(66585069,248050303)
 
-OpenBSDetc(525705,1600787)
+OpenBSDetc(525174,1584420)
 
-OpenBSDgame(2780418,6448784)
+OpenBSDgame(2774608,6444319)
 
-OpenBSDman(9462570,34570291)
+OpenBSDman(9726732,37465442)
 
-OpenBSDxbase(17265154,58987356)
+OpenBSDxbase(12454180,41802095)
 
-OpenBSDxetc(71455,275750)
+OpenBSDxetc(72833,279431)
 
-OpenBSDxfont(39687861,51387549)
+OpenBSDxfont(39409588,50905227)
 
-OpenBSDxserv(11389100,33222213)
+OpenBSDxserv(6527834,17941165)
 
-OpenBSDxshare(2946844,16054084)
+OpenBSDxshare(3425493,18440335)
diff --git a/distrib/notes/vax/contents b/distrib/notes/vax/contents
index 543c9a00331..4973c1f03a9 100644
--- a/distrib/notes/vax/contents
+++ b/distrib/notes/vax/contents
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: contents,v 1.28 2011/04/10 13:47:19 miod Exp $
+dnl	$OpenBSD: contents,v 1.29 2011/08/08 20:03:04 miod Exp $
 TopPart
 
 OpenBSDdistsets
@@ -20,22 +20,22 @@ OpenBSDfloppydesc(single,The)
 
 DistributionDescription(ten)
 
-OpenBSDbase(82056379,195688330)
+OpenBSDbase(94009790,226183717)
 
-OpenBSDcomp(42777946,149542023)
+OpenBSDcomp(44094491,152795027)
 
-OpenBSDetc(524685,1596309)
+OpenBSDetc(525085,1580177)
 
-OpenBSDgame(6258035,12305316)
+OpenBSDgame(6548138,12759795)
 
-OpenBSDman(8956284,32599305)
+OpenBSDman(9046801,34760184)
 
-OpenBSDxbase(79755149,134151760)
+OpenBSDxbase(83117037,147250516)
 
-OpenBSDxetc(991439,1700765)
+OpenBSDxetc(1009667,1752285)
 
-OpenBSDxfont(39687217,51387549)
+OpenBSDxfont(39419570,50905227)
 
-OpenBSDxserv(6212,15692)
+OpenBSDxserv(13047,52116)
 
-OpenBSDxshare(2948799,16054185)
+OpenBSDxshare(3427419,18440432)
diff --git a/distrib/notes/zaurus/contents b/distrib/notes/zaurus/contents
index d197dae894f..bd76cd2ae7e 100644
--- a/distrib/notes/zaurus/contents
+++ b/distrib/notes/zaurus/contents
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: contents,v 1.12 2011/04/10 13:47:19 miod Exp $
+dnl	$OpenBSD: contents,v 1.13 2011/08/08 20:03:04 miod Exp $
 TopPart
 
 OpenBSDdistsets
@@ -21,22 +21,22 @@ dnl OpenBSDcd
 
 DistributionDescription(ten)
 
-OpenBSDbase(49909242,138382271)
+OpenBSDbase(49953310,146448403)
 
-OpenBSDcomp(20271487,68195504)
+OpenBSDcomp(26806869,87694525)
 
-OpenBSDetc(525526,1596468)
+OpenBSDetc(524346,1416307)
 
-OpenBSDgame(2668100,5974672)
+OpenBSDgame(2674521,6026167)
 
-OpenBSDman(9464660,34570289)
+OpenBSDman(9728246,37463799)
 
-OpenBSDxbase(11621297,35132431)
+OpenBSDxbase(10870674,31110050)
 
-OpenBSDxetc(70917,270548)
+OpenBSDxetc(72223,273268)
 
-OpenBSDxfont(39687184,51387549)
+OpenBSDxfont(39411808,50905227)
 
-OpenBSDxserv(5335715,13879444)
+OpenBSDxserv(5813985,14514535)
 
-OpenBSDxshare(2948576,16053982)
+OpenBSDxshare(3426989,18440335)