Automatic merge of gitlab-org/gitlab-ce master

doc/README.md

@@ -9,7 +9,7 @@ description: 'Learn how to use and administer GitLab, the most scalable Git-base
 </div>
 <!-- the div above will not display on the docs site but will display on /help -->
 
-# GitLab Documentation
+# GitLab Docs
 
 Welcome to [GitLab](https://about.gitlab.com/) Documentation.
 

doc/administration/index.md

@@ -2,7 +2,7 @@
 description: 'Learn how to install, configure, update, and maintain your GitLab instance.'
 ---
 
-# Administrator documentation **(CORE ONLY)**
+# Administrator Docs **(CORE ONLY)**
 
 Learn how to administer your self-managed GitLab instance.
 

doc/api/README.md

-# GitLab API
+# API Docs
 
 Automate GitLab via a simple and powerful API.
 

doc/ci/examples/devops_and_game_dev_with_gitlab_ci_cd/index.md

@@ -418,10 +418,14 @@ fully understand [IAM Best Practices in AWS](https://docs.aws.amazon.com/IAM/lat
 
 1. Log into your AWS account and go to the [Security Credentials page](https://console.aws.amazon.com/iam/home#/security_credential)
 1. Click the **Access Keys** section and **Create New Access Key**. Create the key and keep the id and secret around, you'll need them later
+
    ![AWS Access Key Config](img/aws_config_window.png)
+
 1. Go to your GitLab project, click **Settings > CI/CD** on the left sidebar
 1. Expand the **Variables** section
+
    ![GitLab Secret Config](img/gitlab_config.png)
+
 1. Add a key named `AWS_KEY_ID` and copy the key id from Step 2 into the **Value** textbox
 1. Add a key named `AWS_KEY_SECRET` and copy the key secret from Step 2 into the **Value** textbox
 

doc/ci/runners/README.md

@@ -373,12 +373,12 @@ attacker.
 
 To reset the token:
 
-1. Go to **Settings > CI/CD** for a specified Project
-1. Expand the **General pipelines settings** section
-1. Find the **Runner token** form field and click the **Reveal value** button
-1. Delete the value and save the form
+1. Go to **Settings > CI/CD** for a specified Project.
+1. Expand the **General pipelines settings** section.
+1. Find the **Runner token** form field and click the **Reveal value** button.
+1. Delete the value and save the form.
 1. After the page is refreshed, expand the **Runners settings** section
-    and check the registration token - it should be changed
+   and check the registration token - it should be changed.
 
 From now on the old token is not valid anymore and will not allow to register
 a new Runner to the project. If you are using any tools to provision and

doc/development/README.md

@@ -3,7 +3,7 @@ comments: false
 description: 'Learn how to contribute to GitLab.'
 ---
 
-# GitLab development guides
+# Contributor and Development Docs
 
 ## Get started!
 

doc/integration/jira_development_panel.md

@@ -57,6 +57,7 @@ There are no special requirements if you are using GitLab.com.
    If using a GitLab version earlier than 11.3 the `Redirect URI` value should be `https://<your-gitlab-instance-domain>/-/jira/login/oauth/callback`.
 
    ![GitLab Application setup](img/jira_dev_panel_gl_setup_1.png)
+
    - Check `api` in the Scopes section.
 
 1. Click `Save application`. You will see the generated 'Application Id' and 'Secret' values.

doc/subscriptions/index.md

@@ -2,7 +2,7 @@
 type: index, reference
 ---
 
-# Customers
+# Customer Docs
 
 This section contains information for:
 

doc/user/discussions/index.md

@@ -22,7 +22,7 @@ higher can also edit a comment made by someone else.
 You can also reply to a comment notification email to reply to the comment if
 [Reply by email] is configured for your GitLab instance. Replying to a standard comment
 creates another standard comment. Replying to a threaded comment creates a reply in the thread. Email replies support
- [Markdown] and [quick actions], just as if you replied from the web.
+[Markdown] and [quick actions], just as if you replied from the web.
 
 ## Resolvable comments and threads
 

doc/user/index.md

@@ -2,7 +2,7 @@
 description: 'Read through the GitLab User documentation to learn how to use, configure, and customize GitLab and GitLab.com to your own needs.'
 ---
 
-# User documentation
+# User Docs
 
 Welcome to GitLab! We're glad to have you here!
 

doc/user/project/import/gemnasium.md

@@ -5,13 +5,17 @@ instance or GitLab.com.
 
 ## Why is Gemnasium.com closed?
 
-Gemnasium has been [acquired by GitLab](https://about.gitlab.com/press/releases/2018-01-30-gemnasium-acquisition.html)
+Gemnasium was [acquired by GitLab](https://about.gitlab.com/press/releases/2018-01-30-gemnasium-acquisition.html)
 in January 2018. Since May 15, 2018, the services provided by Gemnasium are no longer available.
 The team behind Gemnasium has joined GitLab as the new Security Products team
-and is working on a wider range of tools than just Dependency Scanning:
-[SAST](../../application_security/sast/index.md),
-[DAST](../../application_security/dast/index.md),
-[Container Scanning](../../application_security/container_scanning/index.md) and more.
+and is working on a [wide range of tools](../../application_security/index.md),
+including:
+
+- [Dependency Scanning](../../application_security/dependency_scanning/index.md)
+- [SAST](../../application_security/sast/index.md)
+- [DAST](../../application_security/dast/index.md)
+- [Container Scanning](../../application_security/container_scanning/index.md)
+
 If you want to continue monitoring your dependencies, see the
 [Migrating to GitLab](#migrating-to-gitlab) section below.
 

doc/user/project/import/manifest.md

 # Import multiple repositories by uploading a manifest file
 
-> [Introduced](https://gitlab.com/gitlab-org/gitlab-ce/issues/28811) in
-GitLab 11.2.
+> [Introduced](https://gitlab.com/gitlab-org/gitlab-ce/issues/28811) in GitLab 11.2.
 
 GitLab allows you to import all the required Git repositories
 based on a manifest file like the one used by the

doc/user/project/integrations/mattermost_slash_commands.md

@@ -42,16 +42,12 @@ the administrator console.
 
    ![Mattermost go to console](img/mattermost_goto_console.png)
 
-    ---
-
 1. Click **Custom integrations** and set **Enable Custom Slash Commands**,
    **Enable custom integrations to override usernames**, and **Override
    custom integrations to override profile picture icons** to true
 
    ![Mattermost console](img/mattermost_console_integrations.png)
 
-    ---
-
 1. Click **Save** at the bottom to save the changes.
 
 ### Step 2. Open the Mattermost slash commands service in GitLab
@@ -62,15 +58,13 @@ the administrator console.
    A screen will appear with all the values you need to copy in Mattermost as
    described in the next step. Leave the window open.
 
-    >**Note:**
+   NOTE: **Note:**
    GitLab will propose some values for the Mattermost settings. The only one
    required to copy-paste as-is is the **Request URL**, all the others are just
    suggestions.
 
    ![Mattermost setup instructions](img/mattermost_config_help.png)
 
-    ---
-
 1. Proceed to the next step and create a slash command in Mattermost with the
    above values.
 
@@ -85,19 +79,15 @@ in a new slash command.
 
    ![Mattermost team integrations](img/mattermost_team_integrations.png)
 
-    ---
-
 1. Go to the **Slash Commands** integration and add a new one by clicking the
    **Add Slash Command** button.
 
    ![Mattermost add command](img/mattermost_add_slash_command.png)
 
-    ---
-
 1. Fill in the options for the custom command as described in
    [step 2](#step-2-open-the-mattermost-slash-commands-service-in-gitlab).
 
-    >**Note:**
+   NOTE: **Note:**
    If you plan on connecting multiple projects, pick a slash command trigger
    word that relates to your projects such as `/gitlab-project-name` or even
    just `/project-name`. Only use `/gitlab` if you will only connect a single
@@ -119,8 +109,6 @@ in a new slash command.
 
 1. Click **Save changes** for the changes to take effect.
 
----
-
 You are now set to start using slash commands in Mattermost that talk to the
 GitLab project you configured.
 

doc/user/project/merge_requests/merge_request_approvals.md

@@ -144,9 +144,12 @@ the following is possible:
 
   - If the required number of approvals has _not_ been yet met, they can approve
     it by clicking the displayed **Approve** button.
+
     ![Approve](img/approve.png)
+
   - If the required number of approvals has already been met, they can still
     approve it by clicking the displayed **Approve additionally** button.
+
     ![Add approval](img/approve_additionally.png)
 
 - **They have already approved this merge request**: They can remove their approval.
@@ -159,7 +162,7 @@ if [**Prevent author approval**](#allowing-merge-request-authors-to-approve-thei
 
 For a given merge request, if the approval restrictions have been satisfied,
 the merge request is unblocked and can be merged.
-Note, that meeting the required number of approvals is a necessary, but not
+Note that meeting the required number of approvals is a necessary, but not
 sufficient condition for unblocking a merge request from being merged. There
 are other conditions that may block it, such as merge conflicts,
 [pending discussions](../../discussions/index.md#only-allow-merge-requests-to-be-merged-if-all-threads-are-resolved)

doc/user/project/pages/getting_started_part_two.md

@@ -123,20 +123,20 @@ where you'll find its default URL.
 > **Notes:**
 >
 > - GitLab Pages [supports any SSG](https://about.gitlab.com/2016/06/17/ssg-overview-gitlab-pages-part-3-examples-ci/), but,
-  if you don't find yours among the templates, you'll need
-  to configure your own `.gitlab-ci.yml`. To do that, please
-  read through the article [Creating and Tweaking GitLab CI/CD for GitLab Pages](getting_started_part_four.md). New SSGs are very welcome among
-  the [example projects](https://gitlab.com/pages). If you set
-  up a new one, please
-  [contribute](https://gitlab.com/pages/pages.gitlab.io/blob/master/CONTRIBUTING.md)
-  to our examples.
+>   if you don't find yours among the templates, you'll need
+>   to configure your own `.gitlab-ci.yml`. To do that, please
+>   read through the article [Creating and Tweaking GitLab CI/CD for GitLab Pages](getting_started_part_four.md). New SSGs are very welcome among
+>   the [example projects](https://gitlab.com/pages). If you set
+>   up a new one, please
+>   [contribute](https://gitlab.com/pages/pages.gitlab.io/blob/master/CONTRIBUTING.md)
+>   to our examples.
 >
 > - The second step _"Clone it to your local computer"_, can be done
-  differently, achieving the same results: instead of cloning the bare
-  repository to you local computer and moving your site files into it,
-  you can run `git init` in your local website directory, add the
-  remote URL: `git remote add origin git@gitlab.com:namespace/project-name.git`,
-  then add, commit, and push to GitLab.
+>   differently, achieving the same results: instead of cloning the bare
+>   repository to you local computer and moving your site files into it,
+>   you can run `git init` in your local website directory, add the
+>   remote URL: `git remote add origin git@gitlab.com:namespace/project-name.git`,
+>   then add, commit, and push to GitLab.
 
 ## URLs and Baseurls