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

[Matthew T. Kromer]

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

Modified Files:
	copyright.dtml 
Log Message:
More license cleanup for files the auto cleanup program missed


=== Zope/lib/python/App/dtml/copyright.dtml 1.6 => 1.7 ===
 <A NAME="ZPL">
 
-<H2>Zope Public License (ZPL) Version 1.1</H2>
+<H2>Zope Public License (ZPL) Version 2.0</H2>
 
-<h3>Copyright &copy; 1997, 1998, 1999
-  <a href="http://www.zope.com/" TARGET="_top">
-  Zope Corporation</a>, All rights reserved.</h3>
+
+<h3>This software is Copyright &copy;
+<a href="http://www.zope.com/" TARGET="_top">Zope Corporation</a> &tm; and
+Contributors. All rights reserved.</h3>
 
 <p>
-This license has been certified as open source.
+This license has been certified as open source. It has also
+been designated as GPL compatible by the Free Software
+Foundation (FSF).
 </p>
 
 <p>
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
+Redistribution and use in source and binary forms, with or
+without modification, are permitted provided that the
+following conditions are met:
 </p>
 
-
 <ol>
-<li>Redistributions in source code must retain the above copyright
-   notice, this list of conditions, and the following disclaimer.
-
-<li>Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions, and the following disclaimer in
-   the documentation and/or other materials provided with the
-   distribution.
-
-<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 Zope 
-     Corporation for use in the Z Object Publishing Environment
-     (http://www.zope.org/)."
-   </dl>
-
-   In the event that the product being advertised includes an
-   intact Zope distribution (with copyright and license included)
-   then this clause is waived.
-
-<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 Zope Corporation.
-
-<li><dl><dt>Modified redistributions of any form whatsoever must retain
-   the following acknowledgment:
-
-     <dd>"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.
-</dl>
-
-<li> 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
-   carry the name Zope may be packaged in any form, as long as they
-   conform to all of the clauses above.
+<li>Redistributions in source code must retain the above
+   copyright notice, this list of conditions, and the following
+   disclaimer.
+
+<li> Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions, and the following
+   disclaimer in the documentation and/or other materials
+   provided with the distribution.
+
+<li> The name Zope Corporation (tm) must not be used to
+   endorse or promote products derived from this software
+   without prior written permission from Zope Corporation.
+
+<li> The right to distribute this software or to use it for
+   any purpose does not give you the right to use Servicemarks
+   (sm) or Trademarks (tm) of Zope Corporation. Use of them is
+   covered in a separate agreement (see
+   http://www.zope.com/Marks).
+
+<li> If any files are modified, you must cause the modified
+   files to carry prominent notices stating that you changed
+   the files and the date of any change.
 </ol>
-<dl>
-<dt>Disclaimer
 
-  <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 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
-  USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
-  OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-  SUCH DAMAGE.
+<h3>Disclaimer</h3>
+
+<p>
+<bold>
+  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 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 USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+  HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+  OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+  DAMAGE.
+</bold>
+</p>
+
+<p>
+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.
+</p>
 
 <hr>