[Zope-Checkins] CVS: Zope/lib/python/App/dtml - copyright.dtml:1.4.38.2

[Brian Lloyd]

Update of /cvs-repository/Zope/lib/python/App/dtml
In directory cvs.zope.org:/tmp/cvs-serv2155

Modified Files:
      Tag: Zope-2_4-branch
	copyright.dtml 
Log Message:
updated to ZPL 1.1


=== Zope/lib/python/App/dtml/copyright.dtml 1.4.38.1 => 1.4.38.2 ===
 <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 @@
    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 @@
 
 <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 @@
 <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