From: William A. Rowe Jr <wrowe@apache.org>
Date: Fri, 22 Aug 2014 15:56:20 +0000 (+0000)
Subject: Prepare to tag once again, at 2.2.29
X-Git-Tag: 2.2.29~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=de972dc365ffcb306bde3244d74afae27ad9d8db;p=thirdparty%2Fapache%2Fhttpd.git

Prepare to tag once again, at 2.2.29

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1619849 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/CHANGES b/CHANGES
index 9049e8cfd59..98ba56bbe51 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,7 +1,8 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.2.29
 
-
+  *) Corrected docs/manual pages for new MergeTrailers directive and other
+     out of date documentation. [William Rowe]
 
 Changes with Apache 2.2.28
 
diff --git a/STATUS b/STATUS
index a7a56ec82ca..c426a248a53 100644
--- a/STATUS
+++ b/STATUS
@@ -23,8 +23,8 @@ Patches considered for backport are noted in their branches' STATUS:
 Release history:
     [NOTE that x.{odd}.z versions are strictly Alpha/Beta releases,
           while x.{even}.z versions are Stable/GA releases.]
-    2.2.29  : In maintenance
-    2.2.28  : Tagged August 22, 2014
+    2.2.29  : Tagged August 22, 2014
+    2.2.28  : Tagged August 22, 2014. Not released.
     2.2.27  : Released March 26, 2014
     2.2.26  : Released November 18, 2013
     2.2.25  : Released July 9, 2013
diff --git a/include/ap_release.h b/include/ap_release.h
index a633cb3c7fe..c329c7df835 100644
--- a/include/ap_release.h
+++ b/include/ap_release.h
@@ -44,7 +44,7 @@
 #define AP_SERVER_MAJORVERSION_NUMBER 2
 #define AP_SERVER_MINORVERSION_NUMBER 2
 #define AP_SERVER_PATCHLEVEL_NUMBER   29
-#define AP_SERVER_DEVBUILD_BOOLEAN    1
+#define AP_SERVER_DEVBUILD_BOOLEAN    0
 
 /* Synchronize the above with docs/manual/style/version.ent */