Add latest changes from gitlab-org/gitlab@master

8 files changed, 10 insertions, 9 deletions

diff --git a/doc/development/README.md b/doc/development/README.md
index e55989e312a..0620c96ba21 100644
--- a/doc/development/README.md
+++ b/doc/development/README.md
@@ -222,3 +222,4 @@ Complementary reads:
 
 - [Run full Auto DevOps cycle in a GDK instance](https://gitlab.com/gitlab-org/gitlab-development-kit/blob/master/doc/howto/auto_devops.md)
 - [Using GitLab Runner with GDK](https://gitlab.com/gitlab-org/gitlab-development-kit/blob/master/doc/howto/runner.md)
+- [Using the Web IDE terminal with GDK](https://gitlab.com/gitlab-org/gitlab-development-kit/-/blob/master/doc/howto/web_ide_terminal_gdk_setup.md)
diff --git a/doc/development/api_graphql_styleguide.md b/doc/development/api_graphql_styleguide.md
index 7fd158aec04..6d224db1a02 100644
--- a/doc/development/api_graphql_styleguide.md
+++ b/doc/development/api_graphql_styleguide.md
@@ -150,7 +150,7 @@ query($project_path: ID!) {
 ```
 
 This would return the first 2 pipelines of a project and related
-pagination info., ordered by descending ID. The returned data would
+pagination information, ordered by descending ID. The returned data would
 look like this:
 
 ```json
diff --git a/doc/development/documentation/site_architecture/global_nav.md b/doc/development/documentation/site_architecture/global_nav.md
index ae822e91360..12190e2cb9e 100644
--- a/doc/development/documentation/site_architecture/global_nav.md
+++ b/doc/development/documentation/site_architecture/global_nav.md
@@ -272,7 +272,7 @@ and the following syntax rules.
 - For `index.html` files, use the clean (canonical) URL: `path/to/`.
 - For EE-only docs, use the same relative path, but add the attribute `ee_only: true` below
   the `doc_url` or `category_url`, as explained above. This displays
-  an "info" icon on the nav to make the user aware that the feature is
+  an "information" icon on the nav to make the user aware that the feature is
   EE-only.
 
 DANGER: **Important!**
diff --git a/doc/development/documentation/styleguide.md b/doc/development/documentation/styleguide.md
index 57c6105372f..deb86569879 100644
--- a/doc/development/documentation/styleguide.md
+++ b/doc/development/documentation/styleguide.md
@@ -583,7 +583,7 @@ For other punctuation rules, please refer to the
 - [Avoid using symbols and special chars](https://gitlab.com/gitlab-org/gitlab-docs/issues/84)
   in headers. Whenever possible, they should be plain and short text.
 - Avoid adding things that show ephemeral statuses. For example, if a feature is
-  considered beta or experimental, put this info in a note, not in the heading.
+  considered beta or experimental, put this information in a note, not in the heading.
 - When introducing a new document, be careful for the headings to be
   grammatically and syntactically correct. Mention an [assigned technical writer (TW)](https://about.gitlab.com/handbook/product/categories/)
   for review.
diff --git a/doc/development/emails.md b/doc/development/emails.md
index 133434523ec..a84895eef5b 100644
--- a/doc/development/emails.md
+++ b/doc/development/emails.md
@@ -17,7 +17,7 @@ dummy data.
 The previews live in [`app/mailers/previews`][previews] and can be viewed at
 [`/rails/mailers`](http://localhost:3000/rails/mailers).
 
-See the [Rails guides](https://guides.rubyonrails.org/action_mailer_basics.html#previewing-emails) for more info.
+See the [Rails guides](https://guides.rubyonrails.org/action_mailer_basics.html#previewing-emails) for more information.
 
 [previews]: https://gitlab.com/gitlab-org/gitlab-foss/tree/master/app/mailers/previews
 
diff --git a/doc/development/fe_guide/style/scss.md b/doc/development/fe_guide/style/scss.md
index 83dd7990951..6c0247ad00c 100644
--- a/doc/development/fe_guide/style/scss.md
+++ b/doc/development/fe_guide/style/scss.md
@@ -264,7 +264,7 @@ Note that this won't fix every problem, but it should fix a majority.
 ### Ignoring issues
 
 If you want a line or set of lines to be ignored by the linter, you can use
-`// scss-lint:disable RuleName` ([more info](https://github.com/sds/scss-lint#disabling-linters-via-source)):
+`// scss-lint:disable RuleName` ([more information](https://github.com/sds/scss-lint#disabling-linters-via-source)):
 
 ```scss
 // This lint rule is disabled because it is supported only in Chrome/Safari
diff --git a/doc/development/feature_flags/controls.md b/doc/development/feature_flags/controls.md
index f17ac55a809..21d6d48d446 100644
--- a/doc/development/feature_flags/controls.md
+++ b/doc/development/feature_flags/controls.md
@@ -98,6 +98,7 @@ Slack:
 
 This will enable the feature for GitLab.com, with `new_navigation_bar` being the
 name of the feature.
+This command does *not* enable the feature for 25% of the total users. Instead, when the feature is checked with `enabled?`, it will return `true` 25% of the time.
 
 If you are not certain what percentages to use, simply use the following steps:
 
@@ -136,9 +137,8 @@ you run these 2 commands:
 /chatops run feature set some_feature 25
 ```
 
-Then `some_feature` will be enabled for 25% of the time the users are interacting with
-`gitlab-org/gitlab`. Note that the the feature is not enabled to 25%
-of the users, rather a simple randomization is made each time the `enabled?` is checked.
+Then `some_feature` will be enabled for both 25% of users and all users interacting with
+`gitlab-org/gitlab`.
 
 NOTE: **Note:**
 **Percentage of time** rollout is not a good idea if what you want is to make sure a feature
diff --git a/doc/development/integrations/secure.md b/doc/development/integrations/secure.md
index 8d5944c5de5..30d6c2ae754 100644
--- a/doc/development/integrations/secure.md
+++ b/doc/development/integrations/secure.md
@@ -80,7 +80,7 @@ See [GitLab CI/CD predefined variables](../../ci/variables/predefined_variables.
 
 Also, scanning jobs should be skipped when the corresponding variable prefixed with `_DISABLED` is present.
 See `DEPENDENCY_SCANNING_DISABLED`, `CONTAINER_SCANNING_DISABLED`, `SAST_DISABLED`, and `DAST_DISABLED`
-in [Auto DevOps documentation](../../topics/autodevops/index.md#disable-jobs).
+in [Auto DevOps documentation](../../topics/autodevops/customize.md#disable-jobs).
 
 Finally, SAST and Dependency Scanning job definitions should use
 `CI_PROJECT_REPOSITORY_LANGUAGES` (comma-separated list of values)