Merge branch '0.12-maintenance'

This commit is contained in:
David Lord 2018-04-26 12:18:06 -07:00
commit 216151c8a3
No known key found for this signature in database
GPG key ID: 7A1C87E3F5BC42A8
3 changed files with 17 additions and 1 deletions

View file

@ -6,6 +6,7 @@ Welcome to Flask
.. image:: _static/logo-full.png
:alt: Flask: web development, one drop at a time
:align: right
:align: right
Welcome to Flask's documentation. Get started with :ref:`installation`
and then get an overview with the :ref:`quickstart`. There is also a

View file

@ -215,7 +215,7 @@ good.
To apply the upgrade script do the following:
1. Download the script: `flask-07-upgrade.py
<https://raw.githubusercontent.com/pallets/flask/master/scripts/flask-07-upgrade.py>`_
<https://raw.githubusercontent.com/pallets/flask/0.12.3/scripts/flask-07-upgrade.py>`_
2. Run it in the directory of your application::
python flask-07-upgrade.py > patchfile.diff