Skip to content

Commit e266a74

Browse files
authored
Merge branch 'feature/8.0.0/DOC-3147' into feature/8.0.0/DOC-3147_TINY-12101
2 parents 25d85e2 + 38c93a6 commit e266a74

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+1752
-775
lines changed

modules/ROOT/examples/live-demos/a11ychecker/index.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,11 @@ tinymce.init({
22
selector: 'textarea#a11ychecker',
33
plugins: 'a11ychecker advcode table advlist lists image media anchor link autoresize',
44
toolbar: 'a11ycheck | blocks bold forecolor backcolor | bullist numlist | link image media anchor | table | code',
5+
max_height: 500,
56
a11y_advanced_options: true,
67
a11ychecker_html_version: 'html5',
78
a11ychecker_level: 'aaa',
9+
a11ychecker_allow_decorative_images: true,
10+
a11ychecker_alt_text_max_length: 150,
811
content_style: 'body { font-family:Helvetica,Arial,sans-serif; font-size:16px }'
912
});

modules/ROOT/examples/live-demos/spellchecker/index.js

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,31 +3,31 @@ tinymce.init({
33
plugins: 'code tinymcespellchecker link',
44
toolbar: 'spellchecker language spellcheckdialog',
55
height: 500,
6-
spellchecker_language: 'en_US',
6+
spellchecker_language: 'en-US',
77
content_langs: [
8-
{ title: 'Afrikaans (South Africa)', code: 'af_ZA', customCode: 'af_ZA' },
9-
{ title: 'English (Australia)', code: 'en_AU' },
10-
{ title: 'English (Canada)', code: 'en_CA' },
11-
{ title: 'English (United Kingdom)', code: 'en_GB' },
12-
{ title: 'English (United States)', code: 'en_US' },
13-
{ title: 'Medical English (US)', code: 'en_US', customCode: 'en_US-medical' },
14-
{ title: 'Medical English (UK)', code: 'en_GB', customCode: 'en_GB-medical' },
8+
{ title: 'Afrikaans (South Africa)', code: 'af-ZA', customCode: 'af-ZA' },
9+
{ title: 'English (Australia)', code: 'en-AU' },
10+
{ title: 'English (Canada)', code: 'en-CA' },
11+
{ title: 'English (United Kingdom)', code: 'en-GB' },
12+
{ title: 'English (United States)', code: 'en-US' },
13+
{ title: 'Medical English (US)', code: 'en-US', customCode: 'en-US-medical' },
14+
{ title: 'Medical English (UK)', code: 'en-GB', customCode: 'en-GB-medical' },
1515
{ title: 'Danish', code: 'da' },
16-
{ title: 'Dutch', code: 'nl_NL' },
16+
{ title: 'Dutch', code: 'nl-NL' },
1717
{ title: 'Finnish', code: 'fi' },
1818
{ title: 'French', code: 'fr' },
19-
{ title: 'German', code: 'de_DE' },
19+
{ title: 'German', code: 'de-DE' },
2020
{ title: 'Hungarian', code: 'hu' },
21-
{ title: 'Italian', code: 'it_IT' },
22-
{ title: 'Maori (New Zealand)', code: 'mi_NZ' },
23-
{ title: 'Norwegian Bokmål', code: 'nb_NO' },
21+
{ title: 'Italian', code: 'it-IT' },
22+
{ title: 'Maori (New Zealand)', code: 'mi-NZ' },
23+
{ title: 'Norwegian Bokmål', code: 'nb-NO' },
2424
{ title: 'Norwegian Nynorsk', code: 'nn' },
2525
{ title: 'Polish', code: 'pl' },
26-
{ title: 'Portuguese (Brazil)', code: 'pt_BR' },
27-
{ title: 'Portuguese (Portugal)', code: 'pt_PT' },
26+
{ title: 'Portuguese (Brazil)', code: 'pt-BR' },
27+
{ title: 'Portuguese (Portugal)', code: 'pt-PT' },
2828
{ title: 'Spanish', code: 'es' },
29-
{ title: 'Swedish', code: 'sv_SE' },
30-
{ title: 'Swedish (Finland)', code: 'sv_FI' }
29+
{ title: 'Swedish', code: 'sv-SE' },
30+
{ title: 'Swedish (Finland)', code: 'sv-FI' }
3131
],
3232
content_style: 'body { font-family:Helvetica,Arial,sans-serif; font-size:16px }'
3333
});

modules/ROOT/nav.adoc

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,8 +140,6 @@
140140
**** xref:configure-imageproxy-service.adoc[Image Proxy service settings]
141141
**** xref:configure-spelling-service.adoc[Spelling service settings]
142142
**** xref:self-hosting-hunspell.adoc[Spelling service - Using Hunspell dictionaries]
143-
**** xref:configure-logging-services.adoc[Activity logging]
144-
*** xref:introduction-to-premium-selfhosted-services.adoc[Server-side component installation without Docker]
145143
*** xref:troubleshoot-server.adoc[Troubleshoot server-side components]
146144
** Customizing the editor appearance
147145
*** xref:customize-ui.adoc[Customizing the UI]

modules/ROOT/pages/8.0-release-notes.adoc

Lines changed: 295 additions & 18 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)