Merge branch '2.8' into 3.4

javiereguiluz · javiereguiluz · commit a92d44b84a07 · 2018-10-12T10:30:40.000+02:00
* 2.8:
  Improve is_granted documentation
  Mentioned the 60 second timeout of processes
  fix #310430: DomCrawler component selectButton() docs update
diff --git a/components/dom_crawler.rst b/components/dom_crawler.rst
@@ -404,9 +404,13 @@ Forms
 ~~~~~
 
 Special treatment is also given to forms. A ``selectButton()`` method is
-available on the Crawler which returns another Crawler that matches a button
-(``input[type=submit]``, ``input[type=image]``, or a ``button``) with the
-given text. This method is especially useful because you can use it to return
+available on the Crawler which returns another Crawler that matches ``<button>``
+or ``<input type="submit">`` or ``<input type="button">`` elements (or an
+``<img>`` element inside them). The string given as argument is looked for in
+the ``id``, ``alt``, ``name``, and ``value`` attributes and the text content of
+those elements.
+
+This method is especially useful because you can use it to return
 a :class:`Symfony\\Component\\DomCrawler\\Form` object that represents the
 form that the button lives in::
 
diff --git a/components/process.rst b/components/process.rst
@@ -320,8 +320,8 @@ instead::
 Process Timeout
 ---------------
 
-You can limit the amount of time a process takes to complete by setting a
-timeout (in seconds)::
+By default processes have a timeout of 60 seconds, but you can change it passing
+a different timeout (in seconds) to the ``setTimeout()`` method::
 
     use Symfony\Component\Process\Process;
 
diff --git a/reference/twig_reference.rst b/reference/twig_reference.rst
@@ -286,15 +286,19 @@ is_granted
     {{ is_granted(role, object = null, field = null) }}
 
 ``role``
-    **type**: ``string``
+    **type**: ``string``, ``string[]``
 ``object`` *(optional)*
     **type**: ``object``
 ``field`` *(optional)*
     **type**: ``string``
 
-Returns ``true`` if the current user has the required role. Optionally,
-an object can be pasted to be used by the voter. More information can be
-found in :ref:`security-template`.
+Returns ``true`` if the current user has the given role. If several roles are
+passed in an array, returns ``true`` if the user has all of them or at least one
+of them, depending on the value of this option:
+:ref:`security.access_decision_manager.strategy <security-voters-change-strategy>`.
+
+Optionally, an object can be passed to be used by the voter. More information
+can be found in :ref:`security-template`.
 
 .. note::
 
