Merge branch 'master' of https://github.com/mitsuhiko/flask

docs/config.rst

@@ -130,7 +130,8 @@ The following configuration values are used internally by Flask:
 ``SEND_FILE_MAX_AGE_DEFAULT``     Default cache control max age to use with
                                   :meth:`~flask.Flask.send_static_file` (the
                                   default static file handler) and
-                                  :func:`~flask.send_file`, in
+                                  :func:`~flask.send_file`, as
+                                  :class:`datetime.timedelta` or as seconds.
                                   seconds. Override this value on a per-file
                                   basis using the
                                   :meth:`~flask.Flask.get_send_file_max_age`

docs/deploying/index.rst

@@ -24,7 +24,7 @@ Hosted options
 - `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/>`_
-
+- `Deploying on Azure (IIS) <https://azure.microsoft.com/documentation/articles/web-sites-python-configure/>`_
 
 Self-hosted options
 -------------------

docs/deploying/mod_wsgi.rst

@@ -193,5 +193,11 @@ Add the following lines to the top of your ``.wsgi`` file::
     activate_this = '/path/to/env/bin/activate_this.py'
     execfile(activate_this, dict(__file__=activate_this))
 
+For Python 3 add the following lines to the top of your ``.wsgi`` file::
+
+    activate_this = '/path/to/env/bin/activate_this.py'
+    with open(activate_this) as file_:
+        exec(file_.read(), dict(__file__=activate_this))
+
 This sets up the load paths according to the settings of the virtual
 environment.  Keep in mind that the path has to be absolute.

docs/patterns/sqlalchemy.rst

@@ -33,7 +33,7 @@ SQLAlchemy.  It allows you to define tables and models in one go, similar
 to how Django works.  In addition to the following text I recommend the
 official documentation on the `declarative`_ extension.
 
-Here the example :file:`database.py` module for your application::
+Here's the example :file:`database.py` module for your application::
 
     from sqlalchemy import create_engine
     from sqlalchemy.orm import scoped_session, sessionmaker