Commit f7796bc2 authored by Ken Coar's avatar Ken Coar
Browse files

Modify the licence clauses for 1.3 to prohibit derived packages 

	from claiming to be "Apache" without the AG's permission.  (Always
	the intent, I believe, but previously not explicit enough.)
	Hopefully this will help deter further dilution of the brand.

Reviewed by:	Paul Sutton, Ben Laurie, Jim Jagielski, Randy Terbush,
		Roy Fielding, Chuck Murcko, Mark Cox, Ralf Engeschall,
		Sameer Parekh, Martin Kraemer, Dean Gaudet, Brian Behlendorf


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@80761 13f79535-47bb-0310-9956-ffa450edef68
parent ddb648fe

docs/manual/LICENSE

+5 −1
Changes for docs/manual/LICENSE: 5 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -23,7 +23,11 @@ 
 *    prior written permission. For written permission, please contact

 *    apache@apache.org.

 *

 * 5. Redistributions of any form whatsoever must retain the following

 * 5. Products derived from this software may not be called "Apache"

 *    nor may "Apache" appear in their names without prior written

 *    permission of the Apache Group.

 *

 * 6. Redistributions of any form whatsoever must retain the following

 *    acknowledgment:

 *    "This product includes software developed by the Apache Group

 *    for use in the Apache HTTP server project (http://www.apache.org/)."

docs/manual/expand.pl

+5 −1
Changes for docs/manual/expand.pl: 5 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -34,7 +34,11 @@ 
#    endorse or promote products derived from this software without

#    prior written permission.

#

# 5. Redistributions of any form whatsoever must retain the following

# 5. Products derived from this software may not be called "Apache"

#    nor may "Apache" appear in their names without prior written

#    permission of the Apache Group.

#

# 6. Redistributions of any form whatsoever must retain the following

#    acknowledgment:

#    "This product includes software developed by the Apache Group

#    for use in the Apache HTTP server project (http://www.apache.org/)."