[Zope-Checkins] SVN: Zope/branches/Zope-2_9-branch/ Deprecated the ImageFile module for good. It will be removed in Zope 2.11.

2005-11-18 Thread Philipp von Weitershausen
Log message for revision 40210:
  Deprecated the ImageFile module for good. It will be removed in Zope 2.11.
  

Changed:
  U   Zope/branches/Zope-2_9-branch/doc/CHANGES.txt
  U   Zope/branches/Zope-2_9-branch/lib/python/ImageFile.py
  U   Zope/branches/Zope-2_9-branch/lib/python/Products/OFSP/__init__.py
  U   Zope/branches/Zope-2_9-branch/lib/python/Products/SiteErrorLog/__init__.py

-=-
Modified: Zope/branches/Zope-2_9-branch/doc/CHANGES.txt
===
--- Zope/branches/Zope-2_9-branch/doc/CHANGES.txt   2005-11-18 13:22:02 UTC 
(rev 40209)
+++ Zope/branches/Zope-2_9-branch/doc/CHANGES.txt   2005-11-18 13:25:28 UTC 
(rev 40210)
@@ -92,6 +92,9 @@
 non-existing or closed database connection next to the Connection ID
 dropdown and present it using red to increase its visibility.
 
+  - The ImageFile module has finally been deprecated for good and
+will be removed in Zope 2.11.  Use App.ImageFile instead.
+
   after Zope 2.8.1
 
   - The '@' character is now allowed in object ids (RFC 1738 allows it).

Modified: Zope/branches/Zope-2_9-branch/lib/python/ImageFile.py
===
--- Zope/branches/Zope-2_9-branch/lib/python/ImageFile.py   2005-11-18 
13:22:02 UTC (rev 40209)
+++ Zope/branches/Zope-2_9-branch/lib/python/ImageFile.py   2005-11-18 
13:25:28 UTC (rev 40210)
@@ -14,12 +14,10 @@
 
 __version__='$Revision: 1.13 $'[11:-2]
 
-
 
+# BBB 2005/11/18 -- This module will be removed in Zope 2.11
 #
-# Eventually this module will go away!
-#
-
-
-
 from App.ImageFile import ImageFile
+import warnings
+warnings.warn("The ImageFile module will be removed in Zope 2.11. "
+  "Use App.ImageFile instead.", DeprecationWarning, stacklevel=2)

Modified: Zope/branches/Zope-2_9-branch/lib/python/Products/OFSP/__init__.py
===
--- Zope/branches/Zope-2_9-branch/lib/python/Products/OFSP/__init__.py  
2005-11-18 13:22:02 UTC (rev 40209)
+++ Zope/branches/Zope-2_9-branch/lib/python/Products/OFSP/__init__.py  
2005-11-18 13:25:28 UTC (rev 40210)
@@ -22,7 +22,7 @@
 from AccessControl.Permissions import add_documents_images_and_files
 from AccessControl.Permissions import add_folders
 from ZClasses import createZClassForBase
-from ImageFile import ImageFile
+from App.ImageFile import ImageFile
 
 createZClassForBase( OFS.DTMLMethod.DTMLMethod, globals()
, 'ZDTMLMethod', 'DTML Method' )

Modified: 
Zope/branches/Zope-2_9-branch/lib/python/Products/SiteErrorLog/__init__.py
===
--- Zope/branches/Zope-2_9-branch/lib/python/Products/SiteErrorLog/__init__.py  
2005-11-18 13:22:02 UTC (rev 40209)
+++ Zope/branches/Zope-2_9-branch/lib/python/Products/SiteErrorLog/__init__.py  
2005-11-18 13:25:28 UTC (rev 40210)
@@ -17,7 +17,7 @@
 """
 
 import SiteErrorLog
-from ImageFile import ImageFile
+from App.ImageFile import ImageFile
 
 misc_={
 'ok.gif': ImageFile('www/ok.gif', globals()),

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins


[Zope-Checkins] SVN: Zope/trunk/ Merge r40210 from Zope 2.9 branch:

2005-11-18 Thread Philipp von Weitershausen
Log message for revision 40211:
  Merge r40210 from Zope 2.9 branch:
Deprecated the ImageFile module for good. It will be removed in Zope 2.11.
  

Changed:
  U   Zope/trunk/doc/CHANGES.txt
  U   Zope/trunk/lib/python/ImageFile.py
  U   Zope/trunk/lib/python/Products/OFSP/__init__.py
  U   Zope/trunk/lib/python/Products/SiteErrorLog/__init__.py

-=-
Modified: Zope/trunk/doc/CHANGES.txt
===
--- Zope/trunk/doc/CHANGES.txt  2005-11-18 13:25:28 UTC (rev 40210)
+++ Zope/trunk/doc/CHANGES.txt  2005-11-18 13:28:29 UTC (rev 40211)
@@ -92,6 +92,9 @@
 non-existing or closed database connection next to the Connection ID
 dropdown and present it using red to increase its visibility.
 
+  - The ImageFile module has finally been deprecated for good and
+will be removed in Zope 2.11.  Use App.ImageFile instead.
+
   after Zope 2.8.1
 
   - The '@' character is now allowed in object ids (RFC 1738 allows it).

Modified: Zope/trunk/lib/python/ImageFile.py
===
--- Zope/trunk/lib/python/ImageFile.py  2005-11-18 13:25:28 UTC (rev 40210)
+++ Zope/trunk/lib/python/ImageFile.py  2005-11-18 13:28:29 UTC (rev 40211)
@@ -14,12 +14,10 @@
 
 __version__='$Revision: 1.13 $'[11:-2]
 
-
 
+# BBB 2005/11/18 -- This module will be removed in Zope 2.11
 #
-# Eventually this module will go away!
-#
-
-
-
 from App.ImageFile import ImageFile
+import warnings
+warnings.warn("The ImageFile module will be removed in Zope 2.11. "
+  "Use App.ImageFile instead.", DeprecationWarning, stacklevel=2)

Modified: Zope/trunk/lib/python/Products/OFSP/__init__.py
===
--- Zope/trunk/lib/python/Products/OFSP/__init__.py 2005-11-18 13:25:28 UTC 
(rev 40210)
+++ Zope/trunk/lib/python/Products/OFSP/__init__.py 2005-11-18 13:28:29 UTC 
(rev 40211)
@@ -22,7 +22,7 @@
 from AccessControl.Permissions import add_documents_images_and_files
 from AccessControl.Permissions import add_folders
 from ZClasses import createZClassForBase
-from ImageFile import ImageFile
+from App.ImageFile import ImageFile
 
 createZClassForBase( OFS.DTMLMethod.DTMLMethod, globals()
, 'ZDTMLMethod', 'DTML Method' )

Modified: Zope/trunk/lib/python/Products/SiteErrorLog/__init__.py
===
--- Zope/trunk/lib/python/Products/SiteErrorLog/__init__.py 2005-11-18 
13:25:28 UTC (rev 40210)
+++ Zope/trunk/lib/python/Products/SiteErrorLog/__init__.py 2005-11-18 
13:28:29 UTC (rev 40211)
@@ -17,7 +17,7 @@
 """
 
 import SiteErrorLog
-from ImageFile import ImageFile
+from App.ImageFile import ImageFile
 
 misc_={
 'ok.gif': ImageFile('www/ok.gif', globals()),

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins


[Zope-Checkins] SVN: Zope/branches/Zope-2_9-branch/doc/CHANGES.txt Note some changes made recently.

2005-11-18 Thread Philipp von Weitershausen
Log message for revision 40213:
  Note some changes made recently.
  

Changed:
  U   Zope/branches/Zope-2_9-branch/doc/CHANGES.txt

-=-
Modified: Zope/branches/Zope-2_9-branch/doc/CHANGES.txt
===
--- Zope/branches/Zope-2_9-branch/doc/CHANGES.txt   2005-11-18 13:33:28 UTC 
(rev 40212)
+++ Zope/branches/Zope-2_9-branch/doc/CHANGES.txt   2005-11-18 13:47:04 UTC 
(rev 40213)
@@ -76,8 +76,18 @@
 line in fileobject: ..., as well as fileobject.next() and
 fileobject.xreadlines() ) Collector #1837
 
-  - Improved test runner.  Run test.py with -h to find out more.
+  - Switched the bundled Zope 3 to release 3.2 and upgraded the
+Five product to version 1.3 (see Products/Five/CHANGES.txt).
 
+  - The PageTemplate implementation now uses Zope 3 message
+catalogs by default for translation.  Old-style translation
+services such as Localizer or PlacelessTranslationService are
+still supported as fall-backs.  See Products/Five/doc/i18n.txt
+for more information.
+
+  - Switched to the new improved test runner from Zope 3.  Run
+test.py with -h to find out more.
+
 Bugs Fixed
 
   - OFS PropertySheets / webdav: Fixed dav__resourcetype.

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins


[Zope-Checkins] SVN: Zope/trunk/doc/CHANGES.txt Merge r40213 from the trunk:

2005-11-18 Thread Philipp von Weitershausen
Log message for revision 40214:
  Merge r40213 from the trunk:
Note some changes made recently.
  

Changed:
  U   Zope/trunk/doc/CHANGES.txt

-=-
Modified: Zope/trunk/doc/CHANGES.txt
===
--- Zope/trunk/doc/CHANGES.txt  2005-11-18 13:47:04 UTC (rev 40213)
+++ Zope/trunk/doc/CHANGES.txt  2005-11-18 13:53:25 UTC (rev 40214)
@@ -76,8 +76,18 @@
 line in fileobject: ..., as well as fileobject.next() and
 fileobject.xreadlines() ) Collector #1837
 
-  - Improved test runner.  Run test.py with -h to find out more.
+  - Switched the bundled Zope 3 to release 3.2 and upgraded the
+Five product to version 1.3 (see Products/Five/CHANGES.txt).
 
+  - The PageTemplate implementation now uses Zope 3 message
+catalogs by default for translation.  Old-style translation
+services such as Localizer or PlacelessTranslationService are
+still supported as fall-backs.  See Products/Five/doc/i18n.txt
+for more information.
+
+  - Switched to the new improved test runner from Zope 3.  Run
+test.py with -h to find out more.
+
 Bugs Fixed
 
   - OFS PropertySheets / webdav: Fixed dav__resourcetype.

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins


[Zope-Checkins] SVN: Zope/trunk/configure bump version number on the trunk

2005-11-18 Thread Philipp von Weitershausen
Log message for revision 40215:
  bump version number on the trunk
  

Changed:
  U   Zope/trunk/configure

-=-
Modified: Zope/trunk/configure
===
--- Zope/trunk/configure2005-11-18 13:53:25 UTC (rev 40214)
+++ Zope/trunk/configure2005-11-18 13:57:56 UTC (rev 40215)
@@ -8,7 +8,7 @@
 #
 
 # Place the Zope major version number below.
-ZOPE_VERS=2.9
+ZOPE_VERS=2.10
 
 # Place the optimal target version number for Zope (as returned by sys.version)
 # below

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins


[Zope-Checkins] SVN: Zope/trunk/utilities/fixheaders.py added

2005-11-18 Thread Andreas Jung
Log message for revision 40216:
  added
  

Changed:
  A   Zope/trunk/utilities/fixheaders.py

-=-
Added: Zope/trunk/utilities/fixheaders.py
===
--- Zope/trunk/utilities/fixheaders.py  2005-11-18 13:57:56 UTC (rev 40215)
+++ Zope/trunk/utilities/fixheaders.py  2005-11-18 14:14:45 UTC (rev 40216)
@@ -0,0 +1,26 @@
+
+# Script to fix the header files to ZPL 2.1
+
+import os
+
+for dirpath, dirnames, filenames in os.walk('.'):
+
+for fname in filenames:
+base,ext = os.path.splitext(fname)
+if not ext in ('.py', '.c', '.h'): continue
+fullname = os.path.join(dirpath, fname)
+if '.svn' in fullname: continue
+data = open(fullname).read()
+
+changed = False
+if 'Version 2.0 (ZPL)' in data:
+data = data.replace('Version 2.0 (ZPL)', 'Version 2.1 (ZPL)')
+changed = True
+
+if '(c) 2002 Zope Corporation' in data:
+data = data.replace('(c) 2002 Zope Corporation', '(c) 2002 Zope 
Corporation')
+changed = True
+
+print fullname, changed
+if changed:
+open(fullname, 'w').write(data)

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins


[Zope-Checkins] SVN: Zope/trunk/utilities/fixheaders.py fix

2005-11-18 Thread Andreas Jung
Log message for revision 40217:
  fix
  

Changed:
  U   Zope/trunk/utilities/fixheaders.py

-=-
Modified: Zope/trunk/utilities/fixheaders.py
===
--- Zope/trunk/utilities/fixheaders.py  2005-11-18 14:14:45 UTC (rev 40216)
+++ Zope/trunk/utilities/fixheaders.py  2005-11-18 14:16:32 UTC (rev 40217)
@@ -17,8 +17,8 @@
 data = data.replace('Version 2.0 (ZPL)', 'Version 2.1 (ZPL)')
 changed = True
 
-if '(c) 2002 Zope Corporation' in data:
-data = data.replace('(c) 2002 Zope Corporation', '(c) 2002 Zope 
Corporation')
+if '(c) 2001 Zope Corporation' in data:
+data = data.replace('(c) 2001 Zope Corporation', '(c) 2002 Zope 
Corporation')
 changed = True
 
 print fullname, changed

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins


[Zope-Checkins] SVN: Zope/branches/Zope-2 Jim suggest this new naming schema for new branches

2005-11-18 Thread Andreas Jung
Log message for revision 40220:
  Jim suggest this new naming schema for new branches
  

Changed:
  A   Zope/branches/Zope-2.9/
  D   Zope/branches/Zope-2_9-branch/

-=-
Copied: Zope/branches/Zope-2.9 (from rev 40219, Zope/branches/Zope-2_9-branch)

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins


Re: [Zope-Checkins] SVN: Zope/branches/Zope-2 Jim suggest this new naming schema for new branches

2005-11-18 Thread Stephan Richter
On Friday 18 November 2005 10:15, Andreas Jung wrote:
> Log message for revision 40220:
>   Jim suggest this new naming schema for new branches
>  
>
> Changed:
>   A   Zope/branches/Zope-2.9/
>   D   Zope/branches/Zope-2_9-branch/

Jim suggests: Zope/branches/2.9

I will use that scheme for 3.2 onward.

Regards,
Stephan
-- 
Stephan Richter
CBU Physics & Chemistry (B.S.) / Tufts Physics (Ph.D. student)
Web2k - Web Software Design, Development and Training
___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins


[Zope-Checkins] SVN: Zope/branches/ fixed the naming schema

2005-11-18 Thread Andreas Jung
Log message for revision 40221:
  fixed the naming schema
  

Changed:
  A   Zope/branches/2.9/
  D   Zope/branches/Zope-2.9/

-=-
Copied: Zope/branches/2.9 (from rev 40220, Zope/branches/Zope-2.9)

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins


Re: [Zope-Checkins] SVN: Zope/branches/Zope-2 Jim suggest this new naming schema for new branches

2005-11-18 Thread Jens Vagelpohl


On 18 Nov 2005, at 10:16, Stephan Richter wrote:


On Friday 18 November 2005 10:15, Andreas Jung wrote:

Log message for revision 40220:
  Jim suggest this new naming schema for new branches


Changed:
  A   Zope/branches/Zope-2.9/
  D   Zope/branches/Zope-2_9-branch/


Jim suggests: Zope/branches/2.9

I will use that scheme for 3.2 onward.


Yes, the "2.9" naming would also match what we're doing for CMF  
nowadays.


jens

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins


Re: [Zope3-checkins] Re: [Zope-Checkins] SVN: Zope/branches/Zope-2 Jim suggest this new naming schema for new branches

2005-11-18 Thread Andreas Jung

ok, fixed

--On 18. November 2005 10:16:58 -0500 Stephan Richter 
<[EMAIL PROTECTED]> wrote:



On Friday 18 November 2005 10:15, Andreas Jung wrote:

Log message for revision 40220:
  Jim suggest this new naming schema for new branches
 

Changed:
  A   Zope/branches/Zope-2.9/
  D   Zope/branches/Zope-2_9-branch/


Jim suggests: Zope/branches/2.9

I will use that scheme for 3.2 onward.

Regards,
Stephan
--
Stephan Richter
CBU Physics & Chemistry (B.S.) / Tufts Physics (Ph.D. student)
Web2k - Web Software Design, Development and Training
___
Zope3-Checkins mailing list
[EMAIL PROTECTED]
http://mail.zope.org/mailman/listinfo/zope3-checkins






pgpcdnezRh3Ua.pgp
Description: PGP signature
___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins


[Zope-Checkins] SVN: Zope/branches/2.9/ ZPL 2.1

2005-11-18 Thread Andreas Jung
Log message for revision 40223:
  ZPL 2.1
  

Changed:
  U   Zope/branches/2.9/inst/WinBuilders/zeo_addons/skel/bin/zeoservice.py.in
  U   Zope/branches/2.9/skel/bin/zopeservice.py.in

-=-
Modified: 
Zope/branches/2.9/inst/WinBuilders/zeo_addons/skel/bin/zeoservice.py.in
===
--- Zope/branches/2.9/inst/WinBuilders/zeo_addons/skel/bin/zeoservice.py.in 
2005-11-18 15:46:28 UTC (rev 40222)
+++ Zope/branches/2.9/inst/WinBuilders/zeo_addons/skel/bin/zeoservice.py.in 
2005-11-18 15:53:13 UTC (rev 40223)
@@ -1,9 +1,9 @@
 ##
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
-# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
+# Version 2.1 (ZPL).  A copy of the ZPL should accompany this distribution.
 # THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
 # WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 # WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS

Modified: Zope/branches/2.9/skel/bin/zopeservice.py.in
===
--- Zope/branches/2.9/skel/bin/zopeservice.py.in2005-11-18 15:46:28 UTC 
(rev 40222)
+++ Zope/branches/2.9/skel/bin/zopeservice.py.in2005-11-18 15:53:13 UTC 
(rev 40223)
@@ -1,9 +1,9 @@
 ##
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
-# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
+# Version 2.1 (ZPL).  A copy of the ZPL should accompany this distribution.
 # THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
 # WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 # WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins


[Zope-Checkins] SVN: Zope/trunk/ ZPL 2.1

2005-11-18 Thread Andreas Jung
Log message for revision 40224:
  ZPL 2.1
  

Changed:
  U   Zope/trunk/inst/WinBuilders/zeo_addons/skel/bin/zeoservice.py.in
  U   Zope/trunk/skel/bin/zopeservice.py.in

-=-
Modified: Zope/trunk/inst/WinBuilders/zeo_addons/skel/bin/zeoservice.py.in
===
--- Zope/trunk/inst/WinBuilders/zeo_addons/skel/bin/zeoservice.py.in
2005-11-18 15:53:13 UTC (rev 40223)
+++ Zope/trunk/inst/WinBuilders/zeo_addons/skel/bin/zeoservice.py.in
2005-11-18 15:57:11 UTC (rev 40224)
@@ -1,9 +1,9 @@
 ##
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
-# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
+# Version 2.1 (ZPL).  A copy of the ZPL should accompany this distribution.
 # THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
 # WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 # WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS

Modified: Zope/trunk/skel/bin/zopeservice.py.in
===
--- Zope/trunk/skel/bin/zopeservice.py.in   2005-11-18 15:53:13 UTC (rev 
40223)
+++ Zope/trunk/skel/bin/zopeservice.py.in   2005-11-18 15:57:11 UTC (rev 
40224)
@@ -1,9 +1,9 @@
 ##
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
-# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
+# Version 2.1 (ZPL).  A copy of the ZPL should accompany this distribution.
 # THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
 # WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 # WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins


[Zope-Checkins] SVN: Zope/trunk/lib/python/App/dtml/copyright.dtml update to ZPL 2.1

2005-11-18 Thread Andreas Jung
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 @@
 
 
 
-Zope Public License (ZPL) Version 2.0
-
-
+Zope Public License (ZPL) Version 2.1
 This software is Copyright ©
 http://www.zope.com/"; TARGET="_top">Zope Corporation™ and
 Contributors. All rights reserved.
@@ -33,39 +31,46 @@
 
 
 
-Redistributions in source code must retain the above
-   copyright notice, this list of conditions, and the following
-   disclaimer.
 
- 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.
-
- The name Zope Corporation must not be used to
+
+Redistributions in source code must retain the
+   accompanying copyright notice, this list of conditions,
+   and the following disclaimer.
+
+
+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.
+
+
+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.
-
- 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";>http://www.zope.com/Marks).
-
- If any files are modified, you must cause the modified
+   without prior written permission from the copyright
+   holders.
+
+
+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.
+
+
+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.
+
 
 
 Disclaimer
-
 
 
-  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 @@
 
 
 
+
 
 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


[Zope-Checkins] SVN: Zope/branches/2.9/lib/python/App/dtml/copyright.dtml updated to ZPL 2.1

2005-11-18 Thread Andreas Jung
Log message for revision 40226:
  updated to ZPL 2.1
  

Changed:
  U   Zope/branches/2.9/lib/python/App/dtml/copyright.dtml

-=-
Modified: Zope/branches/2.9/lib/python/App/dtml/copyright.dtml
===
--- Zope/branches/2.9/lib/python/App/dtml/copyright.dtml2005-11-18 
16:08:35 UTC (rev 40225)
+++ Zope/branches/2.9/lib/python/App/dtml/copyright.dtml2005-11-18 
16:09:06 UTC (rev 40226)
@@ -13,9 +13,7 @@
 
 
 
-Zope Public License (ZPL) Version 2.0
-
-
+Zope Public License (ZPL) Version 2.1
 This software is Copyright ©
 http://www.zope.com/"; TARGET="_top">Zope Corporation™ and
 Contributors. All rights reserved.
@@ -33,39 +31,46 @@
 
 
 
-Redistributions in source code must retain the above
-   copyright notice, this list of conditions, and the following
-   disclaimer.
 
- 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.
-
- The name Zope Corporation must not be used to
+
+Redistributions in source code must retain the
+   accompanying copyright notice, this list of conditions,
+   and the following disclaimer.
+
+
+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.
+
+
+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.
-
- 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";>http://www.zope.com/Marks).
-
- If any files are modified, you must cause the modified
+   without prior written permission from the copyright
+   holders.
+
+
+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.
+
+
+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.
+
 
 
 Disclaimer
-
 
 
-  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 @@
 
 
 
+
 
 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


[Zope-Checkins] SVN: Zope/branches/2.9/doc/CHANGES.txt

2005-11-18 Thread Andreas Jung
Log message for revision 40227:
  

Changed:
  U   Zope/branches/2.9/doc/CHANGES.txt

-=-
Modified: Zope/branches/2.9/doc/CHANGES.txt
===
--- Zope/branches/2.9/doc/CHANGES.txt   2005-11-18 16:09:06 UTC (rev 40226)
+++ Zope/branches/2.9/doc/CHANGES.txt   2005-11-18 16:13:47 UTC (rev 40227)
@@ -24,8 +24,10 @@
 
   Trunk only (unreleased)
 
-Features added
+Features added  
 
+  - updated to ZPL 2.1
+
   - interfaces: Added 'Interfaces' tab to basic core objects.
 This is a Five feature and only available if the classes are made
 five:traversable. It allows to inspect interfaces and to assign

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins


[Zope-Checkins] SVN: Zope/trunk/doc/CHANGES.txt

2005-11-18 Thread Andreas Jung
Log message for revision 40228:
  

Changed:
  U   Zope/trunk/doc/CHANGES.txt

-=-
Modified: Zope/trunk/doc/CHANGES.txt
===
--- Zope/trunk/doc/CHANGES.txt  2005-11-18 16:13:47 UTC (rev 40227)
+++ Zope/trunk/doc/CHANGES.txt  2005-11-18 16:14:12 UTC (rev 40228)
@@ -26,6 +26,8 @@
 
 Features added
 
+  - updated to ZPL 2.1
+
   - interfaces: Added 'Interfaces' tab to basic core objects.
 This is a Five feature and only available if the classes are made
 five:traversable. It allows to inspect interfaces and to assign

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins


[Zope-Checkins] SVN: Zope/trunk/lib/python/Products/PluginIndexes/ Clean up manage views mess on plugin indexes

2005-11-18 Thread Martijn Pieters
Log message for revision 40191:
  Clean up manage views mess on plugin indexes
  

Changed:
  U   Zope/trunk/lib/python/Products/PluginIndexes/FieldIndex/FieldIndex.py
  U   Zope/trunk/lib/python/Products/PluginIndexes/KeywordIndex/KeywordIndex.py
  U   Zope/trunk/lib/python/Products/PluginIndexes/PathIndex/PathIndex.py
  U   Zope/trunk/lib/python/Products/PluginIndexes/TextIndex/TextIndex.py
  U   Zope/trunk/lib/python/Products/PluginIndexes/TopicIndex/TopicIndex.py

-=-
Modified: Zope/trunk/lib/python/Products/PluginIndexes/FieldIndex/FieldIndex.py
===
--- Zope/trunk/lib/python/Products/PluginIndexes/FieldIndex/FieldIndex.py   
2005-11-17 00:19:20 UTC (rev 40190)
+++ Zope/trunk/lib/python/Products/PluginIndexes/FieldIndex/FieldIndex.py   
2005-11-17 12:22:12 UTC (rev 40191)
@@ -40,9 +40,8 @@
 
 query_options = ["query","range"]
 
-index_html = DTMLFile('dtml/index', globals())
-
-manage_workspace = DTMLFile('dtml/manageFieldIndex', globals())
+manage = manage_main = DTMLFile('dtml/manageFieldIndex', globals())
+manage_main._setName('manage_main')
 manage_browse = DTMLFile('../dtml/browseIndex', globals())
 
 

Modified: 
Zope/trunk/lib/python/Products/PluginIndexes/KeywordIndex/KeywordIndex.py
===
--- Zope/trunk/lib/python/Products/PluginIndexes/KeywordIndex/KeywordIndex.py   
2005-11-17 00:19:20 UTC (rev 40190)
+++ Zope/trunk/lib/python/Products/PluginIndexes/KeywordIndex/KeywordIndex.py   
2005-11-17 12:22:12 UTC (rev 40191)
@@ -130,8 +130,8 @@
 LOG.error('Attempt to unindex nonexistent'
   ' document id %s' % documentId)
 
-index_html = DTMLFile('dtml/index', globals())
-manage_workspace = DTMLFile('dtml/manageKeywordIndex', globals())
+manage = manage_main = DTMLFile('dtml/manageKeywordIndex', globals())
+manage_main._setName('manage_main')
 manage_browse = DTMLFile('../dtml/browseIndex', globals())
 
 

Modified: Zope/trunk/lib/python/Products/PluginIndexes/PathIndex/PathIndex.py
===
--- Zope/trunk/lib/python/Products/PluginIndexes/PathIndex/PathIndex.py 
2005-11-17 00:19:20 UTC (rev 40190)
+++ Zope/trunk/lib/python/Products/PluginIndexes/PathIndex/PathIndex.py 
2005-11-17 12:22:12 UTC (rev 40191)
@@ -258,8 +258,8 @@
 # XXX Why is default ignored?
 return None
 
-index_html = DTMLFile('dtml/index', globals())
-manage_workspace = DTMLFile('dtml/managePathIndex', globals())
+manage = manage_main = DTMLFile('dtml/managePathIndex', globals())
+manage_main._setName('manage_main')
 
 
 manage_addPathIndexForm = DTMLFile('dtml/addPathIndex', globals())

Modified: Zope/trunk/lib/python/Products/PluginIndexes/TextIndex/TextIndex.py
===
--- Zope/trunk/lib/python/Products/PluginIndexes/TextIndex/TextIndex.py 
2005-11-17 00:19:20 UTC (rev 40190)
+++ Zope/trunk/lib/python/Products/PluginIndexes/TextIndex/TextIndex.py 
2005-11-17 12:22:12 UTC (rev 40191)
@@ -652,7 +652,8 @@
 if RESPONSE:
 RESPONSE.redirect(URL2 + 
'/manage_main?manage_tabs_message=Preferences%20saved')
 
-manage_workspace  = DTMLFile("dtml/manageTextIndex",globals())
+manage = manage_main = DTMLFile("dtml/manageTextIndex",globals())
+manage_main._setName('manage_main')
 manage_vocabulary = DTMLFile("dtml/manageVocabulary",globals())
 
 

Modified: Zope/trunk/lib/python/Products/PluginIndexes/TopicIndex/TopicIndex.py
===
--- Zope/trunk/lib/python/Products/PluginIndexes/TopicIndex/TopicIndex.py   
2005-11-17 00:19:20 UTC (rev 40190)
+++ Zope/trunk/lib/python/Products/PluginIndexes/TopicIndex/TopicIndex.py   
2005-11-17 12:22:12 UTC (rev 40191)
@@ -50,7 +50,7 @@
 
 manage_options= (
 {'label': 'FilteredSets',
- 'action': 'manage_workspace',
+ 'action': 'manage_main',
  'help': ('TopicIndex','TopicIndex_searchResults.stx')},
 )
 
@@ -195,8 +195,8 @@
 RESPONSE.redirect(URL1+'/manage_workspace?'
  'manage_tabs_message=FilteredSet(s)%20cleared')
 
-index_html  = DTMLFile('dtml/index', globals())
-manage_workspace = DTMLFile('dtml/manageTopicIndex',globals())
+manage = manage_main = DTMLFile('dtml/manageTopicIndex',globals())
+manage_main._setName('manage_main')
 editFilteredSet = DTMLFile('dtml/editFilteredSet',globals())
 
 

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins


[Zope-Checkins] SVN: Zope/branches/Zope-2_8-branch/lib/python/Products/PluginIndexes/ Merge 40191 from trunk: clean up crufty and buggy ZMI views.

2005-11-18 Thread Martijn Pieters
Log message for revision 40192:
  Merge 40191 from trunk: clean up crufty and buggy ZMI views.
  

Changed:
  U   
Zope/branches/Zope-2_8-branch/lib/python/Products/PluginIndexes/FieldIndex/FieldIndex.py
  U   
Zope/branches/Zope-2_8-branch/lib/python/Products/PluginIndexes/KeywordIndex/KeywordIndex.py
  U   
Zope/branches/Zope-2_8-branch/lib/python/Products/PluginIndexes/PathIndex/PathIndex.py
  U   
Zope/branches/Zope-2_8-branch/lib/python/Products/PluginIndexes/TextIndex/TextIndex.py
  U   
Zope/branches/Zope-2_8-branch/lib/python/Products/PluginIndexes/TopicIndex/TopicIndex.py

-=-
Modified: 
Zope/branches/Zope-2_8-branch/lib/python/Products/PluginIndexes/FieldIndex/FieldIndex.py
===
--- 
Zope/branches/Zope-2_8-branch/lib/python/Products/PluginIndexes/FieldIndex/FieldIndex.py
2005-11-17 12:22:12 UTC (rev 40191)
+++ 
Zope/branches/Zope-2_8-branch/lib/python/Products/PluginIndexes/FieldIndex/FieldIndex.py
2005-11-17 13:20:58 UTC (rev 40192)
@@ -40,9 +40,8 @@
 
 query_options = ["query","range"]
 
-index_html = DTMLFile('dtml/index', globals())
-
-manage_workspace = DTMLFile('dtml/manageFieldIndex', globals())
+manage = manage_main = DTMLFile('dtml/manageFieldIndex', globals())
+manage_main._setName('manage_main')
 manage_browse = DTMLFile('../dtml/browseIndex', globals())
 
 

Modified: 
Zope/branches/Zope-2_8-branch/lib/python/Products/PluginIndexes/KeywordIndex/KeywordIndex.py
===
--- 
Zope/branches/Zope-2_8-branch/lib/python/Products/PluginIndexes/KeywordIndex/KeywordIndex.py
2005-11-17 12:22:12 UTC (rev 40191)
+++ 
Zope/branches/Zope-2_8-branch/lib/python/Products/PluginIndexes/KeywordIndex/KeywordIndex.py
2005-11-17 13:20:58 UTC (rev 40192)
@@ -130,8 +130,8 @@
 LOG.error('Attempt to unindex nonexistent'
   ' document id %s' % documentId)
 
-index_html = DTMLFile('dtml/index', globals())
-manage_workspace = DTMLFile('dtml/manageKeywordIndex', globals())
+manage = manage_main = DTMLFile('dtml/manageKeywordIndex', globals())
+manage_main._setName('manage_main')
 manage_browse = DTMLFile('../dtml/browseIndex', globals())
 
 

Modified: 
Zope/branches/Zope-2_8-branch/lib/python/Products/PluginIndexes/PathIndex/PathIndex.py
===
--- 
Zope/branches/Zope-2_8-branch/lib/python/Products/PluginIndexes/PathIndex/PathIndex.py
  2005-11-17 12:22:12 UTC (rev 40191)
+++ 
Zope/branches/Zope-2_8-branch/lib/python/Products/PluginIndexes/PathIndex/PathIndex.py
  2005-11-17 13:20:58 UTC (rev 40192)
@@ -267,8 +267,8 @@
 # XXX Why is default ignored?
 return None
 
-index_html = DTMLFile('dtml/index', globals())
-manage_workspace = DTMLFile('dtml/managePathIndex', globals())
+manage = manage_main = DTMLFile('dtml/managePathIndex', globals())
+manage_main._setName('manage_main')
 
 
 manage_addPathIndexForm = DTMLFile('dtml/addPathIndex', globals())

Modified: 
Zope/branches/Zope-2_8-branch/lib/python/Products/PluginIndexes/TextIndex/TextIndex.py
===
--- 
Zope/branches/Zope-2_8-branch/lib/python/Products/PluginIndexes/TextIndex/TextIndex.py
  2005-11-17 12:22:12 UTC (rev 40191)
+++ 
Zope/branches/Zope-2_8-branch/lib/python/Products/PluginIndexes/TextIndex/TextIndex.py
  2005-11-17 13:20:58 UTC (rev 40192)
@@ -652,7 +652,8 @@
 if RESPONSE:
 RESPONSE.redirect(URL2 + 
'/manage_main?manage_tabs_message=Preferences%20saved')
 
-manage_workspace  = DTMLFile("dtml/manageTextIndex",globals())
+manage = manage_main = DTMLFile("dtml/manageTextIndex",globals())
+manage_main._setName('manage_main')
 manage_vocabulary = DTMLFile("dtml/manageVocabulary",globals())
 
 

Modified: 
Zope/branches/Zope-2_8-branch/lib/python/Products/PluginIndexes/TopicIndex/TopicIndex.py
===
--- 
Zope/branches/Zope-2_8-branch/lib/python/Products/PluginIndexes/TopicIndex/TopicIndex.py
2005-11-17 12:22:12 UTC (rev 40191)
+++ 
Zope/branches/Zope-2_8-branch/lib/python/Products/PluginIndexes/TopicIndex/TopicIndex.py
2005-11-17 13:20:58 UTC (rev 40192)
@@ -50,7 +50,7 @@
 
 manage_options= (
 {'label': 'FilteredSets',
- 'action': 'manage_workspace',
+ 'action': 'manage_main',
  'help': ('TopicIndex','TopicIndex_searchResults.stx')},
 )
 
@@ -195,8 +195,8 @@
 RESPONSE.redirect(URL1+'/manage_workspace?'
  'manage_tabs_message=FilteredSet(s)%20cleared')
 
-index_html  = DTMLFile('dtml/index', globals())
-manage_workspace = DTMLFile('dtml/manageTopicIndex',globals())
+manage = manage_main = DTMLFile('dtml/manageTopicIndex',globals())
+manage_main._setName('manage_main')
 e

[Zope-Checkins] SVN: Zope/branches/2.9/README.txt Restify document and point to ZPL 2.1 license text.

2005-11-18 Thread Philipp von Weitershausen
Log message for revision 40237:
  Restify document and point to ZPL 2.1 license text.
  

Changed:
  U   Zope/branches/2.9/README.txt

-=-
Modified: Zope/branches/2.9/README.txt
===
--- Zope/branches/2.9/README.txt2005-11-18 21:33:47 UTC (rev 40236)
+++ Zope/branches/2.9/README.txt2005-11-19 04:16:19 UTC (rev 40237)
@@ -1,41 +1,44 @@
 Welcome to The Zope Source Release
+==
 
-  Zope is an open-source web application server.
+Zope is an open-source web application server.
 
-  This document provides some general information about the Zope
-  source release and provides links to other documents.
+This document provides some general information about the Zope source
+release and provides links to other documents.
 
-  Installation information can be found in "doc/INSTALL.txt". Other
-  documentation is also in the "doc" directory and in the Zope.org
-  documentation section at http://www.zope.org/Documentation/.
+Installation information can be found in ``doc/INSTALL.txt``.  Other
+documentation is also in the "doc" directory and in the Zope.org
+documentation section at http://www.zope.org/Documentation/.
 
-  General Zope information is available at http://www.zope.org/
+General Zope information is available at http://www.zope.org/
 
-  Report problems with this release on the Zope mailing list
-  (zope@zope.org) To subscribe to the list send mail to
-  [EMAIL PROTECTED] with "subscribe" in the subject line.
+Report problems with this release on the Zope mailing list
+(zope@zope.org) To subscribe to the list send mail to
[EMAIL PROTECTED] with "subscribe" in the subject line.
 
 Introduction
+
 
-  The source release is intended for tinkerers, those who want to use
-  Zope components separately, people who want to use their own Python,
-  and people who work on platforms that are not supported by
-  a binary distribution.
+The source release is intended for tinkerers, those who want to use
+Zope components separately, people who want to use their own Python,
+and people who work on platforms that are not supported by a binary
+distribution.
 
 License
+---
 
-  The Zope License is included in "doc/LICENSE.txt" Send your feedback
-  about the license to [EMAIL PROTECTED]
+The Zope License is included in ``ZopePublicLicense.txt``.  Send your
+feedback about the license to [EMAIL PROTECTED]
 
 Installing Zope
+---
 
-  Follow the instructions in "doc/INSTALL.txt" to install Zope.
+Follow the instructions in ``doc/INSTALL.txt`` to install Zope.
 
 Reporting bugs
+--
 
-  Bugs reports should be made through the Zope bugtracker at
-  http://collector.zope.org/Zope. A bug report should contain detailed
-  information about how to reproduce the bug, error messages (see /error_log
-  within the ZMI or var/event.log)
-
-
+Bugs reports should be made through the Zope bugtracker at
+http://collector.zope.org/Zope.  A bug report should contain detailed
+information about how to reproduce the bug, error messages (see
+/error_log within the ZMI or var/event.log)

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins


[Zope-Checkins] SVN: Zope/branches/2.9/doc/LICENSE.txt get rid of ZPL 2.0 license text. ZopePublicLicense.txt is taking over

2005-11-18 Thread Philipp von Weitershausen
Log message for revision 40238:
  get rid of ZPL 2.0 license text. ZopePublicLicense.txt is taking over
  

Changed:
  D   Zope/branches/2.9/doc/LICENSE.txt

-=-
Deleted: Zope/branches/2.9/doc/LICENSE.txt
===
--- Zope/branches/2.9/doc/LICENSE.txt   2005-11-19 04:16:19 UTC (rev 40237)
+++ Zope/branches/2.9/doc/LICENSE.txt   2005-11-19 04:17:16 UTC (rev 40238)
@@ -1,54 +0,0 @@
-Zope Public License (ZPL) Version 2.1
-
-A copyright notice accompanies this license document that
-identifies the copyright holders.
-
-This license has been certified as open source. It has also
-been designated as GPL compatible by the Free Software
-Foundation (FSF).
-
-Redistribution and use in source and binary forms, with or
-without modification, are permitted provided that the
-following conditions are met:
-
-1. Redistributions in source code must retain the
-   accompanying copyright notice, this list of conditions,
-   and the following disclaimer.
-
-2. 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.
-
-3. Names of the copyright holders must not be used to
-   endorse or promote products derived from this software
-   without prior written permission from the copyright
-   holders.
-
-4. 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.
-
-5. 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.
-
-Disclaimer
-
-  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 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;
-  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.
-

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins


[Zope-Checkins] SVN: Zope/trunk/ Merge r40237 from 2.9 branch:

2005-11-18 Thread Philipp von Weitershausen
Log message for revision 40239:
  Merge r40237 from 2.9 branch:
Restify document and point to ZPL 2.1 license text.
  
  Merge r40238 from 2.9 branch:
get rid of ZPL 2.0 license text. ZopePublicLicense.txt is taking over
  

Changed:
  U   Zope/trunk/README.txt
  D   Zope/trunk/doc/LICENSE.txt

-=-
Modified: Zope/trunk/README.txt
===
--- Zope/trunk/README.txt   2005-11-19 04:17:16 UTC (rev 40238)
+++ Zope/trunk/README.txt   2005-11-19 04:34:59 UTC (rev 40239)
@@ -1,41 +1,44 @@
 Welcome to The Zope Source Release
+==
 
-  Zope is an open-source web application server.
+Zope is an open-source web application server.
 
-  This document provides some general information about the Zope
-  source release and provides links to other documents.
+This document provides some general information about the Zope source
+release and provides links to other documents.
 
-  Installation information can be found in "doc/INSTALL.txt". Other
-  documentation is also in the "doc" directory and in the Zope.org
-  documentation section at http://www.zope.org/Documentation/.
+Installation information can be found in ``doc/INSTALL.txt``.  Other
+documentation is also in the "doc" directory and in the Zope.org
+documentation section at http://www.zope.org/Documentation/.
 
-  General Zope information is available at http://www.zope.org/
+General Zope information is available at http://www.zope.org/
 
-  Report problems with this release on the Zope mailing list
-  (zope@zope.org) To subscribe to the list send mail to
-  [EMAIL PROTECTED] with "subscribe" in the subject line.
+Report problems with this release on the Zope mailing list
+(zope@zope.org) To subscribe to the list send mail to
[EMAIL PROTECTED] with "subscribe" in the subject line.
 
 Introduction
+
 
-  The source release is intended for tinkerers, those who want to use
-  Zope components separately, people who want to use their own Python,
-  and people who work on platforms that are not supported by
-  a binary distribution.
+The source release is intended for tinkerers, those who want to use
+Zope components separately, people who want to use their own Python,
+and people who work on platforms that are not supported by a binary
+distribution.
 
 License
+---
 
-  The Zope License is included in "doc/LICENSE.txt" Send your feedback
-  about the license to [EMAIL PROTECTED]
+The Zope License is included in ``ZopePublicLicense.txt``.  Send your
+feedback about the license to [EMAIL PROTECTED]
 
 Installing Zope
+---
 
-  Follow the instructions in "doc/INSTALL.txt" to install Zope.
+Follow the instructions in ``doc/INSTALL.txt`` to install Zope.
 
 Reporting bugs
+--
 
-  Bugs reports should be made through the Zope bugtracker at
-  http://collector.zope.org/Zope. A bug report should contain detailed
-  information about how to reproduce the bug, error messages (see /error_log
-  within the ZMI or var/event.log)
-
-
+Bugs reports should be made through the Zope bugtracker at
+http://collector.zope.org/Zope.  A bug report should contain detailed
+information about how to reproduce the bug, error messages (see
+/error_log within the ZMI or var/event.log)

Deleted: Zope/trunk/doc/LICENSE.txt
===
--- Zope/trunk/doc/LICENSE.txt  2005-11-19 04:17:16 UTC (rev 40238)
+++ Zope/trunk/doc/LICENSE.txt  2005-11-19 04:34:59 UTC (rev 40239)
@@ -1,54 +0,0 @@
-Zope Public License (ZPL) Version 2.1
-
-A copyright notice accompanies this license document that
-identifies the copyright holders.
-
-This license has been certified as open source. It has also
-been designated as GPL compatible by the Free Software
-Foundation (FSF).
-
-Redistribution and use in source and binary forms, with or
-without modification, are permitted provided that the
-following conditions are met:
-
-1. Redistributions in source code must retain the
-   accompanying copyright notice, this list of conditions,
-   and the following disclaimer.
-
-2. 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.
-
-3. Names of the copyright holders must not be used to
-   endorse or promote products derived from this software
-   without prior written permission from the copyright
-   holders.
-
-4. 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.
-
-5. 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.
-
-Disclaimer
-
-  THIS SOFTWARE IS