OSREV & OSrev fixups

6 files changed, 27 insertions, 28 deletions

diff --git a/distrib/notes/sparc/contents b/distrib/notes/sparc/contents
index d298363db52..6c09e87f35e 100644
--- a/distrib/notes/sparc/contents
+++ b/distrib/notes/sparc/contents
@@ -69,16 +69,16 @@ Bootable installation/upgrade floppies:
   upgr{:--:}OSrev.fs
 	This disk contains a file system, and has holds the utilities 
 	needed in order to upgrade an existing OpenBSD (or NetBSD) system
-	to a minimal working OpenBSD 2.3 system.
+	to a minimal working OpenBSD OSREV system.
 
   floppy{:--:}OSrev.fs
 	This disk contains a compressed ramdisk filesystem, and holds
-        all utilities needed to install or upgrade to OpenBSD 2.3
+        all utilities needed to install or upgrade to OpenBSD OSREV
   
   miniroot{:--:}OSrev.fs
 	This is a miniroot filesystem image which can be copied to the
 	swap partition of an existing OpenBSD, NetBSD, Linux, SunOS, 
-	or Solaris installation to allow upgrading to OpenBSD 2.3
+	or Solaris installation to allow upgrading to OpenBSD OSREV
 
 
 DistributionDescription
diff --git a/distrib/notes/sparc/hardware b/distrib/notes/sparc/hardware
index bfeb61afb46..fd3f23e2712 100644
--- a/distrib/notes/sparc/hardware
+++ b/distrib/notes/sparc/hardware
@@ -1,11 +1,11 @@
-OpenBSD/sparc 2.3 runs on the following classes of machines:
+OpenBSD/sparc OSREV runs on the following classes of machines:
 	- sun4  -- 4/100, 4/200, and 4/300.   (note that support
 		   for the 4/400 processor is incomplete)
 	- sun4c -- SS1, SS1+, SS2, IPC, ELC, IPX, and SLC
 	- sun4m -- Sparc Classic, LX, 4, 5, 10, and 20. *** See Notes Below
 	- faithful clones of the above Sun systems (e.g. Integrix)
 
-OpenBSD/sparc 2.3 does NOT run on these machines (yet):
+OpenBSD/sparc OSREV does NOT run on these machines (yet):
 	- Sun 4/400 --  Lacking support for the I/O cache, and related
 			ethernet problems.
 	- Sun 4/6xx -- Sparcserver 600MP, Different registers (auxio
@@ -86,14 +86,14 @@ Hardware the we do NOT currently support, but get many questions about:
 
 *** Note: sun4m and general sparc caveats
 
-As of of the OpenBSD 2.3 release there are still some outstanding problems
+As of of the OpenBSD OSREV release there are still some outstanding problems
 with OpenBSD on the various Sparc architectures.  The sun4m architecture,
 particularly the Viking/SuperSPARC implementations, is probably the least
 stable and is also lacking useful floppy/audio support.  
 
 The supplied GENERIC kernel is the best attempt at a configuration that
 works on the widest range of machinery (sun4, sun4c, and sun4m).  
-If you have problems with the OpenBSD 2.3 kernel in this distribution, 
+If you have problems with the OpenBSD OSREV kernel in this distribution, 
 please visit the OpenBSD web page (http://www.openbsd.org) and the mailing 
 lists to review the current status and check for updates and distribution
 errata.
diff --git a/distrib/notes/sparc/install b/distrib/notes/sparc/install
index 9eb384a34c4..145b2f7cd9f 100644
--- a/distrib/notes/sparc/install
+++ b/distrib/notes/sparc/install
@@ -489,10 +489,9 @@ The installboot man page says to do something like this:
 You can now extract the provided "*.tar.gz files onto your disk.
 
     sunos# ls -FC
-    base{:--:}OSrev.tar.gz      etc{:--:}OSrev.tar.gz       man{:--:}OSrev.tar.gz       secr23.tar.gz
-    comp{:--:}OSrev.tar.gz      game{:--:}OSrev.tar.gz      misc{:--:}OSrev.tar.gz
-    xbase{:--:}OSrev.tar.gz     xfont{:--:}OSrev.tar.gz     xserv{:--:}OSrev.tar.gz     bsd
-    bsd.scsi3
+    base{:--:}OSrev.tar.gz   comp{:--:}OSrev.tar.gz   man{:--:}OSrev.tar.gz       xfont{:--:}OSrev.tar.gz
+    bsd             etc{:--:}OSrev.tar.gz    misc{:--:}OSrev.tar.gz      xserv{:--:}OSrev.tar.gz
+    bsd.scsi3       game{:--:}OSrev.tar.gz   xbase{:--:}OSrev.tar.gz
     sunos{:-#-:} gunzip < base{:--:}OSrev.tar.gz | (cd /mnt; gtar xvpf -)
     [...] for each set
 
diff --git a/distrib/notes/sparc/upgrade b/distrib/notes/sparc/upgrade
index b2b5dbd195e..f957e34c6ec 100644
--- a/distrib/notes/sparc/upgrade
+++ b/distrib/notes/sparc/upgrade
@@ -1,4 +1,4 @@
-To upgrade to OpenBSD 2.3 from a previous version start with the general
+To upgrade to OpenBSD OSREV from a previous version start with the general
 instructions in the section "Installing OpenBSD".
 
 If you are upgrading with the miniroot or the new single floppy image,
@@ -6,7 +6,7 @@ select the (U)pdate option rather than the (I)nstall option at the prompt
 in the install process. 
 
 If you are using the old multi-floppy installation procedure, use the
-"upgr23.fs" floppy rather than the "inst23.fs" floppy when prompted to
+"upgr{:--:}OSrev.fs" floppy rather than the "inst{:--:}OSrev.fs" floppy when prompted to
 put in the filesystem diskette.  When you arrive at the shell prompt,
 run the "upgrade" script rather than "install" script.
 
diff --git a/distrib/notes/sparc/whatis b/distrib/notes/sparc/whatis
index 6e7fbd78468..6ba2845a3f3 100644
--- a/distrib/notes/sparc/whatis
+++ b/distrib/notes/sparc/whatis
@@ -1,12 +1,12 @@
-OpenBSD/sparc 2.3 is brought to you by the same people who did the first
+OpenBSD/sparc OSREV is brought to you by the same people who did the first
 free BSD sparc port (based on Chris Torek's 4.4BSD work).  Many more sparc
 models and devices are now supported.
 
-In addition to the providing SunOS 4.1 compatibility, OpenBSD 2.3 will
+In addition to the providing SunOS 4.1 compatibility, OpenBSD OSREV will
 also run some number of SunOS 5 (SVR4) executables in binary emulation mode.
 
 OpenBSD/sparc has gone though several development cycles since it's origin,
-but the OpenBSD/sparc 2.3 release should be considered as "under active
+but the OpenBSD/sparc OSREV release should be considered as "under active
 development" rather than a production ready release.  There are still known
 problems with the kernel and missing support for some common devices.
 
diff --git a/distrib/notes/sparc/xfer b/distrib/notes/sparc/xfer
index 60de1120be7..4556cfd6330 100644
--- a/distrib/notes/sparc/xfer
+++ b/distrib/notes/sparc/xfer
@@ -40,7 +40,7 @@ Creating a bootable floppy disk using DOS/Windows:
 
 	First you need to get access to the OpenBSD Bootable floppy
 	images.  If you can access the CD-ROM distribution under DOS
-	the bootable disks are in the 2.3/sparc directory, otherwise
+	the bootable disks are in the OSREV/sparc directory, otherwise
 	you you will have to download them from one of the OpenBSD
 	ftp or http mirror sites, using ftp or a web-viewer.  In either
 	case, take care to do "binary" transfers, since these are
@@ -74,7 +74,7 @@ Creating a bootable floppy disk using SunOS or other Un*x-like system:
 	Next, use the dd(1) utility to copy the file to the floppy drive.
 	Under SunOS, the command would be:
 
-		dd if=floppy23.fs of=/dev/rfd0c bs=36b
+		dd if=floppy{:--:}OSrev.fs of=/dev/rfd0c bs=36b
 
 	If you are using something other than SunOS, you may have to adapt
 	this to conform to local naming conventions for the floppy and
@@ -96,7 +96,7 @@ Creating a bootable floppy disk using SunOS or other Un*x-like system:
 Creating a bootable hard disk using SunOS or other Un*x-like system:
 
 	If you don't have a floppy drive you can copy the single floppy
-	installation image "floppy23.fs" or the mini-root "miniroot23.fs"
+	installation image "floppy{:--:}OSrev.fs" or the mini-root "miniroot{:--:}OSrev.fs"
 	onto the hard disk you intend to boot on.  Traditionally, the
 	way to do this is to use dd(1) to place the bootable filesystem
 	image in the "swap" partition of the disk (while running in
@@ -113,9 +113,9 @@ Creating a bootable hard disk using SunOS or other Un*x-like system:
 	Use the dd(1) utility to copy the file to the hard drive.
 	Under SunOS, the command would be:
 
-		dd if=floppy23.fs of=/dev/rsd0b bs=36b
+		dd if=floppy{:--:}OSrev.fs of=/dev/rsd0b bs=36b
 				- or -
-		dd if=miniroot23.fs of=/dev/rsd0b bs=36b
+		dd if=miniroot{:--:}OSrev.fs of=/dev/rsd0b bs=36b
 
 	The blocksize is arbitrary as long as it's a multiple of 512-bytes
 	and within the maximum supported by the driver, i.e. bs=126b may
@@ -140,7 +140,7 @@ Creating a bootable hard disk using SunOS or other Un*x-like system:
 
 	To copy the floppy image to the whole disk, overwriting labels:
 
-		dd if=floppy23.fs of=/dev/rsdXc bs=36b
+		dd if=floppy{:--:}OSrev.fs of=/dev/rsdXc bs=36b
 
 	Two notes - X should be replaced by the unit number of the target
 	disk, which is most likely *not* the disk/partition that's your
@@ -159,13 +159,13 @@ Creating a bootable hard disk using SunOS or other Un*x-like system:
 	To copy the floppy image to the hard disk, preserving SunOS,
 	Solaris NetBSD or OpenBSD labels:
 
-		dd if=floppy23.fs of=/dev/rsdXc bs=1b skip=1 seek=1
+		dd if=floppy{:--:}OSrev.fs of=/dev/rsdXc bs=1b skip=1 seek=1
 
 	You need to be sure that your version of dd(1) supports the
 	skip and seek operands, otherwise you can try a technique like:
 
 		dd if=/dev/rsdXc of=/tmp/label bs=1b count=1
-		dd if=floppy23.fs of=/dev/rsdXc bs=36b
+		dd if=floppy{:--:}OSrev.fs of=/dev/rsdXc bs=36b
 		dd if=/tmp/label of=/dev/rsdXc bs=1b count=1
 
 	In either case, you've created a situation where the disklabel
@@ -177,7 +177,7 @@ Creating a network bootable setup using SunOS or other Un*x-like system:
 
 	The details of setting up a network bootable environment vary
 	considerably, depending on the networks host.  Extract the
-	OpenBSD diskless(8) man page from the man23.tar.gz distribution
+	OpenBSD diskless(8) man page from the man{:--:}OSrev.tar.gz distribution
 	set or see the copy on the OpenBSD web page.  You will also
 	need to reference the relevant man pages or administrators guide
 	for the host system.
@@ -217,7 +217,7 @@ To install or upgrade OpenBSD using a tape, you need to do the following:
 	#! /bin/sh
 	tape=/dev/nrst0
 	mt -f ${tape} rewind
-	for file in base23 etc23 comp23 game23 man23 misc23 x*23
+	for file in base{:--:}OSrev etc{:--:}OSrev comp{:--:}OSrev game{:--:}OSrev man{:--:}OSrev misc{:--:}OSrev x*{:--:}OSrev
 	do
 		dd if=${file}.tar.gz of=${tape}
 	done
@@ -228,7 +228,7 @@ To install or upgrade OpenBSD using a tape, you need to do the following:
 
 	And then:
 
-	cd .../2.3/sparc
+	cd .../OSREV/sparc
 	sh -x /tmp/maketape
 
 
@@ -275,7 +275,7 @@ following:
 	Place the distribution sets you wish to upgrade somewhere in
 	your current file system tree.  At a bare minimum, you must
 	upgrade the "base" binary distribution, and so must put the
-	"base23" set somewhere in your file system.  If you wish,
+	"base{:--:}OSrev" set somewhere in your file system.  If you wish,
 	you can do the other sets, as well, but you should NOT upgrade
 	the "etc" distribution; the "etc" distribution contains system
 	configuration files that you should review and update by hand.