Merge branch '1.0-maintenance'

This commit is contained in:
David Lord 2019-01-06 10:36:54 -08:00
commit 3b45b82ec2
No known key found for this signature in database
GPG key ID: 7A1C87E3F5BC42A8
13 changed files with 68 additions and 57 deletions

View file

@ -312,10 +312,10 @@ JSON module:
as string.
The :func:`~htmlsafe_dumps` function of this json module is also available
as filter called ``|tojson`` in Jinja2. Note that inside ``script``
tags no escaping must take place, so make sure to disable escaping
with ``|safe`` if you intend to use it inside ``script`` tags unless
you are using Flask 0.10 which implies that:
as a filter called ``|tojson`` in Jinja2. Note that in versions of Flask prior
to Flask 0.10, you must disable escaping with ``|safe`` if you intend to use
``|tojson`` output inside ``script`` tags. In Flask 0.10 and above, this
happens automatically (but it's harmless to include ``|safe`` anyway).
.. sourcecode:: html+jinja