From f354e1ceb9fb91aac3608c4c43ede199ba767138 Mon Sep 17 00:00:00 2001
From: Marcel Amirault <mamirault@gitlab.com>
Date: Thu, 5 Dec 2024 11:23:51 +0000
Subject: [PATCH] Update feature flag notes in profile docs

---
 doc/user/profile/account/two_factor_authentication.md | 10 +++++++---
 doc/user/profile/comment_templates.md                 |  8 +++-----
 doc/user/profile/preferences.md                       |  2 +-
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/doc/user/profile/account/two_factor_authentication.md b/doc/user/profile/account/two_factor_authentication.md
index eef8aba1fbe8..bf72ae53ade1 100644
--- a/doc/user/profile/account/two_factor_authentication.md
+++ b/doc/user/profile/account/two_factor_authentication.md
@@ -91,6 +91,10 @@ in a safe place.
 
 ### Enable a one-time password authenticator using FortiAuthenticator
 
+DETAILS:
+**Offering:** Self-managed
+
+FLAG:
 On self-managed GitLab, by default this feature is not available. To make it available per user, an administrator can
 [enable the feature flag](../../../administration/feature_flags.md) named `forti_authenticator`.
 On GitLab.com and GitLab Dedicated, this feature is not available.
@@ -152,10 +156,10 @@ Configure FortiAuthenticator in GitLab. On your GitLab server:
 
 ### Enable a one-time password authenticator using Cisco Duo
 
-> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/15760) in GitLab 15.10.
+DETAILS:
+**Offering:** Self-managed
 
-FLAG:
-On self-managed GitLab, by default this feature is available. On GitLab.com this feature is not available.
+> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/15760) in GitLab 15.10.
 
 You can use Cisco Duo as an OTP provider in GitLab.
 
diff --git a/doc/user/profile/comment_templates.md b/doc/user/profile/comment_templates.md
index 4244c261e7ba..97ecd30735d5 100644
--- a/doc/user/profile/comment_templates.md
+++ b/doc/user/profile/comment_templates.md
@@ -17,13 +17,11 @@ DETAILS:
 > - Group-level saved replies [introduced](https://gitlab.com/groups/gitlab-org/-/epics/12669) in GitLab 16.11 [with a flag](../../administration/feature_flags.md) named `group_saved_replies_flag`. Disabled by default.
 > - Group-level saved replies [enabled](https://gitlab.com/gitlab-org/gitlab/-/issues/440817) on GitLab.com and self-managed in GitLab 16.11.
 > - Group-level saved replies [generally available](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/148958) in GitLab 17.0. Feature flag `group_saved_replies_flag` removed.
-> - Project-level saved replies [introduced](https://gitlab.com/groups/gitlab-org/-/epics/12669) in GitLab 17.0 [with a flag](../../administration/feature_flags.md) named `project_saved_replies_flag`. Disabled by default.
+> - Project-level saved replies [introduced](https://gitlab.com/groups/gitlab-org/-/epics/12669) in GitLab 17.0 [with a flag](../../administration/feature_flags.md) named `project_saved_replies_flag`. Enabled by default.
 
 FLAG:
-On self-managed GitLab, by default project-level saved replies are not available.
-To make them available, an administrator can [enable the feature flag](../../administration/feature_flags.md) named `project_saved_replies_flag`.
-On GitLab.com, this feature is available.
-On GitLab Dedicated, this feature is not available.
+The availability of Project-level saved replies is controlled by a feature flag.
+For more information, see the history.
 
 With comment templates, create and reuse text for any text area in:
 
diff --git a/doc/user/profile/preferences.md b/doc/user/profile/preferences.md
index 82e83c250356..96e317099314 100644
--- a/doc/user/profile/preferences.md
+++ b/doc/user/profile/preferences.md
@@ -89,7 +89,7 @@ To change the layout width of your UI:
 > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/419079) in GitLab 16.6 [with a flag](../../administration/feature_flags.md) named `ui_for_organizations`. Disabled by default.
 
 FLAG:
-On self-managed GitLab, by default this feature is not available. To make it available, an administrator can [enable the feature flag](../../administration/feature_flags.md) named `ui_for_organizations`.
+The availability of this feature is controlled by a feature flag. For more information, see the history.
 On GitLab.com and GitLab Dedicated, this feature is not available.
 This feature is not ready for production use.
 
-- 
GitLab