Add latest changes from gitlab-org/gitlab@master

10 files changed, 39 insertions, 38 deletions

diff --git a/doc/administration/troubleshooting/gitlab_rails_cheat_sheet.md b/doc/administration/troubleshooting/gitlab_rails_cheat_sheet.md
index 0cd34ca16df..ddee79046f6 100644
--- a/doc/administration/troubleshooting/gitlab_rails_cheat_sheet.md
+++ b/doc/administration/troubleshooting/gitlab_rails_cheat_sheet.md
@@ -10,7 +10,7 @@ This was the GitLab Support Team's collection of information regarding the GitLa
 console, for use while troubleshooting. It is listed here for posterity,
 as most content has been moved to feature-specific troubleshooting pages and sections,
 see epic [&8147](https://gitlab.com/groups/gitlab-org/-/epics/8147#tree).
-Please update your bookmarks accordingly.
+You may want to update your bookmarks accordingly.
 
 If you are currently having an issue with GitLab,
 it is highly recommended that you first check
diff --git a/doc/api/import.md b/doc/api/import.md
index 67ee7bc60a1..5e9fbf30226 100644
--- a/doc/api/import.md
+++ b/doc/api/import.md
@@ -12,7 +12,9 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 
 Import your projects from GitHub to GitLab using the API.
 
-The namespace set in `target_namespace` must exist. The namespace can be your user namespace or an existing group that you have at least the Developer role for.
+The namespace set in `target_namespace` must exist. The namespace can be your user namespace or an existing group that
+you have at least the Maintainer role for. Using the Developer role for this purpose was
+[deprecated](https://gitlab.com/gitlab-org/gitlab/-/issues/387891) in GitLab 15.8 and will be removed in GitLab 16.0.
 
 ```plaintext
 POST /import/github
diff --git a/doc/api/project_import_export.md b/doc/api/project_import_export.md
index 489176b23ff..00e73d41b46 100644
--- a/doc/api/project_import_export.md
+++ b/doc/api/project_import_export.md
@@ -135,8 +135,7 @@ POST /projects/import
 
 | Attribute | Type           | Required | Description                              |
 | --------- | -------------- | -------- | ---------------------------------------- |
-| `namespace` | integer/string | no | The ID or path of the namespace to import the project to. Defaults to the current user's namespace. Requires at least the Maintainer role on the destination group to import to. Using the Developer role for this purpose was
-[deprecated](https://gitlab.com/gitlab-org/gitlab/-/issues/387891) in GitLab 15.8 and will be removed in GitLab 16.0. |
+| `namespace` | integer/string | no | The ID or path of the namespace to import the project to. Defaults to the current user's namespace.<br/><br/>Requires at least the Maintainer role on the destination group to import to. Using the Developer role for this purpose was [deprecated](https://gitlab.com/gitlab-org/gitlab/-/issues/387891) in GitLab 15.8 and will be removed in GitLab 16.0. |
 | `name` | string | no | The name of the project to be imported. Defaults to the path of the project if not provided |
 | `file` | string | yes | The file to be uploaded |
 | `path` | string | yes | Name and path for new project |
diff --git a/doc/ci/environments/protected_environments.md b/doc/ci/environments/protected_environments.md
index b72ee9b388f..8e8cee302bc 100644
--- a/doc/ci/environments/protected_environments.md
+++ b/doc/ci/environments/protected_environments.md
@@ -26,7 +26,7 @@ Maintainer role.
 
 Prerequisites:
 
-- When granting the **Allowed to deploy** permission to a group or subgroup, the user configuring the protected environment must be a **direct member** of the group or subgroup to be added. Otherwise, the group or subgroup will not show up in the dropdown list. For more information see [issue #345140](https://gitlab.com/gitlab-org/gitlab/-/issues/345140).
+- When granting the **Allowed to deploy** permission to a group or subgroup, the user configuring the protected environment must be a **direct member** of the group or subgroup to be added. Otherwise, the group or subgroup does not show up in the dropdown list. For more information see [issue #345140](https://gitlab.com/gitlab-org/gitlab/-/issues/345140).
 
 To protect an environment:
 
@@ -261,6 +261,6 @@ Protected environments can also be used to require manual approvals before deplo
 
 ### Reporter can't run a trigger job that deploys to a protected environment in downstream pipeline
 
-A user who has [deployment-only access to protected environments](#deployment-only-access-to-protected-environments) might **not** be able to run a job if it's with a [`trigger`](../yaml/index.md#trigger) keyword. This is because the job is missing the [`environment`](../yaml/index.md#environment) keyword definition to associate the job with the protected environment, therefore the job is recognized as a normal job that uses [regular CI/CD permission model](../../user/permissions.md#gitlab-cicd-permissions).
+A user who has [deployment-only access to protected environments](#deployment-only-access-to-protected-environments) might **not** be able to run a job if it's with a [`trigger`](../yaml/index.md#trigger) keyword. This is because the job is missing the [`environment`](../yaml/index.md#environment) keyword definition to associate the job with the protected environment, therefore the job is recognized as a standard job that uses [regular CI/CD permission model](../../user/permissions.md#gitlab-cicd-permissions).
 
-Please see [this issue](https://gitlab.com/groups/gitlab-org/-/epics/8483) for more information about supporting `environment` keyword with `trigger` keyword.
+See [this issue](https://gitlab.com/groups/gitlab-org/-/epics/8483) for more information about supporting `environment` keyword with `trigger` keyword.
diff --git a/doc/ci/testing/fail_fast_testing.md b/doc/ci/testing/fail_fast_testing.md
index b1bc44a0a37..4ad1656c8d6 100644
--- a/doc/ci/testing/fail_fast_testing.md
+++ b/doc/ci/testing/fail_fast_testing.md
@@ -27,7 +27,7 @@ Fail fast testing is useful when adding new functionality to a project and addin
 new automated tests.
 
 Your project could have hundreds of thousands of tests that take a long time to complete.
-You may be confident that a new test will pass, but you have to wait for all the tests
+You may expect a new test to pass, but you have to wait for all the tests
 to complete to verify it. This could take an hour or more, even when using parallelization.
 
 Fail fast testing gives you a faster feedback loop from the pipeline. It lets you
diff --git a/doc/ci/testing/load_performance_testing.md b/doc/ci/testing/load_performance_testing.md
index ba7bf14fb59..7e527fae562 100644
--- a/doc/ci/testing/load_performance_testing.md
+++ b/doc/ci/testing/load_performance_testing.md
@@ -60,7 +60,7 @@ Configuring your Load Performance Testing job can be broken down into several di
 ### Determine the test parameters
 
 The first thing you need to do is determine the [type of load test](https://k6.io/docs/test-types/introduction)
-you want to run, and how it will run (for example, the number of users, throughput, and so on).
+you want to run, and how you want it to run (for example, the number of users, throughput, and so on).
 
 Refer to the [k6 docs](https://k6.io/docs/), especially the [k6 testing guides](https://k6.io/docs/testing-guides),
 for guidance on the above and more.
@@ -69,7 +69,7 @@ for guidance on the above and more.
 
 A large part of the effort around load performance testing is to prepare the target test environment
 for high loads. You should ensure it's able to handle the
-[throughput](https://k6.io/blog/monthly-visits-concurrent-users) it will be tested with.
+[throughput](https://k6.io/blog/monthly-visits-concurrent-users) it is tested with.
 
 It's also typically required to have representative test data in the target environment
 for the load performance test to use.
@@ -121,7 +121,7 @@ the k6 test.
 NOTE:
 For Kubernetes setups a different template should be used: [`Jobs/Load-Performance-Testing.gitlab-ci.yml`](https://gitlab.com/gitlab-org/gitlab/-/blob/master/lib/gitlab/ci/templates/Jobs/Load-Performance-Testing.gitlab-ci.yml).
 
-k6 has [various options](https://k6.io/docs/using-k6/k6-options/reference/) to configure how it will run tests, such as what throughput (RPS) to run with,
+k6 has [various options](https://k6.io/docs/using-k6/k6-options/reference/) to configure how it runs the tests, such as what throughput (RPS) to run with,
 how long the test should run, and so on. Almost all options can be configured in the test itself, but as
 you can also pass command line options via the `K6_OPTIONS` variable.
 
diff --git a/doc/install/installation.md b/doc/install/installation.md
index 68c2b663566..77d613b9d9d 100644
--- a/doc/install/installation.md
+++ b/doc/install/installation.md
@@ -1051,7 +1051,7 @@ To use GitLab with HTTPS:
    1. Review the configuration file and consider applying other security and performance enhancing features.
 
 Using a self-signed certificate is discouraged. If you must use one,
-follow the normal directions and generate a self-signed SSL certificate:
+follow the standard directions and generate a self-signed SSL certificate:
 
    ```shell
    mkdir -p /etc/nginx/ssl/
diff --git a/doc/topics/git/index.md b/doc/topics/git/index.md
index f5dd458f625..b47a34fa7b2 100644
--- a/doc/topics/git/index.md
+++ b/doc/topics/git/index.md
@@ -12,7 +12,7 @@ distributed version control system designed to handle everything from small to
 large projects with speed and efficiency.
 
 [GitLab](https://about.gitlab.com) is a Git-based fully integrated platform for
-software development. Besides Git's functionalities, GitLab has a lot of
+software development. Besides Git functionalities, GitLab has a lot of
 powerful [features](https://about.gitlab.com/features/) to enhance your
 [workflow](https://about.gitlab.com/topics/version-control/what-is-gitlab-flow/).
 
diff --git a/doc/topics/git/troubleshooting_git.md b/doc/topics/git/troubleshooting_git.md
index 050d2415b26..a116f6cc978 100644
--- a/doc/topics/git/troubleshooting_git.md
+++ b/doc/topics/git/troubleshooting_git.md
@@ -25,7 +25,7 @@ To fix this issue, here are some possible solutions.
 
 ### Increase the POST buffer size in Git
 
-**If you're using Git over HTTP instead of SSH**, you can try increasing the POST buffer size in Git's
+**If you're using Git over HTTP instead of SSH**, you can try increasing the POST buffer size in Git
 configuration.
 
 Example of an error during a clone:
@@ -38,7 +38,7 @@ git config http.postBuffer 52428800
 ```
 
 The value is specified in bytes, so in the above case the buffer size has been
-set to 50MB. The default is 1MB.
+set to 50 MB. The default is 1 MB.
 
 ### RPC failed; curl 92 HTTP/2 stream 0 was not closed cleanly: INTERNAL_ERROR (err 2)
 
diff --git a/doc/user/application_security/dependency_scanning/index.md b/doc/user/application_security/dependency_scanning/index.md
index 8106201cb99..4bf5b769c71 100644
--- a/doc/user/application_security/dependency_scanning/index.md
+++ b/doc/user/application_security/dependency_scanning/index.md
@@ -155,23 +155,14 @@ table.supported-languages ul {
   </thead>
   <tbody>
     <tr>
-      <td>Ruby</td>
-      <td>All versions</td>
-      <td><a href="https://bundler.io/">Bundler</a></td>
-      <td>
-        <ul>
-            <li><code>Gemfile.lock</code></li>
-            <li><code>gems.locked</code></li>
-        </ul>
-      </td>
-      <td>Y</td>
+      <td>.NET</td>
+      <td rowspan="2">All versions</td>
+      <td rowspan="2"><a href="https://www.nuget.org/">NuGet</a></td>
+      <td rowspan="2"><a href="https://learn.microsoft.com/en-us/nuget/consume-packages/package-references-in-project-files#enabling-lock-file"><code>packages.lock.json</code></a></td>
+      <td rowspan="2">Y</td>
     </tr>
     <tr>
-      <td>PHP</td>
-      <td>All versions</td>
-      <td><a href="https://getcomposer.org/">Composer</a></td>
-      <td><code>composer.lock</code></td>
-      <td>Y</td>
+      <td>C#</td>
     </tr>
     <tr>
       <td>C</td>
@@ -239,14 +230,11 @@ table.supported-languages ul {
       <td>Y</td>
     </tr>
     <tr>
-      <td>.NET</td>
-      <td rowspan="2">All versions</td>
-      <td rowspan="2"><a href="https://www.nuget.org/">NuGet</a></td>
-      <td rowspan="2"><a href="https://learn.microsoft.com/en-us/nuget/consume-packages/package-references-in-project-files#enabling-lock-file"><code>packages.lock.json</code></a></td>
-      <td rowspan="2">Y</td>
-    </tr>
-    <tr>
-      <td>C#</td>
+      <td>PHP</td>
+      <td>All versions</td>
+      <td><a href="https://getcomposer.org/">Composer</a></td>
+      <td><code>composer.lock</code></td>
+      <td>Y</td>
     </tr>
     <tr>
       <td rowspan="4">Python</td>
@@ -282,6 +270,18 @@ table.supported-languages ul {
       <td>N</td>
     </tr>
     <tr>
+      <td>Ruby</td>
+      <td>All versions</td>
+      <td><a href="https://bundler.io/">Bundler</a></td>
+      <td>
+        <ul>
+            <li><code>Gemfile.lock</code></li>
+            <li><code>gems.locked</code></li>
+        </ul>
+      </td>
+      <td>Y</td>
+    </tr>
+    <tr>
       <td>Scala</td>
       <td>All versions</td>
       <td><a href="https://www.scala-sbt.org/">sbt</a><sup><b><a href="#notes-regarding-supported-languages-and-package-managers-6">6</a></b></sup></td>