[Plone-cvs] r27686 - in plone.app.portlets/trunk: . docs

[Hanno S. <svn...@pl...>]

Author: hannosch
Date: Sat Jun 27 15:58:22 2009
New Revision: 27686

Modified:
   plone.app.portlets/trunk/   (props changed)
   plone.app.portlets/trunk/README.txt
   plone.app.portlets/trunk/docs/HISTORY.txt
   plone.app.portlets/trunk/setup.py
Log:
Merged /plone.app.portlets/branches/1.2:r25703-25706


Modified: plone.app.portlets/trunk/README.txt
==============================================================================
--- plone.app.portlets/trunk/README.txt	(original)
+++ plone.app.portlets/trunk/README.txt	Sat Jun 27 15:58:22 2009
@@ -1,7 +1,6 @@
-plone.app.portlets Package Readme
-=========================
+Introduction
+=============
 
-Overview
---------
+plone.app.portlets provides a Plone-specific user interface for 
+plone.portlets, as well as a standard set of portlets that ship with Plone.
 
-Plone integration for the basic plone.portlets package

Modified: plone.app.portlets/trunk/docs/HISTORY.txt
==============================================================================
--- plone.app.portlets/trunk/docs/HISTORY.txt	(original)
+++ plone.app.portlets/trunk/docs/HISTORY.txt	Sat Jun 27 15:58:22 2009
@@ -18,15 +18,6 @@
   on Plone 3.3 and above.
   [hannosch]
 
-1.2 - UNRELEASED
-----------------
-
-- Template cleanup: add missing xmlns declarations and fix invalid markup.
-  [wichert]
-
-1.2rc3 - April 8, 2009
-----------------------
-
 - Import navigation functionality from plone.app.layout instead of
   Products.CMFPlone.
   [hannosch]
@@ -34,16 +25,6 @@
 - Removed inflexible and outstandingly slow calendar portlet.
   [hannosch]
 
-1.2 - UNRELEASED
-----------------
-
-- Correct case in the feedparser dependency.
-  [wichert]
-
-
-1.2rc1 - March 27, 2009
------------------------
-
 - Avoid acquiring `portal_properties` and call it via a proper API.
   [hannosch]
 
@@ -51,10 +32,6 @@
   `global_statusmessage` macro.
   [hannosch]
 
-
-1.2b1 - March 7, 2009
----------------------
-
 - Use the `default_page` view in favor of the isDefaultPage method.
   Adjust the code to call the view on the parent of the object.
   [hannosch]
@@ -77,9 +54,21 @@
 1.2 - Unreleased
 ----------------
 
-- Clean-up unnecessary variable declarations within navigation_recurse.pt.
-  Let the default view on the Link type decide what's best
-  [andrewb]
+- Template cleanup: add missing xmlns declarations and fix invalid markup.
+  [wichert]
+
+1.2rc3 - 2009-04-08
+-------------------
+
+- Correct case in the feedparser dependency.
+  [wichert]
+
+1.2rc1 - 2009-03-27
+-------------------
+
+
+1.2b1 - 2009-03-07
+------------------
 
 - Fixed the various portlets to no longer use portal_url, but use the 
   navigation_root_url from the plone_portal_state view. Changed the
@@ -95,6 +84,10 @@
 - Added title option to the RSS portlet.
   [davisagli]
 
+- Clean-up unnecessary variable declarations within navigation_recurse.pt.
+  Let the default view on the Link type decide what's best
+  [andrewb]
+
 1.1.7 (unreleased)
 ------------------
 

Modified: plone.app.portlets/trunk/setup.py
==============================================================================
--- plone.app.portlets/trunk/setup.py	(original)
+++ plone.app.portlets/trunk/setup.py	Sat Jun 27 15:58:22 2009
@@ -1,14 +1,13 @@
 from setuptools import setup, find_packages
+import os.path
 
 version = '2.0'
 
 setup(name='plone.app.portlets',
       version=version,
       description="Plone integration for the basic plone.portlets package",
-      long_description="""\
-plone.app.portlets provides a Plone-specific user interface for 
-plone.portlets, as well as a standard set of portlets that ship with Plone.
-""",
+      long_description=open("README.txt").read() + "\n" +
+                       open(os.path.join("docs", "HISTORY.txt")).read(),
       classifiers=[
         "Framework :: Plone",
         "Framework :: Zope2",