From 413502b4f248dc6638c9ac336ad4abaa6ed42518 Mon Sep 17 00:00:00 2001 From: Mitchell Crompton Date: Thu, 30 Nov 2023 10:15:30 +1000 Subject: [PATCH] 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: '
' virt_ellps: '⋮' ellps: '…' + # Prevent Mergetags becoming variables + prefix: '{{' + suffix: '}}' # Demo logos logofordemos: 'https://www.tiny.cloud/docs/images/logos/android-chrome-256x256.png' logofordemoshtml: '

TinyMCE Logo

' 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 @@

To insert a template

Select the template to add to the TinyMCE document from the Templates dialog that presents.
  1. - Click the Without an insertion point marker category to see and select a template that does not use the {{mce-cursor}} insertion point marker. + Click the Without an insertion point marker category to see and select a template that does not use the {{prefix}}mce-cursor{{suffix}} insertion point marker.
  2. - Click the With an insertion point marker category to see and select a template that does use the {{mce-cursor}} insertion point marker. + Click the With an insertion point marker category to see and select a template that does use the {{prefix}}mce-cursor{{suffix}} insertion point marker.
@@ -23,21 +23,21 @@

To insert a template

Noting the difference

-

The Name entry prompt template without the {{mce-cursor}} insertion point marker, places the insertion point at the end of the template text.

+

The Name entry prompt template without the {{prefix}}mce-cursor{{suffix}} insertion point marker, places the insertion point at the end of the template text.

-

By contrast, the Name entry prompt template with the {{mce-cursor}} insertion point marker places the insertion point at the right spot for someone to enter their name, as requested.

+

By contrast, the Name entry prompt template with the {{prefix}}mce-cursor{{suffix}} insertion point marker places the insertion point at the right spot for someone to enter their name, as requested.

-

Similarly, the Letter outline template without the {{mce-cursor}} insertion point marker, places the insertion point at the end of the template text.

+

Similarly, the Letter outline template without the {{prefix}}mce-cursor{{suffix}} insertion point marker, places the insertion point at the end of the template text.

-

And, by equivalent contrast, the Letter outline template with the {{mce-cursor}} insertion point marker places the insertion point at the right spot for someone to start writing a letter.

+

And, by equivalent contrast, the Letter outline template with the {{prefix}}mce-cursor{{suffix}} insertion point marker places the insertion point at the right spot for someone to start writing a letter.

Working with Merge Tags

-

The second pre-defined template in this demonstration — the Letter outline template — shows the {{mce-cursor}} string working in conjunction with the Merge Tags Premium plugin.

+

The second pre-defined template in this demonstration — the Letter outline template — shows the {{prefix}}mce-cursor{{suffix}} string working in conjunction with the Merge Tags Premium plugin.

The fixed string that is the Insertion Point Marker uses the same delimiting characters as are used by default by the Merge Tags plugin.

-

The Merge Tags plugin knows nothing about the {{mce-cursor}} being a marker string for the Advanced Templates plugin. And, if this particular string was used in a Merge Tags configuration, the Merge Tags plugin would recognise it and substitute it with whatever contents it was set to substitute, as expected. +

The Merge Tags plugin knows nothing about the {{prefix}}mce-cursor{{suffix}} being a marker string for the Advanced Templates plugin. And, if this particular string was used in a Merge Tags configuration, the Merge Tags plugin would recognise it and substitute it with whatever contents it was set to substitute, as expected.

The Advanced Templates plugin removes the Insertion Point Marker before inserting a template containing the string in to a TinyMCE instance, however.

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: '

{{Current.Date}}

{{Honorific}} {{Person.Name.Last}},

 

Regards,

{{staff.digital.signature}}

{{Staff.Name}}

{{Staff.Email}}

' + content: '

{{prefix}}Current.Date{{suffix}}

{{prefix}}Honorific{{suffix}} {{prefix}}Person.Name.Last{{suffix}},

 

Regards,

{{prefix}}staff.digital.signature{{suffix}}

{{prefix}}Staff.Name{{suffix}}

{{prefix}}Staff.Email{{suffix}}

' }, ], }, @@ -21,11 +21,11 @@ tinymce.init({ items: [ { title: 'Name entry prompt', - content: '

Enter your name:{{mce-cursor}}

Include both your given and family names, in your preferred order.

' + content: '

Enter your name:{{prefix}}mce-cursor{{suffix}}

Include both your given and family names, in your preferred order.

' }, { title: 'Letter outline', - content: '

{{Current.Date}}

{{Honorific}} {{Person.Name.Last}},

{{mce-cursor}} 

Regards,

{{staff.digital.signature}}

{{Staff.Name}}

{{Staff.Email}}

' + content: '

{{prefix}}Current.Date{{suffix}}

{{prefix}}Honorific{{suffix}} {{prefix}}Person.Name.Last{{suffix}},

{{prefix}}mce-cursor{{suffix}} 

Regards,

{{prefix}}staff.digital.signature{{suffix}}

{{prefix}}Staff.Name{{suffix}}

{{prefix}}Staff.Email{{suffix}}

' }, ], }, 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: '

Hey {{Customer.FirstName}}!

\n

Just a quick note to say we’ve received your message, and will get back to you within 48 hours.

\n

For reference, your ticket number is: {{Ticket.Number}}

\n

Should you have any questions in the meantime, just reply to this email and it will be attached to this ticket.

\n

 

\n

Regards,

\n

{{Agent.FirstName}}

' + content: '

Hey {{prefix}}Customer.FirstName{{suffix}}!

\n

Just a quick note to say we’ve received your message, and will get back to you within 48 hours.

\n

For reference, your ticket number is: {{prefix}}Ticket.Number{{suffix}}

\n

Should you have any questions in the meantime, just reply to this email and it will be attached to this ticket.

\n

 

\n

Regards,

\n

{{prefix}}Agent.FirstName{{suffix}}

' }, { title: 'Thanks for the feedback', - content: '

Hi {{Customer.FirstName}},

\n

We appreciate you taking the time to provide feedback on {{Product.Name}}.

\n

It sounds like it wasn’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}}.

\n

 

\n

All the best, and let us know if there’s anything else we can do to help.

\n

-{{Agent.FirstName}}

' + content: '

Hi {{prefix}}Customer.FirstName{{suffix}},

\n

We appreciate you taking the time to provide feedback on {{prefix}}Product.Name{{suffix}}.

\n

It sounds like it wasn’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}}.

\n

 

\n

All the best, and let us know if there’s anything else we can do to help.

\n

-{{prefix}}Agent.FirstName{{suffix}}

' }, { title: 'Still working on case', - content: '

\n

 

\n

Hi {{Customer.FirstName}},

\n

Just a quick note to let you know we’re still working on your case. It’s taking a bit longer than we hoped, but we’re aiming to get you an answer in the next 48 hours.

\n

Stay tuned,

\n

{{Agent.FirstName}}

' + content: '

Hi {{prefix}}Customer.FirstName{{suffix}},

\n

Just a quick note to let you know we’re still working on your case. It’s taking a bit longer than we hoped, but we’re aiming to get you an answer in the next 48 hours.

\n

Stay tuned,

\n

{{prefix}}Agent.FirstName{{suffix}}

' } ] }, @@ -21,11 +21,11 @@ const advtemplate_templates = [ items: [ { title: 'Closing ticket', - content: '

Hi {{Customer.FirstName}},

\n

We haven’t heard back from you in over a week, so we have gone ahead and closed your ticket number {{Ticket.Number}}.

\n

If you’re still running into issues, not to worry, just reply to this email and we will re-open your ticket.

\n

 

\n

All the best,

\n

{{Agent.FirstName}}

' + content: '

Hi {{prefix}}Customer.FirstName{{suffix}},

\n

We haven’t heard back from you in over a week, so we have gone ahead and closed your ticket number {{prefix}}Ticket.Number{{suffix}}.

\n

If you’re still running into issues, not to worry, just reply to this email and we will re-open your ticket.

\n

 

\n

All the best,

\n

{{prefix}}Agent.FirstName{{suffix}}

' }, { title: 'Post-call survey', - content: '

Hey {{Customer.FirstName}}!

\n

 

\n

How did we do?

\n

If you have a few moments, we’d love you to fill out our post-support survey: {{Survey.Link}}

\n

 

\n

Thanks in advance!
{{Company.Name}} Customer Support

' + content: '

Hey {{prefix}}Customer.FirstName{{suffix}}!

\n

 

\n

How did we do?

\n

If you have a few moments, we’d love you to fill out our post-support survey: {{prefix}}Survey.Link{{suffix}}

\n

 

\n

Thanks in advance!
{{prefix}}Company.Name{{suffix}} Customer Support

' } ] }, @@ -34,11 +34,11 @@ const advtemplate_templates = [ items: [ { title: 'How to find model number', - content: '

Hi {{Customer.FirstName}},

\n

 

\n

My name is {{Agent.FirstName}} and I will be glad to assist you today.

\n

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. 

\n

It should look something like the following: XX.XXXXX.X

\n

Once you send it over, I will advise on next steps.

\n

 

\n

Thanks!

\n

{{Agent.FirstName}}

' + content: '

Hi {{prefix}}Customer.FirstName{{suffix}},

\n

 

\n

My name is {{prefix}}Agent.FirstName{{suffix}} and I will be glad to assist you today.

\n

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. 

\n

It should look something like the following: XX.XXXXX.X

\n

Once you send it over, I will advise on next steps.

\n

 

\n

Thanks!

\n

{{prefix}}Agent.FirstName{{suffix}}

' }, { title: 'Support escalation', - content: '

\n

 

\n

Hi {{Customer.FirstName}},

\n

We have escalated your ticket {{Ticket.Number}} to second-level support.

\n

You should hear back from the new agent on your case, {{NewAgent.FirstName}}, shortly.

\n

 

\n

Thanks,

\n

{{Company.Name}} Customer Support

' + content: '

Hi {{prefix}}Customer.FirstName{{suffix}},

\n

We have escalated your ticket {{prefix}}Ticket.Number{{suffix}} to second-level support.

\n

You should hear back from the new agent on your case, {{prefix}}NewAgent.FirstName{{suffix}}, shortly.

\n

 

\n

Thanks,

\n

{{prefix}}Company.Name{{suffix}} Customer Support

' } ] } 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: '

Hey {{Customer.FirstName}}!

\n

Just a quick note to say we’ve received your message, and will get back to you within 48 hours.

\n

For reference, your ticket number is: {{Ticket.Number}}

\n

Should you have any questions in the meantime, just reply to this email and it will be attached to this ticket.

\n

 

\n

Regards,

\n

{{Agent.FirstName}}

' + content: '

Hey {{prefix}}Customer.FirstName\}}!

\n

Just a quick note to say we’ve received your message, and will get back to you within 48 hours.

\n

For reference, your ticket number is: {{mergetag-open}}Ticket.Number{{suffix}}

\n

Should you have any questions in the meantime, just reply to this email and it will be attached to this ticket.

\n

 

\n

Regards,

\n

{{prefix}}Agent.FirstName{{suffix}}

' }, { title: 'Thanks for the feedback', - content: '

Hi {{Customer.FirstName}},

\n

We appreciate you taking the time to provide feedback on {{Product.Name}}.

\n

It sounds like it wasn’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}}.

\n

 

\n

All the best, and let us know if there’s anything else we can do to help.

\n

-{{Agent.FirstName}}

' + content: '

Hi {{prefix}}Customer.FirstName{{suffix}},

\n

We appreciate you taking the time to provide feedback on {{prefix}}Product.Name{{suffix}}.

\n

It sounds like it wasn’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}}.

\n

 

\n

All the best, and let us know if there’s anything else we can do to help.

\n

-{{prefix}}Agent.FirstName{{suffix}}

' }, { title: 'Still working on case', - content: '

\n

 

\n

Hi {{Customer.FirstName}},

\n

Just a quick note to let you know we’re still working on your case. It’s taking a bit longer than we hoped, but we’re aiming to get you an answer in the next 48 hours.

\n

Stay tuned,

\n

{{Agent.FirstName}}

' + content: '

Hi {{prefix}}Customer.FirstName{{suffix}},

\n

Just a quick note to let you know we’re still working on your case. It’s taking a bit longer than we hoped, but we’re aiming to get you an answer in the next 48 hours.

\n

Stay tuned,

\n

{{prefix}}Agent.FirstName{{suffix}}

' } ] }, @@ -21,11 +21,11 @@ const data = [ items: [ { title: 'Closing ticket', - content: '

Hi {{Customer.FirstName}},

\n

We haven’t heard back from you in over a week, so we have gone ahead and closed your ticket number {{Ticket.Number}}.

\n

If you’re still running into issues, not to worry, just reply to this email and we will re-open your ticket.

\n

 

\n

All the best,

\n

{{Agent.FirstName}}

' + content: '

Hi {{prefix}}Customer.FirstName{{suffix}},

\n

We haven’t heard back from you in over a week, so we have gone ahead and closed your ticket number {{prefix}}Ticket.Number{{suffix}}.

\n

If you’re still running into issues, not to worry, just reply to this email and we will re-open your ticket.

\n

 

\n

All the best,

\n

{{prefix}}Agent.FirstName{{suffix}}

' }, { title: 'Post-call survey', - content: '

Hey {{Customer.FirstName}}!

\n

 

\n

How did we do?

\n

If you have a few moments, we’d love you to fill out our post-support survey: {{Survey.Link}}

\n

 

\n

Thanks in advance!
{{Company.Name}} Customer Support

' + content: '

Hey {{prefix}}Customer.FirstName{{suffix}}!

\n

 

\n

How did we do?

\n

If you have a few moments, we’d love you to fill out our post-support survey: {{prefix}}Survey.Link{{suffix}}

\n

 

\n

Thanks in advance!
{{prefix}}Company.Name{{suffix}} Customer Support

' } ] }, @@ -34,11 +34,11 @@ const data = [ items: [ { title: 'How to find model number', - content: '

Hi {{Customer.FirstName}},

\n

 

\n

My name is {{Agent.FirstName}} and I will be glad to assist you today.

\n

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. 

\n

It should look something like the following: XX.XXXXX.X

\n

Once you send it over, I will advise on next steps.

\n

 

\n

Thanks!

\n

{{Agent.FirstName}}

' + content: '

Hi {{prefix}}Customer.FirstName{{suffix}},

\n

 

\n

My name is {{prefix}}Agent.FirstName{{suffix}} and I will be glad to assist you today.

\n

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. 

\n

It should look something like the following: XX.XXXXX.X

\n

Once you send it over, I will advise on next steps.

\n

 

\n

Thanks!

\n

{{prefix}}Agent.FirstName{{suffix}}

' }, { title: 'Support escalation', - content: '

\n

 

\n

Hi {{Customer.FirstName}},

\n

We have escalated your ticket {{Ticket.Number}} to second-level support.

\n

You should hear back from the new agent on your case, {{NewAgent.FirstName}}, shortly.

\n

 

\n

Thanks,

\n

{{Company.Name}} Customer Support

' + content: '

Hi {{prefix}}Customer.FirstName{{suffix}},

\n

We have escalated your ticket {{prefix}}Ticket.Number{{suffix}} to second-level support.

\n

You should hear back from the new agent on your case, {{prefix}}NewAgent.FirstName{{suffix}}, shortly.

\n

 

\n

Thanks,

\n

{{prefix}}Company.Name{{suffix}} Customer Support

' } ] } 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 `
  • ` element, the editor would only account for scenarios where the list is either the first or last element within the `
  • `. In such cases, {productname} would treat the content contained within the `
  • ` 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 — `
  • ` — 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 — `
  • ` — 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.