Merge remote branch 'davisp/master'

README.rst

@@ -0,0 +1,44 @@
+About
+-----
+
+gunicorn 'Green Unicorn' is a WSGI HTTP Server for UNIX, fast clients and nothing else. 
+
+This is a  port of Unicorn (http://unicorn.bogomips.org/) in Python.
+
+Installation
+------------
+
+::
+
+    $ python setup.py install
+
+Usage
+-----
+
+::
+
+    $ gunicorn --help
+    Usage: gunicorn [OPTIONS] APP_MODULE
+    
+    Options:
+      --host=HOST        Host to listen on. [127.0.0.1]
+      --port=PORT        Port to listen on. [8000]
+      --workers=WORKERS  Number of workers to spawn. [1]
+      -h, --help         show this help message and exit
+
+
+Example with test app::
+
+    $ cd examples
+    $ gunicorn --workers=2 test:app
+    
+    
+For django projects use the `gunicorn_django` command::
+
+    $ cd yourdjangoproject
+    $ gunicorn_django --workers=2
+    
+    
+
+
+

README.txt

@@ -1,40 +0,0 @@
-gunicorn 'Green Unicorn' is a WSGI HTTP Server for UNIX, fast clients and nothing else. 
-This is a  port of Unicorn (http://unicorn.bogomips.org/) in Python.
-
-
-Install
--------
-
-Run command :
-   
-	$ python setup.py install
-
-
-Use gunicorn:
--------------
-
-	$ gunicorn --help
-	Usage: gunicorn [OPTIONS] APP_MODULE
-
-	Options:
-	  --host=HOST        Host to listen on. [127.0.0.1]
-	  --port=PORT        Port to listen on. [8000]
-	  --workers=WORKERS  Number of workers to spawn. [1]
-	  -h, --help         show this help message and exit
-
-
-Example with test app :
-
-	$ cd examples
-	$ gunicorn --workers=2 test:app
-	
-	
-For django projects use the `gunicorn_django` command.
-
-	$ cd yourdjangoproject
-	$ gunicorn_django --workers=2
-	
-	
-
-
-

setup.py

@@ -37,7 +37,7 @@ setup(
     long_description = file(
         os.path.join(
             os.path.dirname(__file__),
-            'README.txt'
+            'README.rst'
         )
     ).read(),
     author = 'Benoit Chesneau',