summaryrefslogtreecommitdiff
path: root/doc/user/profile
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-01-10 03:07:46 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-01-10 03:07:46 +0000
commitb24ae1cbc66e5b0f622393bcf2c59711750161ea (patch)
treede9514fdda81f7d8293612687026a87826b0d9dd /doc/user/profile
parent775816e676aae53509d7b6f364945f2720636f72 (diff)
downloadgitlab-ce-b24ae1cbc66e5b0f622393bcf2c59711750161ea.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/user/profile')
-rw-r--r--doc/user/profile/personal_access_tokens.md10
1 files changed, 4 insertions, 6 deletions
diff --git a/doc/user/profile/personal_access_tokens.md b/doc/user/profile/personal_access_tokens.md
index 980a7d5968d..09825bd5ff8 100644
--- a/doc/user/profile/personal_access_tokens.md
+++ b/doc/user/profile/personal_access_tokens.md
@@ -6,15 +6,13 @@ type: concepts, howto
> [Introduced][ce-3749] in GitLab 8.8.
-Personal access tokens are the preferred way for third party applications and scripts to
-authenticate with the [GitLab API][api], if using [OAuth2](../../api/oauth2.md) is not practical.
+If you're unable to use [OAuth2](../../api/oauth2.md), you can use a personal access token to authenticate with the [GitLab API][api].
-You can also use personal access tokens to authenticate against Git over HTTP or SSH. They must be used when you have [Two-Factor Authentication (2FA)][2fa] enabled. Authenticate with a token in place of your password.
+You can also use personal access tokens with Git to authenticate over HTTP or SSH. Personal access tokens are required when [Two-Factor Authentication (2FA)][2fa] is enabled. In both cases, you can authenticate with a token in place of your password.
-To make [authenticated requests to the API][usage], use either the `private_token` parameter or the `Private-Token` header.
+Personal access tokens expire on the date you define, at midnight UTC.
-The expiration of personal access tokens happens on the date you define,
-at midnight UTC.
+For examples of how you can use a personal access token to authenticate with the API, see the following section from our [API Docs](../../api/README.md#personal-access-tokens).
## Creating a personal access token