Author: markt
Date: Thu Nov 7 09:57:47 2013
New Revision: 1539575
URL: http://svn.apache.org/r1539575
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55663
Minor correction to the wording of the NOTICE files to align them with
http://www.apache.org/legal/src-headers.html#notice (violetagg)
Modified:
tomcat/tc6.0.x/trunk/ (props changed)
tomcat/tc6.0.x/trunk/NOTICE
tomcat/tc6.0.x/trunk/res/META-INF/default.notice
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc6.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1533312,1536520
Merged /tomcat/tc7.0.x/trunk:r1536524
Modified: tomcat/tc6.0.x/trunk/NOTICE
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/NOTICE?rev=1539575&r1=1539574&r2=1539575&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/NOTICE (original)
+++ tomcat/tc6.0.x/trunk/NOTICE Thu Nov 7 09:57:47 2013
@@ -1,7 +1,7 @@
Apache Tomcat
Copyright 1999-2013 The Apache Software Foundation
-This product includes software developed by
+This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
The Windows Installer is built with the Nullsoft
Modified: tomcat/tc6.0.x/trunk/res/META-INF/default.notice
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/res/META-INF/default.notice?rev=1539575&r1=1539574&r2=1539575&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/res/META-INF/default.notice (original)
+++ tomcat/tc6.0.x/trunk/res/META-INF/default.notice Thu Nov 7 09:57:47 2013
@@ -1,5 +1,5 @@
Apache Tomcat
Copyright 1999-@YEAR@ The Apache Software Foundation
-This product includes software developed by
+This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1539575&r1=1539574&r2=1539575&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Thu Nov 7 09:57:47 2013
@@ -106,6 +106,12 @@
Update Maven Central location used to download dependencies at build
time to be <code>repo.maven.apache.org</code>. (kkolinko)
</update>
+ <fix>
+ <bug>55663</bug>: Minor correction to the wording of the NOTICE files
to
+ align them with the
+ <a
href="http://www.apache.org/legal/src-headers.html#notice";>requirements
+ for NOTICE files</a>. (violetagg)
+ </fix>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
