Merge branch '0.12-maintenance'

davidism · davidism · commit 216151c8a3c0 · 2018-04-26T12:18:06.000-07:00
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -213,6 +213,21 @@ unreleased
 .. _#2691: https://github.com/pallets/flask/pull/2691
 .. _#2693: https://github.com/pallets/flask/pull/2693
 .. _#2709: https://github.com/pallets/flask/pull/2709
+Version 0.12.3
+--------------
+
+Released on April 26th 2018
+
+-   :func:`Request.get_json` no longer accepts arbitrary encodings.
+    Incoming JSON should be encoded using UTF-8 per :rfc:`8259`, but
+    Flask will autodetect UTF-8, -16, or -32. (`#2692`_)
+-   Fix a Python warning about imports when using ``python -m flask``.
+    (`#2666`_)
+-   Fix a ``ValueError`` caused by invalid ``Range`` requests in some
+    cases.
+
+.. _#2666: https://github.com/pallets/flask/issues/2666
+.. _#2692: https://github.com/pallets/flask/issues/2692
 
 
 Version 0.12.2
diff --git a/docs/index.rst b/docs/index.rst
@@ -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
diff --git a/docs/upgrading.rst b/docs/upgrading.rst
@@ -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
