diff --git a/docs/docsite/jinja.inv b/docs/docsite/jinja2.inv similarity index 100% rename from docs/docsite/jinja.inv rename to docs/docsite/jinja2.inv diff --git a/docs/docsite/rst/conf.py b/docs/docsite/rst/conf.py index 906167af56b..4b686f7dec6 100644 --- a/docs/docsite/rst/conf.py +++ b/docs/docsite/rst/conf.py @@ -276,4 +276,4 @@ autoclass_content = 'both' # location for the mappning to live) will confuse it. intersphinx_mapping = {'python': ('https://docs.python.org/2/', (None, '../python2.inv')), 'python3': ('https://docs.python.org/3/', (None, '../python3.inv')), - 'jinja': ('http://jinja.palletsprojects.com/', (None, '../jinja.inv'))} + 'jinja2': ('http://jinja.palletsprojects.com/', (None, '../jinja2.inv'))} diff --git a/docs/docsite/rst/user_guide/playbooks_filters.rst b/docs/docsite/rst/user_guide/playbooks_filters.rst index a5e4ec0b698..3f734febb2f 100644 --- a/docs/docsite/rst/user_guide/playbooks_filters.rst +++ b/docs/docsite/rst/user_guide/playbooks_filters.rst @@ -4,7 +4,7 @@ Filters ******* -Filters let you transform data inside template expressions. This page documents mainly Ansible-specific filters, but you can use any of the standard filters shipped with Jinja2 - see the list of :ref:`builtin filters ` in the official Jinja2 template documentation. You can also use :ref:`Python methods ` to manipulate variables. A few useful filters are typically added with each new Ansible release. The development documentation shows +Filters let you transform data inside template expressions. This page documents mainly Ansible-specific filters, but you can use any of the standard filters shipped with Jinja2 - see the list of :ref:`builtin filters ` in the official Jinja2 template documentation. You can also use :ref:`Python methods ` to manipulate variables. A few useful filters are typically added with each new Ansible release. The development documentation shows how to create custom Ansible filters as plugins, though we generally welcome new filters into the core code so everyone can use them. Templating happens on the Ansible controller, **not** on the target host, so filters execute on the controller and manipulate data locally. @@ -1352,7 +1352,7 @@ To create a namespaced UUIDv5 using the default Ansible namespace '361E6D51-FAEC .. versionadded:: 1.9 -To make use of one attribute from each item in a list of complex variables, use the :func:`Jinja2 map filter `:: +To make use of one attribute from each item in a list of complex variables, use the :func:`Jinja2 map filter `:: # get a comma-separated list of the mount points (e.g. "/,/mnt/stuff") on a host {{ ansible_mounts | map(attribute='mount') | join(',') }} diff --git a/docs/docsite/rst/user_guide/playbooks_python_version.rst b/docs/docsite/rst/user_guide/playbooks_python_version.rst index ae97f8b96b4..60821b37f42 100644 --- a/docs/docsite/rst/user_guide/playbooks_python_version.rst +++ b/docs/docsite/rst/user_guide/playbooks_python_version.rst @@ -22,7 +22,7 @@ representation that Ansible can turn back into a list. In Python3, those methods return a :ref:`dictionary view ` object. The string representation that Jinja2 returns for dictionary views cannot be parsed back into a list by Ansible. It is, however, easy to make this portable by -using the :func:`list ` filter whenever using :meth:`dict.keys`, +using the :func:`list ` filter whenever using :meth:`dict.keys`, :meth:`dict.values`, or :meth:`dict.items`:: vars: @@ -60,5 +60,5 @@ Python3 dictionaries do not have these methods. Use :meth:`dict.keys`, :meth:`di .. seealso:: * The :ref:`pb-py-compat-dict-views` entry for information on - why the :func:`list filter ` is necessary + why the :func:`list filter ` is necessary here.