Add latest changes from gitlab-org/gitlab@master

3 files changed, 16 insertions, 5 deletions

diff --git a/doc/development/README.md b/doc/development/README.md
index 7511221b246..1e5e1cdce5f 100644
--- a/doc/development/README.md
+++ b/doc/development/README.md
@@ -147,6 +147,7 @@ Complementary reads:
 ## Integration guides
 
 - [Jira Connect app](integrations/jira_connect.md)
+- [Security Scanners](integrations/secure.md)
 
 ## Testing guides
 
diff --git a/doc/development/import_project.md b/doc/development/import_project.md
index 37cf07ff702..b969cb5f1c4 100644
--- a/doc/development/import_project.md
+++ b/doc/development/import_project.md
@@ -53,8 +53,18 @@ As part of this script we also disable direct and background upload to avoid sit
 
 We can simply run this script from the terminal:
 
+Parameters:
+
+| Attribute | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `username`      | string | yes | User name |
+| `namespace_path` | string | yes | Namespace path |
+| `project_path` | string | yes | Project name |
+| `archive_path` | string | yes | Path to the exported project tarball you want to import |
+| `measurement_enabled` | boolean | no | Measure execution time, number of SQL calls and GC count |
+
 ```shell
-bundle exec rake "gitlab:import_export:import[root, root, testingprojectimport, /path/to/file.tar.gz]"
+bundle exec rake "gitlab:import_export:import[root, root, testingprojectimport, /path/to/file.tar.gz, true]"
 ```
 
 ### Importing via the Rails console
diff --git a/doc/development/integrations/secure.md b/doc/development/integrations/secure.md
index b9b37a7e298..c54c2050790 100644
--- a/doc/development/integrations/secure.md
+++ b/doc/development/integrations/secure.md
@@ -116,9 +116,9 @@ the scanner with all the libraries and tools it depends on.
 
 ### Image size
 
-Depending on the CI infrastucture,
+Depending on the CI infrastructure,
 the CI may have to fetch the Docker image every time the job runs.
-To make the scanning job run fast, and to avoid wasting bandwith,
+To make the scanning job run fast, and to avoid wasting bandwidth,
 it is important to make Docker images as small as possible,
 ideally smaller than 50 MB.
 
@@ -189,7 +189,7 @@ then `artifacts:reports:dependency_scanning` must be set to `depscan.json`.
 ### Exit code
 
 Following the POSIX exit code standard, the scanner will exit with 0 for success and any number from 1 to 255 for anything else.
-This also includes the case when vulnerabilities are found.
+Success also includes the case when vulnerabilities are found.
 
 ### Logging
 
@@ -275,7 +275,7 @@ It should not repeat the other fields of the vulnerability object.
 In particular, the `description` should not repeat the `location` (what is affected)
 or the `solution` (how to mitigate the risk).
 
-There is a proposal to remove either the `name` or the `message`, to remove abmiguities.
+There is a proposal to remove either the `name` or the `message`, to remove ambiguities.
 See [issue #36779](https://gitlab.com/gitlab-org/gitlab/issues/36779).
 
 #### Solution