Commit 9f95a151 authored by Rainer Jung's avatar Rainer Jung
Browse files

New year, backport of r1429349 from trunk 

resp. r1429350 from 2.4.x.


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

NOTICE

+1 −1
Original line number Diff line number Diff line 
Apache HTTP Server

Copyright 2012 The Apache Software Foundation.

Copyright 2013 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
@@ -318,7 +318,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 2012 The Apache Software Foundation.</xsl:text><br />

        <xsl:text>Copyright 2013 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
@@ -25,7 +25,7 @@ 
#include "apr_general.h" /* stringify */



#define AP_SERVER_COPYRIGHT \

    "Copyright 2012 The Apache Software Foundation."

    "Copyright 2013 The Apache Software Foundation."



/*

 * The below defines the base string of the Server: header. Additional