Commit b6b56c58 authored by Andreas Jung's avatar Andreas Jung

updated to ZPL 2.1

parent 8e838eba
...@@ -13,9 +13,7 @@ ...@@ -13,9 +13,7 @@
<A NAME="ZPL"> <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 &copy; <h3>This software is Copyright &copy;
<a href="http://www.zope.com/" TARGET="_top">Zope Corporation</a>&trade; and <a href="http://www.zope.com/" TARGET="_top">Zope Corporation</a>&trade; and
Contributors. All rights reserved.</h3> Contributors. All rights reserved.</h3>
...@@ -33,39 +31,46 @@ following conditions are met: ...@@ -33,39 +31,46 @@ following conditions are met:
</p> </p>
<ol> <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 <li>
copyright notice, this list of conditions, and the following Redistributions in source code must retain the
disclaimer in the documentation and/or other materials accompanying copyright notice, this list of conditions,
provided with the distribution. and the following disclaimer.
</li>
<li> The name Zope Corporation must not be used to <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 endorse or promote products derived from this software
without prior written permission from Zope Corporation. without prior written permission from the copyright
holders.
<li> The right to distribute this software or to use it for </li>
any purpose does not give you the right to use Servicemarks <li>
(sm) or Trademarks (tm) of Zope Corporation. Use of The right to distribute this software or to use it for
them is covered in a separate agreement (see any purpose does not give you the right to use
<a href="http://www.zope.com/Marks">http://www.zope.com/Marks</a>). Servicemarks (sm) or Trademarks (tm) of the copyright
holders. Use of them is covered by separate agreement
<li> If any files are modified, you must cause the modified 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 files to carry prominent notices stating that you changed
the files and the date of any change. the files and the date of any change.
</li>
</ol> </ol>
<h3>Disclaimer</h3> <h3>Disclaimer</h3>
<p> <p>
<strong> <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 AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT
NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN 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, LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
...@@ -78,6 +83,7 @@ following conditions are met: ...@@ -78,6 +83,7 @@ following conditions are met:
</strong> </strong>
</p> </p>
<p> <p>
This software consists of contributions made by Zope This software consists of contributions made by Zope
Corporation and many individuals on behalf of Zope Corporation and many individuals on behalf of Zope
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment