Merge branch 'flask_deployment_docs'

Conflicts:
	docs/quickstart.rst

docs/deploying/index.rst

@@ -3,18 +3,30 @@
 Deployment Options
 ==================
 
-Depending on what you have available there are multiple ways to run
-Flask applications.  You can use the builtin server during development,
-but you should use a full deployment option for production applications.
-(Do not use the builtin development server in production.)  Several
-options are available and documented here.
+While lightweight and easy to use, **Flask's built-in server is not suitable
+for production** as it doesn't scale well and by default serves only one
+request at a time.  Some of the options available for properly running Flask in
+production are documented here.
 
-If you have a different WSGI server look up the server documentation
-about how to use a WSGI app with it.  Just remember that your
-:class:`Flask` application object is the actual WSGI application.
+If you want to deploy your Flask application to a WSGI server not listed here,
+look up the server documentation about how to use a WSGI app with it.  Just
+remember that your :class:`Flask` application object is the actual WSGI
+application.
 
-For hosted options to get up and running quickly, see
-:ref:`quickstart_deployment` in the Quickstart.
+
+Hosted options
+--------------
+
+- `Deploying Flask on Heroku <https://devcenter.heroku.com/articles/getting-started-with-python>`_
+- `Deploying WSGI on dotCloud <http://docs.dotcloud.com/services/python/>`_
+  with `Flask-specific notes <http://flask.pocoo.org/snippets/48/>`_
+- `Deploying Flask on Webfaction <http://flask.pocoo.org/snippets/65/>`_
+- `Deploying Flask on Google App Engine <https://github.com/kamalgill/flask-appengine-template>`_
+- `Sharing your Localhost Server with Localtunnel <http://flask.pocoo.org/snippets/89/>`_
+
+
+Self-hosted options
+-------------------
 
 .. toctree::
    :maxdepth: 2