From: Matthew Dillon <dillon@apollo.backplane.com>
Date: Tue, 15 Sep 2009 01:56:43 +0000 (-0700)
Subject: RELEASE 2.4 - Release Engineering on release branch adjust to 2.4
X-Git-Tag: v2.4.0^0
X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/2ee9a0d68907366cb987223faf3e28538051f724

RELEASE 2.4 - Release Engineering on release branch adjust to 2.4
---

diff --git a/gnu/usr.bin/groff/tmac/mdoc.local b/gnu/usr.bin/groff/tmac/mdoc.local
index 065e634e41..34e1c5f9f2 100644
--- a/gnu/usr.bin/groff/tmac/mdoc.local
+++ b/gnu/usr.bin/groff/tmac/mdoc.local
@@ -77,7 +77,7 @@
 .
 .
 .\" Default .Os value
-.ds doc-default-operating-system DragonFly\~2.3
+.ds doc-default-operating-system DragonFly\~2.4
 .
 .
 .\" DragonFly releases not found in doc-common
@@ -99,6 +99,8 @@
 .ds doc-operating-system-DragonFly-2.1 2.1
 .ds doc-operating-system-DragonFly-2.2 2.2
 .ds doc-operating-system-DragonFly-2.3 2.3
+.ds doc-operating-system-DragonFly-2.4 2.4
+.ds doc-operating-system-DragonFly-2.5 2.5
 .
 .\" FreeBSD releases not found in doc-common.
 .ds doc-operating-system-FreeBSD-4.11 4.11
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index e7b57cf9de..fbd1b891dc 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -44,7 +44,7 @@ fi
 
 # Set the branch
 #
-BRANCH="DEVELOPMENT_2_3"
+BRANCH="RELEASE_2_4"
 
 TYPE="DragonFly"
 
diff --git a/sys/conf/subvers-DEVELOPMENT_2_3 b/sys/conf/subvers-DEVELOPMENT_2_3
deleted file mode 100644
index e1fc111b93..0000000000
--- a/sys/conf/subvers-DEVELOPMENT_2_3
+++ /dev/null
@@ -1,5 +0,0 @@
-# Subversion control for DragonFly 2.3.X-DEVELOPMENT
-#
-0	-
-1	-
-2	-
diff --git a/sys/conf/subvers-RELEASE_2_4 b/sys/conf/subvers-RELEASE_2_4
new file mode 100644
index 0000000000..e8cb4f7d42
--- /dev/null
+++ b/sys/conf/subvers-RELEASE_2_4
@@ -0,0 +1,3 @@
+# Subversion control for DragonFly 2.4.X-RELEASE
+#
+0	-
diff --git a/sys/sys/param.h b/sys/sys/param.h
index 1df9021242..9802600898 100644
--- a/sys/sys/param.h
+++ b/sys/sys/param.h
@@ -69,9 +69,11 @@
  * 200204 - suser() & suser_cred() removal
  * 200205 - devfs import
  * 200206 - *sleep() renames
+ * 200400 - 2.4 branch
+ * 200500 - 2.5 master
  */
 #undef __DragonFly_version
-#define __DragonFly_version 200206	/* Master, propagated to newvers */
+#define __DragonFly_version 200400	/* 2.4 propagated to newvers */
 
 #ifdef __FreeBSD__
 /*