Merge branch 'main' into mavyn/update-to-server-FAQs

Author: saltspell

docs/guides/modules/ROOT/images/audit-log-stream-actions.png

@@ -421,6 +421,13 @@ a|  * GitLab: push, merge request
 | image:guides:ROOT:icons/check.svg[check icon, role="no-border"]
 | image:guides:ROOT:icons/cancel.svg[cancel icon, role="no-border"]
 
+| `pipeline.event.github.pull_request.merged`
+| GitHub App
+| Boolean
+| A boolean value indicating whether the pull request is has been merged. Only populated for pipelines triggered xref:guides:orchestrate:github-trigger-event-options.adoc#supported-trigger-options[by pull request events] (`pipeline.event.name = "pull_request"`).
+| image:guides:ROOT:icons/check.svg[check icon, role="no-border"]
+| image:guides:ROOT:icons/cancel.svg[cancel icon, role="no-border"]
+
 | `pipeline.deploy.component_name`
 | GitHub App
 | String

docs/guides/modules/ROOT/images/confirm-prerequisites.png

@@ -209,32 +209,32 @@ Anchors and aliases work for scalar values, but to save maps or sequences, use `
 
 ```yaml
 default: &default
-  school: hogwarts
+  category: Tea
 
-harry:
+hojicha:
   <<: *default
-  house: gryffindor
+  price: 3.95
 
-draco:
+matcha_latte:
   <<: *default
-  house: slytherin
+  price: 5.95
 ```
 
 You can also merge multiple maps.
 
 ```yaml
-name: &harry_name
-  first_name: Harry
-  last_name: Potter
-
-address: &harry_address
-  street: 4, Privet Drive
-  district: Little Whinging
-  county: Surrey
-  country: England
-
-harry_data:
-  <<: [*harry_name, *harry_address]
+name: &big_bird_alter_egos
+  ep_0246: Verybig Bird
+  ep_3161: Big Fish
+
+address: &big_bird_address
+  street: 123½ Sesame Street
+  city: New York
+  state: New York
+  country: United States
+
+big_bird_data:
+  <<: [*big_bird_alter_egos, *big_bird_address]
 ```
 
 **Note**: As mentioned in https://github.com/yaml/yaml/issues/35[a YAML repository issue], it is possible to merge maps, but not sequences (also called arrays or lists). For a more complex example, see https://gist.github.com/bowsersenior/979804[this gist].

docs/guides/modules/ROOT/images/connect-circleci-aws.png

@@ -113,6 +113,7 @@ workflows:
 
 * `pipeline.event.github.pull_request.title`: the title of the pull request.
 * `pipeline.event.github.pull_request.number`: the numeric identifier of the pull request.
+* `pipeline.event.github.pull_request.merged`: a boolean that indicates whether the PR was merged or not. 
 
 These values are extracted directly from the GitHub event payload. The part after prefix `pipeline.event.github.*` matches the corresponding field in the pull request event structure described in link:https://docs.github.com/en/webhooks/webhook-events-and-payloads#pull_request[the GitHub docs].