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

diff --git a/docs/manual/LICENSE b/docs/manual/LICENSE
index 6c3c47cad51b6fa69d7382f814426e1a2f580d6e..edb90e071f6e7ef7a00719840e37505783cd6f4f 100644 (file)
--- a/docs/manual/LICENSE
+++ b/docs/manual/LICENSE
@@ -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/)."

diff --git a/docs/manual/expand.pl b/docs/manual/expand.pl
index b35da5c5f9c6f3c1c062830f6c666cbabd52f45a..79b997fe9f2da442735a4c4313d7ce84d594234d 100644 (file)
--- a/docs/manual/expand.pl
+++ b/docs/manual/expand.pl
@@ -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/)."