Merge branch '1.1.x'

CHANGES.rst

@@ -44,15 +44,7 @@ Unreleased
     :issue:`3215`
 -   Include ``samesite`` and ``secure`` options when removing the
     session cookie. :pr:`3726`
-
+-   Support passing a ``pathlib.Path`` to ``static_folder``. :pr:`3579`
-
-Version 1.1.x
--------------
-
-Not yet released.
-
--   Officially support passing a :class:`pathlib.Path` for
-    ``static_folder`` which stopped working in 1.1.2. :pr:`3579`
 
 
 Version 1.1.2

docs/appcontext.rst

@@ -117,7 +117,7 @@ For example, you can manage a database connection using this pattern::
         return g.db
 
     @app.teardown_appcontext
-    def teardown_db():
+    def teardown_db(exception):
         db = g.pop('db', None)
 
         if db is not None:

docs/deploying/mod_wsgi.rst

@@ -25,7 +25,7 @@ follows:
 
 .. sourcecode:: text
 
-    $ apt-get install libapache2-mod-wsgi
+    $ apt-get install libapache2-mod-wsgi-py3
 
 If you are using a yum based distribution (Fedora, OpenSUSE, etc..) you
 can install it as follows:
@@ -39,7 +39,7 @@ using pkg_add:
 
 .. sourcecode:: text
 
-    $ pkg install ap22-mod_wsgi2
+    $ pkg install ap24-py37-mod_wsgi
 
 If you are using pkgsrc you can install `mod_wsgi` by compiling the
 `www/ap2-wsgi` package.

docs/errorhandling.rst

@@ -70,7 +70,7 @@ See also:
     (RQ, Celery, etc.) in a similar fashion. See the `Python SDK docs
     <https://docs.sentry.io/platforms/python/>`__ for more information.
 -   `Getting started with Sentry <https://docs.sentry.io/quickstart/?platform=python>`__
--   `Flask-specific documentation <https://docs.sentry.io/platforms/python/flask/>`__
+-   `Flask-specific documentation <https://docs.sentry.io/platforms/python/guides/flask/>`__
 
 
 Error Handlers

docs/quickstart.rst

@@ -105,7 +105,7 @@ First of all you need to look at the error message.
 Old Version of Flask
 ````````````````````
 
-Versions of Flask older than 0.11 use to have different ways to start the
+Versions of Flask older than 0.11 used to have different ways to start the
 application.  In short, the :command:`flask` command did not exist, and
 neither did :command:`python -m flask`.  In that case you have two options:
 either upgrade to newer Flask versions or have a look at :doc:`/server`