Move branded_login_page to new location and deprecate the welcome message

8 files changed, 31 insertions, 36 deletions

diff --git a/doc/README.md b/doc/README.md
index 254394eb63e..f1f259ad773 100644
--- a/doc/README.md
+++ b/doc/README.md
@@ -41,7 +41,7 @@
 - [Security](security/README.md) Learn what you can do to further secure your GitLab instance.
 - [System hooks](system_hooks/system_hooks.md) Notifications when users, projects and keys are changed.
 - [Update](update/README.md) Update guides to upgrade your installation.
-- [Welcome message](customization/welcome_message.md) Add a custom welcome message to the sign-in page.
+- [Customize the sign-in page](user/admin_area/appearance.md) Change the logo and add custom text in the sign-in page.
 - [Reply by email](incoming_email/README.md) Allow users to comment on issues and merge requests by replying to notification emails.
 - [Migrate GitLab CI to CE/EE](migrate_ci_to_ce/README.md) Follow this guide to migrate your existing GitLab CI data to GitLab CE/EE.
 - [Git LFS configuration](workflow/lfs/lfs_administration.md)
diff --git a/doc/customization/branded_login_page.md b/doc/customization/branded_login_page.md
index d4d9f5f7b5e..737ef8eb930 100644
--- a/doc/customization/branded_login_page.md
+++ b/doc/customization/branded_login_page.md
@@ -1,19 +1 @@
-# Changing the appearance of the login page
-
-GitLab Community Edition offers a way to put your company's identity on the login page of your GitLab server and make it a branded login page.
-
-By default, the page shows the GitLab logo and description.
-
-![default_login_page](branded_login_page/default_login_page.png)
-
-## Changing the appearance of the login page
-
-Navigate to the **Admin** area and go to the **Appearance** page.
-
-Fill in the required details like Title, Description and upload the company logo.
-
-![appearance](branded_login_page/appearance.png)
-
-After saving the page, your GitLab login page will have the details you filled in:
-
-![company_login_page](branded_login_page/custom_sign_in.png)
+This document was moved to [user/admin_area/appearance](../user/admin_area/appearance.md).
diff --git a/doc/customization/issue_closing.md b/doc/customization/issue_closing.md
index 4620bb2dcde..26853bad921 100644
--- a/doc/customization/issue_closing.md
+++ b/doc/customization/issue_closing.md
@@ -1,11 +1,16 @@
 # Issue closing pattern
 
-When a commit or merge request resolves one or more issues, it is possible to automatically have these issues closed when the commit or merge request lands in the project's default branch.
+When a commit or merge request resolves one or more issues, it is possible to
+automatically have these issues closed when the commit or merge request lands
+in the project's default branch.
 
-If a commit message or merge request description contains a sentence matching the regular expression below, all issues referenced from
-the matched text will be closed. This happens when the commit is pushed to a project's default branch, or when a commit or merge request is merged into there.
+If a commit message or merge request description contains a sentence matching
+the regular expression below, all issues referenced from the matched text will
+be closed. This happens when the commit is pushed to a project's default branch,
+or when a commit or merge request is merged into there.
 
-When not specified, the default `issue_closing_pattern` as shown below will be used:
+When not specified, the default `issue_closing_pattern` as shown below will be
+used:
 
 ```bash
 ((?:[Cc]los(?:e[sd]?|ing)|[Ff]ix(?:e[sd]|ing)?|[Rr]esolv(?:e[sd]?|ing))(:?) +(?:(?:issues? +)?%{issue_ref}(?:(?:, *| +and +)?)|([A-Z][A-Z0-9_]+-\d+))+)
diff --git a/doc/customization/welcome_message.md b/doc/customization/welcome_message.md
index a0cb234bea0..329f555d050 100644
--- a/doc/customization/welcome_message.md
+++ b/doc/customization/welcome_message.md
@@ -1,12 +1 @@
-# Customize the complete sign-in page
-
-Please see [Branded login page](branded_login_page.md)
-
-# Add a welcome message to the sign-in page (GitLab Community Edition)
-
-It is possible to add a markdown-formatted welcome message to your GitLab
-sign-in page. Users of GitLab Enterprise Edition should use the [branded login
-page feature](branded_login_page.md) instead.
-
-The welcome message (extra_sign_in_text) can now be set/changed in the Admin UI.  
-Admin area > Settings
+This feature was deprecated in favor of [branded login page](branded_login_page.md).
diff --git a/doc/user/admin_area/appearance.md b/doc/user/admin_area/appearance.md
new file mode 100644
index 00000000000..dda732e0f50
--- /dev/null
+++ b/doc/user/admin_area/appearance.md
@@ -0,0 +1,19 @@
+# Changing the appearance of the login page
+
+GitLab Community Edition offers a way to put your company's identity on the login page of your GitLab server and make it a branded login page.
+
+By default, the page shows the GitLab logo and description.
+
+![default_login_page](img/default_login_page.png)
+
+## Changing the appearance of the login page
+
+Navigate to the **Admin** area and go to the **Appearance** page.
+
+Fill in the required details like Title, Description and upload the company logo.
+
+![appearance](img/appearance.png)
+
+After saving the page, your GitLab login page will have the details you filled in:
+
+![company_login_page](img/custom_sign_in.png)
diff --git a/doc/customization/branded_login_page/appearance.png b/doc/user/admin_area/img/appearance.png
index 023dc5599b4..023dc5599b4 100644
--- a/doc/customization/branded_login_page/appearance.png
+++ b/doc/user/admin_area/img/appearance.png
diff --git a/doc/customization/branded_login_page/custom_sign_in.png b/doc/user/admin_area/img/custom_sign_in.png
index 7d99e0a2b3b..7d99e0a2b3b 100644
--- a/doc/customization/branded_login_page/custom_sign_in.png
+++ b/doc/user/admin_area/img/custom_sign_in.png
diff --git a/doc/customization/branded_login_page/default_login_page.png b/doc/user/admin_area/img/default_login_page.png
index 0cfa9da202e..0cfa9da202e 100644
--- a/doc/customization/branded_login_page/default_login_page.png
+++ b/doc/user/admin_area/img/default_login_page.png