Add latest changes from gitlab-org/gitlab@master

3 files changed, 50 insertions, 51 deletions

diff --git a/doc/development/application_limits.md b/doc/development/application_limits.md
index 4d296451add..f96ed2e7f57 100644
--- a/doc/development/application_limits.md
+++ b/doc/development/application_limits.md
@@ -17,50 +17,50 @@ limits](https://about.gitlab.com/handbook/product/product-processes/#introducing
 
 ### Insert database plan limits
 
-In the `plan_limits` table, you have to create a new column and insert the
-limit values. It's recommended to create separate migration script files.
-
-1. Add new column to the `plan_limits` table with non-null default value
-   that represents desired limit, such as:
-
-  ```ruby
-  add_column(:plan_limits, :project_hooks, :integer, default: 100, null: false)
-  ```
-
-  NOTE: **Note:**
-  Plan limits entries set to `0` mean that limits are not
-  enabled. You should use this setting only in special and documented circumstances.
-
-1. (Optionally) Create the database migration that fine-tunes each level with
-    a desired limit using `create_or_update_plan_limit` migration helper, such as:
-
-  ```ruby
-  class InsertProjectHooksPlanLimits < ActiveRecord::Migration[5.2]
-    include Gitlab::Database::MigrationHelpers
-
-    DOWNTIME = false
-
-    def up
-      create_or_update_plan_limit('project_hooks', 'default', 0)
-      create_or_update_plan_limit('project_hooks', 'free', 10)
-      create_or_update_plan_limit('project_hooks', 'bronze', 20)
-      create_or_update_plan_limit('project_hooks', 'silver', 30)
-      create_or_update_plan_limit('project_hooks', 'gold', 100)
-    end
-
-    def down
-      create_or_update_plan_limit('project_hooks', 'default', 0)
-      create_or_update_plan_limit('project_hooks', 'free', 0)
-      create_or_update_plan_limit('project_hooks', 'bronze', 0)
-      create_or_update_plan_limit('project_hooks', 'silver', 0)
-      create_or_update_plan_limit('project_hooks', 'gold', 0)
-    end
-  end
-  ```
-
-NOTE: **Note:**
-Some plans exist only on GitLab.com. This will be no-op
-for plans that do not exist.
+In the `plan_limits` table, create a new column and insert the limit values.
+It's recommended to create two separate migration script files.
+
+1. Add a new column to the `plan_limits` table with non-null default value that
+   represents desired limit, such as:
+
+   ```ruby
+   add_column(:plan_limits, :project_hooks, :integer, default: 100, null: false)
+   ```
+
+   NOTE: **Note:**
+   Plan limits entries set to `0` mean that limits are not enabled. You should
+   use this setting only in special and documented circumstances.
+
+1. (Optionally) Create the database migration that fine-tunes each level with a
+   desired limit using `create_or_update_plan_limit` migration helper, such as:
+
+   ```ruby
+   class InsertProjectHooksPlanLimits < ActiveRecord::Migration[5.2]
+     include Gitlab::Database::MigrationHelpers
+
+     DOWNTIME = false
+
+     def up
+       create_or_update_plan_limit('project_hooks', 'default', 0)
+       create_or_update_plan_limit('project_hooks', 'free', 10)
+       create_or_update_plan_limit('project_hooks', 'bronze', 20)
+       create_or_update_plan_limit('project_hooks', 'silver', 30)
+       create_or_update_plan_limit('project_hooks', 'gold', 100)
+     end
+
+     def down
+       create_or_update_plan_limit('project_hooks', 'default', 0)
+       create_or_update_plan_limit('project_hooks', 'free', 0)
+       create_or_update_plan_limit('project_hooks', 'bronze', 0)
+       create_or_update_plan_limit('project_hooks', 'silver', 0)
+       create_or_update_plan_limit('project_hooks', 'gold', 0)
+     end
+   end
+   ```
+
+   NOTE: **Note:**
+   Some plans exist only on GitLab.com. This will be a no-op for plans
+   that do not exist.
 
 ### Plan limits validation
 
diff --git a/doc/development/documentation/feature_flags.md b/doc/development/documentation/feature_flags.md
index 7d6a99d1623..392f478273e 100644
--- a/doc/development/documentation/feature_flags.md
+++ b/doc/development/documentation/feature_flags.md
@@ -66,7 +66,7 @@ be enabled for a single project, and is not ready for production use:
 > - It's not recommended for production use.
 > - To use it in GitLab self-managed instances, ask a GitLab administrator to [enable it](#anchor-to-section). **(CORE ONLY)**
 
-CAUTION: **Caution:**
+CAUTION: **Warning:**
 This feature might not be available to you. Check the **version history** note above for details.
 
 (...Regular content goes here...)
@@ -125,7 +125,7 @@ use:
 > - It's recommended for production use.
 > - For GitLab self-managed instances, GitLab administrators can opt to [disable it](#anchor-to-section). **(CORE ONLY)**
 
-CAUTION: **Caution:**
+CAUTION: **Warning:**
 This feature might not be available to you. Check the **version history** note above for details.
 
 (...Regular content goes here...)
@@ -181,7 +181,7 @@ cannot be enabled for a single project, and is ready for production use:
 > - It's recommended for production use.
 > - For GitLab self-managed instances, GitLab administrators can opt to [disable it](#anchor-to-section). **(CORE ONLY)**
 
-CAUTION: **Caution:**
+CAUTION: **Warning:**
 This feature might not be available to you. Check the **version history** note above for details.
 
 (...Regular content goes here...)
@@ -254,7 +254,7 @@ be enabled by project, and is ready for production use:
 > - It's recommended for production use.
 > - For GitLab self-managed instances, GitLab administrators can opt to [disable it](#anchor-to-section). **(CORE ONLY)**
 
-CAUTION: **Caution:**
+CAUTION: **Warning:**
 This feature might not be available to you. Check the **version history** note above for details.
 
 (...Regular content goes here...)
diff --git a/doc/development/documentation/styleguide.md b/doc/development/documentation/styleguide.md
index 81f6ef43372..b099d589b0f 100644
--- a/doc/development/documentation/styleguide.md
+++ b/doc/development/documentation/styleguide.md
@@ -874,9 +874,8 @@ For other punctuation rules, please refer to the
   someone in the Merge Request.
 - [Avoid using symbols and special characters](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 information in a note, not in the
-  heading.
+- When possible, avoid including words that might change in the future. Changing
+  a heading changes its anchor URL, which affects other linked pages.
 - 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/product-categories/)
   for review.