11 files changed, 35 insertions, 9 deletions
diff --git a/doc/user/project/milestones/burndown_and_burnup_charts.md b/doc/user/project/milestones/burndown_and_burnup_charts.md
index 327a52a05ab..ae03be5fa0f 100644
--- a/doc/user/project/milestones/burndown_and_burnup_charts.md
+++ b/doc/user/project/milestones/burndown_and_burnup_charts.md
@@ -9,18 +9,18 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 
 [Burndown](#burndown-charts) and [burnup](#burnup-charts) charts show the progress of completing a milestone.
 
-![burndown and burnup chart](img/burndown_and_burnup_charts_v13_5.png)
+![burndown and burnup chart](img/burndown_and_burnup_charts_v13_6.png)
 
 ## Burndown charts
 
 > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/1540) in [GitLab Starter](https://about.gitlab.com/pricing/) 9.1 for project milestones.
 > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/5354) in [GitLab Premium](https://about.gitlab.com/pricing/) 10.8 for group milestones.
 > - [Added](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/6495) to [GitLab Starter](https://about.gitlab.com/pricing/) 11.2 for group milestones.
-> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/6903) [fixed burndown charts](#fixed-burndown-charts) in [GitLab Starter](https://about.gitlab.com/pricing/) 13.5.
+> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/6903) [fixed burndown charts](#fixed-burndown-charts) in [GitLab Starter](https://about.gitlab.com/pricing/) 13.6.
 
 Burndown charts show the number of issues over the course of a milestone.
 
-![burndown chart](img/burndown_chart_v13_5.png)
+![burndown chart](img/burndown_chart_v13_6.png)
 
 At a glance, you see the current state for the completion a given milestone.
 Without them, you would have to organize the data from the milestone and plot it
@@ -81,12 +81,12 @@ cumulative value.
 
 ### Fixed burndown charts
 
-For milestones created before GitLab 13.5, burndown charts have an additional toggle to
+For milestones created before GitLab 13.6, burndown charts have an additional toggle to
 switch between Legacy and Fixed views.
 
 | Legacy | Fixed |
 | ----- | ----- |
-| ![Legacy burndown chart, ](img/burndown_chart_legacy_v13_5.png) | ![Fixed burndown chart, showing a jump when a lot of issues were added to the milestone](img/burndown_chart_fixed_v13_5.png) |
+| ![Legacy burndown chart](img/burndown_chart_legacy_v13_6.png) | ![Fixed burndown chart, showing a jump when a lot of issues were added to the milestone](img/burndown_chart_fixed_v13_6.png) |
 
 **Fixed burndown** charts track the full history of milestone activity, from its creation until the
 milestone expires. After the milestone due date passes, issues removed from the milestone no longer
@@ -103,11 +103,18 @@ 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.5.
+> - [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.
 
 Burnup charts show the assigned and completed work for a milestone.
 
-![burnup chart](img/burnup_chart_v13_5.png)
+![burnup chart](img/burnup_chart_v13_6.png)
 
 To view a project's burnup chart:
 
@@ -129,6 +136,25 @@ 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 5aa5534dd37..5d9e6b67bb8 100644
--- a/doc/user/project/milestones/burndown_charts.md
+++ b/doc/user/project/milestones/burndown_charts.md
@@ -2,4 +2,4 @@
 redirect_to: './burndown_and_burnup_charts.md'
 ---
 
-This document was moved to [another location](./burndown_and_burnup_charts.md).
+This document was moved to [another location](burndown_and_burnup_charts.md).
diff --git a/doc/user/project/milestones/img/burndown_and_burnup_charts_v13_5.png b/doc/user/project/milestones/img/burndown_and_burnup_charts_v13_6.png
index 8d6ba1d4fa7..8d6ba1d4fa7 100644
--- a/doc/user/project/milestones/img/burndown_and_burnup_charts_v13_5.png
+++ b/doc/user/project/milestones/img/burndown_and_burnup_charts_v13_6.png
diff --git a/doc/user/project/milestones/img/burndown_chart_fixed_v13_5.png b/doc/user/project/milestones/img/burndown_chart_fixed_v13_6.png
index a532bfeeca0..a532bfeeca0 100644
--- a/doc/user/project/milestones/img/burndown_chart_fixed_v13_5.png
+++ b/doc/user/project/milestones/img/burndown_chart_fixed_v13_6.png
diff --git a/doc/user/project/milestones/img/burndown_chart_legacy_v13_5.png b/doc/user/project/milestones/img/burndown_chart_legacy_v13_6.png
index 5824fc59ce5..5824fc59ce5 100644
--- a/doc/user/project/milestones/img/burndown_chart_legacy_v13_5.png
+++ b/doc/user/project/milestones/img/burndown_chart_legacy_v13_6.png
diff --git a/doc/user/project/milestones/img/burndown_chart_v13_5.png b/doc/user/project/milestones/img/burndown_chart_v13_6.png
index e06b24f9907..e06b24f9907 100644
--- a/doc/user/project/milestones/img/burndown_chart_v13_5.png
+++ b/doc/user/project/milestones/img/burndown_chart_v13_6.png
diff --git a/doc/user/project/milestones/img/burnup_chart_v13_5.png b/doc/user/project/milestones/img/burnup_chart_v13_6.png
index a850caba348..a850caba348 100644
--- a/doc/user/project/milestones/img/burnup_chart_v13_5.png
+++ b/doc/user/project/milestones/img/burnup_chart_v13_6.png
diff --git a/doc/user/project/milestones/img/milestones_new_group_milestone.png b/doc/user/project/milestones/img/milestones_new_group_milestone.png
index a517f0f7537..5bbe8e51f23 100644
--- a/doc/user/project/milestones/img/milestones_new_group_milestone.png
+++ b/doc/user/project/milestones/img/milestones_new_group_milestone.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 482c73f6568..2d0bdce542d 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/img/milestones_project_milestone_page.png b/doc/user/project/milestones/img/milestones_project_milestone_page.png
index c17bf350aeb..1faaf0b3979 100644
--- a/doc/user/project/milestones/img/milestones_project_milestone_page.png
+++ b/doc/user/project/milestones/img/milestones_project_milestone_page.png
diff --git a/doc/user/project/milestones/index.md b/doc/user/project/milestones/index.md
index 8cbed3de1c6..9c47f15cb8f 100644
--- a/doc/user/project/milestones/index.md
+++ b/doc/user/project/milestones/index.md
@@ -150,7 +150,7 @@ There are also tabs below these that show the following:
 
 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.
 
-![burndown chart](img/burndown_chart_v13_5.png)
+![burndown chart](img/burndown_chart_v13_6.png)
 
 ### Group Burndown Charts **(STARTER)**