Merge branch 'master' of github.com:kennethreitz/python-guide

Conflicts:
	AUTHORS

docs/scenarios/web.rst

@@ -110,26 +110,91 @@ There is also a tutorial about deploying Django using this stack: http://daltonm
 Hosting
 :::::::
 
+Platform-as-a-Service
+---------------------
+
+Platform-as-a-Service (PaaS) is a type of cloud computing infrastructure
+which abstracts and manages infrastructure, routing, and scaling of web
+applications. When using PaaS, application developers can focus on writing
+application code rather than needing to be concerned with deployment
+details.
+
+Most PaaS services offer a command-line interface that developers can use to
+set up and interrogate configuration, and to deploy new releases of an
+application to the service.
+
+PaaS services and their partners offer add-on functionality which is well
+integrated into the platform, such as database hosting, email services,
+logging, scheduled and background tasks, billing and payment, etc.
+
+
 Heroku
-------
+~~~~~~
+
+`Heroku <http://www.heroku.com/>`_'s
+`Cedar <http://devcenter.heroku.com/articles/cedar>`_ stack supports Python
+web applications running on Python version 2.7. At this time, Cedar is in
+public beta, but it is intended to become the default stack for all new
+Heroku applications at some point.
+
+Heroku uses a git-based workflow, so it is well-suited for use with
+applications whose source control is managed in a git repository.
+
+Heroku publishes `step-by-step instructions
+<http://devcenter.heroku.com/articles/python>`_ on how to set up your first
+application for use in Heroku, and maintains a list of `example applications
+<http://python.herokuapp.com/>`_ using Heroku.
+
 
 DotCloud
---------
+~~~~~~~~
+
+`DotCloud <http://www.dotcloud.com/>`_ supports WSGI applications and
+background/worker tasks natively on their platform. Web applications running
+Python version 2.6, and uses `nginx <http://nginx.org/>`_ and `uWSGI
+<http://projects.unbit.it/uwsgi/>`_, and allows custom configuration of both
+for advanced users.
+
+DotCloud uses a custom command-line API client which can work with
+applications managed in git repositories or any other version control
+system.
+
+See the `DotCloud documentation on Python
+<http://docs.dotcloud.com/services/python/>`_ for more information and help
+getting started.
 
-gondor.io
----------
 
 ep.io
------
+~~~~~
+
+`ep.io <https://www.ep.io/>`_ is a PaaS designed specifically for Python web
+applications. It supports Python versions 2.6 and 2.7, and has Pythonic
+integrations with a variety of services.
+
+ep.io publishes `step-by-step instructions
+<https://www.ep.io/docs/quickstart/>`_ on how to get started with their
+platform and how to deploy Django, Flask, or generic WSGI applications.
+
+ep.io is currently in invite-only beta.
+
 
 Gondor
-------
+~~~~~~
 
-Heroku
-------
+`Gondor <https://gondor.io/>`_ is a PaaS specailized for deploying Django
+and Pinax applications. Gondor supports Django versions 1.2 and 1.3 on
+Python version 2.7, and can automatically configure your Django site if you
+use ``local_settings.py`` for site-specific configuration information.
+
+Gondor publishes guides to deploying `Django projects
+<https://gondor.io/support/setting-up-django/>`_ and `Pinax projects
+<https://gondor.io/support/setting-up-pinax/>`_ on their platform.
+
+Shared Web Hosting
+------------------
 
 WebFaction
------------
+~~~~~~~~~~~
 
 
 Twisted