Add latest changes from gitlab-org/gitlab@master

7 files changed, 45 insertions, 39 deletions

diff --git a/doc/user/admin_area/analytics/dev_ops_report.md b/doc/user/admin_area/analytics/dev_ops_report.md
index 34a1c285a76..e1b47262e16 100644
--- a/doc/user/admin_area/analytics/dev_ops_report.md
+++ b/doc/user/admin_area/analytics/dev_ops_report.md
@@ -59,18 +59,18 @@ DevOps Adoption allows you to:
 
 ### Disable or enable DevOps Adoption
 
-DevOps Adoption is deployed behind a feature flag that is **disabled by default**.
+DevOps Adoption is deployed behind a feature flag that is **enabled by default**.
 [GitLab administrators with access to the GitLab Rails console](../../../administration/feature_flags.md)
-can opt to enable it.
+can opt to disable it.
 
-To enable it:
+To disable it:
 
 ```ruby
-Feature.enable(:devops_adoption_feature)
+Feature.disable(:devops_adoption_feature)
 ```
 
-To disable it:
+To reenable it:
 
 ```ruby
-Feature.disable(:devops_adoption_feature)
+Feature.enable(:devops_adoption_feature)
 ```
diff --git a/doc/user/admin_area/diff_limits.md b/doc/user/admin_area/diff_limits.md
index 32756ab4780..88d24680500 100644
--- a/doc/user/admin_area/diff_limits.md
+++ b/doc/user/admin_area/diff_limits.md
@@ -10,6 +10,7 @@ type: reference
 You can set a maximum size for display of diff files (patches).
 
 For details about diff files, [view changes between files](../project/merge_requests/changes.md).
+Read more about the [built-in limits for merge requests and diffs](../../administration/instance_limits.md#merge-requests).
 
 ## Maximum diff patch size
 
diff --git a/doc/user/clusters/applications.md b/doc/user/clusters/applications.md
index 501f7a8692f..dded55cfa0e 100644
--- a/doc/user/clusters/applications.md
+++ b/doc/user/clusters/applications.md
@@ -404,6 +404,10 @@ These values can be specified using [CI/CD variables](../../ci/variables/README.
 - `GITLAB_RUNNER_GITLAB_URL` is used for `gitlabUrl`.
 - `GITLAB_RUNNER_REGISTRATION_TOKEN` is used for `runnerRegistrationToken`
 
+The methods of specifying these values are mutually exclusive. Either specify variables `GITLAB_RUNNER_REGISTRATION_TOKEN` and `GITLAB_RUNNER_TOKEN` as CI variables (recommended) or provide values for `runnerRegistrationToken:` and `runnerToken:` in `.gitlab/managed-apps/gitlab-runner/values.yaml`. If you choose to use CI variables, comment out or remove `runnerRegistrationToken:` and `runnerToken:` from `.gitlab/managed-apps/gitlab-runner/values`.  
+
+The runner registration token allows connection to a project by a runner and therefore should be treated as a secret to prevent malicious use and code exfiltration through a runner. For this reason, we recommend that you specify the runner registration token as a [protected variable](../../ci/variables/README.md#protect-a-cicd-variable) and [masked variable](../../ci/variables/README.md#mask-a-cicd-variable) and do not commit them to the Git repository in the `values.yaml` file. 
+
 You can customize the installation of GitLab Runner by defining
 `.gitlab/managed-apps/gitlab-runner/values.yaml` file in your cluster
 management project. Refer to the
diff --git a/doc/user/img/completed_tasks_v13_3.png b/doc/user/img/completed_tasks_v13_3.png
index 31e051852cb..b12d95f0a23 100644
--- a/doc/user/img/completed_tasks_v13_3.png
+++ b/doc/user/img/completed_tasks_v13_3.png
diff --git a/doc/user/markdown.md b/doc/user/markdown.md
index f642d0bd373..d7ff258bd4f 100644
--- a/doc/user/markdown.md
+++ b/doc/user/markdown.md
@@ -56,7 +56,7 @@ extends standard Markdown with features made specifically for GitLab.
 
 Features not found in standard Markdown:
 
-- [Color chips written in HEX, RGB or HSL](#colors)
+- [Color chips written in `HEX`, `RGB` or `HSL`](#colors)
 - [Diagrams and flowcharts](#diagrams-and-flowcharts)
 - [Emoji](#emojis)
 - [Front matter](#front-matter)
@@ -380,15 +380,15 @@ the [Asciidoctor user manual](https://asciidoctor.org/docs/user-manual/#activati
 
 ### Task lists
 
-If this section isn't rendered correctly, [view it in GitLab itself](https://gitlab.com/gitlab-org/gitlab/blob/master/doc/user/markdown.md#task-lists).
+[View this topic in GitLab](https://gitlab.com/gitlab-org/gitlab/blob/master/doc/user/markdown.md#task-lists).
 
-You can add task lists anywhere Markdown is supported, but only issues, merge requests, and
-comments support clicking to toggle the boxes. In other
-places, you must edit the Markdown manually to change the status by adding or
-removing an `x` inside the square brackets.
+You can add task lists anywhere Markdown is supported.
 
-To create a task list, add a specially-formatted Markdown list. You can use either
-unordered or ordered lists:
+- In issues, merge requests, and comments, you can click to select the boxes.
+- In all other places, you cannot click to select the boxes. You must edit the Markdown manually
+  by adding or removing an `x` in the brackets.
+
+To create a task list, follow the format of an ordered or unordered list:
 
 ```markdown
 - [x] Completed task
@@ -403,13 +403,14 @@ unordered or ordered lists:
    1. [x] Sub-task 2
 ```
 
-![Task list as rendered by the GitLab interface](img/completed_tasks_v13_3.png)
+![Task list as rendered by GitLab](img/completed_tasks_v13_3.png)
 
 ### Table of contents
 
-Add a table of contents to a Markdown file, wiki page, issue request, or merge request
-description by adding the tag `[[_TOC_]]` on its own line.
-It displays an unordered list that links to subheadings in the document.
+A table of contents is an unordered list that links to subheadings in the document.
+
+To add a table of contents to a Markdown file, wiki page, issue request, or merge request
+description, add the `[[_TOC_]]` tag on its own line.
 
 ```markdown
 This is an intro sentence to my Wiki page.
@@ -429,14 +430,14 @@ Second section content.
 
 ### Wiki-specific Markdown
 
-The following examples show how links inside wikis behave.
+The following topics show how links inside wikis behave.
 
 #### Wiki - direct page link
 
-A link which just includes the slug for a page points to that page,
-_at the base level of the wiki_.
+A direct page link includes the slug for a page that points to that page,
+at the base level of the wiki.
 
-This snippet would link to a `documentation` page at the root of your wiki:
+This example links to a `documentation` page at the root of your wiki:
 
 ```markdown
 [Link to Documentation](documentation)
@@ -444,10 +445,10 @@ This snippet would link to a `documentation` page at the root of your wiki:
 
 #### Wiki - direct file link
 
-Links with a file extension point to that file, _relative to the current page_.
+A direct file link points to a file extension for a file, relative to the current page.
 
-If the snippet below was placed on a page at `<your_wiki>/documentation/related`,
-it would link to `<your_wiki>/documentation/file.md`:
+If the following example is on a page at `<your_wiki>/documentation/related`,
+it links to `<your_wiki>/documentation/file.md`:
 
 ```markdown
 [Link to File](file.md)
@@ -455,32 +456,32 @@ it would link to `<your_wiki>/documentation/file.md`:
 
 #### Wiki - hierarchical link
 
-A link can be constructed relative to the current wiki page using `./<page>`,
+A hierarchical link can be constructed relative to the current wiki page by using `./<page>`,
 `../<page>`, and so on.
 
-If this snippet was placed on a page at `<your_wiki>/documentation/main`,
-it would link to `<your_wiki>/documentation/related`:
+If this example is on a page at `<your_wiki>/documentation/main`,
+it links to `<your_wiki>/documentation/related`:
 
 ```markdown
 [Link to Related Page](related)
 ```
 
-If this snippet was placed on a page at `<your_wiki>/documentation/related/content`,
-it would link to `<your_wiki>/documentation/main`:
+If this example is on a page at `<your_wiki>/documentation/related/content`,
+it links to `<your_wiki>/documentation/main`:
 
 ```markdown
 [Link to Related Page](../main)
 ```
 
-If this snippet was placed on a page at `<your_wiki>/documentation/main`,
-it would link to `<your_wiki>/documentation/related.md`:
+If this example is on a page at `<your_wiki>/documentation/main`,
+it links to `<your_wiki>/documentation/related.md`:
 
 ```markdown
 [Link to Related Page](related.md)
 ```
 
-If this snippet was placed on a page at `<your_wiki>/documentation/related/content`,
-it would link to `<your_wiki>/documentation/main.md`:
+If this example is on a page at `<your_wiki>/documentation/related/content`,
+it links to `<your_wiki>/documentation/main.md`:
 
 ```markdown
 [Link to Related Page](../main.md)
@@ -488,15 +489,15 @@ it would link to `<your_wiki>/documentation/main.md`:
 
 #### Wiki - root link
 
-A link starting with a `/` is relative to the wiki root.
+A root link starts with a `/` and is relative to the wiki root.
 
-This snippet links to `<wiki_root>/documentation`:
+This example links to `<wiki_root>/documentation`:
 
 ```markdown
 [Link to Related Page](/documentation)
 ```
 
-This snippet links to `<wiki_root>/miscellaneous.md`:
+This example links to `<wiki_root>/miscellaneous.md`:
 
 ```markdown
 [Link to Related Page](/miscellaneous.md)
diff --git a/doc/user/packages/conan_repository/index.md b/doc/user/packages/conan_repository/index.md
index 5643882b23c..a429e746cf2 100644
--- a/doc/user/packages/conan_repository/index.md
+++ b/doc/user/packages/conan_repository/index.md
@@ -281,7 +281,7 @@ image: conanio/gcc7
 create_package:
   stage: deploy
   script:
-    - ${CI_API_V4_URL}/projects/$CI_PROJECT_ID/packages/conan
+    - conan remote add gitlab ${CI_API_V4_URL}/projects/$CI_PROJECT_ID/packages/conan
     - conan new <package-name>/0.1 -t
     - conan create . <group-name>+<project-name>/stable
     - CONAN_LOGIN_USERNAME=ci_user CONAN_PASSWORD=${CI_JOB_TOKEN} conan upload <package-name>/0.1@<group-name>+<project-name>/stable --all --remote=gitlab
diff --git a/doc/user/packages/nuget_repository/index.md b/doc/user/packages/nuget_repository/index.md
index 6d206739852..f19d565ef36 100644
--- a/doc/user/packages/nuget_repository/index.md
+++ b/doc/user/packages/nuget_repository/index.md
@@ -336,7 +336,7 @@ updated:
      stage: deploy
      script:
        - dotnet pack -c Release
-       - dotnet nuget add source "${CI_API_V4_URL}/$CI_PROJECT_ID/packages/nuget/index.json" --name gitlab --username gitlab-ci-token --password $CI_JOB_TOKEN --store-password-in-clear-text
+       - dotnet nuget add source "${CI_API_V4_URL}/${CI_PROJECT_ID}/packages/nuget/index.json" --name gitlab --username gitlab-ci-token --password $CI_JOB_TOKEN --store-password-in-clear-text
        - dotnet nuget push "bin/Release/*.nupkg" --source gitlab
      only:
        - master