doc changestrunk

4 files changed, 27 insertions, 74 deletions

diff --git a/configobj.py b/configobj.py
index cf3a891..fd61bcd 100644
--- a/configobj.py
+++ b/configobj.py
@@ -117,7 +117,7 @@ __version__ = '4.6.0'
 
 __revision__ = '$Id: configobj.py 156 2006-01-31 14:57:08Z fuzzyman $'
 
-__docformat__ = "restructuredtext en"
+__docformat__ = "restructuredtext en" 
 
 __all__ = (
     '__version__',
diff --git a/docs/configobj.txt b/docs/configobj.txt
index 6c1fc6e..731dbaf 100644
--- a/docs/configobj.txt
+++ b/docs/configobj.txt
@@ -612,7 +612,7 @@ details.
     quite simple and powerful. The best guide to them is this article on
     ConfigObj:
     
-    * `Introduction to ConfigObj`_
+    * `An Introduction to ConfigObj`_
 
 The ``copy`` parameter fills in missing values from the configspec (default
 values), *without* marking the values as defaults. It also causes comments to
diff --git a/docs/validate.txt b/docs/validate.txt
index 88147b4..5f5b153 100644
--- a/docs/validate.txt
+++ b/docs/validate.txt
@@ -12,6 +12,7 @@
 :Date: 2009/04/13
 :Homepage: `Validate Homepage`_
 :Repository: `Google code homepage <http://code.google.com/p/configobj/>`_
+:PyPI Entry: `Validate on Python Packaging Index <http://pypi.python.org/pypi/validate>`_
 :License: `BSD License`_
 :Support: `Mailing List`_
 
@@ -95,12 +96,11 @@ Documentation
 
 * You can view `this document`_ online as the `Validate Homepage`_.
 
-.. _configobj.py: http://www.voidspace.org.uk/cgi-bin/voidspace/downman.py?file=configobj.py
-.. _configobj.zip: http://www.voidspace.org.uk/cgi-bin/voidspace/downman.py?file=configobj-4.5.3.zip
-.. _validate.py: http://www.voidspace.org.uk/cgi-bin/voidspace/downman.py?file=validate.py
+.. _configobj.py: http://www.voidspace.org.uk/cgi-bin/voidspace/download/configobj.py
+.. _configobj.zip: http://www.voidspace.org.uk/cgi-bin/voidspace/download/configobj-4.6.0.zip
+.. _validate.py: http://www.voidspace.org.uk/cgi-bin/voidspace/download/validate.py
 .. _Subversion Repository: http://code.google.com/p/configobj/
 .. _Sourceforge: http://sourceforge.net/projects/configobj
-.. _pythonutils: http://www.voidspace.org.uk/python/pythonutils.html
 .. _validate: http://www.voidspace.org.uk/python/validate.html
 
 
@@ -617,7 +617,7 @@ CHANGELOG
 * BUGFIX: can now handle multiline strings.
 * Addition of 'force_list' validation option.
 
-As there are no known bugs or outstanding feature requests I am marking this 1.0.
+As the API is stable and there are no known bugs or outstanding feature requests I am marking this 1.0.
 
 
 2008/02/24 - Version 0.3.2
@@ -708,34 +708,4 @@ Does type conversion as well.
 Initial version developed by `Michael Foord`_
 and Mark Andrews.
 
-.. note::
-
-    Rendering this document with docutils also needs the
-    textmacros module and the PySrc CSS stuff. See
-    http://www.voidspace.org.uk/python/firedrop2/textmacros.shtml
-
-
-.. raw:: html
-
-    <div align="center">
-        <p>
-            <a href="http://www.python.org">
-                <img src="images/new_python.gif" width="100" height="103" border="0" 
-                    alt="Powered by Python" />
-            </a>
-            <a href="http://sourceforge.net">
-                <img src="http://sourceforge.net/sflogo.php?group_id=123265&amp;type=1" width="88" height="31" border="0" alt="SourceForge.net Logo" />
-            </a>
-            <a href="http://www.opensource.org">
-                <img src="images/osi-certified-120x100.gif" width="120" height="100" border="0"
-                    alt="Certified Open Source"/>
-            </a>
-        </p>
-        <p>
-            <a href="http://www.voidspace.org.uk/python/index.shtml">
-                <img src="images/pythonbanner.gif" width="468" height="60" 
-                alt="Python on Voidspace" border="0" />
-            </a>
-        </p>
-    </div>
 
diff --git a/setup.py b/setup.py
index 7170656..722f99a 100644
--- a/setup.py
+++ b/setup.py
@@ -1,48 +1,31 @@
 # setup.py
 # Install script for ConfigObj
-# Copyright (C) 2005 Michael Foord, Mark Andrews, Nicola Larosa
+# Copyright (C) 2005-2009 Michael Foord, Mark Andrews, Nicola Larosa
 # E-mail: fuzzyman AT voidspace DOT org DOT uk
 #         mark AT la-la DOT com
 #         nico AT tekNico DOT net
 
 # This software is licensed under the terms of the BSD license.
 # http://www.voidspace.org.uk/python/license.shtml
-# Basically you're free to copy, modify, distribute and relicense it,
-# So long as you keep a copy of the license with it.
 
-# Scripts maintained at http://www.voidspace.org.uk/python/index.shtml
-# For information about bugfixes, updates and support, please join the
-# Rest2Web mailing list:
-# http://lists.sourceforge.net/lists/listinfo/rest2web-develop
-# Comments, suggestions and bug reports welcome.
-"""
-**setup.py** for ``configobj`` and ``validate`` modules.
-"""
+import sys
+from distutils.core import setup
+from configobj import __version__ as VERSION
 
-if __name__ == '__main__':
-    import sys
-    from distutils.core import setup
-    from configobj import __version__ as VERSION
+NAME = 'configobj'
+MODULES = 'configobj', 'validate'
+DESCRIPTION = 'Config file reading, writing, and validation.'
+URL = 'http://www.voidspace.org.uk/python/configobj.html'
+LICENSE = 'BSD'
+PLATFORMS = ["Platform Independent"]
 
-    NAME = 'configobj'
-    MODULES = 'configobj', 'validate'
-    DESCRIPTION = 'Config file reading, writing, and validation.'
-    URL = 'http://www.voidspace.org.uk/python/configobj.html'
-    LICENSE = 'BSD'
-    PLATFORMS = ["Platform Independent"]
-
-    if sys.version < '2.2.3':
-        from distutils.dist import DistributionMetadata
-        DistributionMetadata.classifiers = None
-        DistributionMetadata.download_url = None
-
-    setup(name= NAME,
-          version= VERSION,
-          description= DESCRIPTION,
-          license = LICENSE,
-          platforms = PLATFORMS,
-          author= 'Michael Foord & Nicola Larosa',
-          author_email= 'fuzzyman@voidspace.org.uk',
-          url= URL,
-          py_modules = MODULES,
-         )
+setup(name= NAME,
+      version= VERSION,
+      description= DESCRIPTION,
+      license = LICENSE,
+      platforms = PLATFORMS,
+      author= 'Michael Foord & Nicola Larosa',
+      author_email= 'fuzzyman@voidspace.org.uk',
+      url= URL,
+      py_modules = MODULES,
+     )