Updating documentation

README.rst

@@ -9,7 +9,7 @@ Introduction
 AMQP-Storm is a library designed to be consistent, stable and thread-safe.
 
 - 100% Unit-test Coverage!
-- Supports Python 2.6, 2.7 and Python 3+.
+- Supports Python 2.6, 2.7 and Python 3.3+.
 - When using a SSL connection, TLSv1 or higher is required.
 
 Documentation
@@ -31,4 +31,4 @@ Special thanks to gmr (Gavin M. Roy) for creating pamqp, and in addition amqpsto
    :target: https://travis-ci.org/eandersson/amqpstorm
 
 .. |Coverage| image:: https://codecov.io/gh/eandersson/amqpstorm/branch/master/graph/badge.svg
-   :target: https://codecov.io/gh/eandersson/amqpstorm
+   :target: https://codecov.io/gh/eandersson/amqpstorm

docs/index.rst

@@ -3,15 +3,20 @@
    You can adapt this file completely to your liking, but it should at least
    contain the root `toctree` directive.
 
-amqpstorm package
+AMQPStorm package
 =================
 Thread-safe Python RabbitMQ Client Library based on pamqp.
 
 Installation
 ------------
-amqpstorm can be installed by running :command:`pip install amqpstorm`
+AMQPStorm can be installed by running :command:`pip install amqpstorm`
 
-Contents:
+Examples
+--------
+A wide verity of examples is available on Github at `https://github.com/eandersson/amqpstorm/tree/master/examples <https://github.com/eandersson/amqpstorm/tree/master/examples>`_
+
+API Documentation
+-----------------
 
 .. toctree::
    :glob:
@@ -25,12 +30,11 @@ Please report any issues to the Github repo at `https://github.com/eandersson/am
 
 Source
 ------
-amqpstorm source is available on Github at  `https://github.com/eandersson/amqp-storm <https://github.com/eandersson/amqp-storm>`_
+AMQPStorm source code is available on Github at  `https://github.com/eandersson/amqp-storm <https://github.com/eandersson/amqp-storm>`_
 
 Indices and tables
 ==================
 
 * :ref:`genindex`
 * :ref:`modindex`
 * :ref:`search`
-

setup.py

@@ -1,13 +1,10 @@
 from setuptools import setup
 
-long_description = """
-See https://github.com/eandersson/amqpstorm for more information.
-"""
 
 setup(name='AMQPStorm',
-      version='2.0.0a1',
+      version='2.0.0',
       description='Thread-safe Python RabbitMQ Client Library based on pamqp.',
-      long_description=long_description,
+      long_description=open('README.rst').read(),
       author='Erik Olof Gunnar Andersson',
       author_email='me@eandersson.net',
       include_package_data=True,
@@ -37,4 +34,5 @@
           'Topic :: Internet',
           'Topic :: Software Development :: Libraries',
           'Topic :: Software Development :: Libraries :: Python Modules',
-          'Topic :: System :: Networking'])
+          'Topic :: System :: Networking'
+      ])