Log message for revision 40225: update to ZPL 2.1 Changed: U Zope/trunk/lib/python/App/dtml/copyright.dtml
-=- Modified: Zope/trunk/lib/python/App/dtml/copyright.dtml =================================================================== --- Zope/trunk/lib/python/App/dtml/copyright.dtml 2005-11-18 15:57:11 UTC (rev 40224) +++ Zope/trunk/lib/python/App/dtml/copyright.dtml 2005-11-18 16:08:35 UTC (rev 40225) @@ -13,9 +13,7 @@ <A NAME="ZPL"> -<H2>Zope Public License (ZPL) Version 2.0</H2> - - +<H2>Zope Public License (ZPL) Version 2.1</H2> <h3>This software is Copyright © <a href="http://www.zope.com/" TARGET="_top">Zope Corporation</a>™ and Contributors. All rights reserved.</h3> @@ -33,39 +31,46 @@ </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> The name Zope Corporation must not be used to +<li> +Redistributions in source code must retain the + accompanying copyright notice, this list of conditions, + and the following disclaimer. +</li> +<li> +Redistributions in binary form must reproduce the accompanying + copyright notice, this list of conditions, and the + following disclaimer in the documentation and/or other + materials provided with the distribution. +</li> +<li> +Names of the copyright holders 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 - <a href="http://www.zope.com/Marks">http://www.zope.com/Marks</a>). - -<li> If any files are modified, you must cause the modified + without prior written permission from the copyright + holders. +</li> +<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 the copyright + holders. Use of them is covered by separate agreement + with the copyright holders. +</li> +<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. +</li> </ol> <h3>Disclaimer</h3> - <p> <strong> - THIS SOFTWARE IS PROVIDED BY ZOPE CORPORATION ``AS IS'' + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``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 + NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; @@ -78,6 +83,7 @@ </strong> </p> + <p> This software consists of contributions made by Zope Corporation and many individuals on behalf of Zope _______________________________________________ Zope-Checkins maillist - Zope-Checkins@zope.org http://mail.zope.org/mailman/listinfo/zope-checkins