diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2024-01-20 21:07:59 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2024-01-20 21:07:59 +0300 |
| commit | eb4efc68a4569212049051a2dfb9a2e7cf8549a5 (patch) | |
| tree | 94c237bfc327f7b75f7d1b356e29208083f6fd64 | |
| parent | 7ff989621e2783d855cff7ecb8aa1348a6498146 (diff) | |
Add latest changes from gitlab-org/gitlab@master
| -rw-r--r-- | doc/ci/jobs/ci_job_token.md | 4 | ||||
| -rw-r--r-- | doc/development/documentation/topic_types/troubleshooting.md | 16 |
2 files changed, 14 insertions, 6 deletions
diff --git a/doc/ci/jobs/ci_job_token.md b/doc/ci/jobs/ci_job_token.md index 3a787189ac0..e46a6356dd2 100644 --- a/doc/ci/jobs/ci_job_token.md +++ b/doc/ci/jobs/ci_job_token.md @@ -86,8 +86,8 @@ There is a proposal to add more strategic control of the access permissions, see [epic 3559](https://gitlab.com/groups/gitlab-org/-/epics/3559). NOTE: -Because `CI_REGISTRY_TOKEN` uses `CI_JOB_TOKEN` to authenticate, the access configuration -also applies to `CI_REGISTRY_TOKEN`. +Because `CI_REGISTRY_PASSWORD` uses `CI_JOB_TOKEN` to authenticate, the access configuration +also applies to `CI_REGISTRY_PASSWORD`. ### Allow access to your project with a job token diff --git a/doc/development/documentation/topic_types/troubleshooting.md b/doc/development/documentation/topic_types/troubleshooting.md index f970b58e4fc..468d4d674ff 100644 --- a/doc/development/documentation/topic_types/troubleshooting.md +++ b/doc/development/documentation/topic_types/troubleshooting.md @@ -8,10 +8,7 @@ info: For assistance with this Style Guide page, see https://handbook.gitlab.com Troubleshooting topics should be the final topics on a page. -If a page has five or more troubleshooting topics, put those topics on a separate page. - -- Name the page `Troubleshooting <feature>`. -- In the left nav, use the word `Troubleshooting` only. +If a page has five or more troubleshooting topics, put those topics on a [separate page](#troubleshooting-page-type). ## What type of troubleshooting information to include @@ -85,3 +82,14 @@ add the following warning: WARNING: Commands that change data can cause damage if not run correctly or under the right conditions. Always run commands in a test environment first and have a backup instance ready to restore. ``` + +## Troubleshooting page type + +When there are five Troubleshooting topics or more on a page, create a separate Troubleshooting page type. + +Follow these conventions: + +- Name the page `Troubleshooting <feature>`. +- In the left nav, use the word `Troubleshooting` only. +- In the navigation file, nest the new page under the feature it belongs to. +- Name the file `<feature>_troubleshooting.md`. |