Add latest changes from gitlab-org/gitlab@13-12-stable-eev13.12.0-rc42

1 files changed, 3 insertions, 3 deletions

diff --git a/doc/development/documentation/feature_flags.md b/doc/development/documentation/feature_flags.md
index 7dd02c44afa..7fa80e2d0f5 100644
--- a/doc/development/documentation/feature_flags.md
+++ b/doc/development/documentation/feature_flags.md
@@ -52,7 +52,7 @@ Include details of the feature flag in the documentation:
   [by-project information](#features-enabled-by-project). Otherwise,
   do not say anything about it.
 - Say whether it's recommended for production use.
-- Document how to enable and disable it.
+- Document how to enable and disable it, preferably at the end of the file.
 - Add a warning to the user saying that the feature might be disabled.
 
 For example, for a feature disabled by default, disabled on GitLab.com, cannot
@@ -110,7 +110,7 @@ default:
   [by-project information](#features-enabled-by-project). Otherwise,
   do not say anything about it.
 - Say whether it's recommended for production use.
-- Document how to disable and enable it.
+- Document how to disable and enable it, preferably at the end of the file.
 - Add a warning to the user saying that the feature might be disabled.
 
 For example, for a feature initially deployed disabled by default, that became
@@ -169,7 +169,7 @@ For features enabled by default:
   [by-project information](#features-enabled-by-project). Otherwise,
   do not say anything about it.
 - Say whether it's recommended for production use.
-- Document how to disable and enable it.
+- Document how to disable and enable it, preferably at the end of the file.
 - Add a warning to the user saying that the feature might be disabled.
 
 For example, for a feature enabled by default, enabled on GitLab.com, that