Skip to content

Commit 1625ed8

Browse files
committed
DOC-3202: copy edits, cleanup.
1 parent fcfb0c0 commit 1625ed8

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

modules/ROOT/pages/migration-from-4x.adoc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -117,11 +117,11 @@ forced_root_block: "p"
117117

118118
* **Removed in {productname} 6.0**: Legacy mobile theme was removed, but mobile-specific configuration is still supported through the `mobile` option.
119119
* **Default Changes in TinyMCE 7.0**:
120-
** xref:content-filtering.adoc#sandbox-iframes[sandbox iframes]: Now defaults to `true` (adds sandbox attribute to iframes)
121-
** xref:content-filtering.adoc#convert-unsafe-embeds[convert_unsafe_embeds]: Now defaults to `true` (converts object/embed elements to safer alternatives)
122-
** xref:accessibility.adoc#highlight_on_focus[highlight_on_focus]: Now defaults to `true` (adds focus outline to editors)
120+
** xref:content-filtering.adoc#sandbox-iframes[`sandbox iframes`]: Now defaults to `true` (adds sandbox attribute to iframes)
121+
** xref:content-filtering.adoc#convert-unsafe-embeds[`convert_unsafe_embeds`]: Now defaults to `true` (converts object/embed elements to safer alternatives)
122+
** xref:accessibility.adoc#highlight_on_focus[`highlight_on_focus`]: Now defaults to `true` (adds focus outline to editors)
123123
* **New Options in {productname} 7.0**:
124-
** xref:license-key.adoc[license_key]: Must be set to `gpl` or a valid license key
124+
** xref:license-key.adoc[`license_key`]: Must be set to `gpl` or a valid license key
125125
** xref:content-filtering.adoc#sandbox-iframes-exclusions[`sandbox_iframes_exclusions`]: List of URL hosts to exclude from iframe sandboxing
126126

127127
.Example:
@@ -164,7 +164,7 @@ license_key: "your-license-key"
164164
. **Update Core Initialization**:
165165
.. Update `theme`, `skin`, and to refect the new oxide theme and skin.
166166
... In {productname} 4, there were multiple themes available including 'modern', 'inlite', and 'mobile'. These themes were removed in {productname} 5 and combined into a single responsive theme called "Silver".
167-
.. Update `forced_root_block: false` options to `forced_root_block: "<p>"`.
167+
.. Update `forced_root_block: false` options to `forced_root_block: "p"`.
168168
.. Consolidate toolbars.
169169
.. Review new v{release-version} defaults for security settings.
170170
. **Plugin Migration**:

modules/ROOT/pages/migration-from-5x.adoc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -130,12 +130,12 @@ tinymce.init({
130130
** `table_responsive_width` replaced by `table_sizing_mode`.
131131

132132
* **Default Changes in TinyMCE 7.0**:
133-
** xref:content-filtering.adoc#sandbox-iframes[sandbox iframes]: Now defaults to `true` (adds sandbox attribute to iframes)
134-
** xref:content-filtering.adoc#convert-unsafe-embeds[convert_unsafe_embeds]: Now defaults to `true` (converts object/embed elements to safer alternatives)
135-
** xref:accessibility.adoc#highlight_on_focus[highlight_on_focus]: Now defaults to `true` (adds focus outline to editors)
133+
** xref:content-filtering.adoc#sandbox-iframes[`sandbox iframes`]: Now defaults to `true` (adds sandbox attribute to iframes)
134+
** xref:content-filtering.adoc#convert-unsafe-embeds[`convert_unsafe_embeds`]: Now defaults to `true` (converts object/embed elements to safer alternatives)
135+
** xref:accessibility.adoc#highlight_on_focus[`highlight_on_focus`]: Now defaults to `true` (adds focus outline to editors)
136136

137137
* **New Options in {productname} 7.0**:
138-
** xref:license-key.adoc[license_key]: Must be set to `gpl` or a valid license key
138+
** xref:license-key.adoc[`license_key`]: Must be set to `gpl` or a valid license key
139139
** xref:content-filtering.adoc#sandbox-iframes-exclusions[`sandbox_iframes_exclusions`]: List of URL hosts to exclude from iframe sandboxing
140140

141141
.Example:
@@ -198,7 +198,7 @@ license_key: "your-license-key"
198198
. **Update Core Initialization**:
199199
.. Update `theme`, `skin`, and to refect the new oxide theme and skin.
200200
... In {productname} 4, there were multiple themes available including 'modern', 'inlite', and 'mobile'. These themes were removed in {productname} 5 and combined into a single responsive theme called "Silver".
201-
.. Update `forced_root_block: false` options to `forced_root_block: "<p>"`.
201+
.. Update `forced_root_block: false` options to `forced_root_block: "p"`.
202202
.. Consolidate toolbars.
203203
.. Review new v{release-version} defaults for security settings.
204204
. **Plugin Migration**:

0 commit comments

Comments
 (0)