summaryrefslogtreecommitdiff
path: root/doc/user/profile
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-01-30 15:09:15 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-01-30 15:09:15 +0000
commit536aa3a1f4b96abc4ca34489bf2cbe503afcded7 (patch)
tree88d08f7dfa29a32d6526773c4fe0fefd9f2bc7d1 /doc/user/profile
parent50ae4065530c4eafbeb7c5ff2c462c48c02947ca (diff)
downloadgitlab-ce-536aa3a1f4b96abc4ca34489bf2cbe503afcded7.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/user/profile')
-rw-r--r--doc/user/profile/account/two_factor_authentication.md4
-rw-r--r--doc/user/profile/index.md2
2 files changed, 3 insertions, 3 deletions
diff --git a/doc/user/profile/account/two_factor_authentication.md b/doc/user/profile/account/two_factor_authentication.md
index 108d4f0b387..ab701337c2a 100644
--- a/doc/user/profile/account/two_factor_authentication.md
+++ b/doc/user/profile/account/two_factor_authentication.md
@@ -181,14 +181,14 @@ a new set of recovery codes with SSH:
1. Run:
- ```sh
+ ```shell
ssh git@gitlab.example.com 2fa_recovery_codes
```
1. You will then be prompted to confirm that you want to generate new codes.
Continuing this process invalidates previously saved codes:
- ```sh
+ ```shell
Are you sure you want to generate new two-factor recovery codes?
Any existing recovery codes you saved will be invalidated. (yes/no)
diff --git a/doc/user/profile/index.md b/doc/user/profile/index.md
index 06e4eac6623..dc6c744ff3c 100644
--- a/doc/user/profile/index.md
+++ b/doc/user/profile/index.md
@@ -209,7 +209,7 @@ Once this option is enabled, every Git-related action will be performed using th
To stay fully anonymous, you can also copy this private commit email
and configure it on your local machine using the following command:
-```sh
+```shell
git config --global user.email <your email address>
```