[Checkins] SVN: zc.buildout/branches/gary-6/ merge from gary-5 <- gary-4

[Gary Poster]

Log message for revision 109384:
  merge from gary-5 <- gary-4

Changed:
  _U  zc.buildout/branches/gary-6/
  U   zc.buildout/branches/gary-6/CHANGES.txt

-=-

Property changes on: zc.buildout/branches/gary-6
___________________________________________________________________
Modified: svn:mergeinfo
   - /zc.buildout/branches/gary-5:109333-109334
/zc.buildout/branches/gary-2:108913,109099
/zc.buildout/branches/gary-3:108914,109100
/zc.buildout/branches/gary-1:109098

   + /zc.buildout/branches/gary-5:109333-109334,109383
/zc.buildout/branches/gary-2:108913,109099
/zc.buildout/branches/gary-3:108914,109100
/zc.buildout/branches/gary-1:109098

Modified: svk:merge
   - 62d5b8a3-27da-0310-9561-8e5933582275:/zc.buildout/branches/gary-3:109100
62d5b8a3-27da-0310-9561-8e5933582275:/zc.buildout/branches/gary-5:109334

   + 62d5b8a3-27da-0310-9561-8e5933582275:/zc.buildout/branches/gary-3:109100
62d5b8a3-27da-0310-9561-8e5933582275:/zc.buildout/branches/gary-5:109334
62d5b8a3-27da-0310-9561-8e5933582275:/zc.buildout/branches/gary-5:109383


Modified: zc.buildout/branches/gary-6/CHANGES.txt
===================================================================
--- zc.buildout/branches/gary-6/CHANGES.txt	2010-02-23 20:34:07 UTC (rev 109383)
+++ zc.buildout/branches/gary-6/CHANGES.txt	2010-02-23 20:35:13 UTC (rev 109384)
@@ -6,11 +6,15 @@
 
 New Features:
 
-- Buildout can be safely used with a system Python, as long as you use the
-  new z3c.recipe.scripts recipe to generate scripts and interpreters, rather
-  than zc.recipe.egg (which is still a fully supported, and simpler, way of
-  generating scripts and interpreters if you are using a "clean" Python).
+- Buildout can be safely used with a system Python (or any Python with code
+  in site-packages), as long as you use the new z3c.recipe.scripts
+  recipe to generate scripts and interpreters, rather than zc.recipe.egg.
 
+  zc.recipe.egg is still a fully supported, and simpler, way of
+  generating scripts and interpreters if you are using a "clean" Python,
+  without code installed in site-packages. It keeps its previous behavior in
+  order to provide backwards compatibility.
+
   The z3c.recipe.scripts recipe allows you to control how you use the
   code in site-packages.  You can exclude it entirely; allow eggs in it
   to fulfill package dependencies declared in setup.py and buildout