merged ZPL 1.1 update

LICENSE.txt

 
-Zope Public License (ZPL) Version 1.0
+Zope Public License (ZPL) Version 1.1
 -------------------------------------
 
-Copyright (c) Digital Creations.  All rights reserved.
+Copyright (c) Zope Corporation.  All rights reserved.
 
-This license has been certified as Open Source(tm).
+This license has been certified as open source.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
@@ -18,19 +18,11 @@ met:
    the documentation and/or other materials provided with the
    distribution.
 
-3. Digital Creations requests that attribution be given to Zope
-   in any manner possible. Zope includes a "Powered by Zope"
-   button that is installed by default. While it is not a license
-   violation to remove this button, it is requested that the
-   attribution remain. A significant investment has been put
-   into Zope, and this effort will continue if the Zope community
-   continues to grow. This is one way to assure that growth.
-
-4. All advertising materials and documentation mentioning
+3. All advertising materials and documentation mentioning
    features derived from or use of this software must display
    the following acknowledgement:
 
-     "This product includes software developed by Digital Creations
+     "This product includes software developed by Zope Corporation 
      for use in the Z Object Publishing Environment
      (http://www.zope.org/)."
 
@@ -38,21 +30,21 @@ met:
    intact Zope distribution (with copyright and license included)
    then this clause is waived.
 
-5. Names associated with Zope or Digital Creations must not be used to
+4. Names associated with Zope or Zope Corporation must not be used to
    endorse or promote products derived from this software without
-   prior written permission from Digital Creations.
+   prior written permission from Zope Corporation.
 
-6. Modified redistributions of any form whatsoever must retain
+5. Modified redistributions of any form whatsoever must retain
    the following acknowledgment:
 
-     "This product includes software developed by Digital Creations
+     "This product includes software developed by Zope Corporation
      for use in the Z Object Publishing Environment
      (http://www.zope.org/)."
 
    Intact (re-)distributions of any official Zope release do not
    require an external acknowledgement.
 
-7. Modifications are encouraged but must be packaged separately as
+6. Modifications are encouraged but must be packaged separately as
    patches to official Zope releases.  Distributions that do not
    clearly separate the patches from the original work must be clearly
    labeled as unofficial distributions.  Modifications which do not
@@ -62,10 +54,10 @@ met:
 
 Disclaimer
 
-  THIS SOFTWARE IS PROVIDED BY DIGITAL CREATIONS ``AS IS'' AND ANY
+  THIS SOFTWARE IS PROVIDED BY ZOPE CORPORATION ``AS IS'' AND ANY
   EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-  PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL DIGITAL CREATIONS OR ITS
+  PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL ZOPE CORPORATION OR ITS
   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
@@ -76,6 +68,6 @@ Disclaimer
   SUCH DAMAGE.
 
 
-This software consists of contributions made by Digital Creations and
-many individuals on behalf of Digital Creations.  Specific
+This software consists of contributions made by Zope Corporation and
+many individuals on behalf of Zope Corporation.  Specific
 attributions are listed in the accompanying credits file.

lib/python/App/dtml/copyright.dtml

@@ -13,14 +13,14 @@
 
 <A NAME="ZPL">
 
-<H2>Zope Public License (ZPL) Version 1.0</H2>
+<H2>Zope Public License (ZPL) Version 1.1</H2>
 
 <h3>Copyright &copy; 1997, 1998, 1999
-  <a href="http://www.digicool.com/" TARGET="_top">
+  <a href="http://www.zope.com/" TARGET="_top">
   Zope Corporation</a>, All rights reserved.</h3>
 
 <p>
-This license has been certified as Open Source(tm).
+This license has been certified as open source.
 </p>
 
 <p>
@@ -39,21 +39,13 @@ met:
    the documentation and/or other materials provided with the
    distribution.
 
-<li>Zope Corporation requests that attribution be given to Zope
-   in any manner possible. Zope includes a "Powered by Zope"
-   button that is installed by default. While it is not a license
-   violation to remove this button, it is requested that the
-   attribution remain. A significant investment has been put
-   into Zope, and this effort will continue if the Zope community
-   continues to grow. This is one way to assure that growth.
-
 <li><dl><dt> 
    All advertising materials and documentation mentioning
       features derived from or use of this software must display
    the following acknowledgement:
 
-     <dd>"This product includes software developed by Digital
-     Creations for use in the Z Object Publishing Environment
+     <dd>"This product includes software developed by Zope 
+     Corporation for use in the Z Object Publishing Environment
      (http://www.zope.org/)."
    </dl>
 
@@ -63,8 +55,7 @@ met:
 
 <li> Names associated with Zope or Zope Corporation must not be
    used to endorse or promote products derived from this
-   software without prior written permission from Digital
-   Creations.
+   software without prior written permission from Zope Corporation.
 
 <li><dl><dt>Modified redistributions of any form whatsoever must retain
    the following acknowledgment:
@@ -87,10 +78,10 @@ met:
 <dl>
 <dt>Disclaimer
 
-  <dd>  THIS SOFTWARE IS PROVIDED BY DIGITAL CREATIONS ``AS IS'' AND ANY
+  <dd>  THIS SOFTWARE IS PROVIDED BY ZOPE CORPORATION ``AS IS'' AND ANY
   EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-  PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL DIGITAL CREATIONS OR ITS
+  PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL ZOPE CORPORATION OR ITS
   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF