Merge branch '2.x' into 3.x

* 2.x:
  Tweak previous commit
  [Documentation] Add note about simple string matching

doc/templates.rst

@@ -638,8 +638,7 @@ Comparisons
 The following comparison operators are supported in any expression: ``==``,
 ``!=``, ``<``, ``>``, ``>=``, and ``<=``.
 
-You can also check if a string ``starts with`` or ``ends with`` another
-string:
+Check if a string ``starts with`` or ``ends with`` another string:
 
 .. code-block:: twig
 
@@ -649,6 +648,9 @@ string:
     {% if 'Fabien' ends with 'n' %}
     {% endif %}
 
+Check that a string contains another string via the containment operator (see
+next section).
+
 .. note::
 
     For complex string comparisons, the ``matches`` operator allows you to use