Commit 29977b0d authored by Jonston Chan's avatar Jonston Chan Committed by Russell Dickenson

Clean up some Vale substitution warnings

Replaces some shorthand words to enforce standard
parent ab24e120
...@@ -142,7 +142,7 @@ new PostgreSQL one: ...@@ -142,7 +142,7 @@ new PostgreSQL one:
sudo -u gitlab-psql pgloader commands.load sudo -u gitlab-psql pgloader commands.load
``` ```
1. Once the migration finishes, you should see a summary table that looks like 1. After the migration finishes, you should see a summary table that looks like
the following: the following:
```plaintext ```plaintext
...@@ -243,7 +243,7 @@ new PostgreSQL one: ...@@ -243,7 +243,7 @@ new PostgreSQL one:
sudo -u postgres pgloader commands.load sudo -u postgres pgloader commands.load
``` ```
1. Once the migration finishes, you should see a summary table that looks like 1. After the migration finishes, you should see a summary table that looks like
the following: the following:
```plaintext ```plaintext
......
...@@ -40,7 +40,7 @@ If you're not using the Omnibus GitLab package you may have to adjust the paths ...@@ -40,7 +40,7 @@ If you're not using the Omnibus GitLab package you may have to adjust the paths
`pg_dump` and the PostgreSQL installation directory to match the paths of your `pg_dump` and the PostgreSQL installation directory to match the paths of your
configuration. configuration.
Once the structure dump is generated we also need to generate a dump for the After the structure dump is generated we also need to generate a dump for the
`schema_migrations` table. This table doesn't have any primary keys and as such `schema_migrations` table. This table doesn't have any primary keys and as such
can't be replicated easily by Slony. To generate this dump run the following can't be replicated easily by Slony. To generate this dump run the following
command on your active database server: command on your active database server:
...@@ -210,7 +210,7 @@ this output, don't just append it below it. The result looks like this: ...@@ -210,7 +210,7 @@ this output, don't just append it below it. The result looks like this:
] ]
``` ```
Once you have the configuration file generated you must install it on both the After you have the configuration file generated you must install it on both the
old and new database. To do so, place it in old and new database. To do so, place it in
`/var/opt/gitlab/postgresql/slony/slon_tools.conf` (for which we created the `/var/opt/gitlab/postgresql/slony/slon_tools.conf` (for which we created the
directory earlier on). directory earlier on).
...@@ -218,7 +218,7 @@ directory earlier on). ...@@ -218,7 +218,7 @@ directory earlier on).
Now that the configuration file is in place we can _finally_ start replicating Now that the configuration file is in place we can _finally_ start replicating
our database. First we must set up the schema in our new database. To do so make our database. First we must set up the schema in our new database. To do so make
sure that the SQL files we generated earlier can be found in the `/tmp` sure that the SQL files we generated earlier can be found in the `/tmp`
directory of the new server. Once these files are in place start a `psql` directory of the new server. After these files are in place start a `psql`
session on this server: session on this server:
```shell ```shell
......
...@@ -20,7 +20,7 @@ used (less than 1MB) and it is automatically resized. ...@@ -20,7 +20,7 @@ used (less than 1MB) and it is automatically resized.
![Navigation bar header logo screenshot](img/appearance_header_logo_v12_3.png) ![Navigation bar header logo screenshot](img/appearance_header_logo_v12_3.png)
Once you select and upload an image, click **Update appearance settings** at the bottom After you select and upload an image, click **Update appearance settings** at the bottom
of the page to activate it in the GitLab instance. of the page to activate it in the GitLab instance.
NOTE: NOTE:
......
...@@ -40,7 +40,7 @@ In order to change this option: ...@@ -40,7 +40,7 @@ In order to change this option:
1. Select **Save changes**. 1. Select **Save changes**.
NOTE: NOTE:
Once the hostname gets configured, every private commit email using the previous hostname, will not get After the hostname gets configured, every private commit email using the previous hostname is not
recognized by GitLab. This can directly conflict with certain [Push rules](../../../push_rules/push_rules.md) such as recognized by GitLab. This can directly conflict with certain [Push rules](../../../push_rules/push_rules.md) such as
`Check whether author is a GitLab user` and `Check whether committer is the current authenticated user`. `Check whether author is a GitLab user` and `Check whether committer is the current authenticated user`.
......
...@@ -27,7 +27,7 @@ You can restrict the password authentication for web interface and Git over HTTP ...@@ -27,7 +27,7 @@ You can restrict the password authentication for web interface and Git over HTTP
When this feature enabled, all users must use the [two-factor authentication](../../profile/account/two_factor_authentication.md). When this feature enabled, all users must use the [two-factor authentication](../../profile/account/two_factor_authentication.md).
Once the two-factor authentication is configured as mandatory, the users are allowed After the two-factor authentication is configured as mandatory, users are allowed
to skip forced configuration of two-factor authentication for the configurable grace to skip forced configuration of two-factor authentication for the configurable grace
period in hours. period in hours.
......
...@@ -267,7 +267,7 @@ You can dismiss multiple vulnerabilities at once, providing an optional reason. ...@@ -267,7 +267,7 @@ You can dismiss multiple vulnerabilities at once, providing an optional reason.
Selecting the checkboxes on the side of each vulnerability in the list selects that individual vulnerability. Selecting the checkboxes on the side of each vulnerability in the list selects that individual vulnerability.
Alternatively, you can select all the vulnerabilities in the list by selecting the checkbox in the table header. Alternatively, you can select all the vulnerabilities in the list by selecting the checkbox in the table header.
Deselecting the checkbox in the header deselects all the vulnerabilities in the list. Deselecting the checkbox in the header deselects all the vulnerabilities in the list.
Once you have selected some vulnerabilities, a menu appears at the top of the table that allows you to select a dismissal reason. After you have selected some vulnerabilities, a menu appears at the top of the table that allows you to select a dismissal reason.
Pressing the "Dismiss Selected" button dismisses all the selected vulnerabilities at once, with the reason you chose. Pressing the "Dismiss Selected" button dismisses all the selected vulnerabilities at once, with the reason you chose.
![Multiple vulnerability dismissal](img/multi_select_v12_9.png) ![Multiple vulnerability dismissal](img/multi_select_v12_9.png)
...@@ -281,7 +281,7 @@ You can create an issue for a vulnerability by visiting the vulnerability's page ...@@ -281,7 +281,7 @@ You can create an issue for a vulnerability by visiting the vulnerability's page
This creates a [confidential issue](../project/issues/confidential_issues.md) in the project the This creates a [confidential issue](../project/issues/confidential_issues.md) in the project the
vulnerability came from, and pre-populates it with some useful information taken from the vulnerability vulnerability came from, and pre-populates it with some useful information taken from the vulnerability
report. Once the issue is created, you are redirected to it so you can edit, assign, or comment on report. After the issue is created, you are redirected to it so you can edit, assign, or comment on
it. it.
Upon returning to the group security dashboard, the vulnerability now has an associated issue next Upon returning to the group security dashboard, the vulnerability now has an associated issue next
......
...@@ -267,7 +267,7 @@ To create an issue associated with the vulnerability, click the **Create Issue** ...@@ -267,7 +267,7 @@ To create an issue associated with the vulnerability, click the **Create Issue**
![Create an issue for the vulnerability](img/vulnerability_details_create_issue_v13_7.png) ![Create an issue for the vulnerability](img/vulnerability_details_create_issue_v13_7.png)
Once you create the issue, the linked issue icon in the vulnerability list: After you create the issue, the linked issue icon in the vulnerability list:
- Indicates that an issue has been created for that vulnerability. - Indicates that an issue has been created for that vulnerability.
- Shows a tooltip that contains a link to the issue. - Shows a tooltip that contains a link to the issue.
......
...@@ -38,7 +38,7 @@ In order to: ...@@ -38,7 +38,7 @@ In order to:
- Show pod usage correctly, you must - Show pod usage correctly, you must
[enable Deploy Boards](../project/deploy_boards.md#enabling-deploy-boards). [enable Deploy Boards](../project/deploy_boards.md#enabling-deploy-boards).
Once you have successful deployments to your group-level or instance-level cluster: After you have successful deployments to your group-level or instance-level cluster:
1. Navigate to your group's **Kubernetes** page. 1. Navigate to your group's **Kubernetes** page.
1. Click on the **Environments** tab. 1. Click on the **Environments** tab.
......
...@@ -370,7 +370,7 @@ From a merge request's **Discussion** tab, or from an epic/issue overview, find ...@@ -370,7 +370,7 @@ From a merge request's **Discussion** tab, or from an epic/issue overview, find
![Notes filters dropdown options](img/index_notes_filters.png) ![Notes filters dropdown options](img/index_notes_filters.png)
Once you select one of the filters in a given issue or MR, GitLab will save After you select one of the filters in a given issue or MR, GitLab will save
your preference, so that it will persist when you visit the same page again your preference, so that it will persist when you visit the same page again
from any device you're logged into. from any device you're logged into.
...@@ -401,7 +401,7 @@ the merge request authored by the user that applied them. ...@@ -401,7 +401,7 @@ the merge request authored by the user that applied them.
![Apply suggestions](img/apply_suggestion_v12_7.png) ![Apply suggestions](img/apply_suggestion_v12_7.png)
Once the author applies a Suggestion, it will be marked with the **Applied** label, After the author applies a Suggestion, it will be marked with the **Applied** label,
the thread will be automatically resolved, and GitLab will create a new commit the thread will be automatically resolved, and GitLab will create a new commit
and push the suggested change directly into the codebase in the merge request's and push the suggested change directly into the codebase in the merge request's
branch. [Developer permission](../permissions.md) is required to do so. branch. [Developer permission](../permissions.md) is required to do so.
...@@ -537,7 +537,7 @@ Clicking on the **Reply to comment** button will bring the reply area into focus ...@@ -537,7 +537,7 @@ Clicking on the **Reply to comment** button will bring the reply area into focus
![Reply to comment feature](img/reply_to_comment.gif) ![Reply to comment feature](img/reply_to_comment.gif)
Replying to a non-thread comment will convert the non-thread comment to a Replying to a non-thread comment will convert the non-thread comment to a
thread once the reply is submitted. This conversion is considered an edit thread after the reply is submitted. This conversion is considered an edit
to the original comment, so a note about when it was last edited will appear underneath it. to the original comment, so a note about when it was last edited will appear underneath it.
This feature only exists for Issues, Merge requests, and Epics. Commits, Snippets and Merge request diff threads are This feature only exists for Issues, Merge requests, and Epics. Commits, Snippets and Merge request diff threads are
......
...@@ -69,7 +69,7 @@ For more details on the specific data persisted in a group export, see the ...@@ -69,7 +69,7 @@ For more details on the specific data persisted in a group export, see the
![Export group panel](img/export_panel_v13_0.png) ![Export group panel](img/export_panel_v13_0.png)
1. Once the export is generated, you should receive an e-mail with a link to the [exported contents](#exported-contents) 1. After the export is generated, you should receive an e-mail with a link to the [exported contents](#exported-contents)
in a compressed tar archive, with contents in JSON format. in a compressed tar archive, with contents in JSON format.
1. Alternatively, you can come back to the project settings and download the 1. Alternatively, you can come back to the project settings and download the
......
...@@ -384,7 +384,7 @@ codes. If you saved these codes, you can use one of them to sign in. ...@@ -384,7 +384,7 @@ codes. If you saved these codes, you can use one of them to sign in.
To use a recovery code, enter your username/email and password on the GitLab To use a recovery code, enter your username/email and password on the GitLab
sign-in page. When prompted for a two-factor code, enter the recovery code. sign-in page. When prompted for a two-factor code, enter the recovery code.
Once you use a recovery code, you cannot re-use it. You can still use the other After you use a recovery code, you cannot re-use it. You can still use the other
recovery codes you saved. recovery codes you saved.
### Generate new recovery codes using SSH ### Generate new recovery codes using SSH
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment