[Checkins] SVN: zc.sourcefactory/branches/0.3/ Merge CHANGES into long_info

[Christian Theune]

Log message for revision 87289:
  Merge CHANGES into long_info
  

Changed:
  U   zc.sourcefactory/branches/0.3/CHANGES.txt
  U   zc.sourcefactory/branches/0.3/setup.py

-=-
Modified: zc.sourcefactory/branches/0.3/CHANGES.txt
===================================================================
--- zc.sourcefactory/branches/0.3/CHANGES.txt	2008-06-10 14:48:26 UTC (rev 87288)
+++ zc.sourcefactory/branches/0.3/CHANGES.txt	2008-06-10 14:53:32 UTC (rev 87289)
@@ -1,39 +1,39 @@
-=======
 Changes
 =======
 
 0.3.3 (unreleased)
-==================
+------------------
 
+
 0.3.2 (2008-04-09)
-==================
+------------------
 
     - Fixed scalability bug caused by missing __nonzero__ on ValueMappingSource
 
 
 0.3.1 (2008-02-12)
-==================
+------------------
 
     - Fixed scalability bug caused by missing __nonzero__ on BasicSourceFactory
 
 
 0.3.0 (??????????)
-==================
+------------------
 
     - Added class-level defaults for attributes that are declared in the
       interfaces to not have the Zope 2 security machinery complain about
       them.
 
 
-0.2.1 - 2007-07-10
-==================
+0.2.1 (2007-07-10)
+------------------
 
     - Fixed a bug in the contextual token policy that was handling the
       resolution of values for a given token incorrectly.
 
 
-0.2.0 - 2007-07-10
-==================
+0.2.0 (2007-07-10)
+------------------
 
     - Added a contextual token policy interface that allows getToken and
       getValue to access the cotext for contextual sources.

Modified: zc.sourcefactory/branches/0.3/setup.py
===================================================================
--- zc.sourcefactory/branches/0.3/setup.py	2008-06-10 14:48:26 UTC (rev 87288)
+++ zc.sourcefactory/branches/0.3/setup.py	2008-06-10 14:53:32 UTC (rev 87289)
@@ -10,10 +10,12 @@
 
     description="An easy way to create custom Zope 3 sources.",
 
-    long_description=open(
+    long_description=(open(
         os.path.join(os.path.dirname(__file__),
                      "src", "zc", "sourcefactory", "README.txt"),
-        "r").read(),
+        "r").read() + "\n\n" + 
+        open(os.path.join(os.path.dirname(__file__), "CHANGES.txt"),
+             "r").read()),
 
     packages=find_packages('src'),
     package_dir={'':'src'},