Add latest changes from gitlab-org/gitlab@master

3 files changed, 7 insertions, 5 deletions

diff --git a/doc/development/internal_api/index.md b/doc/development/internal_api/index.md
index 288c0056821..13e095b4a83 100644
--- a/doc/development/internal_api/index.md
+++ b/doc/development/internal_api/index.md
@@ -334,14 +334,15 @@ Example response:
 ## Authenticate Error Tracking requests
 
 This endpoint is called by the error tracking Go REST API application to authenticate a project.
+> [Introduced](https://gitlab.com/gitlab-org/opstrace/opstrace/-/issues/1693) in GitLab 15.1.
 
 | Attribute    | Type    | Required | Description                                                        |
 |:-------------|:--------|:---------|:-------------------------------------------------------------------|
 | `project_id` | integer | yes      | The ID of the project which has the associated key.                |
-| `public_key` | string  | yes      | The public key generated by the integrated error tracking feature. |
+| `public_key` | string  | yes      | The [public key](../../api/error_tracking.md#error-tracking-client-keys) generated by the integrated Error Tracking feature. |
 
 ```plaintext
-POST /internal/error_tracking_allowed
+POST /internal/error_tracking/allowed
 ```
 
 Example request:
@@ -349,7 +350,7 @@ Example request:
 ```shell
 curl --request POST --header "Gitlab-Shared-Secret: <Base64 encoded secret>" \
      --data "project_id=111&public_key=generated-error-tracking-key" \
-          "http://localhost:3001/api/v4/internal/error_tracking_allowed"
+          "http://localhost:3001/api/v4/internal/error_tracking/allowed"
 ```
 
 Example response:
diff --git a/doc/development/pipelines.md b/doc/development/pipelines.md
index 436977a7f38..596af5b777b 100644
--- a/doc/development/pipelines.md
+++ b/doc/development/pipelines.md
@@ -292,7 +292,7 @@ fail.
 ### Troubleshooting `rspec:undercoverage` failures
 
 The `rspec:undercoverage` job has [known bugs](https://gitlab.com/groups/gitlab-org/-/epics/8254)
-that can cause false positive failures. You can locally test coverage locally to determine if it's
+that can cause false positive failures. You can test coverage locally to determine if it's
 safe to apply `~"pipeline:skip-undercoverage"`. For example, using `<spec>` as the name of the
 test causing the failure:
 
diff --git a/doc/user/infrastructure/iac/terraform_state.md b/doc/user/infrastructure/iac/terraform_state.md
index e8637abce91..e29228c7a4c 100644
--- a/doc/user/infrastructure/iac/terraform_state.md
+++ b/doc/user/infrastructure/iac/terraform_state.md
@@ -151,7 +151,8 @@ You can use a GitLab-managed Terraform state backend as a
      a [Personal Access Token](../../profile/personal_access_tokens.md) for
      authentication, this value is your GitLab username. If you are using GitLab CI/CD, this value is `'gitlab-ci-token'`.
    - **password**: The password to authenticate with the data source. If you are using a Personal Access Token for
-     authentication, this value is the token value. If you are using GitLab CI/CD, this value is the contents of the `${CI_JOB_TOKEN}` CI/CD variable.
+     authentication, this value is the token value (the token must have the **API** scope).
+     If you are using GitLab CI/CD, this value is the contents of the `${CI_JOB_TOKEN}` CI/CD variable.
 
 Outputs from the data source can now be referenced in your Terraform resources
 using `data.terraform_remote_state.example.outputs.<OUTPUT-NAME>`.