[Zope3-checkins] SVN: Zope3/branches/ZopeX3-3.0/LICENSES.txt Merged from trunk:

[Jim Fulton]

Log message for revision 27012:
  Merged from trunk:
  
    r26958 | jim | 2004-08-09 05:57:47 -0400 (Mon, 09 Aug 2004) | 2 lines
  
  Added an entry for zope.testing.doctest.
  


Changed:
  U   Zope3/branches/ZopeX3-3.0/LICENSES.txt


-=-
Modified: Zope3/branches/ZopeX3-3.0/LICENSES.txt
===================================================================
--- Zope3/branches/ZopeX3-3.0/LICENSES.txt	2004-08-11 18:19:52 UTC (rev 27011)
+++ Zope3/branches/ZopeX3-3.0/LICENSES.txt	2004-08-11 18:25:49 UTC (rev 27012)
@@ -65,3 +65,11 @@
     This program is free software; you can redistribute it and/or modify
     it under the terms of the Python 2.1.1 license, available at
     http://www.python.org/2.1.1/license.html
+
+----------------------------------------------------------------------
+
+The zope.testing.doctest module is a copy of the doctest module from
+the Python 2.4 standard library.  It if the property of the Python
+Software Foundation (PSF) and is covered by the PSF license agreement
+for Python 2.4.  We will no-longer distribute this module with Zope at
+some point on the future.