From: David Lord Date: Fri, 11 Mar 2022 22:22:45 +0000 (-0800) Subject: Merge branch '2.9.x' into 2.10.x X-Git-Tag: 2.10.x^0 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7c3b7ca95cb17589dd64fddc957035336180b90d;p=thirdparty%2Fjinja.git Merge branch '2.9.x' into 2.10.x --- 7c3b7ca95cb17589dd64fddc957035336180b90d diff --cc docs/extensions.rst index 82118581,a07b557d..fde2ae4b --- a/docs/extensions.rst +++ b/docs/extensions.rst @@@ -132,7 -123,7 +132,7 @@@ extraction tools in case you are not us What's the big difference between standard and newstyle gettext calls? In general they are less to type and less error prone. Also if they are used - in an :ref:`autescaping` environment they better support automatic escaping. -in an autoescaping environment they better support automatic escaping. ++in an :ref:`autoescaping` environment they better support automatic escaping. Here are some common differences between old and new calls: standard gettext: