diff --git a/typo3/sysext/core/Documentation/Changelog/10.2/Feature-88950-AddStoreSessionArgumentToWidgetViewHelpers.rst b/typo3/sysext/core/Documentation/Changelog/10.2/Feature-88950-AddStoreSessionArgumentToWidgetViewHelpers.rst
index 70d7f6182a1a5efdaf76b7e6fbb8c3f29b60b9fd..32d7d0a9196ae5742ca30fdc93fd35758b8f0833 100644
--- a/typo3/sysext/core/Documentation/Changelog/10.2/Feature-88950-AddStoreSessionArgumentToWidgetViewHelpers.rst
+++ b/typo3/sysext/core/Documentation/Changelog/10.2/Feature-88950-AddStoreSessionArgumentToWidgetViewHelpers.rst
@@ -1,5 +1,4 @@
 .. include:: /Includes.rst.txt
-.. highlight:: xml
 
 .. _feature-88950:
 
@@ -20,13 +19,17 @@ As this is not always a desired behaviour (gdpr),
 a boolean argument ``storeSession`` has been added to :php:`\TYPO3\CMS\Fluid\Core\Widget\AbstractWidgetViewHelper`,
 which defaults to true and can be used to disable session storage for this ViewHelper.
 
-This will automatically create a ``fe_typo_user`` cookie in the frontend::
+This will automatically create a ``fe_typo_user`` cookie in the frontend:
 
-   <f:widget.autocomplete for="name" objects="{posts}" searchProperty="author" />
+..  code-block:: html
 
-This will not create a cookie in frontend::
+    <f:widget.autocomplete for="name" objects="{posts}" searchProperty="author" />
 
-   <f:widget.autocomplete for="name" objects="{posts}" searchProperty="author" storeSession="false" />
+This will not create a cookie in frontend:
+
+..  code-block:: html
+
+    <f:widget.autocomplete for="name" objects="{posts}" searchProperty="author" storeSession="false" />
 
 Impact
 ======
diff --git a/typo3/sysext/core/Documentation/Changelog/10.3/Feature-88147-AddPossibilityToConfigureThePathToSitemapXslFile.rst b/typo3/sysext/core/Documentation/Changelog/10.3/Feature-88147-AddPossibilityToConfigureThePathToSitemapXslFile.rst
index 63900c89e43ffebeff05fe3a1be0a41ec2330938..6a1e3eacd95ee614fd205bfb71e1a0d5111b8183 100644
--- a/typo3/sysext/core/Documentation/Changelog/10.3/Feature-88147-AddPossibilityToConfigureThePathToSitemapXslFile.rst
+++ b/typo3/sysext/core/Documentation/Changelog/10.3/Feature-88147-AddPossibilityToConfigureThePathToSitemapXslFile.rst
@@ -1,7 +1,5 @@
 .. include:: /Includes.rst.txt
 
-.. highlight:: typoscript
-
 .. _feature-88147:
 
 ==========================================================================
@@ -15,17 +13,23 @@ Description
 
 The xsl file to create a layout for a XML sitemap can now be configured on three levels:
 
-1. for all sitemaps::
+1.  for all sitemaps:
+
+    ..  code-block:: typoscript
+
+        plugin.tx_seo.config.xslFile = EXT:myext/Resources/Public/CSS/mySite.xsl
+
+2.  for all sitemaps of a certain sitemapType:
 
-      plugin.tx_seo.config.xslFile = EXT:myext/Resources/Public/CSS/mySite.xsl
+    ..  code-block:: typoscript
 
-2. for all sitemaps of a certain sitemapType::
+        plugin.tx_seo.config.<sitemapType>.sitemaps.xslFile = EXT:myext/Resources/Public/CSS/mySite.xsl
 
-      plugin.tx_seo.config.<sitemapType>.sitemaps.xslFile = EXT:myext/Resources/Public/CSS/mySite.xsl
+3.  for a specific sitemap:
 
-3. for a specific sitemap::
+    ..  code-block:: typoscript
 
-      plugin.tx_seo.config.<sitemapType>.sitemaps.<sitemap>.config.xslFile = EXT:myext/Resources/Public/CSS/mySite.xsl
+        plugin.tx_seo.config.<sitemapType>.sitemaps.<sitemap>.config.xslFile = EXT:myext/Resources/Public/CSS/mySite.xsl
 
 Impact
 ======
diff --git a/typo3/sysext/core/Documentation/Changelog/9.5/Feature-86214-ImplementStaticRoutes.rst b/typo3/sysext/core/Documentation/Changelog/9.5/Feature-86214-ImplementStaticRoutes.rst
index 45fb62e5b74189595afc76d3c0cc6fcec9c52854..642e36599f27ede24829c8a5e3df5af21bdfd04f 100644
--- a/typo3/sysext/core/Documentation/Changelog/9.5/Feature-86214-ImplementStaticRoutes.rst
+++ b/typo3/sysext/core/Documentation/Changelog/9.5/Feature-86214-ImplementStaticRoutes.rst
@@ -1,5 +1,4 @@
 .. include:: /Includes.rst.txt
-.. highlight:: yaml
 
 .. _feature-86214:
 
@@ -37,15 +36,17 @@ StaticText
 The :yaml:`staticText` option allows to deliver simple text content. The text can be added through a text field directly in
 the site configuration. This is suitable for files like :file:`robots.txt` or :file:`humans.txt`.
 
-YAML Configuration Example::
+YAML Configuration Example:
 
-   route: robots.txt
-   type: staticText
-   content: |
-     Sitemap: https://example.com/sitemap.xml
-     User-agent: *
-     Allow: /
-     Disallow: /forbidden/
+..  code-block:: yaml
+
+    route: robots.txt
+    type: staticText
+    content: |
+      Sitemap: https://example.com/sitemap.xml
+      User-agent: *
+      Allow: /
+      Disallow: /forbidden/
 
 TYPO3 URL (t3://)
 -----------------
@@ -53,16 +54,18 @@ TYPO3 URL (t3://)
 The type :yaml:`uri` for TYPO3 URL provides the option to render either a file, page or url. Internally a request to the
 file or URL is done and its content delivered.
 
-YAML Configuration Examples::
+YAML Configuration Examples:
+
+..  code-block:: yaml
 
-   -
-     route: sitemap.xml
-     type: uri
-     source: 't3://page?uid=1&type=1533906435'
-   -
-     route: favicon.ico
-     type: uri
-     source: 't3://file?uid=77'
+    -
+      route: sitemap.xml
+      type: uri
+      source: 't3://page?uid=1&type=1533906435'
+    -
+      route: favicon.ico
+      type: uri
+      source: 't3://file?uid=77'
 
 
 Implementation
diff --git a/typo3/sysext/core/Documentation/Changelog/9.5/Feature-86365-RoutingEnhancersAndAspects.rst b/typo3/sysext/core/Documentation/Changelog/9.5/Feature-86365-RoutingEnhancersAndAspects.rst
index c6931f5d00ccfa36414fbc080550c11e609fd9a4..8fd0f116cc9a51b66424b3491ee3a5d91974a8ca 100644
--- a/typo3/sysext/core/Documentation/Changelog/9.5/Feature-86365-RoutingEnhancersAndAspects.rst
+++ b/typo3/sysext/core/Documentation/Changelog/9.5/Feature-86365-RoutingEnhancersAndAspects.rst
@@ -1,5 +1,4 @@
 .. include:: /Includes.rst.txt
-.. highlight:: yaml
 
 .. _feature-86365: