diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-10-08 16:17:25 +0300 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-10-08 16:17:25 +0300 |
| commit | c616327c1221dc91318a35769e01ab6932d497ea (patch) | |
| tree | bde56e56db7d2fe5eaddf83717233aeaec241db3 /doc | |
| parent | a5ca102aa1440150717a470059f707d5e5842782 (diff) | |
| parent | ddc30871bc56e7aae87d7f7fb3f5b60767a57a76 (diff) | |
Merge branch 'patch-25' into 'master'
docs: cleanup term settings wording
See merge request gitlab-org/gitlab-ce!22162
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/user/admin_area/settings/terms.md | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/doc/user/admin_area/settings/terms.md b/doc/user/admin_area/settings/terms.md index aa817c9a209..e2290bf0598 100644 --- a/doc/user/admin_area/settings/terms.md +++ b/doc/user/admin_area/settings/terms.md @@ -35,17 +35,17 @@ continue their registration afterwards. ## 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 accept or decline the terms.  -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 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. -When a user declines the terms, they will be signed out. +If a user declines the terms, they will be signed out. |