Merge branch 'docs-fix-yaml-4' into 'master'

Clean up yaml code block formatting

See merge request gitlab-org/gitlab!43507

doc/administration/packages/container_registry.md

@@ -589,7 +589,7 @@ In the examples below we set the Registry's port to `5001`.
    [`http:addr`](https://docs.docker.com/registry/configuration/#http) value:
 
    ```yaml
-   http
+   http:
      addr: localhost:5001
    ```
 

doc/administration/packages/dependency_proxy.md

@@ -135,28 +135,28 @@ This section describes the earlier configuration format.
      ##
      ## The location where build dependency_proxy are stored (default: shared/dependency_proxy).
      ##
-     #storage_path: shared/dependency_proxy
+     # storage_path: shared/dependency_proxy
      object_store:
        enabled: false
        remote_directory: dependency_proxy  # The bucket name.
-       #direct_upload: false      # Use Object Storage directly for uploads instead of background uploads if enabled (Default: false).
-       #background_upload: true   # Temporary option to limit automatic upload (Default: true).
-       #proxy_download: false     # Passthrough all downloads via GitLab instead of using Redirects to Object Storage.
+       #  direct_upload: false      # Use Object Storage directly for uploads instead of background uploads if enabled (Default: false).
+       #  background_upload: true   # Temporary option to limit automatic upload (Default: true).
+       #  proxy_download: false     # Passthrough all downloads via GitLab instead of using Redirects to Object Storage.
        connection:
        ##
-         ## If the provider is AWS S3, uncomment the following
+       ## If the provider is AWS S3, use the following
        ##
-         #provider: AWS
-         #region: us-east-1
-         #aws_access_key_id: AWS_ACCESS_KEY_ID
-         #aws_secret_access_key: AWS_SECRET_ACCESS_KEY
+         provider: AWS
+         region: us-east-1
+         aws_access_key_id: AWS_ACCESS_KEY_ID
+         aws_secret_access_key: AWS_SECRET_ACCESS_KEY
          ##
-         ## If the provider is other than AWS (an S3-compatible one), uncomment the following
+         ## If the provider is other than AWS (an S3-compatible one), comment out the previous 4 lines and use the following instead:
          ##
-         #host: 's3.amazonaws.com'             # default: s3.amazonaws.com.
-         #aws_signature_version: 4             # For creation of signed URLs. Set to 2 if provider does not support v4.
-         #endpoint: 'https://s3.amazonaws.com' # Useful for S3-compliant services such as DigitalOcean Spaces.
-         #path_style: false                    # If true, use 'host/bucket_name/object' instead of 'bucket_name.host/object'.
+         #  host: 's3.amazonaws.com'             # default: s3.amazonaws.com.
+         #  aws_signature_version: 4             # For creation of signed URLs. Set to 2 if provider does not support v4.
+         #  endpoint: 'https://s3.amazonaws.com' # Useful for S3-compliant services such as DigitalOcean Spaces.
+         #  path_style: false                    # If true, use 'host/bucket_name/object' instead of 'bucket_name.host/object'.
    ```
 
 1. [Restart GitLab](../restart_gitlab.md#installations-from-source "How to restart GitLab") for the changes to take effect.

doc/administration/packages/index.md

@@ -147,28 +147,28 @@ We recommend using the [consolidated object storage settings](../object_storage.
      ##
      ## The location where build packages are stored (default: shared/packages).
      ##
-       #storage_path: shared/packages
+     # storage_path: shared/packages
      object_store:
        enabled: false
        remote_directory: packages  # The bucket name.
-         #direct_upload: false      # Use Object Storage directly for uploads instead of background uploads if enabled (Default: false).
-         #background_upload: true   # Temporary option to limit automatic upload (Default: true).
-         #proxy_download: false     # Passthrough all downloads via GitLab instead of using Redirects to Object Storage.
+       # direct_upload: false      # Use Object Storage directly for uploads instead of background uploads if enabled (Default: false).
+       # background_upload: true   # Temporary option to limit automatic upload (Default: true).
+       # proxy_download: false     # Passthrough all downloads via GitLab instead of using Redirects to Object Storage.
        connection:
        ##
-           ## If the provider is AWS S3, uncomment the following
+       ## If the provider is AWS S3, use the following:
        ##
-           #provider: AWS
-           #region: us-east-1
-           #aws_access_key_id: AWS_ACCESS_KEY_ID
-           #aws_secret_access_key: AWS_SECRET_ACCESS_KEY
+         provider: AWS
+         region: us-east-1
+         aws_access_key_id: AWS_ACCESS_KEY_ID
+         aws_secret_access_key: AWS_SECRET_ACCESS_KEY
          ##
-           ## If the provider is other than AWS (an S3-compatible one), uncomment the following
+         ## If the provider is other than AWS (an S3-compatible one), comment out the previous 4 lines and use the following instead:
          ##
-           #host: 's3.amazonaws.com'             # default: s3.amazonaws.com.
-           #aws_signature_version: 4             # For creation of signed URLs. Set to 2 if provider does not support v4.
-           #endpoint: 'https://s3.amazonaws.com' # Useful for S3-compliant services such as DigitalOcean Spaces.
-           #path_style: false                    # If true, use 'host/bucket_name/object' instead of 'bucket_name.host/object'.
+         #  host: 's3.amazonaws.com'             # default: s3.amazonaws.com.
+         #  aws_signature_version: 4             # For creation of signed URLs. Set to 2 if provider does not support v4.
+         #  endpoint: 'https://s3.amazonaws.com' # Useful for S3-compliant services such as DigitalOcean Spaces.
+         #  path_style: false                    # If true, use 'host/bucket_name/object' instead of 'bucket_name.host/object'.
    ```
 
 1. Save the file and [restart GitLab](../restart_gitlab.md#installations-from-source) for the changes to take effect.

doc/ci/variables/README.md

@@ -103,7 +103,7 @@ variables:
 You can then call its value in your script:
 
 ```yaml
-  script:
+script:
   - echo "$TEST"
 ```
 

doc/user/packages/conan_repository/index.md

@@ -330,7 +330,6 @@ create_package:
     - conan new <package-name>/0.1 -t
     - conan create . <group-name>+<project-name>/stable
     - CONAN_LOGIN_USERNAME=ci_user CONAN_PASSWORD=${CI_JOB_TOKEN} conan upload <package-name>/0.1@<group-name>+<project-name>/stable --all --remote=gitlab
-
 ```
 
 You can find additional Conan images to use as the base of your CI file

doc/user/packages/container_registry/index.md

@@ -307,7 +307,7 @@ in addition to the steps in the
 Below is an example of what your `.gitlab-ci.yml` should look like:
 
 ```yaml
- build:
+build:
   image: $CI_REGISTRY/group/project/docker:19.03.12
   services:
     - name: $CI_REGISTRY/group/project/docker:19.03.12-dind