Happy New Year 2018

Backport of r1820101 from trunk plus year
update in docs/manual/style/xsl/common.xsl.

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

diff --git a/NOTICE b/NOTICE
index 01a492b7b718afc94eaad7e06b2cf0b5611afa3d..89ee86f60ae7ac8a47b846ffef565349d5a2200b 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 cbee980bf08037d2e9a797bd76620aea186ccae3..88e68b254e256f19449c69a5b3ffe3c27c693e64 100644 (file)
--- a/docs/manual/style/xsl/common.xsl
+++ b/docs/manual/style/xsl/common.xsl
@@ -418,7 +418,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 e1a30c7a02c8d6e6e13940e8b0eb30420de32f77..9f26aeaaceaae91e6eb595f06151313981e5db14 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