Happy New Year 2018

Backport of r1820101 from trunk
resp. r1820103 from 2.4.x.

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

diff --git a/NOTICE b/NOTICE
index af680bd95aabb794404801b672b44ebade8c4506..6efb9a5c448bdfcda5ab6f31651bf2bf51f0f867 100644 (file)
--- a/NOTICE
+++ b/NOTICE
@@ -1,5 +1,5 @@
 Apache HTTP Server
-Copyright 2017 The Apache Software Foundation.
+Copyright 2018 The Apache Software Foundation.
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).

diff --git a/docs/manual/style/xsl/common.xsl b/docs/manual/style/xsl/common.xsl
index 6eda1bd67f9b98c8a00c02c212d529f9c06cc979..ff1d5fa97f42d6afe39c18712c7ef6db01f09fac 100644 (file)
--- a/docs/manual/style/xsl/common.xsl
+++ b/docs/manual/style/xsl/common.xsl
@@ -412,7 +412,7 @@ var comments_identifier = 'http://httpd.apache.org/docs/]]></xsl:text>&httpd.doc
 </xsl:choose>
 <div id="footer">&lf;
     <p class="apache">
-        <xsl:text>Copyright 2017 The Apache Software Foundation.</xsl:text><br />
+        <xsl:text>Copyright 2018 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>

diff --git a/include/ap_release.h b/include/ap_release.h
index 740e91737ec687d1125de117efe0b61d4ee057f3..6422350e555f1bc815b6a8f5e9cb6dbe3df616e9 100644 (file)
--- a/include/ap_release.h
+++ b/include/ap_release.h
@@ -23,7 +23,7 @@
 #define AP_RELEASE_H
 
 #define AP_SERVER_COPYRIGHT \
-    "Copyright 2017 The Apache Software Foundation."
+    "Copyright 2018 The Apache Software Foundation."
 
 /*
  * The below defines the base string of the Server: header. Additional