You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by rj...@apache.org on 2015/01/01 16:37:13 UTC
svn commit: r1648857 - in /httpd/httpd/branches/2.2.x: ./ NOTICE
docs/manual/style/xsl/common.xsl include/ap_release.h
Author: rjung
Date: Thu Jan 1 15:37:13 2015
New Revision: 1648857
URL: http://svn.apache.org/r1648857
Log:
Happy New Year 2015
Backport of r1648840 from trunk
resp. r1648845 from 2.4.x.
Modified:
httpd/httpd/branches/2.2.x/ (props changed)
httpd/httpd/branches/2.2.x/NOTICE
httpd/httpd/branches/2.2.x/docs/manual/style/xsl/common.xsl
httpd/httpd/branches/2.2.x/include/ap_release.h
Propchange: httpd/httpd/branches/2.2.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jan 1 15:37:13 2015
@@ -1,2 +1,2 @@
-/httpd/httpd/branches/2.4.x:1555538,1555559
-/httpd/httpd/trunk:290940,395552,417988,451572,501364,583817,583830,611483,630858,639005,639010,647395,657354,657459,660461,660566,664330,678761,680082,681190,682369,683626,685112,686805,686809,687099,687754,693120,693392,693727-693728,696006,697093,706318,707163,708902,711421,713575,719357,720250,729316-729317,729586,732414,732504,732816,732832,733127,733134,733218-733219,734710,743589,755190,756671,756675,756678,756683,757741,761329,763394,764239,768535,769809,771587,771610,776325,777042,777091,778438-778439,778531,778942,780648,780655,780692,780697,780699,785457,785661,790587,803704,823536,823563,834378,835046,891282,932791,942209,952823,953311,955966,992625,1026743,1031551,1040304,1040373,1058192,1070096,1082189,1082196,1090645,1172732,1222335,1223048,1231446,1244211,1294306,1299738,1300171,1301111,1308862,1327036,1327080,1328133,1328325-1328326,1345319,1348656,1349905,1352912,1363183,1363186,1366344,1367778,1368131,1368396,1369568,1395225,1398066,1400700,1408402,1410681,1413732
,1414094,1416889,1418752,1422234,1422253,1435178,1447426,1470940,1475878,1476604,1476621,1476642,1476644-1476645,1477530,1485409,1485668,1490994,1493330,1496429,1500323,1504276,1506714,1509872,1509875,1524192,1524770,1527925,1528718,1529559,1531505,1532816,1551714,1552227,1553204,1554276,1554281,1555240,1555555,1556428,1572092,1572198,1572543,1572611,1572630,1572655,1572663,1572668-1572671,1572896,1572911,1572967,1573224,1573229,1575400,1586745,1587594,1587639,1590509,1603156,1604353,1610207,1610311,1610491,1610501,1620932
+/httpd/httpd/branches/2.4.x:1555538,1555559,1648845
+/httpd/httpd/trunk:290940,395552,417988,451572,501364,583817,583830,611483,630858,639005,639010,647395,657354,657459,660461,660566,664330,678761,680082,681190,682369,683626,685112,686805,686809,687099,687754,693120,693392,693727-693728,696006,697093,706318,707163,708902,711421,713575,719357,720250,729316-729317,729586,732414,732504,732816,732832,733127,733134,733218-733219,734710,743589,755190,756671,756675,756678,756683,757741,761329,763394,764239,768535,769809,771587,771610,776325,777042,777091,778438-778439,778531,778942,780648,780655,780692,780697,780699,785457,785661,790587,803704,823536,823563,834378,835046,891282,932791,942209,952823,953311,955966,992625,1026743,1031551,1040304,1040373,1058192,1070096,1082189,1082196,1090645,1172732,1222335,1223048,1231446,1244211,1294306,1299738,1300171,1301111,1308862,1327036,1327080,1328133,1328325-1328326,1345319,1348656,1349905,1352912,1363183,1363186,1366344,1367778,1368131,1368396,1369568,1395225,1398066,1400700,1408402,1410681,1413732
,1414094,1416889,1418752,1422234,1422253,1435178,1447426,1470940,1475878,1476604,1476621,1476642,1476644-1476645,1477530,1485409,1485668,1490994,1493330,1496429,1500323,1504276,1506714,1509872,1509875,1524192,1524770,1527925,1528718,1529559,1531505,1532816,1551714,1552227,1553204,1554276,1554281,1555240,1555555,1556428,1572092,1572198,1572543,1572611,1572630,1572655,1572663,1572668-1572671,1572896,1572911,1572967,1573224,1573229,1575400,1586745,1587594,1587639,1590509,1603156,1604353,1610207,1610311,1610491,1610501,1620932,1648840
Modified: httpd/httpd/branches/2.2.x/NOTICE
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/NOTICE?rev=1648857&r1=1648856&r2=1648857&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/NOTICE (original)
+++ httpd/httpd/branches/2.2.x/NOTICE Thu Jan 1 15:37:13 2015
@@ -1,5 +1,5 @@
Apache HTTP Server
-Copyright 2014 The Apache Software Foundation.
+Copyright 2015 The Apache Software Foundation.
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
Modified: httpd/httpd/branches/2.2.x/docs/manual/style/xsl/common.xsl
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/style/xsl/common.xsl?rev=1648857&r1=1648856&r2=1648857&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/style/xsl/common.xsl (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/style/xsl/common.xsl Thu Jan 1 15:37:13 2015
@@ -421,7 +421,7 @@ var comments_identifier = 'http://httpd.
</xsl:choose>
<div id="footer">&lf;
<p class="apache">
- <xsl:text>Copyright 2014 The Apache Software Foundation.</xsl:text><br />
+ <xsl:text>Copyright 2015 The Apache Software Foundation.</xsl:text><br />
<xsl:if test="normalize-space($message[@id='before-license'])">
<xsl:value-of select="$message[@id='before-license']"/>
<xsl:text> </xsl:text>
Modified: httpd/httpd/branches/2.2.x/include/ap_release.h
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/include/ap_release.h?rev=1648857&r1=1648856&r2=1648857&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/include/ap_release.h (original)
+++ httpd/httpd/branches/2.2.x/include/ap_release.h Thu Jan 1 15:37:13 2015
@@ -23,7 +23,7 @@
#define AP_RELEASE_H
#define AP_SERVER_COPYRIGHT \
- "Copyright 2014 The Apache Software Foundation."
+ "Copyright 2015 The Apache Software Foundation."
/*
* The below defines the base string of the Server: header. Additional