Merge branch '6.0' into 6.1

* 6.0:
  Update configuration.rst
  move versionadded directive out of list item
  add back information on accessing the context in guard events

Author: javiereguiluz

configuration.rst

@@ -439,6 +439,13 @@ files directly in the ``config/packages/`` directory.
                 webpack_encore:
                     strict_mode: false
 
+            # YAML syntax allows to reuse contents using "anchors" (&some_name) and "aliases" (*some_name).
+            # In this example, 'test' configuration uses the exact same configuration as in 'prod'
+            when@prod: &webpack_prod
+                webpack_encore:
+                    # ...
+            when@test: *webpack_prod
+
         .. code-block:: xml
 
             <!-- config/packages/webpack_encore.xml -->

workflow.rst

@@ -382,14 +382,14 @@ order:
 
         $workflow->apply($subject, $transitionName, [Workflow::DISABLE_ANNOUNCE_EVENT => true]);
 
-    The context is accessible in all events::
+The context is accessible in all events except for the ``workflow.guard`` events::
 
-        // $context must be an array
-        $context = ['context_key' => 'context_value'];
-        $workflow->apply($subject, $transitionName, $context);
+    // $context must be an array
+    $context = ['context_key' => 'context_value'];
+    $workflow->apply($subject, $transitionName, $context);
 
-        // in an event listener (workflow.guard events)
-        $context = $event->getContext(); // returns ['context']
+    // in an event listener (workflow.guard events)
+    $context = $event->getContext(); // returns ['context']
 
 .. note::