Document upgrades on sparc64 again, and tweak a few things.

6 files changed, 17 insertions, 45 deletions

diff --git a/distrib/notes/sparc64/contents b/distrib/notes/sparc64/contents
index 6dda10efd70..36209c3968b 100644
--- a/distrib/notes/sparc64/contents
+++ b/distrib/notes/sparc64/contents
@@ -1,13 +1,11 @@
-dnl	$OpenBSD: contents,v 1.21 2002/04/14 02:33:19 miod Exp $
+dnl	$OpenBSD: contents,v 1.22 2002/10/03 00:19:48 miod Exp $
 TopPart
 
 OpenBSDminiroot
 				It can be copied to the swap partition of
 				an existing OpenBSD, Solaris, NetBSD or Linux
-dnl uncomment when upgrades are available again
-dnl				installation to allow installing or upgrading
-dnl				to OpenBSD OSREV.
-				installation to allow installing OpenBSD OSREV.
+				installation to allow installing or upgrading
+				to OpenBSD OSREV.
 
 OpenBSDfloppy
 				This floppy image will boot on SBus-based
@@ -56,7 +54,7 @@ OpenBSDbase(25.7,76.8,shared)
 
 OpenBSDcomp(22.1,85.4,shared)
 
-OpenBSDetc(1.2,3.9,noupgrade)
+OpenBSDetc(1.2,3.9)
 
 OpenBSDgame(2.9,6.6)
 
diff --git a/distrib/notes/sparc64/hardware b/distrib/notes/sparc64/hardware
index 94e2cf12228..56fd2987181 100644
--- a/distrib/notes/sparc64/hardware
+++ b/distrib/notes/sparc64/hardware
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: hardware,v 1.36 2002/09/18 04:40:20 jason Exp $
+dnl	$OpenBSD: hardware,v 1.37 2002/10/03 00:19:49 miod Exp $
 OpenBSD/MACHINE OSREV runs on the following classes of machines:
 	- SBUS based workstations:
 		Ultra 1
@@ -167,4 +167,3 @@ Hardware the we do NOT currently support, but get many questions about:
 	Multiprocessor machines.
 	Floppy driver (except for booting).
 	SBUS and PCI cards other than those listed above.
-	UPA AFB Framebuffers
diff --git a/distrib/notes/sparc64/install b/distrib/notes/sparc64/install
index 2c7c9249699..cd14529e577 100644
--- a/distrib/notes/sparc64/install
+++ b/distrib/notes/sparc64/install
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: install,v 1.26 2002/06/30 15:32:14 miod Exp $
+dnl	$OpenBSD: install,v 1.27 2002/10/03 00:19:49 miod Exp $
 OpenBSDInstallPrelude
 
 There are several ways to install OpenBSD onto a disk. The easiest way
@@ -128,20 +128,7 @@ OpenBSDBootMsgs
 	you should choose the terminal type from amongst those listed.
 	(If your terminal type is xterm, just use vt100).
 
-dnl put this back for 3.2
-dnl OpenBSDInstallpart3({:- or "wd0" for IDE drives-:})
-	After entering the terminal type you will be asked whether you
-	wish to do an "(I)nstall".  Enter 'I' for a fresh installation.
-	Note that you cannot upgrade a previous OpenBSD installation
-	to 3.1.
-
-	You will be presented with a welcome message and asked if
-	you really want to continue. Assuming you answered yes, the
-	install program will then tell you which disks of that type
-	it can install on, and ask you which it should use.  The name
-	of the disk is typically "sd0" for SCSI drives and "wd0" for
-	IDE drives. Reply with the name of your disk.
-dnl end put this back
+OpenBSDInstallPart3({:- or "wd0" for IDE drives-:})
 
 OpenBSDInstallPart4
 
@@ -156,10 +143,6 @@ OpenBSDHTTPInstall
 OpenBSDTAPEInstall
 
 OpenBSDCDROMInstall
-dnl
-dnl	On some pci-based systems, installing files from CD-ROM yields
-dnl	a lot of ``pciide bogus intr'' warning messages.  While annoying,
-dnl	these messages do not prevent the installation from suceeding.
 		
 OpenBSDNFSInstall
 
@@ -341,9 +324,7 @@ filesystem for `/usr' with your diskless setup, make sure the "./usr" base
 files in base{:--:}OSrev.tgz end up in the correct location. One way to do this is
 to temporarily use a loopback mount on the server, re-routing <root>/usr to
 your server's exported OpenBSD "/usr" directory. Also put the kernel and
-dnl put back after 3.2
-dnl the install/upgrade scripts into the root directory.
-the install script into the root directory.
+the install/upgrade scripts into the root directory.
 
 A few configuration files need to be edited:
 
diff --git a/distrib/notes/sparc64/upgrade b/distrib/notes/sparc64/upgrade
index 4343574d566..3a3d20142d9 100644
--- a/distrib/notes/sparc64/upgrade
+++ b/distrib/notes/sparc64/upgrade
@@ -1,6 +1,2 @@
-dnl	$OpenBSD: upgrade,v 1.9 2002/03/23 23:58:50 miod Exp $
-Due to the youth of the MACHINE port, upgrades to OpenBSD OSREV are not
-supported.
-You are strongly advised to reinstall your existing machines from scratch.
-dnl
-dnl OpenBSDUpgrade({:-CDROM, the miniroot, or the installation floppy-:})
+dnl	$OpenBSD: upgrade,v 1.10 2002/10/03 00:19:49 miod Exp $
+OpenBSDUpgrade({:-CDROM, the miniroot, or the installation floppy-:})
diff --git a/distrib/notes/sparc64/whatis b/distrib/notes/sparc64/whatis
index 1ab34aff277..76f7ed6897a 100644
--- a/distrib/notes/sparc64/whatis
+++ b/distrib/notes/sparc64/whatis
@@ -1,9 +1,9 @@
-dnl	$OpenBSD: whatis,v 1.4 2002/02/07 08:57:28 miod Exp $
+dnl	$OpenBSD: whatis,v 1.5 2002/10/03 00:19:49 miod Exp $
 OpenBSD/MACHINE OSREV is a port to the UltraSPARC processor-based machines,
 such as the workstations manufactured by Sun Microsystems.
 
-Since the previous release, device support has improved a lot (new models
-supported, X Window support), and stability has improved.
+Since the previous release, device support still has improved a lot (new
+models and on-board devices support), and stability has improved.
 More applications from the ports collection have been compiled and tested on
 this platform as well.
 
diff --git a/distrib/notes/sparc64/xfer b/distrib/notes/sparc64/xfer
index 70a90f236a8..dac30917759 100644
--- a/distrib/notes/sparc64/xfer
+++ b/distrib/notes/sparc64/xfer
@@ -1,9 +1,8 @@
-dnl	$OpenBSD: xfer,v 1.16 2002/06/30 15:32:14 miod Exp $
+dnl	$OpenBSD: xfer,v 1.17 2002/10/03 00:19:49 miod Exp $
 Installation is supported from several media types, including:
 
 	CD-ROM (NOT supported if booting from floppy)
-dnl put back for 3.2
-dnl	FFS partitions
+	FFS partitions
 	Tape
 	Remote NFS partition (NOT supported if booting from floppy)
 	FTP
@@ -95,6 +94,5 @@ OpenBSDXferPrelude
 OpenBSDXferBareTape(xbase xfont xserv xshare)
 
 OpenBSDXferNFS
-dnl put back for 3.2
-dnl
-dnl OpenBSDXferFFS
+
+OpenBSDXferFFS