Add latest changes from gitlab-org/gitlab@master

10 files changed, 46 insertions, 12 deletions

diff --git a/doc/README.md b/doc/README.md
index 56e70bb1779..43a155a730b 100644
--- a/doc/README.md
+++ b/doc/README.md
@@ -382,14 +382,15 @@ The following documentation relates to the DevOps **Monitor** stage:
 GitLab Defend enables organizations to proactively protect cloud-native environments by providing
 context-aware technologies to reduce overall security risk. Defend is a natural extension of your
 existing operation's practices and provides security visibility across the entire DevSecOps
-lifecycle. This empowers your organization to apply DevSecOps best practices from the first line of
-code through monitoring and protecting your applications deployed into production.
+lifecycle. This visibility empowers your organization to apply DevSecOps best practices from the
+first line of code written and extends all the way through to greater monitoring and protection for
+your applications that are deployed in production.
 
 The following documentation relates to the DevOps **Defend** stage:
 
 | Defend topics                                                                                         | Description                                                            |
 |:------------------------------------------------------------------------------------------------------|:-----------------------------------------------------------------------|
-| [Web Application Firewall with ModSecurity](user/compliance/compliance_dashboard/index.md) **(ULTIMATE)**  | Filter, monitor, and block HTTP traffic to and from a web application. |
+| [Web Application Firewall with ModSecurity](user/compliance/compliance_dashboard/index.md)  | Filter, monitor, and block HTTP traffic to and from a web application. |
 | [Container Host Security](user/clusters/applications.md#install-falco-using-gitlab-cicd)                   | Detect and respond to security threats at the Kubernetes, network, and host level. |
 | [Container Network Security](user/clusters/applications.md#install-cilium-using-gitlab-cicd)               |  Detect and block unauthorized network traffic between pods and to/from the internet.|
 
diff --git a/doc/development/distributed_tracing.md b/doc/development/distributed_tracing.md
index 15b3b8ba755..cbbeae47a41 100644
--- a/doc/development/distributed_tracing.md
+++ b/doc/development/distributed_tracing.md
@@ -1,3 +1,9 @@
+---
+stage: Monitor
+group: APM
+info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#designated-technical-writers
+---
+
 # Distributed Tracing - development guidelines
 
 GitLab is instrumented for distributed tracing.
diff --git a/doc/development/elasticsearch.md b/doc/development/elasticsearch.md
index 8901eb0a3cd..c8dd54742e3 100644
--- a/doc/development/elasticsearch.md
+++ b/doc/development/elasticsearch.md
@@ -1,3 +1,9 @@
+---
+stage: Monitor
+group: APM
+info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#designated-technical-writers
+---
+
 # Elasticsearch knowledge **(STARTER ONLY)**
 
 This area is to maintain a compendium of useful information when working with Elasticsearch.
diff --git a/doc/development/instrumentation.md b/doc/development/instrumentation.md
index ee1aab1456e..e420ae0c54f 100644
--- a/doc/development/instrumentation.md
+++ b/doc/development/instrumentation.md
@@ -1,3 +1,9 @@
+---
+stage: Monitor
+group: APM
+info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#designated-technical-writers
+---
+
 # Instrumenting Ruby code
 
 [GitLab Performance Monitoring](../administration/monitoring/performance/index.md) allows instrumenting of both methods and custom
diff --git a/doc/development/logging.md b/doc/development/logging.md
index 27a7f47e36c..474a500da61 100644
--- a/doc/development/logging.md
+++ b/doc/development/logging.md
@@ -1,3 +1,9 @@
+---
+stage: Monitor
+group: APM
+info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#designated-technical-writers
+---
+
 # GitLab Developers Guide to Logging
 
 [GitLab Logs](../administration/logs.md) play a critical role for both
diff --git a/doc/development/prometheus.md b/doc/development/prometheus.md
index f64d4a2eda1..902d4e6a1d0 100644
--- a/doc/development/prometheus.md
+++ b/doc/development/prometheus.md
@@ -1,3 +1,9 @@
+---
+stage: Monitor
+group: APM
+info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#designated-technical-writers
+---
+
 # Working with Prometheus
 
 For more information on working with [Prometheus metrics](prometheus_metrics.md), see
diff --git a/doc/development/prometheus_metrics.md b/doc/development/prometheus_metrics.md
index 024da5cc943..a39d19d8750 100644
--- a/doc/development/prometheus_metrics.md
+++ b/doc/development/prometheus_metrics.md
@@ -1,3 +1,9 @@
+---
+stage: Monitor
+group: APM
+info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#designated-technical-writers
+---
+
 # Working with Prometheus Metrics
 
 ## Adding to the library
diff --git a/doc/user/application_security/dependency_scanning/index.md b/doc/user/application_security/dependency_scanning/index.md
index a866221151d..8234f76872d 100644
--- a/doc/user/application_security/dependency_scanning/index.md
+++ b/doc/user/application_security/dependency_scanning/index.md
@@ -60,6 +60,7 @@ The following languages and dependency managers are supported:
 
 | Language (package managers)  | Supported files | Scan tool(s) |
 |----------------------------- | --------------- | ------------ |
+| C# .NET ([NuGet](https://www.nuget.org/) 4.9+) | [`packages.lock.json`](https://docs.microsoft.com/en-us/nuget/consume-packages/package-references-in-project-files#enabling-lock-file) | [Gemnasium](https://gitlab.com/gitlab-org/security-products/gemnasium) |
 | Java ([Gradle](https://gradle.org/), [Maven](https://maven.apache.org/)) | `build.gradle`, `build.gradle.kts`, `pom.xml` | [Gemnasium](https://gitlab.com/gitlab-org/security-products/gemnasium) |
 | JavaScript ([npm](https://www.npmjs.com/), [yarn](https://classic.yarnpkg.com/en/)) | `package-lock.json`, `npm-shrinkwrap.json`, `yarn.lock` | [Gemnasium](https://gitlab.com/gitlab-org/security-products/gemnasium), [Retire.js](https://retirejs.github.io/retire.js/) |
 | Go ([Golang](https://golang.org/)) | `go.sum` | [Gemnasium](https://gitlab.com/gitlab-org/security-products/gemnasium) |
diff --git a/doc/user/project/pages/getting_started/pages_from_scratch.md b/doc/user/project/pages/getting_started/pages_from_scratch.md
index 7278c734b07..cabaf734d77 100644
--- a/doc/user/project/pages/getting_started/pages_from_scratch.md
+++ b/doc/user/project/pages/getting_started/pages_from_scratch.md
@@ -160,8 +160,9 @@ When it succeeds, go to **Settings > Pages** to view the URL where your site
 is now available.
 
 If you want to do more advanced tasks, you can update your `.gitlab-ci.yml` file
-with [any of the available settings](../../../../ci/yaml/README.md). You can check
-your CI syntax with the [GitLab CI/CD Lint Tool](../../../../ci/yaml/README.md#validate-the-gitlab-ciyml).
+with [any of the available settings](../../../../ci/yaml/README.md). See
+[Validate the `.gitlab-ci.yml`](../../../../ci/yaml/README.md#validate-the-gitlab-ciyml)
+for instructions on validating your YAML file with the Lint tool included with GitLab.
 
 The following topics show other examples of other options you can add to your CI/CD file.
 
diff --git a/doc/user/project/repository/repository_mirroring.md b/doc/user/project/repository/repository_mirroring.md
index 406606b385e..dad897c1cc8 100644
--- a/doc/user/project/repository/repository_mirroring.md
+++ b/doc/user/project/repository/repository_mirroring.md
@@ -3,9 +3,6 @@ stage: Create
 group: Source Code
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#designated-technical-writers
 disqus_identifier: 'https://docs.gitlab.com/ee/workflow/repository_mirroring.html'
-stage: Create
-group: Source Code
-info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#designated-technical-writers
 ---
 
 # Repository mirroring
@@ -150,8 +147,7 @@ To set up a mirror from GitLab to AWS CodeCommit:
    been tested to be the minimum (least privileged) required for mirroring:
 
    ```json
-
-{
+   {
        "Version": "2012-10-17",
        "Statement": [
            {
@@ -168,9 +164,8 @@ To set up a mirror from GitLab to AWS CodeCommit:
            }
        ]
    }
+   ```
 
-   ```json
-   
 1. After the user was created, click the AWS IAM user name.
 1. Click the **Security credentials** tab.
 1. Under **HTTPS Git credentials for AWS CodeCommit** click **Generate credentials**.