Merge remote-tracking branch 'upstream/master' into py3-dev

docs/appcontext.rst

@@ -18,7 +18,7 @@ assumptions are true:
     modify it, there is no magic proxy that can give you a reference to
     the application object you're currently creating or modifying.
 
-On the contrast, during request handling, a couple of other rules exist:
+In contrast, during request handling, a couple of other rules exist:
 
 -   while a request is active, the context local objects
     (:data:`flask.request` and others) point to the current request.

docs/deploying/wsgi-standalone.rst

@@ -66,6 +66,29 @@ event loop::
 .. _greenlet: http://codespeak.net/py/0.9.2/greenlet.html
 .. _libevent: http://monkey.org/~provos/libevent/
 
+Twisted Web
+-----------
+
+`Twisted Web`_ is the web server shipped with `Twisted`_, a mature,
+non-blocking event-driven networking library. Twisted Web comes with a
+standard WSGI container which can be controlled from the command line using
+the ``twistd`` utility::
+
+    twistd web --wsgi myproject.app
+
+This example will run a Flask application called ``app`` from a module named
+``myproject``.
+
+Twisted Web supports many flags and options, and the ``twistd`` utility does
+as well; see ``twistd -h`` and ``twistd web -h`` for more information. For
+example, to run a Twisted Web server in the foreground, on port 8080, with an
+application from ``myproject``::
+
+    twistd -n web --port 8080 --wsgi myproject.app
+
+.. _Twisted: https://twistedmatrix.com/
+.. _Twisted Web: https://twistedmatrix.com/trac/wiki/TwistedWeb
+
 .. _deploying-proxy-setups:
 
 Proxy Setups

docs/templating.rst

@@ -211,7 +211,7 @@ functions)::
     @app.context_processor
     def utility_processor():
         def format_price(amount, currency=u'€'):
-            return u'{0:.2f}{1}.format(amount, currency)
+            return u'{0:.2f}{1}'.format(amount, currency)
         return dict(format_price=format_price)
 
 The context processor above makes the `format_price` function available to all