Merge remote-tracking branch 'origin/1.1.x'

This commit is contained in:
David Lord 2020-04-02 11:56:30 -07:00
commit 037ae3f024
No known key found for this signature in database
GPG key ID: 7A1C87E3F5BC42A8
4 changed files with 6 additions and 6 deletions

View file

@ -3,7 +3,7 @@
Templates
=========
Flask leverages Jinja2 as template engine. You are obviously free to use
Flask leverages Jinja2 as its template engine. You are obviously free to use
a different template engine, but you still have to install Jinja2 to run
Flask itself. This requirement is necessary to enable rich extensions.
An extension can depend on Jinja2 being present.
@ -100,7 +100,7 @@ by default:
Standard Filters
----------------
These filters are available in Jinja2 additionally to the filters provided
Flask provides the following Jinja2 filters in addition to the filters provided
by Jinja2 itself:
.. function:: tojson