diff options
Diffstat (limited to 'doc/user')
| -rw-r--r-- | doc/user/admin_area/settings/continuous_integration.md | 2 | ||||
| -rw-r--r-- | doc/user/application_security/container_scanning/index.md | 4 | ||||
| -rw-r--r-- | doc/user/application_security/dependency_scanning/index.md | 4 | ||||
| -rw-r--r-- | doc/user/application_security/offline_deployments/index.md | 2 | ||||
| -rw-r--r-- | doc/user/application_security/sast/index.md | 4 | ||||
| -rw-r--r-- | doc/user/application_security/security_dashboard/index.md | 2 | ||||
| -rw-r--r-- | doc/user/group/index.md | 2 | ||||
| -rw-r--r-- | doc/user/index.md | 2 | ||||
| -rw-r--r-- | doc/user/markdown.md | 23 | ||||
| -rw-r--r-- | doc/user/packages/conan_repository/index.md | 6 | ||||
| -rw-r--r-- | doc/user/project/clusters/add_eks_clusters.md | 2 | ||||
| -rw-r--r-- | doc/user/project/integrations/irker.md | 2 | ||||
| -rw-r--r-- | doc/user/project/integrations/prometheus.md | 2 | ||||
| -rw-r--r-- | doc/user/project/merge_requests/reviewing_and_managing_merge_requests.md | 2 | ||||
| -rw-r--r-- | doc/user/project/web_ide/index.md | 2 |
15 files changed, 23 insertions, 38 deletions
diff --git a/doc/user/admin_area/settings/continuous_integration.md b/doc/user/admin_area/settings/continuous_integration.md index ebb044fa9d0..4a401210928 100644 --- a/doc/user/admin_area/settings/continuous_integration.md +++ b/doc/user/admin_area/settings/continuous_integration.md @@ -116,7 +116,7 @@ Once saved, you can see the build quota in the group admin view. The quota can also be viewed in the project admin view if shared Runners are enabled. - + You can see an overview of the pipeline minutes quota of all projects of a group in the **Usage Quotas** page available to the group page settings list. diff --git a/doc/user/application_security/container_scanning/index.md b/doc/user/application_security/container_scanning/index.md index e2af69c19e9..5b755916fd8 100644 --- a/doc/user/application_security/container_scanning/index.md +++ b/doc/user/application_security/container_scanning/index.md @@ -367,8 +367,8 @@ the report JSON unless stated otherwise. Presence of optional fields depends on | `vulnerabilities[].message` | A short text that describes the vulnerability, it may include occurrence's specific information. Optional. | | `vulnerabilities[].description` | A long text that describes the vulnerability. Optional. | | `vulnerabilities[].cve` | A fingerprint string value that represents a concrete occurrence of the vulnerability. It's used to determine whether two vulnerability occurrences are same or different. May not be 100% accurate. **This is NOT a [CVE](https://cve.mitre.org/)**. | -| `vulnerabilities[].severity` | How much the vulnerability impacts the software. Possible values: `Undefined` (an analyzer has not provided this info), `Info`, `Unknown`, `Low`, `Medium`, `High`, `Critical`. **Note:** Our current container scanning tool based on [klar](https://github.com/optiopay/klar) only provides the following levels: `Unknown`, `Low`, `Medium`, `High`, `Critical`. | -| `vulnerabilities[].confidence` | How reliable the vulnerability's assessment is. Possible values: `Undefined` (an analyzer has not provided this info), `Ignore`, `Unknown`, `Experimental`, `Low`, `Medium`, `High`, `Confirmed`. **Note:** Our current container scanning tool based on [klar](https://github.com/optiopay/klar) does not provide a confidence level, so this value is currently hardcoded to `Unknown`. | +| `vulnerabilities[].severity` | How much the vulnerability impacts the software. Possible values: `Undefined` (an analyzer has not provided this information), `Info`, `Unknown`, `Low`, `Medium`, `High`, `Critical`. **Note:** Our current container scanning tool based on [klar](https://github.com/optiopay/klar) only provides the following levels: `Unknown`, `Low`, `Medium`, `High`, `Critical`. | +| `vulnerabilities[].confidence` | How reliable the vulnerability's assessment is. Possible values: `Undefined` (an analyzer has not provided this information), `Ignore`, `Unknown`, `Experimental`, `Low`, `Medium`, `High`, `Confirmed`. **Note:** Our current container scanning tool based on [klar](https://github.com/optiopay/klar) does not provide a confidence level, so this value is currently hardcoded to `Unknown`. | | `vulnerabilities[].solution` | Explanation of how to fix the vulnerability. Optional. | | `vulnerabilities[].scanner` | A node that describes the analyzer used to find this vulnerability. | | `vulnerabilities[].scanner.id` | Id of the scanner as a snake_case string. | diff --git a/doc/user/application_security/dependency_scanning/index.md b/doc/user/application_security/dependency_scanning/index.md index faf885b6552..a178751da7d 100644 --- a/doc/user/application_security/dependency_scanning/index.md +++ b/doc/user/application_security/dependency_scanning/index.md @@ -365,8 +365,8 @@ the report JSON unless stated otherwise. Presence of optional fields depends on | `vulnerabilities[].message` | A short text that describes the vulnerability, it may include occurrence's specific information. Optional. | | `vulnerabilities[].description` | A long text that describes the vulnerability. Optional. | | `vulnerabilities[].cve` | A fingerprint string value that represents a concrete occurrence of the vulnerability. It's used to determine whether two vulnerability occurrences are same or different. May not be 100% accurate. **This is NOT a [CVE](https://cve.mitre.org/)**. | -| `vulnerabilities[].severity` | How much the vulnerability impacts the software. Possible values: `Undefined` (an analyzer has not provided this info), `Info`, `Unknown`, `Low`, `Medium`, `High`, `Critical`. | -| `vulnerabilities[].confidence` | How reliable the vulnerability's assessment is. Possible values: `Undefined` (an analyzer has not provided this info), `Ignore`, `Unknown`, `Experimental`, `Low`, `Medium`, `High`, `Confirmed`. | +| `vulnerabilities[].severity` | How much the vulnerability impacts the software. Possible values: `Undefined` (an analyzer has not provided this information), `Info`, `Unknown`, `Low`, `Medium`, `High`, `Critical`. | +| `vulnerabilities[].confidence` | How reliable the vulnerability's assessment is. Possible values: `Undefined` (an analyzer has not provided this information), `Ignore`, `Unknown`, `Experimental`, `Low`, `Medium`, `High`, `Confirmed`. | | `vulnerabilities[].solution` | Explanation of how to fix the vulnerability. Optional. | | `vulnerabilities[].scanner` | A node that describes the analyzer used to find this vulnerability. | | `vulnerabilities[].scanner.id` | Id of the scanner as a snake_case string. | diff --git a/doc/user/application_security/offline_deployments/index.md b/doc/user/application_security/offline_deployments/index.md index 4511b4e80d6..db309357530 100644 --- a/doc/user/application_security/offline_deployments/index.md +++ b/doc/user/application_security/offline_deployments/index.md @@ -73,7 +73,7 @@ hosted within your network. ## Specific scanner instructions Each individual scanner may be slightly different than the steps described -above. You can find more info at each of the pages below: +above. You can find more information at each of the pages below: - [Container scanning offline directions](../container_scanning/index.md#running-container-scanning-in-an-offline-environment) - [SAST offline directions](../sast/index.md#gitlab-sast-in-an-offline-environment) diff --git a/doc/user/application_security/sast/index.md b/doc/user/application_security/sast/index.md index 0930ee6610b..252abc9295f 100644 --- a/doc/user/application_security/sast/index.md +++ b/doc/user/application_security/sast/index.md @@ -443,8 +443,8 @@ the report JSON unless stated otherwise. Presence of optional fields depends on | `vulnerabilities[].message` | A short text that describes the vulnerability, it may include the occurrence's specific information. Optional. | | `vulnerabilities[].description` | A long text that describes the vulnerability. Optional. | | `vulnerabilities[].cve` | A fingerprint string value that represents a concrete occurrence of the vulnerability. Is used to determine whether two vulnerability occurrences are same or different. May not be 100% accurate. **This is NOT a [CVE](https://cve.mitre.org/)**. | -| `vulnerabilities[].severity` | How much the vulnerability impacts the software. Possible values: `Undefined` (an analyzer has not provided this info), `Info`, `Unknown`, `Low`, `Medium`, `High`, `Critical`. | -| `vulnerabilities[].confidence` | How reliable the vulnerability's assessment is. Possible values: `Undefined` (an analyzer has not provided this info), `Ignore`, `Unknown`, `Experimental`, `Low`, `Medium`, `High`, `Confirmed`. | +| `vulnerabilities[].severity` | How much the vulnerability impacts the software. Possible values: `Undefined` (an analyzer has not provided this information), `Info`, `Unknown`, `Low`, `Medium`, `High`, `Critical`. | +| `vulnerabilities[].confidence` | How reliable the vulnerability's assessment is. Possible values: `Undefined` (an analyzer has not provided this information), `Ignore`, `Unknown`, `Experimental`, `Low`, `Medium`, `High`, `Confirmed`. | | `vulnerabilities[].solution` | Explanation of how to fix the vulnerability. Optional. | | `vulnerabilities[].scanner` | A node that describes the analyzer used to find this vulnerability. | | `vulnerabilities[].scanner.id` | Id of the scanner as a snake_case string. | diff --git a/doc/user/application_security/security_dashboard/index.md b/doc/user/application_security/security_dashboard/index.md index 4ce6a9403c5..93a325e6777 100644 --- a/doc/user/application_security/security_dashboard/index.md +++ b/doc/user/application_security/security_dashboard/index.md @@ -156,7 +156,7 @@ That way, reports are created even if no code change happens. ## Security scans using Auto DevOps When using [Auto DevOps](../../../topics/autodevops/index.md), use -[special environment variables](../../../topics/autodevops/index.md#environment-variables) +[special environment variables](../../../topics/autodevops/customize.md#environment-variables) to configure daily security scans. <!-- ## Troubleshooting diff --git a/doc/user/group/index.md b/doc/user/group/index.md index c506da05999..fdcc4105620 100644 --- a/doc/user/group/index.md +++ b/doc/user/group/index.md @@ -99,7 +99,7 @@ To create a new Group, either: Add the following information: - + 1. The **Group name** will automatically populate the URL. Optionally, you can change it. This is the name that displays in group views. diff --git a/doc/user/index.md b/doc/user/index.md index ac19c5a0de7..cc521c2a767 100644 --- a/doc/user/index.md +++ b/doc/user/index.md @@ -100,7 +100,7 @@ directly from GitLab. No third-party integrations needed. There is a lot you can customize and configure to enjoy the best of GitLab. -- [Settings](profile/index.md): Manage your user settings to change your personal info, +- [Settings](profile/index.md): Manage your user settings to change your personal information, personal access tokens, authorized applications, etc. - [Authentication](../topics/authentication/index.md): Read through the authentication methods available in GitLab. diff --git a/doc/user/markdown.md b/doc/user/markdown.md index ca5347ca613..a1f83a47015 100644 --- a/doc/user/markdown.md +++ b/doc/user/markdown.md @@ -110,7 +110,7 @@ changing how standard Markdown is used: | [emphasis](#emphasis) | [multiple underscores in words](#multiple-underscores-in-words-and-mid-word-emphasis) | [headers](#headers) | [linkable Header IDs](#header-ids-and-links) | | [images](#images) | [embedded videos](#videos) and [audio](#audio) | -| [linebreaks](#line-breaks) | [more linebreak control](#newlines) | +| [line breaks](#line-breaks) | [more line break control](#newlines) | | [links](#links) | [automatically linking URLs](#url-auto-linking) | ## New GFM Markdown extensions @@ -256,7 +256,7 @@ when rendered within GitLab, may appear different depending on the OS and browse Most emoji are natively supported on macOS, Windows, iOS, Android and will fallback to image-based emoji where there is lack of support. NOTE: **Note:** On Linux, you can download [Noto Color Emoji](https://www.google.com/get/noto/help/emoji/) -to get full native emoji support. Ubuntu 18.04 (like many modern Linux distros) has +to get full native emoji support. Ubuntu 18.04 (like many modern Linux distributions) has this font installed by default. ### Front matter @@ -1148,7 +1148,7 @@ GFM adheres to the Markdown specification in how [paragraphs and line breaks are A paragraph is one or more consecutive lines of text, separated by one or more blank lines (two newlines at the end of the first paragraph), as [explained above](#line-breaks). -If you need more control over line-breaks or soft returns, you can add a single line-break +If you need more control over line breaks or soft returns, you can add a single line break by ending a line with a backslash, or two or more spaces. Two newlines in a row will create a new paragraph, with a blank line in between: @@ -1163,21 +1163,6 @@ Another line, this time ending with a backslash.\ A new line due to the previous backslash. ``` -<!-- (Do *NOT* remove the two ending whitespaces in the third line) --> -<!-- (They are needed for the Markdown text to render correctly) --> - -First paragraph. -Another line in the same paragraph. -A third line in the same paragraph, but this time ending with two spaces. -A new line directly under the first paragraph. - -<!-- (Do *NOT* remove the two ending whitespaces in the second line) --> -<!-- (They are needed for the Markdown text to render correctly on docs.gitlab.com, the backslash works fine inside GitLab itself) --> - -Second paragraph. -Another line, this time ending with a backslash. -A new line due to the previous backslash. - ### Links There are two ways to create links, inline-style and reference-style: @@ -1406,7 +1391,7 @@ Example: | header 1 | header 2 | header 3 | | --- | ------ |---------:| | cell 1 | cell 2 | cell 3 | -| cell 4 | cell 5 is longer | cell 6 is much longer than the others, but that's ok. It will eventually wrap the text when the cell is too large for the display size. | +| cell 4 | cell 5 is longer | cell 6 is much longer than the others, but that's okay. It will eventually wrap the text when the cell is too large for the display size. | | cell 7 | | cell <br> 9 | Additionally, you can choose the alignment of text within columns by adding colons (`:`) diff --git a/doc/user/packages/conan_repository/index.md b/doc/user/packages/conan_repository/index.md index aa81b3d056e..ffbd8a848b5 100644 --- a/doc/user/packages/conan_repository/index.md +++ b/doc/user/packages/conan_repository/index.md @@ -246,9 +246,9 @@ conan search Hello/0.1@my-group+my-project/beta --all --remote=gitlab The scope of your search will include all projects you have permission to access, this includes your private projects as well as all public projects. -## Fetching Conan package info from the GitLab Package Registry +## Fetching Conan package information from the GitLab Package Registry -The `conan info` command will return info about a given package: +The `conan info` command will return information about a given package: ```shell conan info Hello/0.1@my-group+my-project/beta @@ -261,7 +261,7 @@ The GitLab Conan repository supports the following Conan CLI commands: - `conan upload`: Upload your recipe and package files to the GitLab Package Registry. - `conan install`: Install a conan package from the GitLab Package Registry, this includes using the `conanfile.txt` file. - `conan search`: Search the GitLab Package Registry for public packages, and private packages you have permission to view. -- `conan info`: View the info on a given package from the GitLab Package Registry. +- `conan info`: View the information on a given package from the GitLab Package Registry. - `conan remove`: Delete the package from the GitLab Package Registry. ## Using GitLab CI with Conan packages diff --git a/doc/user/project/clusters/add_eks_clusters.md b/doc/user/project/clusters/add_eks_clusters.md index 6bde461dfa6..82b3cb49075 100644 --- a/doc/user/project/clusters/add_eks_clusters.md +++ b/doc/user/project/clusters/add_eks_clusters.md @@ -279,7 +279,7 @@ If a default Storage Class doesn't already exist and is desired, follow Amazon's to create one. Alternatively, disable PostgreSQL by setting the project variable -[`POSTGRES_ENABLED`](../../../topics/autodevops/#environment-variables) to `false`. +[`POSTGRES_ENABLED`](../../../topics/autodevops/customize.md#environment-variables) to `false`. ### Deploy the app to EKS diff --git a/doc/user/project/integrations/irker.md b/doc/user/project/integrations/irker.md index f7e129d1e7f..db5397ee7d5 100644 --- a/doc/user/project/integrations/irker.md +++ b/doc/user/project/integrations/irker.md @@ -4,7 +4,7 @@ GitLab provides a way to push update messages to an Irker server. When configured, pushes to a project will trigger the service to send data directly to the Irker server. -See the project homepage for further info: <https://gitlab.com/esr/irker> +See the project homepage for further information: <https://gitlab.com/esr/irker> ## Needed setup diff --git a/doc/user/project/integrations/prometheus.md b/doc/user/project/integrations/prometheus.md index 6d848f73cb6..bbed9ae4686 100644 --- a/doc/user/project/integrations/prometheus.md +++ b/doc/user/project/integrations/prometheus.md @@ -775,7 +775,7 @@ GitLab unfurls the link as an embedded metrics panel:  You can also embed a single chart. To get a link to a chart, click the -**{ellipsis_v}** **More info** menu in the upper right corner of the chart, +**{ellipsis_v}** **More actions** menu in the upper right corner of the chart, and select **Copy link to chart**, as shown in this example:  diff --git a/doc/user/project/merge_requests/reviewing_and_managing_merge_requests.md b/doc/user/project/merge_requests/reviewing_and_managing_merge_requests.md index cde6ffaa48c..bb5aadfa9b9 100644 --- a/doc/user/project/merge_requests/reviewing_and_managing_merge_requests.md +++ b/doc/user/project/merge_requests/reviewing_and_managing_merge_requests.md @@ -116,7 +116,7 @@ environment. Deployments that are ongoing will be shown, as well as the deploying/deployed state for environments. If it's the first time the branch is deployed, the link will return a `404` error until done. During the deployment, the stop button will -be disabled. If the pipeline fails to deploy, the deployment info will be hidden. +be disabled. If the pipeline fails to deploy, the deployment information will be hidden.  diff --git a/doc/user/project/web_ide/index.md b/doc/user/project/web_ide/index.md index 23b72e33aae..c98448ff904 100644 --- a/doc/user/project/web_ide/index.md +++ b/doc/user/project/web_ide/index.md @@ -270,7 +270,7 @@ terminal: - The `webide-file-sync` executable must start **after** the project directory is available. This is why we need to add `sleep 5` to the `command`. See [this issue](https://gitlab.com/gitlab-org/webide-file-sync/issues/7) for - more info. + more information. - `$CI_PROJECT_DIR` is a [predefined environment variable](../../../ci/variables/predefined_variables.md) for GitLab Runners. This is where your project's repository will be. |