From c413fa5eb9aa62ff46e9d5d36c0d7f1d7784f442 Mon Sep 17 00:00:00 2001
From: Russell Dickenson <rdickenson@gitlab.com>
Date: Mon, 3 Jun 2019 14:29:10 +1000
Subject: Edited signup restrictions for SSOT guidelines

---
 .../admin_area/settings/sign_up_restrictions.md    | 16 ++++++
 doc/user/admin_area/settings/terms.md              | 61 +++++++++++++---------
 2 files changed, 53 insertions(+), 24 deletions(-)

diff --git a/doc/user/admin_area/settings/sign_up_restrictions.md b/doc/user/admin_area/settings/sign_up_restrictions.md
index d3ecfd42903..cebf36c7ec1 100644
--- a/doc/user/admin_area/settings/sign_up_restrictions.md
+++ b/doc/user/admin_area/settings/sign_up_restrictions.md
@@ -1,3 +1,7 @@
+---
+type: reference
+---
+
 # Sign-up restrictions
 
 You can block email addresses of specific domains, or whitelist only some
@@ -37,5 +41,17 @@ semicolon, comma, or a new line.
 
 ![Domain Blacklist](img/domain_blacklist.png)
 
+<!-- ## Troubleshooting
+
+Include any troubleshooting steps that you can foresee. If you know beforehand what issues
+one might have when setting this up, or when something is changed, or on upgrading, it's
+important to describe those, too. Think of things that may go wrong and include them here.
+This is important to minimize requests for support, and to avoid doc comments with
+questions that you know someone might ask.
+
+Each scenario can be a third-level heading, e.g. `### Getting error message X`.
+If you have none to add when creating a doc, leave this section in place
+but commented out to help encourage others to add to it in the future. -->
+
 [ce-5259]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5259
 [ce-598]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/598
diff --git a/doc/user/admin_area/settings/terms.md b/doc/user/admin_area/settings/terms.md
index e2290bf0598..4d50e117212 100644
--- a/doc/user/admin_area/settings/terms.md
+++ b/doc/user/admin_area/settings/terms.md
@@ -1,43 +1,44 @@
+---
+type: reference
+---
+
 # Enforce accepting Terms of Service
 
 > [Introduced](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/18570)
 > in [GitLab Core](https://about.gitlab.com/pricing/) 10.8
 
+A admin can enforce acceptance of a terms of service and privacy policy. When this option is enabled, new and existing users must accept the terms.
+
 ## Configuration
 
-When it is required for all users of the GitLab instance to accept the
-Terms of Service, this can be configured by an admin on the settings
-page:
+To enforce acceptance of a Terms of Service and Privacy Policy:
 
-![Enable enforcing Terms of Service](img/enforce_terms.png).
+1. Log in to the GitLab instance as an admin user.
+1. Go to **Admin Area > Settings > General**.
+1. Expand the **Terms of Service and Privacy Policy** section.
+1. Check the **Require all users to accept Terms of Service and Privacy Policy when they access
+GitLab.** checkbox.
+1. Input the text of the **Terms of Service and Privacy Policy**. Markdown formatting can be used in this input box.
+1. Click **Save changes**.
+1. When you are presented with the **Terms of Service** statement, click **Accept terms**.
 
-The terms itself can be entered using Markdown. For each update to the
-terms, a new version is stored. When a user accepts or declines the
-terms, GitLab will keep track of which version they accepted or
-declined.
+![Enable enforcing Terms of Service](img/enforce_terms.png).
 
-When an admin enables this feature, they will automattically be
-directed to the page to accept the terms themselves. After they
-accept, they will be directed back to the settings page.
+For each update to the terms, a new version is stored. When a user accepts or declines the terms,
+GitLab will record which version they accepted or declined.
 
-## New registrations
+## New users
 
-When this feature is enabled, a checkbox will be available in the
-sign-up form.
+When this feature is enabled, a checkbox is added to the sign-up form. New sign-ups will not
+proceed unless this checkbox is checked. Users can click on the link to the terms, which will be
+opened in a new browser window.
 
 ![Sign up form](img/sign_up_terms.png)
 
-This checkbox will be required during sign up.
-
-Users can review the terms entered in the admin panel before
-accepting. The page will be opened in a new window so they can
-continue their registration afterwards.
+## Existing users
 
-## Accepting terms
-
-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 this feature is enabled, existing 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)
 
@@ -49,3 +50,15 @@ 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.
 
 If a user declines the terms, they will be signed out.
+
+<!-- ## Troubleshooting
+
+Include any troubleshooting steps that you can foresee. If you know beforehand what issues
+one might have when setting this up, or when something is changed, or on upgrading, it's
+important to describe those, too. Think of things that may go wrong and include them here.
+This is important to minimize requests for support, and to avoid doc comments with
+questions that you know someone might ask.
+
+Each scenario can be a third-level heading, e.g. `### Getting error message X`.
+If you have none to add when creating a doc, leave this section in place
+but commented out to help encourage others to add to it in the future. -->
-- 
cgit v1.2.3