Commit c476210b authored by Rainer Jung's avatar Rainer Jung
Browse files

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
parent c61f623b

NOTICE

+1 −1
Original line number Diff line number Diff line 
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/).

docs/manual/style/xsl/common.xsl

+1 −1
Original line number Diff line number Diff line
@@ -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>

include/ap_release.h

+1 −1
Original line number Diff line number Diff line
@@ -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