diff --git a/content/communities/documenting-your-project-with-wikis/editing-wiki-content.md b/content/communities/documenting-your-project-with-wikis/editing-wiki-content.md
index a1b8206e12..f496dcf094 100644
--- a/content/communities/documenting-your-project-with-wikis/editing-wiki-content.md
+++ b/content/communities/documenting-your-project-with-wikis/editing-wiki-content.md
@@ -46,8 +46,8 @@ You can link to an image in a repository on {% data variables.product.product_na
 
     [[https://github.com/USERNAME/REPOSITORY/blob/main/img/octocat.png|alt=octocat]]
 
-{% ifversion math %}
-## Adding mathematical expressions{% ifversion mermaid %} and diagrams{% endif %}{% endif %}
+{% ifversion fpt or ghec or ghes > 3.6 or ghae > 3.6 %}
+## Adding mathematical expressions and diagrams{% endif %}
 
 {% data reusables.getting-started.math-and-diagrams %}
 
diff --git a/content/get-started/writing-on-github/working-with-advanced-formatting/creating-diagrams.md b/content/get-started/writing-on-github/working-with-advanced-formatting/creating-diagrams.md
index bcd9ed27f2..4b690277a2 100644
--- a/content/get-started/writing-on-github/working-with-advanced-formatting/creating-diagrams.md
+++ b/content/get-started/writing-on-github/working-with-advanced-formatting/creating-diagrams.md
@@ -8,7 +8,7 @@ shortTitle: Create diagrams
 
 ## About creating diagrams
 
-You can create diagrams in Markdown using three different syntaxes: mermaid, geoJSON and topoJSON, and ASCII STL. Diagram rendering is {% data reusables.getting-started.available-throughout %}
+You can create diagrams in Markdown using three different syntaxes: mermaid, geoJSON and topoJSON, and ASCII STL. Diagram rendering is available in {% data variables.product.prodname_github_issues %}, {% data variables.product.prodname_discussions %}, pull requests, wikis, and Markdown files.
 
 ## Creating Mermaid diagrams
 
diff --git a/content/get-started/writing-on-github/working-with-advanced-formatting/writing-mathematical-expressions.md b/content/get-started/writing-on-github/working-with-advanced-formatting/writing-mathematical-expressions.md
index 20360675b3..2a01789396 100644
--- a/content/get-started/writing-on-github/working-with-advanced-formatting/writing-mathematical-expressions.md
+++ b/content/get-started/writing-on-github/working-with-advanced-formatting/writing-mathematical-expressions.md
@@ -12,7 +12,7 @@ To enable clear communication of mathematical expressions, {% data variables.pro
 
 {% data variables.product.company_short %}'s math rendering capability uses MathJax; an open source, JavaScript-based display engine. MathJax supports a wide range of LaTeX macros, and several useful accessibility extensions. For more information, see [the MathJax documentation](http://docs.mathjax.org/en/latest/input/tex/index.html#tex-and-latex-support) and [the MathJax Accessibility Extensions Documentation](https://mathjax.github.io/MathJax-a11y/docs/#reader-guide).
 
-Mathematical expressions rendering is {% data reusables.getting-started.available-throughout %}
+Mathematical expressions rendering is available in {% data variables.product.prodname_github_issues %}, {% data variables.product.prodname_discussions %}, pull requests, {% ifversion fpt or ghec or ghes > 3.6 or ghae > 3.6 %}wikis, {% endif %}and Markdown files.
 
 ## Writing inline expressions
 
diff --git a/data/reusables/getting-started/available-throughout.md b/data/reusables/getting-started/available-throughout.md
deleted file mode 100644
index 3133e543e6..0000000000
--- a/data/reusables/getting-started/available-throughout.md
+++ /dev/null
@@ -1 +0,0 @@
-available in {% data variables.product.prodname_github_issues %}, {% data variables.product.prodname_discussions %}, pull requests, Markdown files, and wikis.
diff --git a/data/reusables/getting-started/math-and-diagrams.md b/data/reusables/getting-started/math-and-diagrams.md
index 12f17c6856..0b8fd102b4 100644
--- a/data/reusables/getting-started/math-and-diagrams.md
+++ b/data/reusables/getting-started/math-and-diagrams.md
@@ -1 +1 @@
-{% ifversion math %}You can use Markdown to add rendered math expressions{% ifversion mermaid %}, diagrams, maps, and 3D models{% endif %} to your wiki. For more information on creating rendered math expressions, see "[Writing mathematical expressions](/get-started/writing-on-github/working-with-advanced-formatting/writing-mathematical-expressions)."{% ifversion mermaid %} For more information on creating diagrams, maps and 3D models, see "[Creating diagrams](/get-started/writing-on-github/working-with-advanced-formatting/creating-diagrams)."{% endif %}{% endif %}
\ No newline at end of file
+{% ifversion mermaid %}You can use Markdown to add rendered math expressions, diagrams, maps, and 3D models to your wiki. For more information on creating rendered math expressions, see "[Writing mathematical expressions](/get-started/writing-on-github/working-with-advanced-formatting/writing-mathematical-expressions)." For more information on creating diagrams, maps and 3D models, see "[Creating diagrams](/get-started/writing-on-github/working-with-advanced-formatting/creating-diagrams)."{% endif %}
\ No newline at end of file