Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2023-05-29 12:08:45 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2023-05-29 12:08:45 +0300
commitc3fe9f52152cd57f6790d30efc2d5e4b9dbf54dd (patch)
treeaf0e47e4d4ff68e36ed2c79c993096668ecb4966 /doc/administration/auth
parentbceef0b492c1f4bc15c21c70cbe7aef34385a3da (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/administration/auth')
-rw-r--r--doc/administration/auth/ldap/ldap_synchronization.md6
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/administration/auth/ldap/ldap_synchronization.md b/doc/administration/auth/ldap/ldap_synchronization.md
index f32a4af9e27..cc788d6d4c8 100644
--- a/doc/administration/auth/ldap/ldap_synchronization.md
+++ b/doc/administration/auth/ldap/ldap_synchronization.md
@@ -15,7 +15,7 @@ You can change when synchronization occurs.
## User sync
-> Preventing LDAP username synchronization [introduced](<https://gitlab.com/gitlab-org/gitlab/-/issues/11336>) in GitLab 15.11.
+> Preventing LDAP user's profile name synchronization [introduced](<https://gitlab.com/gitlab-org/gitlab/-/issues/11336>) in GitLab 15.11.
Once per day, GitLab runs a worker to check and update GitLab
users against LDAP.
@@ -45,9 +45,9 @@ The process also updates the following user information:
- SSH public keys if `sync_ssh_keys` is set.
- Kerberos identity if Kerberos is enabled.
-### Synchronize LDAP username
+### Synchronize LDAP user's profile name
-By default, GitLab synchronizes the LDAP username field.
+By default, GitLab synchronizes the LDAP user's profile name field.
To prevent this synchronization, you can set `sync_name` to `false`.