summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJens Vagelpohl <jens@netz.ooo>2001-07-04 09:28:12 +0000
committerJens Vagelpohl <jens@netz.ooo>2001-07-04 09:28:12 +0000
commit977519a66e28d4c169ec6450e64ecfd81fb0edee (patch)
tree4fcc5e38f0aaa909c50823c60210f67e835a0647
parentbef3055b3faabf5ba044b85f84e7cc02b0d7183e (diff)
downloadLDAPUserManager-977519a66e28d4c169ec6450e64ecfd81fb0edee.zip
LDAPUserManager-977519a66e28d4c169ec6450e64ecfd81fb0edee.tar.gz
Modified acknowledgement requirements for complete and unchanged product distributions
added clause asking for changes to be made available to the product author
-rw-r--r--LICENSE.txt13
1 files changed, 13 insertions, 0 deletions
diff --git a/LICENSE.txt b/LICENSE.txt
index 8e39fb4..2db19d2 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -30,6 +30,10 @@
# for use in the Z Object Publishing Environment
# (http://www.zope.org/)."
#
+# In the event that the product being advertised includes an
+# intact LDAPUserManager distribution (with copyright and license
+# included) then this clause is waived
+#
# 5. Names associated with Jens Vagelpohl must not be used to
# endorse or promote products derived from this software without
# prior written permission from Jens Vagelpohl.
@@ -41,11 +45,18 @@
# for use in the Z Object Publishing Environment
# (http://www.zope.org/)."
#
+# Intact (re-)distributions of any official LDAPUserManager
+# release do not require an external acknowledgement.
+#
# 7. Modifications are encouraged but must be packaged separately as
# patches to official software releases. Distributions that do not
# clearly separate the patches from the original work must be clearly
# labeled as unofficial distributions.
#
+# 8. In the interest of improving this product the author requests that
+# changes be made available to him. This is not mandatory but part
+# of good open source development etiquette.
+#
#
# Disclaimer
#
@@ -65,6 +76,8 @@
#
# This software consists of contributions made by Jens Vagelpohl and
# many other individuals.
+# Special credits go to Ross lazarus and Soren Roug which provided the
+# basis for this code.
#
##############################################################################