From aab8fc1e6b03714a1ffff0918d340405953caa56 Mon Sep 17 00:00:00 2001
From: Karl Kemister-Sheppard <karlkemistersheppard@gmail.com>
Date: Thu, 16 Nov 2023 10:49:58 +1000
Subject: [PATCH 1/6] DOC-2213: add CVE ref to 6.7.3 release notes. (#2983)

---
 modules/ROOT/pages/6.7.3-release-notes.adoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/ROOT/pages/6.7.3-release-notes.adoc b/modules/ROOT/pages/6.7.3-release-notes.adoc
index 07bae913ef..2f5f0d098b 100644
--- a/modules/ROOT/pages/6.7.3-release-notes.adoc
+++ b/modules/ROOT/pages/6.7.3-release-notes.adoc
@@ -32,7 +32,7 @@ This vulnerability has been patched in {productname} 6.7.3 by:
 * ensuring that any unescaped text nodes which contain the special internal marker are emptied before removing the marker from the rest of the HTML, and;
 * removing the special internal marker from content strings passed to `Editor.setContent`, `Editor.insertContent`, and `Editor.resetContent` APIs to prevent them from being loaded into the editor as user-provided content.
 
-CVE: pending.
+CVE: https://www.cve.org/CVERecord?id=CVE-2023-48219[CVE-2023-48219].
 
 GHSA: https://github.com/tinymce/tinymce/security/advisories/GHSA-v626-r774-j7f8[GitHub Advisory].
 

From d8c983897efe85ead30a5ff64dc4541d481a1cf6 Mon Sep 17 00:00:00 2001
From: Karl Kemister-Sheppard <karlkemistersheppard@gmail.com>
Date: Wed, 22 Nov 2023 21:35:31 +1000
Subject: [PATCH 2/6] DOC-2180: TinyMCE 6.8 Community docs release. (#2954)

* DOC-2180: added initial outline for 6.8-specific entrys to .

* DOC-2180: update changelog.adoc for 6.8 release notes.

* DOC-2180: updates to changelog.adoc for 6.8 community release.

* DOC-2180: updates to the changelog.adoc before community release.

* Update modules/ROOT/pages/changelog.adoc

* DOC-2180: api-version bump for tinymce community release 6.8.
---
 .api-version                                  |  2 +-
 changelog.md                                  |  1 +
 .../apis/tinymce.dom.stylesheetloader.adoc    | 33 ++++++++++++++-
 .../apis/tinymce.editor.ui.registry.adoc      |  8 ++--
 modules/ROOT/pages/changelog.adoc             | 42 +++++++++++++++++++
 5 files changed, 80 insertions(+), 6 deletions(-)

diff --git a/.api-version b/.api-version
index 8d81486efa..8a1c5c7e99 100644
--- a/.api-version
+++ b/.api-version
@@ -1 +1 @@
-6.7.3
\ No newline at end of file
+6.8.0
\ No newline at end of file
diff --git a/changelog.md b/changelog.md
index 578ce074af..62898c6619 100644
--- a/changelog.md
+++ b/changelog.md
@@ -6,6 +6,7 @@ The format is loosely based on [Keep a Changelog](https://keepachangelog.com/en/
 
 ### Unreleased
 
+- DOC-2180: Added 6.8-specific entry to `changelog.adoc`.
 
 ### 2023-11-15
 
diff --git a/modules/ROOT/pages/apis/tinymce.dom.stylesheetloader.adoc b/modules/ROOT/pages/apis/tinymce.dom.stylesheetloader.adoc
index add03c43dd..ece37a8086 100644
--- a/modules/ROOT/pages/apis/tinymce.dom.stylesheetloader.adoc
+++ b/modules/ROOT/pages/apis/tinymce.dom.stylesheetloader.adoc
@@ -1,7 +1,7 @@
 = tinymce.dom.StyleSheetLoader
 :navtitle: tinymce.dom.StyleSheetLoader
 :description: This class handles loading of external stylesheets and fires events when these are loaded.
-:keywords: load, loadAll, unload, unloadAll
+:keywords: load, loadAll, loadRawCss, unload, unloadAll, unloadRawCss
 :moxie-type: api
 
 This class handles loading of external stylesheets and fires events when these are loaded.
@@ -16,8 +16,10 @@ This class handles loading of external stylesheets and fires events when these a
 |Name|Summary|Defined by
 |xref:#load[load()]|Loads the specified CSS file and returns a Promise that will resolve when the stylesheet is loaded successfully or reject if it failed to load.|`xref:apis/tinymce.dom.stylesheetloader.adoc[StyleSheetLoader]`
 |xref:#loadAll[loadAll()]|Loads the specified CSS files and returns a Promise that is resolved when all stylesheets are loaded or rejected if any failed to load.|`xref:apis/tinymce.dom.stylesheetloader.adoc[StyleSheetLoader]`
+|xref:#loadRawCss[loadRawCss()]|Loads the specified css string in as a style element with an unique key.|`xref:apis/tinymce.dom.stylesheetloader.adoc[StyleSheetLoader]`
 |xref:#unload[unload()]|Unloads the specified CSS file if no resources currently depend on it.|`xref:apis/tinymce.dom.stylesheetloader.adoc[StyleSheetLoader]`
 |xref:#unloadAll[unloadAll()]|Unloads each specified CSS file if no resources currently depend on it.|`xref:apis/tinymce.dom.stylesheetloader.adoc[StyleSheetLoader]`
+|xref:#unloadRawCss[unloadRawCss()]|Unloads the specified CSS style element by key.|`xref:apis/tinymce.dom.stylesheetloader.adoc[StyleSheetLoader]`
 |===
 
 [[methods]]
@@ -59,6 +61,21 @@ Loads the specified CSS files and returns a Promise that is resolved when all st
 
 '''
 
+[[loadRawCss]]
+=== loadRawCss()
+[source, javascript]
+----
+loadRawCss(key: String, css: String)
+----
+Loads the specified css string in as a style element with an unique key.
+
+==== Parameters
+
+* `key (String)` - Unique key for the style element.
+* `css (String)` - Css style content to add.
+
+'''
+
 [[unload]]
 === unload()
 [source, javascript]
@@ -86,3 +103,17 @@ Unloads each specified CSS file if no resources currently depend on it.
 * `urls (Array)` - URLs to unload or remove.
 
 '''
+
+[[unloadRawCss]]
+=== unloadRawCss()
+[source, javascript]
+----
+unloadRawCss(key: String)
+----
+Unloads the specified CSS style element by key.
+
+==== Parameters
+
+* `key (String)` - Key of CSS style resource to unload.
+
+'''
diff --git a/modules/ROOT/pages/apis/tinymce.editor.ui.registry.adoc b/modules/ROOT/pages/apis/tinymce.editor.ui.registry.adoc
index b7e82e33fc..5f6f0299e8 100644
--- a/modules/ROOT/pages/apis/tinymce.editor.ui.registry.adoc
+++ b/modules/ROOT/pages/apis/tinymce.editor.ui.registry.adoc
@@ -50,8 +50,8 @@ clicked.
 For information on creating a group toolbar button, see:
 link:https://www.tiny.cloud/docs/tinymce/6/custom-group-toolbar-button/[
 UI Components - Types of toolbar buttons: Group toolbar button].|`xref:apis/tinymce.editor.ui.registry.adoc[Registry]`
-|xref:#addIcon[addIcon()]|Registers a new SVG icon, the icon name reference can be configured by any
-TinyMCE 5 Ui components that can display an icon. The icon is only available
+|xref:#addIcon[addIcon()]|Registers a new SVG icon. The icon name reference can be configured by any
+TinyMCE UI components that can display an icon. The icon is only available
 to the editor instance it was configured for.|`xref:apis/tinymce.editor.ui.registry.adoc[Registry]`
 |xref:#addMenuButton[addMenuButton()]|Registers a new menu button. Adds a toolbar button that opens a menu when
 clicked. The menu can be populated by items created by addMenuItem,
@@ -234,8 +234,8 @@ UI Components - Types of toolbar buttons: Group toolbar button].
 ----
 addIcon(name: String, svgData: String)
 ----
-Registers a new SVG icon, the icon name reference can be configured by any
-TinyMCE 5 Ui components that can display an icon. The icon is only available
+Registers a new SVG icon. The icon name reference can be configured by any
+TinyMCE UI components that can display an icon. The icon is only available
 to the editor instance it was configured for.
 
 ==== Examples
diff --git a/modules/ROOT/pages/changelog.adoc b/modules/ROOT/pages/changelog.adoc
index 6b216bf085..0d7af24169 100644
--- a/modules/ROOT/pages/changelog.adoc
+++ b/modules/ROOT/pages/changelog.adoc
@@ -4,6 +4,48 @@
 
 NOTE: This is the {productname} Community version changelog. For information about the latest {cloudname} or {enterpriseversion} Release, see: xref:release-notes.adoc[{productname} Release Notes].
 
+== 6.8 - 2023-11-22
+
+== Added
+* CSS files are now also generated as separate JS files to improve bundling of all resources.
+* Added new StylesheetLoader.loadRawCss API that can be used to load CSS into a style element.
+* Added new StylesheetLoader.unloadRawCss API that can be used to unload CSS that was loaded into a style element.
+* Added force_hex_color editor option. Option 'always' converts all RGB & RGBA colours to hex, 'rgb_only' will only convert RGB and not RGBA colours to hex, 'off' won't convert any colours to hex.
+* Added default_font_stack editor option that makes it possible to define what is considered a system font stack.
+* New `sandbox_iframes` option that controls whether iframe elements will be added a `sandbox=""` attribute to mitigate malicious intent.
+* New `convert_unsafe_embeds` option that controls whether `<object>` and `<embed>` elements will be converted to more restrictive alternatives, namely `<img>` for image MIME types, `<video>` for video MIME types, `<audio>` audio MIME types, or `<iframe>` for other or unspecified MIME types.
+
+== Improved
+* Improved the tooltips of picker buttons for the urlinput components in the "Insert/Edit Image" and "Insert/Edit Link" dialogs.
+* Inline dialog will now respect `size: 'large'` argument in the dialog spec.
+* Bespoke dropdown toolbar buttons including `align`, `fontfamily`, `fontsize`, `blocks`, and `styles` did not include their visible text labels in their accessible names.
+
+== Fixed
+* Editor would convert urls that are not http/s or relative resulting in broken links.
+* Calling the `setProgressState` API would cause the window to be scrolled when the editor wasn't fully visible.
+* Applying heading formatting to the content of the `summary` element extended its application to the content of the parent details element.
+* Setting the content with an attribute that contains a self-closing HTML tag did not preserve the tag.
+* Screen readers now announce the selected color of `forecolor` and `backcolor` buttons.
+* Resize handles would not appear on editable images in a non-editable context.
+* Corrections and copy-edits to the `addIcon` API documentation.
+* The dialog size was not updated when the `size` argument was changed when redialing a dialog.
+* Toggling a list that contains an LI element having another list as its first child would remove the remaining content within that LI element.
+* Custom block element wasn't considered block element in some cases.
+* The editor no longer forcefully takes focus when a notification closes while the focus is outside of the editor.
+* An empty element with a `contenteditable="true"` attribute within a table cell would not be treated as content and get removed if backspace or delete was being pressed.
+* Removing an LI element containing a `details` element would incorrectly merge its content.
+* The function `getModifierState` did not work on events passed through the editor as expected.
+* Search and replace plugin would incorrectly find matching text inside non-editable root elements.
+* Removed use of `async` for editor rendering which caused visual blinking when reloading the editor in-place.
+* Toggling off one format on the caret when multiple formats was toggled on would toggle all of them off.
+* Merging an external `p` inside a `list` via delete or backspace would incorrectly try to move a parent element inside a child element.
+* Directionality would not be consistently applied to the entire accordion block.
+* The `fontsizeinput` toolbar item was causing console warnings when toolbar items were clicked.
+* Menubar buttons with more than one word would sometimes wrap into two lines.
+* Creating a new `li` via enter inside a nested list would not inherit styles from the source `li`.
+* Screen readers now announce the active autocompleter item.
+* Dialog collection items would not display any icons chosen from icon pack.
+
 == 6.7.3 - 2023-11-15
 
 ### Changed

From 300df169abf5cfe7da2e7a5080a1d91d9468fff3 Mon Sep 17 00:00:00 2001
From: Karl Kemister-Sheppard <karlkemistersheppard@gmail.com>
Date: Wed, 22 Nov 2023 22:19:43 +1000
Subject: [PATCH 3/6] DOC-2219: TinyMCE 6.8 community release typo and
 corrections. (#3000)

---
 changelog.md                      |  3 +++
 modules/ROOT/pages/changelog.adoc | 14 +++++++-------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/changelog.md b/changelog.md
index 62898c6619..4da1d4e101 100644
--- a/changelog.md
+++ b/changelog.md
@@ -6,6 +6,9 @@ The format is loosely based on [Keep a Changelog](https://keepachangelog.com/en/
 
 ### Unreleased
 
+
+### 2023-11-22
+
 - DOC-2180: Added 6.8-specific entry to `changelog.adoc`.
 
 ### 2023-11-15
diff --git a/modules/ROOT/pages/changelog.adoc b/modules/ROOT/pages/changelog.adoc
index 0d7af24169..969b6f9d82 100644
--- a/modules/ROOT/pages/changelog.adoc
+++ b/modules/ROOT/pages/changelog.adoc
@@ -4,23 +4,23 @@
 
 NOTE: This is the {productname} Community version changelog. For information about the latest {cloudname} or {enterpriseversion} Release, see: xref:release-notes.adoc[{productname} Release Notes].
 
-== 6.8 - 2023-11-22
+== 6.8.0 - 2023-11-22
 
-== Added
+=== Added
 * CSS files are now also generated as separate JS files to improve bundling of all resources.
 * Added new StylesheetLoader.loadRawCss API that can be used to load CSS into a style element.
 * Added new StylesheetLoader.unloadRawCss API that can be used to unload CSS that was loaded into a style element.
-* Added force_hex_color editor option. Option 'always' converts all RGB & RGBA colours to hex, 'rgb_only' will only convert RGB and not RGBA colours to hex, 'off' won't convert any colours to hex.
+* Added force_hex_color editor option. Option 'always' converts all RGB & RGBA colors to hex, 'rgb_only' will only convert RGB and not RGBA colors to hex, 'off' won't convert any colors to hex.
 * Added default_font_stack editor option that makes it possible to define what is considered a system font stack.
 * New `sandbox_iframes` option that controls whether iframe elements will be added a `sandbox=""` attribute to mitigate malicious intent.
 * New `convert_unsafe_embeds` option that controls whether `<object>` and `<embed>` elements will be converted to more restrictive alternatives, namely `<img>` for image MIME types, `<video>` for video MIME types, `<audio>` audio MIME types, or `<iframe>` for other or unspecified MIME types.
 
-== Improved
+=== Improved
 * Improved the tooltips of picker buttons for the urlinput components in the "Insert/Edit Image" and "Insert/Edit Link" dialogs.
 * Inline dialog will now respect `size: 'large'` argument in the dialog spec.
 * Bespoke dropdown toolbar buttons including `align`, `fontfamily`, `fontsize`, `blocks`, and `styles` did not include their visible text labels in their accessible names.
 
-== Fixed
+=== Fixed
 * Editor would convert urls that are not http/s or relative resulting in broken links.
 * Calling the `setProgressState` API would cause the window to be scrolled when the editor wasn't fully visible.
 * Applying heading formatting to the content of the `summary` element extended its application to the content of the parent details element.
@@ -48,11 +48,11 @@ NOTE: This is the {productname} Community version changelog. For information abo
 
 == 6.7.3 - 2023-11-15
 
-### Changed
+=== Changed
 * Zero width no-break space (U+FEFF) characters are removed from content passed to `setContent`, `insertContent`, and `resetContent` APIs.
 * Zero width no-break space (U+FEFF) characters in initial content are not loaded into the editor upon initialization.
 
-### Fixed
+=== Fixed
 * Specific HTML content containing unescaped text nodes caused mXSS when using undo/redo.
 * Specific HTML content containing unescaped text nodes caused mXSS when using the `getContent` and `setContent` APIs with the `format: 'raw'` option, which also affected the `resetContent` API and the draft restoration feature of the Autosave plugin.
 

From 5582eff8231b0df7c2752b8ae71a95dd1f2c2e69 Mon Sep 17 00:00:00 2001
From: Karl Kemister-Sheppard <karlkemistersheppard@gmail.com>
Date: Wed, 29 Nov 2023 17:56:25 +1000
Subject: [PATCH 4/6] DOC-2221: add new notification messages to
 `cloud-troubleshooting.adoc` file. (#3016)

* DOC-2221: add new notification messages to  file.

* Update modules/ROOT/pages/cloud-troubleshooting.adoc

* Update modules/ROOT/pages/cloud-troubleshooting.adoc

* Update modules/ROOT/pages/cloud-troubleshooting.adoc

* Update modules/ROOT/pages/cloud-troubleshooting.adoc

* Update modules/ROOT/pages/cloud-troubleshooting.adoc

* Update modules/ROOT/pages/cloud-troubleshooting.adoc
---
 changelog.md                                  |  1 +
 modules/ROOT/pages/cloud-troubleshooting.adoc | 12 ++++++------
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/changelog.md b/changelog.md
index 4da1d4e101..3b8d737083 100644
--- a/changelog.md
+++ b/changelog.md
@@ -6,6 +6,7 @@ The format is loosely based on [Keep a Changelog](https://keepachangelog.com/en/
 
 ### Unreleased
 
+- DOC-2221: add new notification messages to `cloud-troubleshooting.adoc` file.
 
 ### 2023-11-22
 
diff --git a/modules/ROOT/pages/cloud-troubleshooting.adoc b/modules/ROOT/pages/cloud-troubleshooting.adoc
index 00642e0e64..ed2d0c162f 100644
--- a/modules/ROOT/pages/cloud-troubleshooting.adoc
+++ b/modules/ROOT/pages/cloud-troubleshooting.adoc
@@ -7,8 +7,8 @@ When {cloudname} detects a problem, it will show an editor notification containi
 
 NOTE: The wording of the notifications shown here may differ from the actual notifications from {cloudname}.
 
-[[this-domain-is-not-registered-with-tiny-cloud-please-see-the-quick-start-guide-or-create-an-account]]
-== "This domain is not registered with Tiny Cloud. Please see the quick start guide or create an account."
+[[A-valid-API-key-is-required-starting-2024-to-continue-using-TinyMCE.-Please-alert-your-admin-to-sign-up-to-get-your-free-API-key.]]
+== "A valid API key is required, starting 2024, to continue using TinyMCE. Please alert your admin to sign-up to get your free API key."
 
 === Cause
 
@@ -35,8 +35,8 @@ Update the `+src+` URL to include your (website or application developer's) {clo
 
 To retrieve your API key, or to sign up for an API key, visit: link:{accountsignup}/[{cloudname}].
 
-[[the-api-key-you-have-entered-is-invalid-please-review-your-api-key]]
-== "The API key you have entered is invalid. Please review your API key."
+[[A-valid-API-key-is-required-starting-2024-to-continue-using-TinyMCE.-Please-alert-your-admin-to-check-the-current-API-key]]
+== "A valid API key is required, starting 2024, to continue using TinyMCE. Please alert your admin to check the current API key."
 
 === Cause
 
@@ -56,8 +56,8 @@ Check the `+apiKey+` provided in the script tag:
 * Any other characters that are not in your API key. If you are using variable substitution, ensure that the variable is substituting properly.
 * Matches the API key shown at {accountpageurl}.
 
-[[this-domain-is-not-registered-with-tiny-cloud-please-review-your-approved-domains]]
-== "This domain is not registered with Tiny Cloud. Please review your approved domains."
+[[This-domain-is-not-registered-with-Tiny-Cloud.-To-continue-using-TinyMCE-a-registered-domain-is-required-starting-2024.-Please-alert-your-admin-to-review-the-approved-domains-and-add-this-one-if-required.]]
+== "This domain is not registered with Tiny Cloud. To continue using TinyMCE, a registered domain is required, starting 2024. Please alert your admin to review the approved domains and add this one if required."
 
 === Cause
 

From f82d6f20ee25fa4caceba3408dbe796c2bdac6f5 Mon Sep 17 00:00:00 2001
From: Karl Kemister-Sheppard <karlkemistersheppard@gmail.com>
Date: Wed, 29 Nov 2023 19:49:00 +1000
Subject: [PATCH 5/6] DOC-2223: TinyMCE 6.8.1 community release. (#3013)

* DOC-2223: TinyMCE 6.8.1 community release specific entries.

* Update changelog.md

* Update modules/ROOT/pages/changelog.adoc

* DOC-2223: api-version bump for tinymce 6.8.1 community rc.
---
 .api-version                      | 2 +-
 changelog.md                      | 4 ++++
 modules/ROOT/pages/changelog.adoc | 9 +++++++++
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/.api-version b/.api-version
index 8a1c5c7e99..23863d3def 100644
--- a/.api-version
+++ b/.api-version
@@ -1 +1 @@
-6.8.0
\ No newline at end of file
+6.8.1
\ No newline at end of file
diff --git a/changelog.md b/changelog.md
index 3b8d737083..707edabc7a 100644
--- a/changelog.md
+++ b/changelog.md
@@ -6,6 +6,10 @@ The format is loosely based on [Keep a Changelog](https://keepachangelog.com/en/
 
 ### Unreleased
 
+
+### 2023-11-29
+
+- DOC-2223: Added 6.8.1-specific entry to `changelog.adoc`.
 - DOC-2221: add new notification messages to `cloud-troubleshooting.adoc` file.
 
 ### 2023-11-22
diff --git a/modules/ROOT/pages/changelog.adoc b/modules/ROOT/pages/changelog.adoc
index 969b6f9d82..ec949812f4 100644
--- a/modules/ROOT/pages/changelog.adoc
+++ b/modules/ROOT/pages/changelog.adoc
@@ -4,6 +4,15 @@
 
 NOTE: This is the {productname} Community version changelog. For information about the latest {cloudname} or {enterpriseversion} Release, see: xref:release-notes.adoc[{productname} Release Notes].
 
+== 6.8.1 - 2023-11-29
+
+=== Improved
+* Colorpicker now includes the Brightness/Saturation selector and hue slider in the keyboard navigable items.
+
+=== Fixed
+* The functions `schema.isWrapper` and `schema.isInline` did not exclude node names that started with `#` which should not be considered as elements. 
+* Translation syntax for announcement text in the table grid was incorrectly formatted.
+
 == 6.8.0 - 2023-11-22
 
 === Added

From 413502b4f248dc6638c9ac336ad4abaa6ed42518 Mon Sep 17 00:00:00 2001
From: Mitchell Crompton <mitchell.crompton@tiny.cloud>
Date: Thu, 30 Nov 2023 10:15:30 +1000
Subject: [PATCH 6/6] DOC-2222: Fix broken mergetags in demos, warnings and
 errors (#3015)

* DOC-2222: Fix warnings, errors, and broken strings

* DOC-2222: Fix missing merge tags in demos

* DOC-2222: Add clipboard variable

* DOC-2222: Replace escaped braces with variables

* DOC-2222: Fix comment
---
 antora.yml                                       |  3 +++
 .../advtemplate-insertionpoint/index.html        | 16 ++++++++--------
 .../advtemplate-insertionpoint/index.js          |  6 +++---
 .../live-demos/advtemplate-predefined/index.js   | 14 +++++++-------
 .../examples/live-demos/advtemplate/index.js     | 14 +++++++-------
 modules/ROOT/pages/6.3-release-notes.adoc        |  3 +--
 modules/ROOT/pages/6.7-release-notes.adoc        |  2 +-
 modules/ROOT/pages/6.7.2-release-notes.adoc      |  8 ++++----
 modules/ROOT/pages/accordion.adoc                |  2 +-
 modules/ROOT/pages/ai-proxy.adoc                 |  2 +-
 modules/ROOT/pages/ai.adoc                       |  1 -
 .../pages/full-featured-open-source-demo.adoc    |  1 +
 .../ROOT/pages/full-featured-premium-demo.adoc   |  1 +
 .../configuration/dialog_persistent.adoc         |  2 +-
 .../release-notes/6.0-release-notes-apis.adoc    |  2 +-
 .../release-notes/6.0-release-notes-summary.adoc | 14 ++++++--------
 16 files changed, 46 insertions(+), 45 deletions(-)

diff --git a/antora.yml b/antora.yml
index c0d639c94a..7011a9243e 100644
--- a/antora.yml
+++ b/antora.yml
@@ -63,6 +63,9 @@ asciidoc:
     newline: '<br>'
     virt_ellps: '&#8942;'
     ellps: '&#133;'
+    # Prevent Mergetags becoming variables
+    prefix: '{{'
+    suffix: '}}'
     # Demo logos
     logofordemos: 'https://www.tiny.cloud/docs/images/logos/android-chrome-256x256.png'
     logofordemoshtml: '<p><img style="display: block; margin-left: auto; margin-right: auto;" title="Tiny Logo" src="https://www.tiny.cloud/docs/images/logos/android-chrome-256x256.png" alt="TinyMCE Logo" width="128" height="128"></p>'
diff --git a/modules/ROOT/examples/live-demos/advtemplate-insertionpoint/index.html b/modules/ROOT/examples/live-demos/advtemplate-insertionpoint/index.html
index 99a1c87c55..0d479350c3 100644
--- a/modules/ROOT/examples/live-demos/advtemplate-insertionpoint/index.html
+++ b/modules/ROOT/examples/live-demos/advtemplate-insertionpoint/index.html
@@ -11,10 +11,10 @@ <h4>To insert a template</h4>
   Select the template to add to the TinyMCE document from the <strong>Templates</strong> dialog that presents.
     <ol>
       <li>
-      Click the <strong>Without an insertion point marker</strong> category to see and select a template that does not use the <code>{{mce-cursor}}</code> insertion point marker.
+      Click the <strong>Without an insertion point marker</strong> category to see and select a template that does not use the <code>{{prefix}}mce-cursor{{suffix}}</code> insertion point marker.
       </li>
       <li>
-      Click the <strong>With an insertion point marker</strong> category to see and select a template that does use the <code>{{mce-cursor}}</code> insertion point marker.
+      Click the <strong>With an insertion point marker</strong> category to see and select a template that does use the <code>{{prefix}}mce-cursor{{suffix}}</code> insertion point marker.
       </li>
     </ol>
   </li>
@@ -23,21 +23,21 @@ <h4>To insert a template</h4>
 
 <h4>Noting the difference</h4>
 
-<p>The <em>Name entry prompt</em> template without the <code>{{mce-cursor}}</code> insertion point marker, places the insertion point at the end of the template text.</p>
+<p>The <em>Name entry prompt</em> template without the <code>{{prefix}}mce-cursor{{suffix}}</code> insertion point marker, places the insertion point at the end of the template text.</p>
 
-<p>By contrast, the <em>Name entry prompt</em> template with the <code>{{mce-cursor}}</code> insertion point marker places the insertion point at the right spot for someone to enter their name, as requested.</p>
+<p>By contrast, the <em>Name entry prompt</em> template with the <code>{{prefix}}mce-cursor{{suffix}}</code> insertion point marker places the insertion point at the right spot for someone to enter their name, as requested.</p>
 
-<p>Similarly, the <em>Letter outline</em> template without the <code>{{mce-cursor}}</code> insertion point marker, places the insertion point at the end of the template text.</p>
+<p>Similarly, the <em>Letter outline</em> template without the <code>{{prefix}}mce-cursor{{suffix}}</code> insertion point marker, places the insertion point at the end of the template text.</p>
 
-<p>And, by equivalent contrast, the <em>Letter outline</em> template with the <code>{{mce-cursor}}</code> insertion point marker places the insertion point at the right spot for someone to start writing a letter.</p>
+<p>And, by equivalent contrast, the <em>Letter outline</em> template with the <code>{{prefix}}mce-cursor{{suffix}}</code> insertion point marker places the insertion point at the right spot for someone to start writing a letter.</p>
 
 <h4>Working with Merge Tags</h4>
 
-<p>The second pre-defined template in this demonstration — the <em>Letter outline</em> template — shows the <code>{{mce-cursor}}</code> string working in conjunction with the <a href="https://tiny.cloud/docs/tinymce/6/mergetags/">Merge Tags</a> Premium plugin.</p>
+<p>The second pre-defined template in this demonstration — the <em>Letter outline</em> template — shows the <code>{{prefix}}mce-cursor{{suffix}}</code> string working in conjunction with the <a href="https://tiny.cloud/docs/tinymce/6/mergetags/">Merge Tags</a> Premium plugin.</p>
 
 <p>The fixed string that is the Insertion Point Marker uses the same delimiting characters as are used by default by the Merge Tags plugin.</p>
 
-<p>The <strong>Merge Tags</strong> plugin knows nothing about the <code>{{mce-cursor}}</code> being a marker string for the <strong>Advanced Templates</strong> plugin. And, if this particular string was used in a Merge Tags configuration, the <strong>Merge Tags</strong> plugin would recognise it and substitute it with whatever contents it was set to substitute, as expected.
+<p>The <strong>Merge Tags</strong> plugin knows nothing about the <code>{{prefix}}mce-cursor{{suffix}}</code> being a marker string for the <strong>Advanced Templates</strong> plugin. And, if this particular string was used in a Merge Tags configuration, the <strong>Merge Tags</strong> plugin would recognise it and substitute it with whatever contents it was set to substitute, as expected.
 
 <p>The <strong>Advanced Templates</strong> plugin removes the Insertion Point Marker before inserting a template containing the string in to a TinyMCE instance, however.</p>
 
diff --git a/modules/ROOT/examples/live-demos/advtemplate-insertionpoint/index.js b/modules/ROOT/examples/live-demos/advtemplate-insertionpoint/index.js
index 37cc14d08c..425c41a3fa 100644
--- a/modules/ROOT/examples/live-demos/advtemplate-insertionpoint/index.js
+++ b/modules/ROOT/examples/live-demos/advtemplate-insertionpoint/index.js
@@ -12,7 +12,7 @@ tinymce.init({
         },
         {
           title: 'Letter outline',
-          content: '<p>{{Current.Date}}</p><p>{{Honorific}} {{Person.Name.Last}},</p><p></p><p>&nbsp;</p><p>Regards,</p><p>{{staff.digital.signature}}</p><p>{{Staff.Name}}</p><p>{{Staff.Email}}</p>'
+          content: '<p>{{prefix}}Current.Date{{suffix}}</p><p>{{prefix}}Honorific{{suffix}} {{prefix}}Person.Name.Last{{suffix}},</p><p></p><p>&nbsp;</p><p>Regards,</p><p>{{prefix}}staff.digital.signature{{suffix}}</p><p>{{prefix}}Staff.Name{{suffix}}</p><p>{{prefix}}Staff.Email{{suffix}}</p>'
         },
       ],
     },
@@ -21,11 +21,11 @@ tinymce.init({
       items: [
         {
           title: 'Name entry prompt',
-          content: '<p><strong>Enter your name:</strong>{{mce-cursor}}</p><p><em>Include both your given and family names, in your preferred order.</em></p>'
+          content: '<p><strong>Enter your name:</strong>{{prefix}}mce-cursor{{suffix}}</p><p><em>Include both your given and family names, in your preferred order.</em></p>'
         },
         {
           title: 'Letter outline',
-          content: '<p>{{Current.Date}}</p><p>{{Honorific}} {{Person.Name.Last}},</p><p>{{mce-cursor}}&nbsp;</p><p>Regards,</p><p>{{staff.digital.signature}}</p><p>{{Staff.Name}}</p><p>{{Staff.Email}}</p>'
+          content: '<p>{{prefix}}Current.Date{{suffix}}</p><p>{{prefix}}Honorific{{suffix}} {{prefix}}Person.Name.Last{{suffix}},</p><p>{{prefix}}mce-cursor{{suffix}}&nbsp;</p><p>Regards,</p><p>{{prefix}}staff.digital.signature{{suffix}}</p><p>{{prefix}}Staff.Name{{suffix}}</p><p>{{prefix}}Staff.Email{{suffix}}</p>'
         },
       ],
     },
diff --git a/modules/ROOT/examples/live-demos/advtemplate-predefined/index.js b/modules/ROOT/examples/live-demos/advtemplate-predefined/index.js
index a17ea7a912..8898bd5216 100644
--- a/modules/ROOT/examples/live-demos/advtemplate-predefined/index.js
+++ b/modules/ROOT/examples/live-demos/advtemplate-predefined/index.js
@@ -4,15 +4,15 @@ const advtemplate_templates = [
     items: [
       {
         title: 'Message received',
-        content: '<p dir="ltr">Hey {{Customer.FirstName}}!</p>\n<p dir="ltr">Just a quick note to say we&rsquo;ve received your message, and will get back to you within 48 hours.</p>\n<p dir="ltr">For reference, your ticket number is: {{Ticket.Number}}</p>\n<p dir="ltr">Should you have any questions in the meantime, just reply to this email and it will be attached to this ticket.</p>\n<p><strong>&nbsp;</strong></p>\n<p dir="ltr">Regards,</p>\n<p dir="ltr">{{Agent.FirstName}}</p>'
+        content: '<p dir="ltr">Hey {{prefix}}Customer.FirstName{{suffix}}!</p>\n<p dir="ltr">Just a quick note to say we&rsquo;ve received your message, and will get back to you within 48 hours.</p>\n<p dir="ltr">For reference, your ticket number is: {{prefix}}Ticket.Number{{suffix}}</p>\n<p dir="ltr">Should you have any questions in the meantime, just reply to this email and it will be attached to this ticket.</p>\n<p><strong>&nbsp;</strong></p>\n<p dir="ltr">Regards,</p>\n<p dir="ltr">{{prefix}}Agent.FirstName{{suffix}}</p>'
       },
       {
         title: 'Thanks for the feedback',
-        content: '<p dir="ltr">Hi {{Customer.FirstName}},</p>\n<p dir="ltr">We appreciate you taking the time to provide feedback on {{Product.Name}}.</p>\n<p dir="ltr">It sounds like it wasn&rsquo;t able to fully meet your expectations, for which we apologize. Rest assured our team looks at each piece of feedback and uses it to decide what to focus on next with {{Product.Name}}.</p>\n<p dir="ltr"><strong>&nbsp;</strong></p>\n<p dir="ltr">All the best, and let us know if there&rsquo;s anything else we can do to help.</p>\n<p dir="ltr">-{{Agent.FirstName}}</p>'
+        content: '<p dir="ltr">Hi {{prefix}}Customer.FirstName{{suffix}},</p>\n<p dir="ltr">We appreciate you taking the time to provide feedback on {{prefix}}Product.Name{{suffix}}.</p>\n<p dir="ltr">It sounds like it wasn&rsquo;t able to fully meet your expectations, for which we apologize. Rest assured our team looks at each piece of feedback and uses it to decide what to focus on next with {{prefix}}Product.Name{{suffix}}.</p>\n<p dir="ltr"><strong>&nbsp;</strong></p>\n<p dir="ltr">All the best, and let us know if there&rsquo;s anything else we can do to help.</p>\n<p dir="ltr">-{{prefix}}Agent.FirstName{{suffix}}</p>'
       },
       {
         title: 'Still working on case',
-        content: '<p dir="ltr"><img src="https://lh4.googleusercontent.com/-H7w_COxrsy2fVpjO6RRnoBsujhaLyg6AXux5zidqmQ_ik1mrE6BtnaTUdWYQuVbtKpviRqQiuPBOHNGUsEXvrRliEHc4-hKDrCLgQQ9Co-MI4uY2ehUvYtU1nn3EeS0WiUzST-7MQB2Z5YFXrMDwRk" width="320" height="240"></p>\n<p><strong>&nbsp;</strong></p>\n<p dir="ltr">Hi {{Customer.FirstName}},</p>\n<p dir="ltr">Just a quick note to let you know we&rsquo;re still working on your case. It&rsquo;s taking a bit longer than we hoped, but we&rsquo;re aiming to get you an answer in the next 48 hours.</p>\n<p dir="ltr">Stay tuned,</p>\n<p dir="ltr">{{Agent.FirstName}}</p>'
+        content: '<p dir="ltr">Hi {{prefix}}Customer.FirstName{{suffix}},</p>\n<p dir="ltr">Just a quick note to let you know we&rsquo;re still working on your case. It&rsquo;s taking a bit longer than we hoped, but we&rsquo;re aiming to get you an answer in the next 48 hours.</p>\n<p dir="ltr">Stay tuned,</p>\n<p dir="ltr">{{prefix}}Agent.FirstName{{suffix}}</p>'
       }
     ]
   },
@@ -21,11 +21,11 @@ const advtemplate_templates = [
     items: [
       {
         title: 'Closing ticket',
-        content: '<p dir="ltr">Hi {{Customer.FirstName}},</p>\n<p dir="ltr">We haven&rsquo;t heard back from you in over a week, so we have gone ahead and closed your ticket number {{Ticket.Number}}.</p>\n<p dir="ltr">If you&rsquo;re still running into issues, not to worry, just reply to this email and we will re-open your ticket.</p>\n<p><strong>&nbsp;</strong></p>\n<p dir="ltr">All the best,</p>\n<p dir="ltr">{{Agent.FirstName}}</p>'
+        content: '<p dir="ltr">Hi {{prefix}}Customer.FirstName{{suffix}},</p>\n<p dir="ltr">We haven&rsquo;t heard back from you in over a week, so we have gone ahead and closed your ticket number {{prefix}}Ticket.Number{{suffix}}.</p>\n<p dir="ltr">If you&rsquo;re still running into issues, not to worry, just reply to this email and we will re-open your ticket.</p>\n<p><strong>&nbsp;</strong></p>\n<p dir="ltr">All the best,</p>\n<p dir="ltr">{{prefix}}Agent.FirstName{{suffix}}</p>'
       },
       {
         title: 'Post-call survey',
-        content: '<p dir="ltr">Hey {{Customer.FirstName}}!</p>\n<p dir="ltr">&nbsp;</p>\n<p dir="ltr">How did we do?</p>\n<p dir="ltr">If you have a few moments, we&rsquo;d love you to fill out our post-support survey: {{Survey.Link}}</p>\n<p><strong>&nbsp;</strong></p>\n<p dir="ltr">Thanks in advance!<br>{{Company.Name}} Customer Support</p>'
+        content: '<p dir="ltr">Hey {{prefix}}Customer.FirstName{{suffix}}!</p>\n<p dir="ltr">&nbsp;</p>\n<p dir="ltr">How did we do?</p>\n<p dir="ltr">If you have a few moments, we&rsquo;d love you to fill out our post-support survey: {{prefix}}Survey.Link{{suffix}}</p>\n<p><strong>&nbsp;</strong></p>\n<p dir="ltr">Thanks in advance!<br>{{prefix}}Company.Name{{suffix}} Customer Support</p>'
       }
     ]
   },
@@ -34,11 +34,11 @@ const advtemplate_templates = [
     items: [
       {
         title: 'How to find model number',
-        content: '<p dir="ltr">Hi {{Customer.FirstName}},</p>\n<p><strong>&nbsp;</strong></p>\n<p dir="ltr">My name is {{Agent.FirstName}} and I will be glad to assist you today.</p>\n<p dir="ltr">To troubleshoot your issue, we first need your model number, which can be found on the underside of your product beneath the safety warning label.&nbsp;</p>\n<p dir="ltr">It should look something like the following: XX.XXXXX.X</p>\n<p dir="ltr">Once you send it over, I will advise on next steps.</p>\n<p><strong>&nbsp;</strong></p>\n<p dir="ltr">Thanks!</p>\n<p dir="ltr">{{Agent.FirstName}}</p>'
+        content: '<p dir="ltr">Hi {{prefix}}Customer.FirstName{{suffix}},</p>\n<p><strong>&nbsp;</strong></p>\n<p dir="ltr">My name is {{prefix}}Agent.FirstName{{suffix}} and I will be glad to assist you today.</p>\n<p dir="ltr">To troubleshoot your issue, we first need your model number, which can be found on the underside of your product beneath the safety warning label.&nbsp;</p>\n<p dir="ltr">It should look something like the following: XX.XXXXX.X</p>\n<p dir="ltr">Once you send it over, I will advise on next steps.</p>\n<p><strong>&nbsp;</strong></p>\n<p dir="ltr">Thanks!</p>\n<p dir="ltr">{{prefix}}Agent.FirstName{{suffix}}</p>'
       },
       {
         title: 'Support escalation',
-        content: '<p dir="ltr"><img src="https://lh3.googleusercontent.com/z4hleIymnERrS9OQQMBwmkqVne8kYZA0Kly9Ny64pp4fi47CWWUy30Q0-UkjGf-K-50zrfR-wltHUTbExzZ7VUSUAUG60Fll5f2E0UZcKjKoa-ZVlIcuOoe-RRckFWqiihUOfVds7pXtM8Y59uy2hpw" width="295" height="295"></p>\n<p><strong>&nbsp;</strong></p>\n<p dir="ltr">Hi {{Customer.FirstName}},</p>\n<p dir="ltr">We have escalated your ticket {{Ticket.Number}} to second-level support.</p>\n<p dir="ltr">You should hear back from the new agent on your case, {{NewAgent.FirstName}}, shortly.</p>\n<p><strong>&nbsp;</strong></p>\n<p dir="ltr">Thanks,</p>\n<p dir="ltr">{{Company.Name}} Customer Support</p>'
+        content: '<p dir="ltr">Hi {{prefix}}Customer.FirstName{{suffix}},</p>\n<p dir="ltr">We have escalated your ticket {{prefix}}Ticket.Number{{suffix}} to second-level support.</p>\n<p dir="ltr">You should hear back from the new agent on your case, {{prefix}}NewAgent.FirstName{{suffix}}, shortly.</p>\n<p><strong>&nbsp;</strong></p>\n<p dir="ltr">Thanks,</p>\n<p dir="ltr">{{prefix}}Company.Name{{suffix}} Customer Support</p>'
       }
     ]
   }
diff --git a/modules/ROOT/examples/live-demos/advtemplate/index.js b/modules/ROOT/examples/live-demos/advtemplate/index.js
index 45a84cd932..adb642890f 100644
--- a/modules/ROOT/examples/live-demos/advtemplate/index.js
+++ b/modules/ROOT/examples/live-demos/advtemplate/index.js
@@ -4,15 +4,15 @@ const data = [
     items: [
       {
         title: 'Message received',
-        content: '<p dir="ltr">Hey {{Customer.FirstName}}!</p>\n<p dir="ltr">Just a quick note to say we&rsquo;ve received your message, and will get back to you within 48 hours.</p>\n<p dir="ltr">For reference, your ticket number is: {{Ticket.Number}}</p>\n<p dir="ltr">Should you have any questions in the meantime, just reply to this email and it will be attached to this ticket.</p>\n<p><strong>&nbsp;</strong></p>\n<p dir="ltr">Regards,</p>\n<p dir="ltr">{{Agent.FirstName}}</p>'
+        content: '<p dir="ltr">Hey {{prefix}}Customer.FirstName\}}!</p>\n<p dir="ltr">Just a quick note to say we&rsquo;ve received your message, and will get back to you within 48 hours.</p>\n<p dir="ltr">For reference, your ticket number is: {{mergetag-open}}Ticket.Number{{suffix}}</p>\n<p dir="ltr">Should you have any questions in the meantime, just reply to this email and it will be attached to this ticket.</p>\n<p><strong>&nbsp;</strong></p>\n<p dir="ltr">Regards,</p>\n<p dir="ltr">{{prefix}}Agent.FirstName{{suffix}}</p>'
       },
       {
         title: 'Thanks for the feedback',
-        content: '<p dir="ltr">Hi {{Customer.FirstName}},</p>\n<p dir="ltr">We appreciate you taking the time to provide feedback on {{Product.Name}}.</p>\n<p dir="ltr">It sounds like it wasn&rsquo;t able to fully meet your expectations, for which we apologize. Rest assured our team looks at each piece of feedback and uses it to decide what to focus on next with {{Product.Name}}.</p>\n<p dir="ltr"><strong>&nbsp;</strong></p>\n<p dir="ltr">All the best, and let us know if there&rsquo;s anything else we can do to help.</p>\n<p dir="ltr">-{{Agent.FirstName}}</p>'
+        content: '<p dir="ltr">Hi {{prefix}}Customer.FirstName{{suffix}},</p>\n<p dir="ltr">We appreciate you taking the time to provide feedback on {{prefix}}Product.Name{{suffix}}.</p>\n<p dir="ltr">It sounds like it wasn&rsquo;t able to fully meet your expectations, for which we apologize. Rest assured our team looks at each piece of feedback and uses it to decide what to focus on next with {{prefix}}Product.Name{{suffix}}.</p>\n<p dir="ltr"><strong>&nbsp;</strong></p>\n<p dir="ltr">All the best, and let us know if there&rsquo;s anything else we can do to help.</p>\n<p dir="ltr">-{{prefix}}Agent.FirstName{{suffix}}</p>'
       },
       {
         title: 'Still working on case',
-        content: '<p dir="ltr"><img src="https://lh4.googleusercontent.com/-H7w_COxrsy2fVpjO6RRnoBsujhaLyg6AXux5zidqmQ_ik1mrE6BtnaTUdWYQuVbtKpviRqQiuPBOHNGUsEXvrRliEHc4-hKDrCLgQQ9Co-MI4uY2ehUvYtU1nn3EeS0WiUzST-7MQB2Z5YFXrMDwRk" width="320" height="240"></p>\n<p><strong>&nbsp;</strong></p>\n<p dir="ltr">Hi {{Customer.FirstName}},</p>\n<p dir="ltr">Just a quick note to let you know we&rsquo;re still working on your case. It&rsquo;s taking a bit longer than we hoped, but we&rsquo;re aiming to get you an answer in the next 48 hours.</p>\n<p dir="ltr">Stay tuned,</p>\n<p dir="ltr">{{Agent.FirstName}}</p>'
+        content: '<p dir="ltr">Hi {{prefix}}Customer.FirstName{{suffix}},</p>\n<p dir="ltr">Just a quick note to let you know we&rsquo;re still working on your case. It&rsquo;s taking a bit longer than we hoped, but we&rsquo;re aiming to get you an answer in the next 48 hours.</p>\n<p dir="ltr">Stay tuned,</p>\n<p dir="ltr">{{prefix}}Agent.FirstName{{suffix}}</p>'
       }
     ]
   },
@@ -21,11 +21,11 @@ const data = [
     items: [
       {
         title: 'Closing ticket',
-        content: '<p dir="ltr">Hi {{Customer.FirstName}},</p>\n<p dir="ltr">We haven&rsquo;t heard back from you in over a week, so we have gone ahead and closed your ticket number {{Ticket.Number}}.</p>\n<p dir="ltr">If you&rsquo;re still running into issues, not to worry, just reply to this email and we will re-open your ticket.</p>\n<p><strong>&nbsp;</strong></p>\n<p dir="ltr">All the best,</p>\n<p dir="ltr">{{Agent.FirstName}}</p>'
+        content: '<p dir="ltr">Hi {{prefix}}Customer.FirstName{{suffix}},</p>\n<p dir="ltr">We haven&rsquo;t heard back from you in over a week, so we have gone ahead and closed your ticket number {{prefix}}Ticket.Number{{suffix}}.</p>\n<p dir="ltr">If you&rsquo;re still running into issues, not to worry, just reply to this email and we will re-open your ticket.</p>\n<p><strong>&nbsp;</strong></p>\n<p dir="ltr">All the best,</p>\n<p dir="ltr">{{prefix}}Agent.FirstName{{suffix}}</p>'
       },
       {
         title: 'Post-call survey',
-        content: '<p dir="ltr">Hey {{Customer.FirstName}}!</p>\n<p dir="ltr">&nbsp;</p>\n<p dir="ltr">How did we do?</p>\n<p dir="ltr">If you have a few moments, we&rsquo;d love you to fill out our post-support survey: {{Survey.Link}}</p>\n<p><strong>&nbsp;</strong></p>\n<p dir="ltr">Thanks in advance!<br>{{Company.Name}} Customer Support</p>'
+        content: '<p dir="ltr">Hey {{prefix}}Customer.FirstName{{suffix}}!</p>\n<p dir="ltr">&nbsp;</p>\n<p dir="ltr">How did we do?</p>\n<p dir="ltr">If you have a few moments, we&rsquo;d love you to fill out our post-support survey: {{prefix}}Survey.Link{{suffix}}</p>\n<p><strong>&nbsp;</strong></p>\n<p dir="ltr">Thanks in advance!<br>{{prefix}}Company.Name{{suffix}} Customer Support</p>'
       }
     ]
   },
@@ -34,11 +34,11 @@ const data = [
     items: [
       {
         title: 'How to find model number',
-        content: '<p dir="ltr">Hi {{Customer.FirstName}},</p>\n<p><strong>&nbsp;</strong></p>\n<p dir="ltr">My name is {{Agent.FirstName}} and I will be glad to assist you today.</p>\n<p dir="ltr">To troubleshoot your issue, we first need your model number, which can be found on the underside of your product beneath the safety warning label.&nbsp;</p>\n<p dir="ltr">It should look something like the following: XX.XXXXX.X</p>\n<p dir="ltr">Once you send it over, I will advise on next steps.</p>\n<p><strong>&nbsp;</strong></p>\n<p dir="ltr">Thanks!</p>\n<p dir="ltr">{{Agent.FirstName}}</p>'
+        content: '<p dir="ltr">Hi {{prefix}}Customer.FirstName{{suffix}},</p>\n<p><strong>&nbsp;</strong></p>\n<p dir="ltr">My name is {{prefix}}Agent.FirstName{{suffix}} and I will be glad to assist you today.</p>\n<p dir="ltr">To troubleshoot your issue, we first need your model number, which can be found on the underside of your product beneath the safety warning label.&nbsp;</p>\n<p dir="ltr">It should look something like the following: XX.XXXXX.X</p>\n<p dir="ltr">Once you send it over, I will advise on next steps.</p>\n<p><strong>&nbsp;</strong></p>\n<p dir="ltr">Thanks!</p>\n<p dir="ltr">{{prefix}}Agent.FirstName{{suffix}}</p>'
       },
       {
         title: 'Support escalation',
-        content: '<p dir="ltr"><img src="https://lh3.googleusercontent.com/z4hleIymnERrS9OQQMBwmkqVne8kYZA0Kly9Ny64pp4fi47CWWUy30Q0-UkjGf-K-50zrfR-wltHUTbExzZ7VUSUAUG60Fll5f2E0UZcKjKoa-ZVlIcuOoe-RRckFWqiihUOfVds7pXtM8Y59uy2hpw" width="295" height="295"></p>\n<p><strong>&nbsp;</strong></p>\n<p dir="ltr">Hi {{Customer.FirstName}},</p>\n<p dir="ltr">We have escalated your ticket {{Ticket.Number}} to second-level support.</p>\n<p dir="ltr">You should hear back from the new agent on your case, {{NewAgent.FirstName}}, shortly.</p>\n<p><strong>&nbsp;</strong></p>\n<p dir="ltr">Thanks,</p>\n<p dir="ltr">{{Company.Name}} Customer Support</p>'
+        content: '<p dir="ltr">Hi {{prefix}}Customer.FirstName{{suffix}},</p>\n<p dir="ltr">We have escalated your ticket {{prefix}}Ticket.Number{{suffix}} to second-level support.</p>\n<p dir="ltr">You should hear back from the new agent on your case, {{prefix}}NewAgent.FirstName{{suffix}}, shortly.</p>\n<p><strong>&nbsp;</strong></p>\n<p dir="ltr">Thanks,</p>\n<p dir="ltr">{{prefix}}Company.Name{{suffix}} Customer Support</p>'
       }
     ]
   }
diff --git a/modules/ROOT/pages/6.3-release-notes.adoc b/modules/ROOT/pages/6.3-release-notes.adoc
index 036986a0e5..aebb7e516e 100644
--- a/modules/ROOT/pages/6.3-release-notes.adoc
+++ b/modules/ROOT/pages/6.3-release-notes.adoc
@@ -226,7 +226,7 @@ tinymce.init({
 });
 ----
 
-In this example, typing `{{string}}` followed by a word boundary character (such as a space, full-stop, question mark or comma) will result in the _string_ being turned into an active merge tag.
+In this example, typing `{\{string\}}` followed by a word boundary character (such as a space, full-stop, question mark or comma) will result in the _string_ being turned into an active merge tag.
 
 ==== Merge tags cannot exceed 255 characters in length
 
@@ -691,4 +691,3 @@ This presentation issue does not affect functionality. Selecting a new *Backgrou
 A workaround is to apply inline formatting after applying the Text and Background color. When the inline formatting is applied after the Text and Background colors are applied, the presentation error does not occur.
 
 NOTE: This checkmark presentation issue occurs in conjunction with the similar checkmark presentation issue documented above. When this presentation issue occurs, the checkmark does denote the current background color in either the *Background color* menu or toolbar item.
-
diff --git a/modules/ROOT/pages/6.7-release-notes.adoc b/modules/ROOT/pages/6.7-release-notes.adoc
index 72547e8a3c..274b8c190a 100644
--- a/modules/ROOT/pages/6.7-release-notes.adoc
+++ b/modules/ROOT/pages/6.7-release-notes.adoc
@@ -85,7 +85,7 @@ This command enables the adding of a new template, specified by its ID, to a {pr
 
 See the xref:advanced-templates.adoc#commands[Commands] section of the xref:advanced-templates.adoc[Advanced Templates] documentation for an example of the command in use.
 
-==== New {{mce-cursor}} marker to indicate the cursor position after the template is inserted
+==== New {\{mce-cursor\}} marker to indicate the cursor position after the template is inserted
 // TINY-9973
 
 The new insertion point marker is a fixed string for adding to any template.
diff --git a/modules/ROOT/pages/6.7.2-release-notes.adoc b/modules/ROOT/pages/6.7.2-release-notes.adoc
index 138fab9ed5..4404e3b1cb 100644
--- a/modules/ROOT/pages/6.7.2-release-notes.adoc
+++ b/modules/ROOT/pages/6.7.2-release-notes.adoc
@@ -68,7 +68,7 @@ include::partial$misc/admon-no-functionality-changes-in-updated-server-side-comp
 
 {productname} 6.7.2 also includes the following bug fixes:
 
-==== The function `getModifierState` did not work on events passed through the editor as expected.
+=== The function `getModifierState` did not work on events passed through the editor as expected.
 // TINY-10263
 The exception error "Uncaught TypeError: Illegal invocation" was displayed in the console, when an integrator called the 'getModifierState' function on a **keydown** event object.
 
@@ -76,7 +76,7 @@ As a consequence, any attempts to invoke this function resulted in the TypeError
 
 {productname} 6.7.2 addresses this, now, when a integrator uses the `getModifierState` on the event object a keydown event no longer triggers an error.
 
-==== Indenting or outdenting a list item that contained non list item siblings after it would result in those siblings being removed.
+=== Indenting or outdenting a list item that contained non list item siblings after it would result in those siblings being removed.
 // TINY-10268
 Previously, when the editor encounter's a list inside an `<li>` element, the editor would only account for scenarios where the list is either the first or last element within the `<li>`. In such cases, {productname} would treat the content contained within the `<li>` as plain HTML, disregarding any nested lists.
 
@@ -102,7 +102,7 @@ the editor would encounter problems when attempting to apply list-related action
 
 As a result, the actions of indenting and unindenting a nested list now work as expected.
 
-==== Removed use of async for editor rendering which caused visual blinking when reloading the editor in-place.
+=== Removed use of async for editor rendering which caused visual blinking when reloading the editor in-place.
 // TINY-10249
 
 In contrast to {productname} version 5, where the editor would initiate rendering without waiting for the completion of CSS loading, in version 6, the editor instance now deliberately synchronizes with the loading of CSS. This modification aims to prevent flickering by ensuring that the necessary styles have finished loading before proceeding with the rendering process.
@@ -111,7 +111,7 @@ In contrast to {productname} version 5, where the editor would initiate renderin
 
 As a result, the editor no longer renders the flicker previously displayed when the editor is refreshed.
 
-==== Toggling a list that contained a list item element — `<li>` — which, in turn, contained another list item element as its first child, removed other content within the first list item element.
+=== Toggling a list that contained a list item element — `<li>` — which, in turn, contained another list item element as its first child, removed other content within the first list item element.
 // TINY-10213
 When a user attempted to indent or outdent a list element inside a nested list, the list was converted into a model which resulted in it being recreated from that model.
 
diff --git a/modules/ROOT/pages/accordion.adoc b/modules/ROOT/pages/accordion.adoc
index f6f7df511c..65d5798cfd 100644
--- a/modules/ROOT/pages/accordion.adoc
+++ b/modules/ROOT/pages/accordion.adoc
@@ -9,7 +9,7 @@
 
 include::partial$misc/admon-requires-6.5v.adoc[]
 
-The Accordion plugin allows for the creation of sections in a document that can be expanded or collapsed to show or hide additional content.
+The {pluginname} plugin allows for the creation of sections in a document that can be expanded or collapsed to show or hide additional content.
 
 == Interactive example
 
diff --git a/modules/ROOT/pages/ai-proxy.adoc b/modules/ROOT/pages/ai-proxy.adoc
index a75710af90..4885e94153 100644
--- a/modules/ROOT/pages/ai-proxy.adoc
+++ b/modules/ROOT/pages/ai-proxy.adoc
@@ -80,7 +80,7 @@ To prevent this, a moderation service can pre-filter abusive content and reject
 
 Below is a flow diagram that illustrates how the above components work together to provide the AI enhanced experience.
 
-image::{imagesdir}/ai-plugin/ai-proxy-call-flows.png[OpenAI Proxy Call Flows]
+image::ai-plugin/ai-proxy-call-flows.png[OpenAI Proxy Call Flows]
 
 == Example Reference Application
 
diff --git a/modules/ROOT/pages/ai.adoc b/modules/ROOT/pages/ai.adoc
index 8048a3693d..fd5b74c6b3 100644
--- a/modules/ROOT/pages/ai.adoc
+++ b/modules/ROOT/pages/ai.adoc
@@ -93,7 +93,6 @@ The following configuration options affect the behavior of the {pluginname} plug
 
 include::partial$configuration/ai_request.adoc[][leveloffset=+1]
 
-[ai_shortcuts]
 include::partial$configuration/ai_shortcuts.adoc[][leveloffset=+1]
 
 include::partial$misc/plugin-toolbar-button-id-boilerplate.adoc[]
diff --git a/modules/ROOT/pages/full-featured-open-source-demo.adoc b/modules/ROOT/pages/full-featured-open-source-demo.adoc
index 5c64618a4b..603569a222 100644
--- a/modules/ROOT/pages/full-featured-open-source-demo.adoc
+++ b/modules/ROOT/pages/full-featured-open-source-demo.adoc
@@ -19,3 +19,4 @@ The following plugins are excluded from this example:
 
 |xref:autoresize.adoc[Autoresize]
 |Resizes the editor to fit the content.
+|===
\ No newline at end of file
diff --git a/modules/ROOT/pages/full-featured-premium-demo.adoc b/modules/ROOT/pages/full-featured-premium-demo.adoc
index 13f2490ce9..25e04c9ab3 100644
--- a/modules/ROOT/pages/full-featured-premium-demo.adoc
+++ b/modules/ROOT/pages/full-featured-premium-demo.adoc
@@ -29,3 +29,4 @@ The following plugins are excluded from this example:
 
 |xref:moxiemanager.adoc[MoxieManager]
 |xref:tinydrive-introduction.adoc[*{cloudfilemanager}*] included instead.
+|===
\ No newline at end of file
diff --git a/modules/ROOT/partials/configuration/dialog_persistent.adoc b/modules/ROOT/partials/configuration/dialog_persistent.adoc
index c77b772e48..97671918f8 100644
--- a/modules/ROOT/partials/configuration/dialog_persistent.adoc
+++ b/modules/ROOT/partials/configuration/dialog_persistent.adoc
@@ -52,7 +52,7 @@ To prevent this
 
 * add a check that the dialog is already open; and
 
-* use the xref:apis/tinymce.editor/#focus[`focus`] method in the xref:apis/tinymce.windowmanager/#return-value[`DialogInstanceAPI`] to transfer focus to the open dialog rather than creating a new instance of the same dialog.
+* use the `focus` method in the xref:apis/tinymce.windowmanager.adoc#open[`DialogInstanceAPI`] to transfer focus to the open dialog rather than creating a new instance of the same dialog.
 
 
 [source,js]
diff --git a/modules/ROOT/partials/release-notes/6.0-release-notes-apis.adoc b/modules/ROOT/partials/release-notes/6.0-release-notes-apis.adoc
index c5be1ec4ba..f7eb07f135 100644
--- a/modules/ROOT/partials/release-notes/6.0-release-notes-apis.adoc
+++ b/modules/ROOT/partials/release-notes/6.0-release-notes-apis.adoc
@@ -45,7 +45,7 @@ The new `FakeClipboard` API provides a means for storing state that can be set a
 
 The new `Resource.unload` API makes it possible to unload resources in the resource loader.
 
-[[setdata]]
+[[setdata-api]]
 === `setData` method in the Dialog API
 
 The dialog API’s `setData` method now uses a deep merge algorithm.
diff --git a/modules/ROOT/partials/release-notes/6.0-release-notes-summary.adoc b/modules/ROOT/partials/release-notes/6.0-release-notes-summary.adoc
index 918a70b92d..bb908a508b 100644
--- a/modules/ROOT/partials/release-notes/6.0-release-notes-summary.adoc
+++ b/modules/ROOT/partials/release-notes/6.0-release-notes-summary.adoc
@@ -1,5 +1,3 @@
-// tag::contents[]
-[[contents]]
 = Contents
 
 * xref:core-changes[Core changes]
@@ -12,12 +10,12 @@
 
 
 [[summary]]
-= Summary
+== Summary
 This section documents the four core changes made to {productname} 6.0.
 
 // tag::core-changes[]
 [[core-changes]]
-== Core changes
+=== Core changes
 
 . Browsers supported by {productname} 6.0 have changed. {productname} 6.0 supports the current and previous major versions of Google Chrome, Mozilla Firefox, Microsoft Edge, and Apple Safari. {productname} 6.0 also supports the current Long Term Release of each of the above browsers (eg, Mozilla Firefox ESR and Google Chrome ESR).
 
@@ -48,7 +46,7 @@ This section also includes four tables that set out the:
 
 // tag::things-we-renamed[]
 [[things-we-renamed]]
-== Things we renamed
+=== Things we renamed
 
 [cols="2,2,1,2"]
 |===
@@ -143,7 +141,7 @@ Where an Option name has changed, configurations using that option must be chang
 
 // tag::default-value-changes[]
 [[default-value-changes]]
-== Default value changes
+=== Default value changes
 
 [cols="1,1,1,1"]
 |===
@@ -170,7 +168,7 @@ Where an Option name has changed, configurations using that option must be chang
 
 // tag::previously-deprecated-items-now-removed[]
 [[previously-deprecated-items-now-removed]]
-== Previously deprecated items now removed
+=== Previously deprecated items now removed
 
 The following elements were previously deprecated and have, with this release, been removed entirely from {productname}.
 
@@ -283,7 +281,7 @@ The following elements were previously deprecated and have, with this release, b
 
 // tag::previously-undocumented-items-removed-without-prior-deprecation[]
 [[previously-undocumented-items-removed-without-prior-deprecation]]
-== Previously undocumented items removed without prior deprecation
+=== Previously undocumented items removed without prior deprecation
 
 The following elements were never documented and have never been formally supported.