- ReST fixes and setup simplifications

git-svn-id: http://svn.dataflake.org/svn/Products.LDAPMultiPlugins/trunk@1554 835909ba-7c00-0410-bfa4-884f43845301

Products/LDAPMultiPlugins/CHANGES.txt

@@ -1,9 +1,7 @@
-=======
-CHANGES
-=======
+Changelog for Products.LDAPMultiplugins
+=======================================
 
-This file contains change information for the LDAPMultiPlugins product.
-To see changes made to revisions prior to the latest version see HISTORY.txt.
+To see earlier changes please see HISTORY.txt.
 
 1.7 (unreleased)
 ----------------

Products/LDAPMultiPlugins/README.txt

@@ -1,6 +1,8 @@
-======
-README
-======
+===========================
+ Products.LDAPMultiPlugins
+===========================
+
+.. contents::
 
 The LDAPMultiPlugins provides PluggableAuthService plugins that use LDAP as 
 the backend for the services they provide. The PluggableAuthService is a 
@@ -12,7 +14,7 @@ package as well.
 
 
 Caching
--------
+=======
 
 The results of some calls into the plugins provided by these package can be 
 cached using the Zope ZCacheable mechanism:
@@ -30,7 +32,7 @@ some of the possibly expensive API calls.
 
 
 Special features - Active Directory Multi Plugin
-------------------------------------------------
+================================================
 
 Properties of the ADMultiPlugin instance:
 
@@ -46,7 +48,7 @@ Properties of the ADMultiPlugin instance:
 
 
 Active Directory configuration hints
-------------------------------------
+====================================
 
 In order for groups support to work correctly, you may have to set the
 following properties. Every situation is different, but this has helped

setup.py

@@ -6,19 +6,14 @@ NAME = 'LDAPMultiPlugins'
 here = os.path.abspath(os.path.dirname(__file__))
 package = os.path.join(here, 'Products', NAME)
 
-def _package_doc(name):
+def _read(name):
     f = open(os.path.join(package, name))
     return f.read()
 
-VERSION = _package_doc('VERSION.txt').strip()
-
-_boundary = '\n' + ('-' * 60) + '\n'
-README = _package_doc('README.txt') + _boundary + _package_doc('CHANGES.txt')
-
 setup(name='Products.%s' % NAME,
-      version=VERSION,
+      version=_read('VERSION.txt').strip(),
       description='LDAP-backed plugins for the Zope2 PluggableAuthService',
-      long_description=README,
+      long_description=_read('README.txt')+'\n\n'+_read('CHANGES.txt'),
       classifiers=[
         "Development Status :: 5 - Production/Stable",
         "Framework :: Zope2",