From: David Lord <davidism@gmail.com>
Date: Tue, 6 Feb 2018 15:48:10 +0000 (-0800)
Subject: add changelog
X-Git-Tag: 2.11.0~126^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=989a7db2347d39bd75618dc306c3c83560d83a34;p=thirdparty%2Fjinja.git

add changelog
fix unrelated docs issue
---

diff --git a/CHANGES.rst b/CHANGES.rst
index 4ff47701..f24ee665 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,5 @@
+.. currentmodule:: jinja2
+
 Jinja Changelog
 ===============
 
@@ -7,6 +9,12 @@ Version 2.11
 
 unreleased
 
+- Async support is only loaded the first time an
+  :class:`~environment.Environment` enables it, in order to avoid a
+  slow initial import. (`#765`_)
+
+.. _#765: https://github.com/pallets/jinja/issues/765
+
 
 Version 2.10
 ------------
diff --git a/docs/templates.rst b/docs/templates.rst
index 266da614..c60234b3 100644
--- a/docs/templates.rst
+++ b/docs/templates.rst
@@ -1309,11 +1309,9 @@ The general syntax is ``<do something> if <something is true> else <do
 something else>``.
 
 The `else` part is optional.  If not provided, the else block implicitly
-evaluates into an undefined object:
+evaluates into an undefined object::
 
-.. sourcecode:: jinja
-
-    {{ '[%s]' % page.title if page.title }}
+    {{ ('[%s]' % page.title) if page.title }}
 
 
 .. _builtin-filters: