Put back upgrade texts.

4 files changed, 14 insertions, 50 deletions

diff --git a/distrib/notes/sparc/contents b/distrib/notes/sparc/contents
index 576dc5eccf6..81bfd4fdb45 100644
--- a/distrib/notes/sparc/contents
+++ b/distrib/notes/sparc/contents
@@ -1,13 +1,11 @@
-dnl	$OpenBSD: contents,v 1.42 2002/10/07 19:32:00 miod Exp $
+dnl	$OpenBSD: contents,v 1.43 2003/02/15 21:22:08 miod Exp $
 TopPart
 
 OpenBSDminiroot
 				It can be copied to the swap partition of
 				an existing OpenBSD, NetBSD, Linux, SunOS,
 				or Solaris installation to allow installing
-dnl uncomment when upgrades are available again
-dnl				or upgrading to OpenBSD OSREV.
-				OpenBSD OSREV.
+				or upgrading to OpenBSD OSREV.
 
 OpenBSDfloppy
 
@@ -35,16 +33,7 @@ The kernel and boot images are provided for net booting installations.
 While the OpenBSD bootblocks will work with the provided miniroot images,
 Sun bootblocks require a separate kernel image and root filesystem.
 
-dnl uncomment when upgrades are available again...
-dnl OpenBSDfloppydesc(single,The)
-dnl ... and remove this paragraph:
-Bootable installation floppy image:
-
-	The single floppy image can be copied to a floppy using rawrite.exe,
-	ntrw.exe or `dd', as described later in this document.
-	The floppy image is a bootable install floppy which can be used
-	to install OpenBSD to the current version.
-	It is also useful for maintenance and disaster recovery.
+OpenBSDfloppydesc(single,The)
 
 DistributionDescription(ten)
 
@@ -52,8 +41,7 @@ OpenBSDbase(24.8,72.1,shared)
 
 OpenBSDcomp(20.4,70.3,shared)
 
-dnl OpenBSDetc(1.5,5.5)
-OpenBSDetc(1.5,5.5,noupgrade)
+OpenBSDetc(1.5,5.5)
 
 OpenBSDgame(2.8,6.2)
 
diff --git a/distrib/notes/sparc/install b/distrib/notes/sparc/install
index 410881415f1..4dcc8a64462 100644
--- a/distrib/notes/sparc/install
+++ b/distrib/notes/sparc/install
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: install,v 1.56 2003/01/04 00:18:09 miod Exp $
+dnl	$OpenBSD: install,v 1.57 2003/02/15 21:22:08 miod Exp $
 OpenBSDInstallPrelude
 
 There are several ways to install OpenBSD onto a disk. The easiest way
@@ -186,20 +186,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.3
-dnl OpenBSDInstallPart3
-	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.2.
-
-	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.
-	Reply with the name of your disk.
-dnl end put this back
+OpenBSDInstallPart3
 
 OpenBSDInstallPart4
 
@@ -508,9 +495,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/sparc/upgrade b/distrib/notes/sparc/upgrade
index 4a6c06c1be2..b5efd9148a3 100644
--- a/distrib/notes/sparc/upgrade
+++ b/distrib/notes/sparc/upgrade
@@ -1,6 +1,2 @@
-dnl	$OpenBSD: upgrade,v 1.15 2002/07/25 19:29:32 miod Exp $
-Due to important changes affecting the MACHINE port since the previous
-release, upgrades to OpenBSD OSREV are not supported.
-You are strongly advised to reinstall your existing machines from scratch.
-dnl
-dnl OpenBSDUpgrade({:-the CD-ROM, the miniroot, or the installation floppy-:})
+dnl	$OpenBSD: upgrade,v 1.16 2003/02/15 21:22:08 miod Exp $
+OpenBSDUpgrade({:-the CD-ROM, the miniroot, or the installation floppy-:})
diff --git a/distrib/notes/sparc/xfer b/distrib/notes/sparc/xfer
index cde28b8b4ae..7d1d505d2ef 100644
--- a/distrib/notes/sparc/xfer
+++ b/distrib/notes/sparc/xfer
@@ -1,9 +1,8 @@
-dnl	$OpenBSD: xfer,v 1.34 2002/12/30 11:13:01 miod Exp $
+dnl	$OpenBSD: xfer,v 1.35 2003/02/15 21:22:08 miod Exp $
 Installation is supported from several media types, including:
 
 	CD-ROM
-dnl put back after 3.2
-dnl	FFS partitions
+	FFS partitions
 	Tape
 	FTP
 	HTTP
@@ -24,11 +23,8 @@ access the binary distribution sets to actually install the system.
 
 Although you can access the distribution sets directly from the CD-ROM or
 from one of the FTP mirrors over the internet, you may wish to transfer
-dnl when upgrades are back, change
-the sets to a local FTP server, or copy them onto a SCSI tape.
-dnl back to this:
-dnl the sets to a local FTP server, or copy them to a partition on the target
-dnl system's disk or onto a SCSI tape.
+the sets to a local FTP server, or copy them to a partition on the target
+system's disk or onto a SCSI tape.
 
 
 OpenBSDXferFloppyFromDOS
@@ -143,5 +139,4 @@ OpenBSDXferPrelude
 
 OpenBSDXferBootTape(xbase xfont xserv xshare,bsd.rd obs=8k conv=sync,boot obs=8k conv=sync)
 
-dnl put back after 3.2
-dnl OpenBSDXferFFS
+OpenBSDXferFFS