kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch 'patch-25' into 'master'

Browse source 
docs: cleanup term settings wording

See merge request gitlab-org/gitlab-ce!22162
This commit is contained in:
Rémy Coutable 2018-10-08 13:17:25 +00:00
commit c616327c12
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
doc/user/admin_area/settings/terms.md
View file

@ -35,17 +35,17 @@ continue their registration afterwards.
## Accepting terms ## Accepting terms
When this feature was enabled, the users that have not accepted the When this feature is enabled, the users that have not accepted the
terms of service will be presented with a screen where they can either terms of service will be presented with a screen where they can either
accept or decline the terms. accept or decline the terms.
![Respond to terms](img/respond_to_terms.png) ![Respond to terms](img/respond_to_terms.png)
When the user accepts the terms, they will be directed to where they If the user accepts the terms, they will be directed to where they
were going. After a sign-in or sign-up this will most likely be the were going. After a sign-in or sign-up this will most likely be the
dashboard. dashboard.
When the user was already logged in when the feature was turned on, If the user was already logged in when the feature was turned on,
they will be asked to accept the terms on their next interaction. they will be asked to accept the terms on their next interaction.
When a user declines the terms, they will be signed out. If a user declines the terms, they will be signed out.