Merge branch 'patch-25' into 'master'

docs: cleanup term settings wording

See merge request gitlab-org/gitlab-ce!22162

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.
 
 ![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
 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.