Merge branch 'nagyv-gitlab-master-patch-00357' into 'master'

Moving the warning to where it belongs

See merge request gitlab-org/gitlab!66641

doc/ci/yaml/index.md

@@ -3277,7 +3277,7 @@ dashboards.
 > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/207528) in GitLab 13.0.
 > - Requires [GitLab Runner](https://docs.gitlab.com/runner/) 11.5 and above.
 
-The `terraform` report obtains a Terraform `tfplan.json` file. [JQ processing required to remove credentials](../../user/infrastructure/mr_integration.md#setup). The collected Terraform
+The `terraform` report obtains a Terraform `tfplan.json` file. [JQ processing required to remove credentials](../../user/infrastructure/mr_integration.md#configure-terraform-report-artifacts). The collected Terraform
 plan report uploads to GitLab as an artifact and displays
 in merge requests. For more information, see
 [Output `terraform plan` information into a merge request](../../user/infrastructure/mr_integration.md).

doc/user/infrastructure/iac/index.md

@@ -67,12 +67,6 @@ Amazon S3 or Google Cloud Storage. Its features include:
 
 Read more on setting up and [using GitLab Managed Terraform states](../terraform_state.md)
 
-WARNING:
-Like any other job artifact, Terraform plan data is [viewable by anyone with Guest access](../../permissions.md) to the repository.
-Neither Terraform nor GitLab encrypts the plan file by default. If your Terraform plan
-includes sensitive data such as passwords, access tokens, or certificates, GitLab strongly
-recommends encrypting plan output or modifying the project visibility settings.
-
 ## Terraform module registry
 
 GitLab can be used as a [Terraform module registry](../../packages/terraform_module_registry/index.md)

doc/user/infrastructure/mr_integration.md

@@ -15,12 +15,17 @@ you can expose details from `terraform plan` runs directly into a merge request
 enabling you to see statistics about the resources that Terraform creates,
 modifies, or destroys.
 
-## Setup
+WARNING:
+Like any other job artifact, Terraform Plan data is [viewable by anyone with Guest access](../permissions.md) to the repository.
+Neither Terraform nor GitLab encrypts the plan file by default. If your Terraform Plan
+includes sensitive data such as passwords, access tokens, or certificates, we strongly
+recommend encrypting plan output or modifying the project visibility settings.
+
+## Configure Terraform report artifacts
 
-NOTE:
 GitLab ships with a [pre-built CI template](iac/index.md#quick-start) that uses GitLab Managed Terraform state and integrates Terraform changes into merge requests. We recommend customizing the pre-built image and relying on the `gitlab-terraform` helper provided within for a quick setup.
 
-To manually configure a GitLab Terraform Report artifact requires the following steps:
+To manually configure a GitLab Terraform Report artifact:
 
 1. For simplicity, let's define a few reusable variables to allow us to
    refer to these files multiple times: