summaryrefslogtreecommitdiff
path: root/share
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2007-07-25 20:07:29 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2007-07-25 20:07:29 +0000
commita7f00a3b55e80534162f7ac81a6ba8d82d2fc389 (patch)
tree8b12dcb7289ba10b47cd270b8fdfc6eaabdf99b2 /share
parentf87c0abacee8e961fce6f6fab542f60d5d614025 (diff)
crank to 4.2-beta
Diffstat (limited to 'share')
-rw-r--r--share/mk/sys.mk4
-rw-r--r--share/tmac/mdoc/doc-common5
2 files changed, 5 insertions, 4 deletions
diff --git a/share/mk/sys.mk b/share/mk/sys.mk
index eb9ee57db48..ec93e916444 100644
--- a/share/mk/sys.mk
+++ b/share/mk/sys.mk
@@ -1,4 +1,4 @@
-# $OpenBSD: sys.mk,v 1.52 2007/02/12 13:10:02 henning Exp $
+# $OpenBSD: sys.mk,v 1.53 2007/07/25 20:07:27 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= 4
-OSMINOR= 1
+OSMINOR= 2
OSREV= $(OSMAJOR).$(OSMINOR)
OSrev= $(OSMAJOR)$(OSMINOR)
diff --git a/share/tmac/mdoc/doc-common b/share/tmac/mdoc/doc-common
index a6047909794..d5ed05a38fb 100644
--- a/share/tmac/mdoc/doc-common
+++ b/share/tmac/mdoc/doc-common
@@ -1,4 +1,4 @@
-.\" $OpenBSD: doc-common,v 1.53 2007/05/31 04:28:09 jmc Exp $
+.\" $OpenBSD: doc-common,v 1.54 2007/07/25 20:07:27 deraadt Exp $
.\"
.\" Copyright (c) 1991, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -203,7 +203,7 @@
.de Os
.ds oS Null
.if "\\$1"" \{\
-. ds oS OpenBSD 4.1
+. ds oS OpenBSD 4.2
.\}
.if "\\$2"" \{\
. ds aa Non-Null
@@ -282,6 +282,7 @@
. if "\\$2"3.9" .as oS \03.9
. if "\\$2"4.0" .as oS \04.0
. if "\\$2"4.1" .as oS \04.1
+. if "\\$2"4.2" .as oS \04.2
.\}
.if "\\*(oS"Null" .ds oS \0\\$1
.if "\\*(aa"Non-Null" .as oS \0\\$2