Merge branch 'docs/manual-license-management' into 'master'

Add steps for manual license management

Closes #7971

See merge request gitlab-org/gitlab-ee!7920

doc/user/project/index.md

@@ -86,10 +86,11 @@ website with GitLab Pages
 - [Cycle Analytics](cycle_analytics.md): Review your development lifecycle
 - [Security Dashboard](security_dashboard.md): Security Dashboard
 - [Syntax highlighting](highlighting.md): An alternative to customize
-your code blocks, overriding GitLab's default choice of language
+  your code blocks, overriding GitLab's default choice of language
 - [Badges](badges.md): Badges for the project overview
 - [Maven packages](packages/maven_repository.md): Your private Maven repository in GitLab **[PREMIUM]**
 - [Code owners](code_owners.md): Specify code owners for certain files **[STARTER]**
+- [License Management](merge_requests/license_management.md): Approve and blacklist licenses for projects **[ULTIMATE]**
 
 ### Project's integrations
 

doc/user/project/merge_requests/license_management.md

@@ -5,16 +5,17 @@
 ## Overview
 
 If you are using [GitLab CI/CD][ci], you can search your project dependencies for their licenses
-using License Management, either by
-including the CI job in your [existing `.gitlab-ci.yml` file][cc-docs] or
-by implicitly using [Auto License Management](../../../topics/autodevops/index.md#auto-dependency-scanning)
-that is provided by [Auto DevOps](../../../topics/autodevops/index.md).
+using License Management by:
 
-Going a step further, GitLab can show the licenses list right in the merge
+- Including the CI job in your [existing `.gitlab-ci.yml` file][cc-docs].
+- Implicitly using [Auto License Management](../../../topics/autodevops/index.md#auto-dependency-scanning)
+  that is provided by [Auto DevOps](../../../topics/autodevops/index.md).
+
+In addition, you can [manually approve or blacklist](#manual-license-management) licenses in the project's settings.
+
+GitLab can show the licenses list right in the merge
 request widget area, highlighting the presence of licenses you don't want to use, or new
 ones that need a decision.
-Licenses can be accepted or blacklisted in the project settings, or directly from the
-merge request widget.
 
 ## Use cases
 
@@ -37,7 +38,7 @@ The following languages and package managers are supported.
 
 ## How it works
 
-First of all, you need to define a job named `license_management` in your
+First, you need to define a job named `license_management` in your
 `.gitlab-ci.yml` file. [Check how the `license_management` job should look like][cc-docs].
 
 In order for the report to show in the merge request, there are two
@@ -50,7 +51,7 @@ prerequisites:
 >**Note:**
 If the license management report doesn't have anything to compare to, no information
 will be displayed in the merge request area. That is the case when you add the
-`license_management` job in your `.gitlab-ci.yml` for the very first time.
+`license_management` job in your `.gitlab-ci.yml` for the first time.
 Consecutive merge requests will have something to compare to and the license
 management report will be shown properly.
 
@@ -67,10 +68,31 @@ the choice to approve it or blacklist it.
 
 ![License approval decision](img/license_management_decision.png)
 
-The list of licenses and their status can also be managed from the project settings.
+From the project's settings:
+
+- The list of licenses and their status can be managed.
+- Licenses can be [manually approved or blacklisted](#manual-license-management).
 
 ![License Management Settings](img/license_management_settings.png)
 
+### Manual license management
+
+> [Introduced](https://gitlab.com/gitlab-org/gitlab-ee/issues/5940) in [GitLab Ultimate][ee] 11.4.
+
+Licenses can be manually approved or blacklisted in a project's settings.
+
+To approve or blacklist a license:
+
+1. Navigate to the project's **Settings > CI/CD**.
+1. Expand the **License Management** section and click the **Add a license** button.
+1. In the **License name** dropdown, either:
+    - Select one of the available licenses. You can search for licenses in the field
+   at the top of the list.
+    - Enter arbitrary text in the field at the top of the list. This will cause the text to be
+    added as a license name to the list.
+1. Select the **Approve** or **Blacklist** radio button to approve or blacklist respectively
+   the selected license.
+
 ## License Management report under pipelines
 
 > [Introduced][ee-5491] in [GitLab Ultimate][ee] 11.2.