Commit c616327c authored by Rémy Coutable's avatar Rémy Coutable

Merge branch 'patch-25' into 'master'

docs: cleanup term settings wording

See merge request gitlab-org/gitlab-ce!22162
parents a5ca102a ddc30871
...@@ -35,17 +35,17 @@ continue their registration afterwards. ...@@ -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.
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