Merge branch 'docs-inherit-keyword-style' into 'master'

Update inherit keyword to new reference style

See merge request gitlab-org/gitlab!74059

doc/ci/jobs/index.md

@@ -168,17 +168,74 @@ file:
 
 - Start the job name with a dot (`.`) and it is not processed by GitLab CI/CD:
 
-```yaml
-.hidden_job:
+  ```yaml
+  .hidden_job:
     script:
       - run test
-```
+  ```
 
 You can use hidden jobs that start with `.` as templates for reusable configuration with:
 
 - The [`extends` keyword](../yaml/index.md#extends).
 - [YAML anchors](../yaml/yaml_specific_features.md#anchors).
 
+## Control the inheritance of default keywords and global variables
+
+You can control the inheritance of:
+
+- [default keywords](../yaml/index.md#default) with [`inherit:default`](../yaml/index.md#inheritdefault).
+- [global variables](../yaml/index.md#default) with [`inherit:variables`](../yaml/index.md#inheritvariables).
+
+For example:
+
+```yaml
+default:
+  image: 'ruby:2.4'
+  before_script:
+    - echo Hello World
+
+variables:
+  DOMAIN: example.com
+  WEBHOOK_URL: https://my-webhook.example.com
+
+rubocop:
+  inherit:
+    default: false
+    variables: false
+  script: bundle exec rubocop
+
+rspec:
+  inherit:
+    default: [image]
+    variables: [WEBHOOK_URL]
+  script: bundle exec rspec
+
+capybara:
+  inherit:
+    variables: false
+  script: bundle exec capybara
+
+karma:
+  inherit:
+    default: true
+    variables: [DOMAIN]
+  script: karma
+```
+
+In this example:
+
+- `rubocop`:
+  - inherits: Nothing.
+- `rspec`:
+  - inherits: the default `image` and the `WEBHOOK_URL` variable.
+  - does **not** inherit: the default `before_script` and the `DOMAIN` variable.
+- `capybara`:
+  - inherits: the default `before_script` and `image`.
+  - does **not** inherit: the `DOMAIN` and `WEBHOOK_URL` variables.
+- `karma`:
+  - inherits: the default `image` and `before_script`, and the `DOMAIN` variable.
+  - does **not** inherit: `WEBHOOK_URL` variable.
+
 ## Specifying variables when running manual jobs
 
 > [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/30485) in GitLab 12.2.

doc/ci/pipelines/multi_project_pipelines.md

@@ -154,7 +154,7 @@ trigger-downstream:
   trigger: my/project
 ```
 
-You can stop global variables from reaching the downstream pipeline by using the [`inherit` keyword](../yaml/index.md#inherit).
+You can stop global variables from reaching the downstream pipeline by using the [`inherit:variables` keyword](../yaml/index.md#inheritvariables).
 In this example, the `MY_GLOBAL_VAR` variable is not available in the triggered pipeline:
 
 ```yaml

doc/ci/yaml/index.md

@@ -114,6 +114,7 @@ a job-specific `image:` section:
   that keyword defined.
 - If a job already has one of the keywords configured, the configuration in the job
   takes precedence and is not replaced by the default.
+- Control inheritance of default keywords in jobs with [`inherit:default`](#inheritdefault).
 
 ### `stages`
 
@@ -4191,84 +4192,80 @@ You must:
 
 > [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/207484) in GitLab 12.9.
 
-Use `inherit:` to control inheritance of globally-defined defaults
-and variables.
+Use `inherit:` to [control inheritance of globally-defined defaults and variables](../jobs/index.md#control-the-inheritance-of-default-keywords-and-global-variables).
 
-To enable or disable the inheritance of all `default:` or `variables:` keywords, use:
+#### `inherit:default`
 
-- `default: true` or `default: false`
-- `variables: true` or `variables: false`
+Use `inherit:default` to control the inheritance of [default keywords](#default).
 
-To inherit only a subset of `default:` keywords or `variables:`, specify what
-you wish to inherit. Anything not listed is **not** inherited. Use
-one of the following formats:
+**Keyword type**: Job keyword. You can use it only as part of a job.
 
-```yaml
-inherit:
-  default: [keyword1, keyword2]
-  variables: [VARIABLE1, VARIABLE2]
-```
+**Possible inputs**:
+
+- `true` (default) or `false` to enable or disable the inheritance of all default keywords.
+- A list of specific default keywords to inherit.
 
-Or:
+**Example of `inherit:default`:**
 
 ```yaml
-inherit:
+default:
+  retry: 2
+  image: ruby:3.0
+  interruptible: true
+
+job1:
+  script: echo "This job does not inherit any default keywords."
+  inherit:
+    default: false
+
+job2:
+  script: echo "This job inherits only the two listed default keywords. It does not inherit 'interruptible'."
+  inherit:
     default:
-    - keyword1
-    - keyword2
-  variables:
-    - VARIABLE1
-    - VARIABLE2
+      - retry
+      - image
 ```
 
-In the following example:
+**Additional details:**
 
-- `rubocop`:
-  - inherits: Nothing.
-- `rspec`:
-  - inherits: the default `image` and the `WEBHOOK_URL` variable.
-  - does **not** inherit: the default `before_script` and the `DOMAIN` variable.
-- `capybara`:
-  - inherits: the default `before_script` and `image`.
-  - does **not** inherit: the `DOMAIN` and `WEBHOOK_URL` variables.
-- `karma`:
-  - inherits: the default `image` and `before_script`, and the `DOMAIN` variable.
-  - does **not** inherit: `WEBHOOK_URL` variable.
+- You can also list default keywords to inherit on one line: `default: [keyword1, keyword2]`
 
-```yaml
-default:
-  image: 'ruby:2.4'
-  before_script:
-    - echo Hello World
+#### `inherit:variables`
 
-variables:
-  DOMAIN: example.com
-  WEBHOOK_URL: https://my-webhook.example.com
+Use `inherit:variables` to control the inheritance of [global variables](#variables) keywords.
 
-rubocop:
-  inherit:
-    default: false
-    variables: false
-  script: bundle exec rubocop
+**Keyword type**: Job keyword. You can use it only as part of a job.
 
-rspec:
-  inherit:
-    default: [image]
-    variables: [WEBHOOK_URL]
-  script: bundle exec rspec
+**Possible inputs**:
+
+- `true` (default) or `false` to enable or disable the inheritance of all global variables.
+- A list of specific variables to inherit.
+
+**Example of `inherit:variables`:**
 
-capybara:
+```yaml
+variables:
+  VARIABLE1: "This is variable 1"
+  VARIABLE2: "This is variable 2"
+  VARIABLE3: "This is variable 3"
+
+job1:
+  script: echo "This job does not inherit any global variables."
   inherit:
     variables: false
-  script: bundle exec capybara
 
-karma:
+job2:
+  script: echo "This job inherits only the two listed global variables. It does not inherit 'VARIABLE3'."
   inherit:
-    default: true
-    variables: [DOMAIN]
-  script: karma
+    variables:
+      - VARIABLE1
+      - VARIABLE2
 ```
 
+**Additional details:**
+
+- You can also list global variables to inherit on one line: `variables: [VARIABLE1, VARIABLE2]`
+
 ## `variables`
 
 > Introduced in GitLab Runner v0.5.0.