add changelog

fix unrelated docs issue

diff --git a/CHANGES.rst b/CHANGES.rst
index 4ff47701e115590d92ab017d427eb5c8d941ee8a..f24ee665237f32dbfdebb7ad2dc5e4c165443c2b 100644 (file)
--- 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 266da6146767eee85f5c16e942c4b96e43e09719..c60234b339774627f08c4b256fa67785a7575f45 100644 (file)
--- 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: