move to 3.1-beta

6 files changed, 21 insertions, 20 deletions

diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub
index ca47c8fa4fb..aad23e0c865 100644
--- a/distrib/miniroot/install.sub
+++ b/distrib/miniroot/install.sub
@@ -1,5 +1,5 @@
 #!/bin/sh
-#	$OpenBSD: install.sub,v 1.187 2002/03/22 01:41:54 krw Exp $
+#	$OpenBSD: install.sub,v 1.188 2002/03/22 23:29:28 deraadt Exp $
 #	$NetBSD: install.sub,v 1.5.2.8 1996/09/02 23:25:02 pk Exp $
 #
 # Copyright (c) 1997-2002 Todd Miller, Theo de Raadt, Ken Westerback
@@ -69,7 +69,7 @@
 #	OpenBSD installation/upgrade script - common subroutines.
 
 ROOTDISK=
-VERSION=30
+VERSION=31
 VERSION_MAJOR=$(( $VERSION / 10 ))
 VERSION_MINOR=$(( $VERSION % 10 ))
 export VERSION VERSION_MAJOR VERSION_MINOR
diff --git a/etc/root/root.mail b/etc/root/root.mail
index c8ed51929bb..2ee145b6592 100644
--- a/etc/root/root.mail
+++ b/etc/root/root.mail
@@ -1,9 +1,9 @@
-From deraadt@do-not-reply.openbsd.org Sat Oct 13 11:48:48 MDT 2001
+From deraadt@do-not-reply.openbsd.org Sat Jun 1 11:48:48 MDT 2002
 Return-Path: root
-Date: Oct 13 11:48:48 MDT 2001
+Date: Jun 1 11:48:48 MDT 2002
 From: deraadt@do-not-reply.openbsd.org (Theo de Raadt)
 To: root
-Subject: Welcome to OpenBSD 3.0!  Secure by Default!
+Subject: Welcome to OpenBSD 3.1!  Secure by Default!
 
 This message attempts to describe the most basic initial questions that a
 system administrator of an OpenBSD box might have.  You are urged to save
@@ -26,7 +26,7 @@ further information regarding configuration in the file /usr/X11R6/README.
 
 Several popular binary packages (pre-compiled applications) are available
 for most architectures.  If you installed from a CD-ROM the packages
-are on the same CD-ROM you installed from in the directory 3.0/packages.
+are on the same CD-ROM you installed from in the directory 3.1/packages.
 
 CD-ROM Space permitted us to include a subset of the following packages
 for the most common architectures.  Please see the FTP sites if you find
@@ -767,21 +767,21 @@ something you need missing.
 	zsh-zftp-4.0.2.tgz			
 
 These and many other packages are also available via ftp at
-      ftp://ftp.openbsd.org/pub/OpenBSD/3.0/packages/
+      ftp://ftp.openbsd.org/pub/OpenBSD/3.1/packages/
 If you do not find a package you want on the CD, please go look at your
 nearest FTP mirror site.
 
 Select your architecture and download the tarballs of your choice.  For example
 to install the emacs package for i386, execute:
   # mount /dev/cd0a /cdrom
-  # pkg_add -v /cdrom/3.0/packages/i386/emacs-20.7.tgz
+  # pkg_add -v /cdrom/3.1/packages/i386/emacs-20.7.tgz
 or alternatively install them via FTP this way:
   # pkg_add -v \
-    ftp://ftp.openbsd.org/pub/OpenBSD/3.0/packages/i386/emacs-20.7.tgz
+    ftp://ftp.openbsd.org/pub/OpenBSD/3.1/packages/i386/emacs-20.7.tgz
 
 You are STRONGLY urged to use ssh instead of telnet, rlogin, or rsh!  ssh is
 included in all OpenBSD systems.  The implementation is OpenSSH, which we are
-the developers of.  Version 3.0 is included, and has support for both SSH1
+the developers of.  Version 3.1 is included, and has support for both SSH1
 and SSH2 protocols.  For more information, see
 	http://www.OpenSSH.com
 
diff --git a/share/mk/sys.mk b/share/mk/sys.mk
index 66e57ca7b99..77975b28d08 100644
--- a/share/mk/sys.mk
+++ b/share/mk/sys.mk
@@ -1,4 +1,4 @@
-#	$OpenBSD: sys.mk,v 1.28 2002/02/23 18:34:50 deraadt Exp $
+#	$OpenBSD: sys.mk,v 1.29 2002/03/22 23:29:28 deraadt Exp $
 #	$NetBSD: sys.mk,v 1.27 1996/04/10 05:47:19 mycroft Exp $
 #	@(#)sys.mk	5.11 (Berkeley) 3/13/91
 
@@ -10,7 +10,7 @@
 
 unix=		We run OpenBSD.
 OSMAJOR=	3
-OSMINOR=	0
+OSMINOR=	1
 OSREV=		$(OSMAJOR).$(OSMINOR)
 OSrev=		$(OSMAJOR)$(OSMINOR)
 
diff --git a/share/tmac/mdoc/doc-common b/share/tmac/mdoc/doc-common
index 9edb97e60de..29a5649e25d 100644
--- a/share/tmac/mdoc/doc-common
+++ b/share/tmac/mdoc/doc-common
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: doc-common,v 1.26 2001/10/02 16:25:30 millert Exp $
+.\"	$OpenBSD: doc-common,v 1.27 2002/03/22 23:29:28 deraadt Exp $
 .\"
 .\" Copyright (c) 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -200,7 +200,7 @@
 .de Os
 .ds oS Null
 .if "\\$1"" \{\
-.	ds oS OpenBSD 3.0
+.	ds oS OpenBSD 3.1
 .\}
 .if "\\$2"" \{\
 .	ds aa Non-Null
@@ -265,6 +265,7 @@
 .	if "\\$2"2.8"  .as oS \02.8
 .	if "\\$2"2.9"  .as oS \02.9
 .	if "\\$2"3.0"  .as oS \03.0
+.	if "\\$2"3.1"  .as oS \03.1
 .\}
 .if "\\*(oS"Null" .ds oS \0\\$1
 .if "\\*(aa"Non-Null" .as oS \0\\$2
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index a2ebded46ce..8e9d2b41e0a 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: newvers.sh,v 1.38 2002/03/14 20:31:31 mickey Exp $
+#	$OpenBSD: newvers.sh,v 1.39 2002/03/22 23:29:28 deraadt Exp $
 #	$NetBSD: newvers.sh,v 1.17.2.1 1995/10/12 05:17:11 jtc Exp $
 #
 # Copyright (c) 1984, 1986, 1990, 1993
@@ -63,7 +63,7 @@ id=`basename ${d}`
 #		VERSION and other bits
 
 ost="OpenBSD"
-osr="3.0"
+osr="3.1"
 
 cat >vers.c <<eof
 const char ostype[] = "${ost}";
@@ -71,7 +71,7 @@ const char osrelease[] = "${osr}";
 const char osversion[] = "${id}#${v}";
 const char sccs[8] = { ' ', ' ', ' ', ' ', '@', '(', '#', ')' };
 const char version[] =
-    "${ost} ${osr}-current (${id}) #${v}: ${t}\n    ${u}@${h}:${d}\n";
+    "${ost} ${osr}-beta (${id}) #${v}: ${t}\n    ${u}@${h}:${d}\n";
 eof
 
 expr ${v} + 1 > version
diff --git a/sys/sys/param.h b/sys/sys/param.h
index 4584609afe8..5057c48a1a5 100644
--- a/sys/sys/param.h
+++ b/sys/sys/param.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: param.h,v 1.46 2002/01/30 20:45:35 nordin Exp $	*/
+/*	$OpenBSD: param.h,v 1.47 2002/03/22 23:29:28 deraadt Exp $	*/
 /*	$NetBSD: param.h,v 1.23 1996/03/17 01:02:29 thorpej Exp $	*/
 
 /*-
@@ -45,8 +45,8 @@
 #define BSD4_3	1
 #define BSD4_4	1
 
-#define OpenBSD	200111		/* OpenBSD version (year & month). */
-#define OpenBSD3_0 1		/* OpenBSD 3.0 */
+#define OpenBSD	200206		/* OpenBSD version (year & month). */
+#define OpenBSD3_1 1		/* OpenBSD 3.1 */
 
 #ifndef NULL
 #ifdef 	__GNUG__