6 files changed, 34 insertions, 47 deletions
diff --git a/doc/user/project/milestones/burndown_and_burnup_charts.md b/doc/user/project/milestones/burndown_and_burnup_charts.md
index ae03be5fa0f..3e266d054be 100644
--- a/doc/user/project/milestones/burndown_and_burnup_charts.md
+++ b/doc/user/project/milestones/burndown_and_burnup_charts.md
@@ -2,7 +2,7 @@
 type: reference
 stage: Plan
 group: Project Management
-info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#designated-technical-writers
+info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#assignments
 ---
 
 # Burndown and burnup charts **(STARTER)**
@@ -66,7 +66,7 @@ and you follow this workflow:
 A burndown chart is available for every project or group milestone that has been attributed a **start
 date** and a **due date**.
 
-NOTE: **Note:**
+NOTE:
 You're able to [promote project](index.md#promoting-project-milestones-to-group-milestones) to group milestones and still see the **burndown chart** for them, respecting license limitations.
 
 The chart indicates the project's progress throughout that milestone (for issues assigned to it).
@@ -104,13 +104,7 @@ Reopened issues are considered as having been opened on the day after they were
 ## Burnup charts
 
 > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/6903) in [GitLab Starter](https://about.gitlab.com/pricing/) 13.6.
-> - It's [deployed behind a feature flag](../../feature_flags.md), enabled by default.
-> - It's enabled on GitLab.com.
-> - It's recommended for production use.
-> - For GitLab self-managed instances, GitLab administrators can opt to [disable it](#enable-or-disable-burnup-charts). **(STARTER ONLY)**
-
-CAUTION: **Warning:**
-This feature might not be available to you. Check the **version history** note above for details.
+> - [Feature flag removed](https://gitlab.com/gitlab-org/gitlab/-/issues/268350) in [GitLab Starter](https://about.gitlab.com/pricing/) 13.7.
 
 Burnup charts show the assigned and completed work for a milestone.
 
@@ -136,25 +130,6 @@ Burnup charts can show either the total number of issues or total weight for eac
 day of the milestone. Use the toggle above the charts to switch between total
 and weight.
 
-### Enable or disable burnup charts **(STARTER ONLY)**
-
-Burnup charts is under development but ready for production use.
-It is deployed behind a feature flag that is **enabled by default**.
-[GitLab administrators with access to the GitLab Rails console](../../../administration/feature_flags.md)
-can opt to disable it.
-
-To enable it:
-
-```ruby
-Feature.enable(:burnup_charts)
-```
-
-To disable it:
-
-```ruby
-Feature.disable(:burnup_charts)
-```
-
 <!-- ## Troubleshooting
 
 Include any troubleshooting steps that you can foresee. If you know beforehand what issues
diff --git a/doc/user/project/milestones/burndown_charts.md b/doc/user/project/milestones/burndown_charts.md
index 5d9e6b67bb8..2985e5da2ab 100644
--- a/doc/user/project/milestones/burndown_charts.md
+++ b/doc/user/project/milestones/burndown_charts.md
@@ -1,5 +1,8 @@
 ---
-redirect_to: './burndown_and_burnup_charts.md'
+redirect_to: 'burndown_and_burnup_charts.md'
 ---
 
 This document was moved to [another location](burndown_and_burnup_charts.md).
+
+<!-- This redirect file can be deleted after February 1, 2021. -->
+<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/#move-or-rename-a-page -->
diff --git a/doc/user/project/milestones/img/milestones_new_group_milestone.png b/doc/user/project/milestones/img/milestones_new_group_milestone.png
deleted file mode 100644
index 5bbe8e51f23..00000000000
--- a/doc/user/project/milestones/img/milestones_new_group_milestone.png
+++ /dev/null
diff --git a/doc/user/project/milestones/img/milestones_new_group_milestone_v13_5.png b/doc/user/project/milestones/img/milestones_new_group_milestone_v13_5.png
new file mode 100644
index 00000000000..a865221c5d7
--- /dev/null
+++ b/doc/user/project/milestones/img/milestones_new_group_milestone_v13_5.png
diff --git a/doc/user/project/milestones/img/milestones_new_project_milestone.png b/doc/user/project/milestones/img/milestones_new_project_milestone.png
index 2d0bdce542d..9207c9f1f7c 100644
--- a/doc/user/project/milestones/img/milestones_new_project_milestone.png
+++ b/doc/user/project/milestones/img/milestones_new_project_milestone.png
diff --git a/doc/user/project/milestones/index.md b/doc/user/project/milestones/index.md
index 9c47f15cb8f..acf32bb0f92 100644
--- a/doc/user/project/milestones/index.md
+++ b/doc/user/project/milestones/index.md
@@ -2,10 +2,10 @@
 type: index, reference
 stage: Plan
 group: Project Management
-info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#designated-technical-writers
+info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#assignments
 ---
 
-# Milestones
+# Milestones **(CORE)**
 
 Milestones in GitLab are a way to track issues and merge requests created to achieve a broader goal in a certain period of time.
 
@@ -27,7 +27,7 @@ Similarly, milestones can be used as releases. To do so:
 1. Set the milestone title to the version of your release, such as `Version 9.4`.
 1. Add an issue to your release by associating the desired milestone from the issue's right-hand sidebar.
 
-Additionally, you can integrate milestones with GitLab's [Releases feature](../releases/index.md#associate-milestones-with-a-release).
+Additionally, you can integrate milestones with the [Releases feature](../releases/index.md#associate-milestones-with-a-release).
 
 ## Project milestones and group milestones
 
@@ -46,14 +46,14 @@ For information about project and group milestones API, see:
 - [Project Milestones API](../../../api/milestones.md)
 - [Group Milestones API](../../../api/group_milestones.md)
 
-NOTE: **Note:**
-If you're in a group and click **Issues > Milestones**, you'll see group milestones and the milestones
-of projects in this group.
-If you're in a project and click **Issues > Milestones**, you'll only see this project's milestones.
+NOTE:
+If you're in a group and click **Issues > Milestones**, GitLab displays group milestones
+and the milestones of projects in this group.
+If you're in a project and click **Issues > Milestones**, GitLab displays only this project's milestones.
 
 ## Creating milestones
 
-NOTE: **Note:**
+NOTE:
 A permission level of [Developer or higher](../../permissions.md) is required to create milestones.
 
 ### New project milestone
@@ -76,11 +76,11 @@ To create a **group milestone**:
 1. Enter the title, an optional description, an optional start date, and an optional due date.
 1. Click **New milestone**.
 
-![New group milestone](img/milestones_new_group_milestone.png)
+![New group milestone](img/milestones_new_group_milestone_v13_5.png)
 
 ## Editing milestones
 
-NOTE: **Note:**
+NOTE:
 A permission level of [Developer or higher](../../permissions.md) is required to edit milestones.
 
 To edit a milestone:
@@ -93,12 +93,21 @@ You can delete a milestone by clicking the **Delete** button.
 
 ### Promoting project milestones to group milestones
 
-If you are expanding from a few projects to a larger number of projects within the same group, you may want to share the same milestone among multiple projects in the same group. If you previously created a project milestone and now want to make it available for other projects within the same group, you can promote it to a group milestone.
+If you are expanding the number of projects in a group, you might want to share the same milestones
+among this group's projects. You can also promote project milestones to group milestones in order to
+make them available to other projects in the same group.
 
-From the project milestone list page, you can promote a project milestone to a group milestone. This will merge all project milestones across all projects in this group with the same name into a single group milestones. All issues and merge requests that previously were assigned one of these project milestones will now be assigned the new group milestones. This action cannot be reversed and the changes are permanent.
+From the project milestone list page, you can promote a project milestone to a group milestone.
+This merges all project milestones across all projects in this group with the same name into a single
+group milestones. All issues and merge requests that were previously assigned to one of these project
+milestones is assigned the new group milestones. This action cannot be reversed and the changes are
+permanent.
 
-CAUTION: **Caution:**
-From GitLab 12.4 and earlier, some information is lost when you promote a project milestone to a group milestone. Not all features on the project milestone view are available on the group milestone view. If you promote a project milestone to a group milestone, you will lose these features. See [Milestone view](#milestone-view) to see which features are missing from the group milestone view.
+WARNING:
+From GitLab 12.4 and earlier, some information is lost when you promote a project milestone to a
+group milestone. Not all features on the project milestone view are available on the group milestone
+view. If you promote a project milestone to a group milestone, you lose these features. Visit
+[Milestone view](#milestone-view) to learn which features are missing from the group milestone view.
 
 ![Promote milestone](img/milestones_promote_milestone.png)
 
@@ -110,7 +119,7 @@ Every issue and merge request can be assigned a milestone. The milestones are vi
 
 ### Filtering in list pages
 
-From the project issue/merge request list pages and the group issue/merge request list pages, you can [filter](../../search/index.md#issues-and-merge-requests) by both group milestones and project milestones.
+From the project and group issue/merge request list pages, you can [filter](../../search/index.md#issues-and-merge-requests) by both group and project milestones.
 
 ### Filtering in issue boards
 
@@ -125,7 +134,7 @@ When filtering by milestone, in addition to choosing a specific project mileston
 
 - **None**: Show issues or merge requests with no assigned milestone.
 - **Any**: Show issues or merge requests that have an assigned milestone.
-- **Upcoming**: Show issues or merge requests that have been assigned the open milestone that has the next upcoming due date (i.e. nearest due date in the future).
+- **Upcoming**: Show issues or merge requests that have been assigned the open milestone and has the nearest due date in the future.
 - **Started**: Show issues or merge requests that have an open assigned milestone with a start date that is before today.
 
 ## Milestone view
@@ -148,13 +157,13 @@ There are also tabs below these that show the following:
 
 ### Project Burndown Charts **(STARTER)**
 
-For project milestones in [GitLab Starter](https://about.gitlab.com/pricing/), a [burndown chart](burndown_charts.md) is in the milestone view, showing the progress of completing a milestone.
+For project milestones in [GitLab Starter](https://about.gitlab.com/pricing/), a [burndown chart](burndown_and_burnup_charts.md) is in the milestone view, showing the progress of completing a milestone.
 
 ![burndown chart](img/burndown_chart_v13_6.png)
 
 ### Group Burndown Charts **(STARTER)**
 
-For group milestones in [GitLab Starter](https://about.gitlab.com/pricing/), a [burndown chart](burndown_charts.md) is in the milestone view, showing the progress of completing a milestone.
+For group milestones in [GitLab Starter](https://about.gitlab.com/pricing/), a [burndown chart](burndown_and_burnup_charts.md) is in the milestone view, showing the progress of completing a milestone.
 
 ### Milestone sidebar