Skip to content

Commit 94902ae

Browse files
authored
DOC-2492_v6: Remove IMPORTANT mention regarding prefix and suffix cannot match in editor config. (#3405)
1 parent 31f3fd9 commit 94902ae

File tree

3 files changed

+6
-10
lines changed

3 files changed

+6
-10
lines changed

modules/ROOT/pages/mergetags.adoc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,13 +66,13 @@ For example, a merge tag can be set to any available typeface, type-size, foregr
6666
+
6767
A selected merge tag can be changed to any other merge tag by using the {pluginname} toolbar menu button.
6868

69-
. Text that matches an existing merge tag will be recognised as a merge tag when it is pasted or otherwise inserted into a {productname} document.
69+
. Text that matches an existing merge tag will be recognized as a merge tag when it is pasted or otherwise inserted into a {productname} document.
7070
+
71-
Content containing the specified prefix and suffix, and matching a specified merge tag, will be inserted as a merge tag when pasted into the editor. For example, if `Sender.Firstname` is a merge tag value, and the merge tag prefix and suffix have their default values, adding the string, `{{Sender.FirstName}}`, to a {productname} document will result in the string automatically being recognised as a merge tag.
71+
Content containing the specified prefix and suffix, and matching a specified merge tag, will be inserted as a merge tag when pasted into the editor. For example, if `Sender.Firstname` is a merge tag value, and the merge tag prefix and suffix have their default values, adding the string, `{{Sender.FirstName}}`, to a {productname} document will result in the string automatically being recognized as a merge tag.
7272

7373
. {pluginname} can be nested within the `+mergetags_list+` option.
7474
+
75-
The `+mergetags_list+` option allows for the specification of a nested menu item within the {pluginname} toolbar menu button. This option allows any number of nested menus and items for merge tag categorisation.
75+
The `+mergetags_list+` option allows for the specification of a nested menu item within the {pluginname} toolbar menu button. This option allows any number of nested menus and items for merge tag categorization.
7676

7777
== Styling Merge Tags
7878

@@ -126,4 +126,4 @@ include::partial$configuration/mergetags_list.adoc[leveloffset=+1]
126126

127127
include::partial$misc/plugin-toolbar-button-id-boilerplate.adoc[]
128128

129-
include::partial$misc/plugin-menu-item-id-boilerplate.adoc[]
129+
include::partial$misc/plugin-menu-item-id-boilerplate.adoc[]

modules/ROOT/partials/configuration/mergetags_prefix.adoc

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,4 @@ tinymce.init({
1919
toolbar: 'mergetags',
2020
mergetags_prefix: '{{'
2121
});
22-
----
23-
24-
IMPORTANT: Whatever character or characters are set as the Merge Tags prefix, it or they must be different to the characters set as the Merge Tags suffix. For example, if the Merge Tags prefix is set to `%`, the Merge Tags suffix cannot also be `%`.
22+
----

modules/ROOT/partials/configuration/mergetags_suffix.adoc

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,4 @@ tinymce.init({
1717
toolbar: 'mergetags',
1818
mergetags_suffix: '}}'
1919
});
20-
----
21-
22-
IMPORTANT: Whatever character or characters are set as the Merge Tags suffix, it or they must be different to the characters set as the Merge Tags prefix. For example, if the Merge Tags suffix is set to `%`, the Merge Tags prefix cannot also be `%`.
20+
----

0 commit comments

Comments
 (0)