[Zope-Checkins] SVN: Zope/branches/2.13/ - corrected copyright information shown in the ZMI

[Yvo Schubbe]

Log message for revision 120591:
  - corrected copyright information shown in the ZMI

Changed:
  U   Zope/branches/2.13/doc/CHANGES.rst
  U   Zope/branches/2.13/src/App/dtml/copyright.dtml
  U   Zope/branches/2.13/src/App/dtml/menu.dtml

-=-
Modified: Zope/branches/2.13/doc/CHANGES.rst
===================================================================
--- Zope/branches/2.13/doc/CHANGES.rst	2011-02-28 10:37:26 UTC (rev 120590)
+++ Zope/branches/2.13/doc/CHANGES.rst	2011-02-28 10:38:24 UTC (rev 120591)
@@ -11,6 +11,7 @@
 Bugs Fixed
 ++++++++++
 
+- Corrected copyright information shown in the ZMI.
 
 Features Added
 ++++++++++++++

Modified: Zope/branches/2.13/src/App/dtml/copyright.dtml
===================================================================
--- Zope/branches/2.13/src/App/dtml/copyright.dtml	2011-02-28 10:37:26 UTC (rev 120590)
+++ Zope/branches/2.13/src/App/dtml/copyright.dtml	2011-02-28 10:38:24 UTC (rev 120591)
@@ -15,7 +15,7 @@
 
 <H2>Zope Public License (ZPL) Version 2.1</H2>
 <h3>This software is Copyright &copy;
-<a href="http://www.zope.com/" TARGET="_top">Zope Corporation</a>&trade; and
+<a href="http://www.zopefoundation.org/" target="_top">Zope Foundation</a> and
 Contributors. All rights reserved.</h3>
 
 <p>
@@ -129,42 +129,7 @@
 PERFORMANCE OF THIS SOFTWARE.</strong></p>
 
 <hr>
-<p>Zope uses the xmlrpclib module:</p>
 
-Copyright &copy; 1999 by Secret Labs AB<br>
-Copyright &copy; 1999 by Fredrik Lundh</p>
-
-<p>By obtaining, using, and/or copying this software and/or its
-associated documentation, you agree that you have read, understood,
-and will comply with the following terms and conditions:</p>
-
-<p>Permission to use, copy, modify, and distribute this software and its
-associated documentation for any purpose and without fee is hereby
-granted, provided that the above copyright notice appears in all
-copies, and that both that copyright notice and this permission notice
-appear in supporting documentation, and that the name of Secret Labs
-AB or the author not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.</p>
-
-<p><strong>SECRET LABS AB AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO
-THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS.  IN NO EVENT SHALL SECRET LABS AB OR THE AUTHOR BE LIABLE FOR
-ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.</strong></p>
-
-<hr>
-<p>Zope uses the C expat library by James Clark, for parsing XML text.</p>
-
-<P>Copyright (c) 1998, 1999 Zope Foundation and Contributors
-HREF="http://www.mozilla.org/NPL/NPL-1_1Final.html">Mozilla Public
-License Version 1.1</A>.
-</p>
-
-<hr>
-
 <A NAME="CREDITS">
 
 <H3>Zope Credits</H3>

Modified: Zope/branches/2.13/src/App/dtml/menu.dtml
===================================================================
--- Zope/branches/2.13/src/App/dtml/menu.dtml	2011-02-28 10:37:26 UTC (rev 120590)
+++ Zope/branches/2.13/src/App/dtml/menu.dtml	2011-02-28 10:38:24 UTC (rev 120591)
@@ -49,7 +49,7 @@
   <td valign="top" nowrap>
   <strong>
   <a href="manage_copyright" target="manage_main">
-  &copy; Zope Corporation
+  &copy; Zope Foundation
   </a>
   </strong>
   </td>