Merge branch '2.10.x'

diff --cc CHANGES.rst
index 7852bec383895f9b0a15f3288d8860ff5fef471e,3199d559ef86605a8826410d93d118c8668ec0da..ab67cd4c04de28c9519c1207dfa240840538b98b
--- 1/CHANGES.rst
--- 2/CHANGES.rst
+++ b/CHANGES.rst
@@@ -1,37 -1,5 +1,28 @@@
  .. currentmodule:: jinja2
  
- Jinja Changelog
- ===============
- 
- 
 +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`_)
- - Python 2.6 and 3.3 are not supported anymore.
- - The ``map`` filter in async mode now automatically awaits
- - Added a new ``ChainableUndefined`` class to support getitem
-   and getattr on an undefined object. (`#977`_)
- - Allow ``{%+`` syntax (with NOP behavior) when
-   ``lstrip_blocks == False`` (`#748`_)
- - Added a ``default`` parameter for the ``map`` filter. (`#557`_)
++Unreleased
++
++-   Async support is only loaded the first time an
++    :class:`~environment.Environment` enables it, in order to avoid a
++    slow initial import. :issue:`765`
++-   Python 2.6 and 3.3 are not supported anymore.
++-   The ``map`` filter in async mode now automatically awaits
++-   Added a new ``ChainableUndefined`` class to support getitem and
++    getattr on an undefined object. :issue:`977`
++-   Allow ``{%+`` syntax (with NOP behavior) when ``lstrip_blocks`` is
++    disabled. :issue:`748`
++-   Added a ``default`` parameter for the ``map`` filter. :issue:`557`
 +-   Exclude environment globals from
-     :func:`meta.find_undeclared_variables`. #931
++    :func:`meta.find_undeclared_variables`. :issue:`931`
 +-   Float literals can be written with scientific notation, like
-     ``{{ 2.56e-3 }}``. #912, #922
++    2.56e-3. :issue:`912`, :pr:`922`
 +-   Int and float literals can be written with the '_' separator for
-     legibility, like ``{{ 12_345 }}``. #923
- 
- .. _#557: https://github.com/pallets/jinja/issues/557
- .. _#765: https://github.com/pallets/jinja/issues/765
- .. _#748: https://github.com/pallets/jinja/issues/748
- .. _#977: https://github.com/pallets/jinja/issues/977
++    legibility, like 12_345. :pr:`923`
 +
 +
  Version 2.10.2
  --------------
  

diff --cc docs/api.rst
Simple merge

diff --cc docs/faq.rst
Simple merge

diff --cc docs/integration.rst
index af0e64ff0f22f5ac1f30cdfc7d9466070f71f14f,e84e5793a7ce1e39cc505c5b03097db62428d65a..ff8fbafbe55cc44072ea47eda6827d6dc96cb02a
--- 1/docs/integration.rst
--- 2/docs/integration.rst
+++ b/docs/integration.rst
@@@ -90,17 -89,13 +90,17 @@@ often used snippets
  Vim
  ---
  
 -A syntax plugin for `Vim`_ exists in the Vim-scripts directory as well as the
 -`ext` folder at the root of the Jinja2 project.  `The script
 -<https://www.vim.org/scripts/script.php?script_id=1856>`_ supports Jinja1 and
 -Jinja2.  Once installed two file types are available `jinja` and `htmljinja`.
 -The first one for text based templates, the latter for HTML templates.
 +A syntax plugin for `Vim`_ is available `from the jinja repository
 +<https://github.com/pallets/jinja/blob/master/ext/Vim/jinja.vim>`_. The script
 +supports Jinja1 and Jinja2. Once installed, two file types are available
 +(``jinja`` and ``htmljinja``). The first one is for text-based templates and the
 +second is for HTML templates. For HTML documents, the plugin attempts to
 +automatically detect Jinja syntax inside of existing HTML documents.
  
 -Copy the files into your `syntax` folder.
 +If you are using a plugin manager like `Pathogen`_, see the `vim-jinja
 +<https://github.com/mitsuhiko/vim-jinja>`_ repository for installing in the
 +``bundle/`` directory.
  
  .. _Babel: http://babel.pocoo.org/
- .. _Vim: http://www.vim.org/
+ .. _Vim: https://www.vim.org/
 +.. _Pathogen: https://github.com/tpope/vim-pathogen

diff --cc docs/intro.rst
index 1059765f3bd82ccbbd4d9901226c41f4270d05b6,90636f57f457b230c0b7acb7f5d74a6db3e520c4..e01450a3f090245c4c700bd58530b3b2639cdebf
--- 1/docs/intro.rst
--- 2/docs/intro.rst
+++ b/docs/intro.rst
@@@ -41,19 -60,22 +41,19 @@@ As an alternative to steps 4 you can al
  which will install the package via `distribute` in development mode.  This also
  has the advantage that the C extensions are compiled.
  
 -.. _download page: https://pypi.org/project/Jinja2/
  .. _distribute: https://pypi.org/project/distribute/
- .. _setuptools: http://peak.telecommunity.com/DevCenter/setuptools
+ .. _setuptools: https://pypi.org/project/setuptools/
 -.. _easy_install: https://setuptools.readthedocs.io/en/latest/easy_install.html
  .. _pip: https://pypi.org/project/pip/
- .. _git: https://git-scm.org/
+ .. _git: https://git-scm.com/
  
  
  MarkupSafe Dependency
  ~~~~~~~~~~~~~~~~~~~~~
  
 -As of version 2.7 Jinja2 depends on the `MarkupSafe`_ module.  If you
 -install Jinja2 via `pip` or `easy_install` it will be installed
 -automatically for you.
 +As of version 2.7 Jinja2 depends on the `MarkupSafe`_ module. If you install
 +Jinja2 via ``pip`` it will be installed automatically for you.
  
- .. _MarkupSafe: https://pypi.org/project/MarkupSafe/
+ .. _MarkupSafe: https://markupsafe.palletsprojects.com/
  
  Basic API Usage
  ---------------

diff --cc docs/templates.rst
Simple merge

diff --cc jinja2/bccache.py
Simple merge

diff --cc jinja2/sandbox.py
Simple merge

diff --cc tests/test_api.py
Simple merge