From 392f25a3d15d29d88f1e7e6318513abb784a5748 Mon Sep 17 00:00:00 2001
From: Josef Glatz <josefglatz@gmail.com>
Date: Tue, 21 Apr 2020 21:54:31 +0200
Subject: [PATCH] [DOCS] Update rte_ckeditor documentation for 10.4 LTS release
Use newer formating, e.g.:
* Definition lists for better readability.
* Content directive to automatically update local TOC.
To not update by hand.
* Use short :: for yaml examples.
To shorten rst code and make it more readable.
* Use option directive to highlight options.
* Update intersphinx urls to not trigger redirects.
Always use YAML instead of yaml or Yaml.
Use inline Fluid example, instead of adding it with another tip.
Update Includes.txt to match current state and provide expected css
classes and text roles.
Resolves: #91137
Releases: master
Change-Id: I185c17a80e69b723b292b9c99eddfe4412362f20
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/64299
Tested-by: Josef Glatz <josefglatz@gmail.com>
Tested-by: Daniel Siepmann <coding@daniel-siepmann.de>
Reviewed-by: Josef Glatz <josefglatz@gmail.com>
Reviewed-by: Daniel Siepmann <coding@daniel-siepmann.de>
---
.../Documentation/Configuration/Concepts.rst | 80 ++++++++-----------
.../Configuration/ConfigureTypo3.rst | 8 +-
.../Documentation/Configuration/Examples.rst | 39 ++++-----
.../Configuration/QuickStart.rst | 26 +++---
.../Documentation/Configuration/Reference.rst | 53 ++++++------
.../Documentation/GeneralConcepts/Index.rst | 37 +++++----
.../rte_ckeditor/Documentation/Includes.txt | 43 +++++-----
.../Documentation/Installation/Index.rst | 4 +-
.../Documentation/Introduction/Index.rst | 2 +-
.../rte_ckeditor/Documentation/Settings.cfg | 36 ++-------
10 files changed, 151 insertions(+), 177 deletions(-)
diff --git a/typo3/sysext/rte_ckeditor/Documentation/Configuration/Concepts.rst b/typo3/sysext/rte_ckeditor/Documentation/Configuration/Concepts.rst
index fd3d32006a91..8665ca2f6ece 100644
--- a/typo3/sysext/rte_ckeditor/Documentation/Configuration/Concepts.rst
+++ b/typo3/sysext/rte_ckeditor/Documentation/Configuration/Concepts.rst
@@ -19,14 +19,17 @@ embedded in the TYPO3 core and not specific to `rte_ckeditor`.
There are three main parts relevant for rich text editing with TYPO3:
-#. **Editor configuration:** This covers how the actual editor (in this case CKEditor)
- should behave, what buttons should be shown, what options are available.
-#. **RTE transformations:** This defines how the information is processed when saved
- from the Rich Text Editor to the database and when loaded from the database into
- the Rich Text Editor
-#. **Frontend output configuration**: The information fetched from the database may need to
- be processed for the frontend. The configuration of the
- frontend output is configured via TypoScript.
+Editor configuration
+ This covers how the actual editor (in this case CKEditor) should behave,
+ what buttons should be shown, what options are available.
+
+RTE transformations
+ This defines how the information is processed when saved from the Rich Text Editor to the database.
+ And when loaded from the database into the Rich Text Editor.
+
+Frontend output configuration
+ The information fetched from the database may need to be processed for the frontend.
+ The configuration of the frontend output is configured via TypoScript.
.. todo: diagram: overview with DB <-> RTE, DB -> FE etc.
@@ -45,49 +48,41 @@ has everything preset (see :ref:`t3tsref:parsefunc`).
Editor Configuration
====================
-Yaml
+YAML
----
For TYPO3 v8 the ability to configure editor-related configuration and transformations
-via Yaml (Yet-Another-Markup-Language) was made available and is usable for both CKEditor
+via YAML (Yet-Another-Markup-Language) was made available and is usable for both CKEditor
and HtmlArea, although for the latter it is recommended to use the existing configuration
when having special setups.
-.. todo: add link to general information about configuration with Yaml, once available
+.. todo: add link to general information about configuration with YAML, once available
-Yaml Basics
+YAML Basics
~~~~~~~~~~~
-* Yaml is case sensitive
+* YAML is case sensitive
* Indenting level reflects hierarchy level and indenting must be used consistently
(indent with 2 spaces in `rte_ckeditor` configuration).
* Comments begin with a `#`.
* White space is important, use a space after `:`.
-This is a dictionary (associative array):
-
-.. code-block:: yaml
+This is a dictionary (associative array)::
key1: value
key2: value
-A dictionary can be nested, for example:
-
-.. code-block:: yaml
+A dictionary can be nested, for example::
key1:
key1-2: value
-This is a list:
-
-.. code-block:: yaml
+This is a list::
- list item 1
- list item 2
-A dictionary can be combined with a list:
-
-.. code-block:: yaml
+A dictionary can be combined with a list::
key:
key2:
@@ -102,7 +97,7 @@ Configuration Presets
Presets are the heart of having custom configuration per record type, or
page area. A preset consists of a name and a reference to the location
-of a Yaml file.
+of a YAML file.
TYPO3 ships with three RTE presets, “defaultâ€, “minimal†and “fullâ€. The
"default" configuration is active by default.
@@ -170,13 +165,14 @@ and per-type basis:
# per-type
RTE.config.tt_content.types.bullets.bodytext.preset = bullets
-* line #2: This sets the "minimal" preset for all bodytext fields of
- content elements.
-* line #4: This sets the "bullets" preset for all bodytext fields of
- content elements with Content Type “Bullet list†(CType=bullets).
+line #2
+ This sets the "minimal" preset for all bodytext fields of content elements.
-Of course, any other specific option set via Yaml can be overridden via
-Page TSconfig as well:
+line #4
+ This sets the "bullets" preset for all bodytext fields of content elements,
+ with Content Type “Bullet list†(CType=bullets).
+
+Of course, any other specific option set via YAML can be overridden via Page TSconfig as well:
.. code-block:: typoscript
@@ -187,10 +183,10 @@ Page TSconfig as well:
The loading order for configuration is:
-#. preset defined for a specific field via PageTS
-#. richtextConfiguration defined for a specific field via TCA
+#. ``preset`` defined for a specific field via PageTS
+#. ``richtextConfiguration`` defined for a specific field via TCA
#. general preset defined via PageTS
-#. default
+#. ``default``
For more examples, see :ref:`t3tsconfig:pageTsRte` in "TSconfig Reference".
@@ -327,7 +323,7 @@ Fluid
-----
Outputting the contents of a RTE-enabled database field within Fluid can
-be achieved by adding :html:`<f:format.html>{record.myfield}</f:format.html>`
+be achieved by adding :html:`{record.myfield -> f:format.html()}`
which in turn calls :typoscript:`stdWrap.parseFunc` with :typoscript:`lib.parseFunc_RTE`
thus applying the same logic. Just ensure that the :typoscript:`lib.parseFunc_RTE`
functionality is available.
@@ -339,13 +335,5 @@ to see if :typoscript:`lib.parseFunc_RTE` is filled.
.. todo: [SCREENSHOT of TSOB having lib.parseFunc_RTE open]
.. important::
- If you add your opening and closing tags on an own line, the rendered output
- includes empty paragraphs at beginning and end.
-
-.. tip::
- In some cases it is an advantage to use the fluid inline notation to output the contents
- of a RTE-enabled database field: :html:`{record.myfield -> f:format.html()}`. This makes
- it easier to process the output further (e.g. by chaining Fluid ViewHelpers).
-
-
-
+ Take care of where you add opening and closing tags, if you don't use the fluid inline notation.
+ If they are on an own line, the rendered output includes empty paragraphs at beginning and end.
diff --git a/typo3/sysext/rte_ckeditor/Documentation/Configuration/ConfigureTypo3.rst b/typo3/sysext/rte_ckeditor/Documentation/Configuration/ConfigureTypo3.rst
index 707edaf057c6..54dc9be3279d 100644
--- a/typo3/sysext/rte_ckeditor/Documentation/Configuration/ConfigureTypo3.rst
+++ b/typo3/sysext/rte_ckeditor/Documentation/Configuration/ConfigureTypo3.rst
@@ -123,10 +123,10 @@ You can view the Global Configuration in
.. _config-typo3-yaml:
-Yaml
+YAML
====
-Most of the configuration of `rte_ckeditor` will be done in a Yaml file.
+Most of the configuration of `rte_ckeditor` will be done in a YAML file.
Relevant Settings for `rte_ckeditor`
@@ -137,7 +137,7 @@ See :ref:`config-ref`
How to change values
--------------------
-This is done directly in the file. The Yaml file should be included in a
+This is done directly in the file. The YAML file should be included in a
sitepackage extension, see :ref:`best-practice-sitepackage`.
@@ -147,7 +147,7 @@ TCA
===
The :abbr:`table configuration array (TCA)` is used to configure database fields and how they will behave in the
-backend when edited. It is for example used to define that tt_content.bodytext should be edited
+backend when edited. It is for example used to define that ``tt_content.bodytext`` should be edited
with a rich text editor.
diff --git a/typo3/sysext/rte_ckeditor/Documentation/Configuration/Examples.rst b/typo3/sysext/rte_ckeditor/Documentation/Configuration/Examples.rst
index c3e393cc3b4a..368ac3657eb7 100644
--- a/typo3/sysext/rte_ckeditor/Documentation/Configuration/Examples.rst
+++ b/typo3/sysext/rte_ckeditor/Documentation/Configuration/Examples.rst
@@ -55,9 +55,7 @@ with the name of your preset.
$GLOBALS['TYPO3_CONF_VARS']['RTE']['Presets']['my_preset'] = 'EXT:my_extension/Configuration/RTE/MyPreset.yaml';
-In :file:`Configuration/RTE/MyPreset.yaml`, create your configuration, for example:
-
-.. code-block:: yaml
+In :file:`Configuration/RTE/MyPreset.yaml`, create your configuration, for example::
# Import basic configuration
imports:
@@ -76,14 +74,14 @@ How Do I Customize the Toolbar?
Since CKEditor 4, there are 2 ways to customize the toolbar buttons:
-#. Using `editor.config.toolbar
- <https://ckeditor.com/docs/ckeditor4/latest/guide/dev_toolbarconcepts.html#item-by-item-configuration>`_
- : This has the advantage, that each button is configured individually and it gives
- you more control over what is displayed in the toolbar.
-#. Using `editor.config.toolbarGroups
- <https://ckeditor.com/docs/ckeditor4/latest/guide/dev_toolbarconcepts.html#toolbar-groups-configuration>`__
- : This has the advantage, that new buttons
- that have been added by plugins will automatically appear.
+Using `editor.config.toolbar <https://ckeditor.com/docs/ckeditor4/latest/guide/dev_toolbarconcepts.html#item-by-item-configuration>`_
+ This has the advantage,
+ that each button is configured individually
+ and it gives you more control over what is displayed in the toolbar.
+
+Using `editor.config.toolbarGroups <https://ckeditor.com/docs/ckeditor4/latest/guide/dev_toolbarconcepts.html#toolbar-groups-configuration>`__
+ This has the advantage,
+ that new buttons that have been added by plugins will automatically appear.
This is explained in the
`Toolbar documentation <https://ckeditor.com/latest/samples/old/toolbar/toolbar.html>`__
@@ -96,9 +94,7 @@ Configuration Using the toolbarGroups Method
Each button is in a specific toolbarGroup. You can configure various toolbars, containing
one or more toolbarGroups.
-Example:
-
-.. code-block:: yaml
+Example::
toolbarGroups:
- { name: clipboard, groups: [ clipboard, cleanup, undo ] }
@@ -121,8 +117,10 @@ When you are ready, click :guilabel:`"Get toolbar config"` to see the configurat
How do I add Custom Plugins?
============================
+.. todo: change url to Plugins.yaml after branching master to 10.4
+
See `EXT:rte_ckeditor/Configuration/RTE/Editor/Plugins.yaml
-<https://github.com/TYPO3/TYPO3.CMS/blob/9.5/typo3/sysext/rte_ckeditor/Configuration/RTE/Editor/Plugins.yaml>`__
+<https://github.com/TYPO3/TYPO3.CMS/blob/master/typo3/sysext/rte_ckeditor/Configuration/RTE/Editor/Plugins.yaml>`__
for a list of plugins, that are already integrated in `rte_ckeditor`. Besides this, the wordcount plugin was added as
npm package. You can find it within :file:`typo3/sysext/rte_ckeditor/Resources/Public/JavaScript/Contrib/plugins/wordcount/`.
@@ -147,18 +145,15 @@ In this example, we integrate the plugin `codesnippet <https://ckeditor.com/cke4
4. Include the path to the plugin in your Yaml configuration, for example:
- :file:`EXT:my_extension/Configuration/RTE/MyPreset.yaml`:
-
- .. code-block:: yaml
+ :file:`EXT:my_extension/Configuration/RTE/MyPreset.yaml`::
editor:
externalPlugins:
codesnippet:
resource: "EXT:my_extension/Resources/Public/CKeditor/Plugins/codesnippet/"
- .. tip::
- Each CKEditor plugin must have a javascript file called :file:`plugin.js` per convention.
- If this is not the case, you must reference the whole path including the javascript file.
+ Each CKEditor plugin must have a javascript file called :file:`plugin.js` per convention.
+ If this is not the case, you must reference the whole path including the javascript file.
5. Configure
@@ -185,7 +180,7 @@ In this example, we integrate the plugin `codesnippet <https://ckeditor.com/cke4
.. -------------------------------------
.. todo: additional questions
What are stylesets?
- Some configuration can be done with Page TSconfig, some with TCA and some with Yaml and some with either 2 or more of these. Why and what should be configured where?
+ Some configuration can be done with Page TSconfig, some with TCA and some with YAML and some with either 2 or more of these. Why and what should be configured where?
How can I configure classes to anchor tags?
What is the contents.css?
How can I set specific classes for anchors?
diff --git a/typo3/sysext/rte_ckeditor/Documentation/Configuration/QuickStart.rst b/typo3/sysext/rte_ckeditor/Documentation/Configuration/QuickStart.rst
index b7202a2e25c9..0d0df221f1ad 100644
--- a/typo3/sysext/rte_ckeditor/Documentation/Configuration/QuickStart.rst
+++ b/typo3/sysext/rte_ckeditor/Documentation/Configuration/QuickStart.rst
@@ -45,10 +45,12 @@ Override the configuration preset "default" by adding this in :file:`<my_extensi
$GLOBALS['TYPO3_CONF_VARS']['RTE']['Presets']['default'] = 'EXT:my_extension/Configuration/RTE/Default.yaml';
Add the file :file:`Configuration/RTE/Default.yaml` to your extension, use the file
-:file:`EXT:rte_ckeditor/Configuration/RTE/Full.yaml` as example (see latest 9.5
-`Full.yaml <https://github.com/TYPO3/TYPO3.CMS/blob/9.5/typo3/sysext/rte_ckeditor/Configuration/RTE/Full.yaml>`__)
+:file:`EXT:rte_ckeditor/Configuration/RTE/Full.yaml` as example (see latest 10.4
+`Full.yaml <https://github.com/TYPO3/TYPO3.CMS/blob/master/typo3/sysext/rte_ckeditor/Configuration/RTE/Full.yaml>`__)
-We explain the example 'Minimal.yaml' from the core:
+.. todo: change url to Full.yaml after branching master to 10.4
+
+We explain the example :file:`Minimal.yaml` from the core:
.. code-block:: yaml
:linenos:
@@ -71,11 +73,13 @@ We explain the example 'Minimal.yaml' from the core:
- Underline
- Strike
-* line #2: imports existing files to make basic parts reusable and improve structure
- of configuration
-* line #9: toolbarGroups, see `toolbarGroups
- <https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_config.html#cfg-toolbarGroups>`__
- and `Understanding CKEditor Toolbar Concepts
- <https://ckeditor.com/docs/ckeditor4/latest/guide/dev_toolbarconcepts.html>`__
-* line #12: removeButtons: this deactivates default buttons rendered in the toolbar, see `removeButtons
- <https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_config.html#cfg-removeButtons>`__
+line #2
+ Imports existing files to make basic parts reusable and improve structure of configuration
+
+line #9 toolbarGroups
+ See `toolbarGroups <https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_config.html#cfg-toolbarGroups>`__
+ and `Understanding CKEditor Toolbar Concepts <https://ckeditor.com/docs/ckeditor4/latest/guide/dev_toolbarconcepts.html>`__
+
+line #12 removeButtons
+ This deactivates default buttons rendered in the toolbar,
+ see `removeButtons <https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_config.html#cfg-removeButtons>`__
diff --git a/typo3/sysext/rte_ckeditor/Documentation/Configuration/Reference.rst b/typo3/sysext/rte_ckeditor/Documentation/Configuration/Reference.rst
index 2bf2148e8586..c4ec97db9af7 100644
--- a/typo3/sysext/rte_ckeditor/Documentation/Configuration/Reference.rst
+++ b/typo3/sysext/rte_ckeditor/Documentation/Configuration/Reference.rst
@@ -9,14 +9,15 @@ Configuration Reference
.. _config-ref-yaml:
-Yaml Configuration Reference
+YAML Configuration Reference
============================
-When configurating the CKEditor using Yaml, these are the property
+When configurating the CKEditor using YAML, these are the property
names that are currently used:
-* processing
-* editor
+.. contents::
+ :local:
+ :depth: 1
processing
----------
@@ -47,44 +48,46 @@ like handling images.
editor.config
~~~~~~~~~~~~~
-.. todo: rewrite this section to optimize the UX and look and feel
+.. option:: editor.config:
-editor.config:
Configuration options For a list of all options see
https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_config.html
-editor.config.language
+.. option:: editor.config.language
+
defines the editor’s UI language, and is dynamically calculated (if not set otherwise) by
the backend users’ preference.
-editor.config.contentsLanguage
+.. option:: editor.config.contentsLanguage
+
defines the language of the data, which is fetched from the
sys_language information, but can be overridden by this option as well.
For referencing files, TYPO3's internal "EXT:" syntax can be used, for
using language labels, TYPO3's "LLL:" language functionality can be used.
-editor.config.contentsCss
- defines the CSS file of the editor and the styles that can be applied.
+.. option:: editor.config.contentsCss
- Example:
+ defines the CSS file of the editor and the styles that can be applied.
- .. code-block:: yaml
+ Example::
editor.config.contentCss: "EXT:rte_ckeditor/Resources/Public/Css/contents.css"
This is the default, as defined in `EXT:rte_ckeditor/Configuration/RTE/Editor/Base.yaml
- <https://github.com/TYPO3/TYPO3.CMS/blob/9.5/typo3/sysext/rte_ckeditor/Configuration/RTE/Editor/Base.yaml>`__.
+ <https://github.com/TYPO3/TYPO3.CMS/blob/master/typo3/sysext/rte_ckeditor/Configuration/RTE/Editor/Base.yaml>`__.
+
+.. todo: change url to Base.yaml after branching master to 10.4
+
+.. option:: editor.config.style
-editor.config.style
Sets the style
-editor.config.toolbarGroup
+.. option:: editor.config.toolbarGroup
+
This defines, which toolbarGroups (and corresponding buttons) will be
visible in the toolbar.
- Example:
-
- .. code-block:: yaml
+ Example::
toolbarGroups:
- { name: clipboard, groups: [ clipboard, cleanup, undo ] }
@@ -92,12 +95,11 @@ editor.config.toolbarGroup
See :ref:`config-example-toolbargroup` for
more information.
-editor.config.removeButtons
- deactivates default buttons rendered in the toolbar.
+.. option:: editor.config.removeButtons
- Example:
+ deactivates default buttons rendered in the toolbar.
- .. code-block:: yaml
+ Example::
removeButtons:
- Anchor
@@ -114,8 +116,11 @@ editor.config.removeButtons
editor.*
~~~~~~~~
-editor.externalPlugins
+.. option:: editor.externalPlugins
+
is a list of plugins with their routes and additional configuration options,
the main “resource†subproperty needs to be set which is a JavaScript file
using CKEditor’s plugin API, see `rte_ckeditor/Configuration/RTE/Editor/Plugins.yaml
- <https://github.com/TYPO3/TYPO3.CMS/blob/9.5/typo3/sysext/rte_ckeditor/Configuration/RTE/Editor/Plugins.yaml>`__.
+ <https://github.com/TYPO3/TYPO3.CMS/blob/master/typo3/sysext/rte_ckeditor/Configuration/RTE/Editor/Plugins.yaml>`__.
+
+.. todo: change url to Plugins.yaml after branching master to 10.4
diff --git a/typo3/sysext/rte_ckeditor/Documentation/GeneralConcepts/Index.rst b/typo3/sysext/rte_ckeditor/Documentation/GeneralConcepts/Index.rst
index 7e4becaf23c5..dffb90fc8b50 100644
--- a/typo3/sysext/rte_ckeditor/Documentation/GeneralConcepts/Index.rst
+++ b/typo3/sysext/rte_ckeditor/Documentation/GeneralConcepts/Index.rst
@@ -12,19 +12,24 @@ Editing Modes
CKEditor has three editing modes:
-* **“Article Editorâ€** mode (classic RTE): Editing is done within a fixed container.
- It is possible to customize how the editor behaves and how the content is styled.
-* **“Document Editorâ€** mode: Editing is done as in Microsoft Word or Google Docs,
- where the document itself mimics a sheet of paper. The focus is on structuring
- content and not mainly on the layout itself.
-* **“Inline Editorâ€** mode: All formatting styles are reused from the surrounding
- HTML and CSS styles, allowing for a seamless frontend editing.
-
-“Article Editor†mode is used in the TYPO3 Backend.
-
-“Inline Editor mode†is used by TYPO3’s “frontend_editing†which can be found on GitHub
-(`frontend_editing <https://github.com/FriendsOfTYPO3/frontend_editing>`__.
-Frontend_editing is not covered in this document.
-
-For a demonstration of all three modes, see the
-`CKEditor demo <https://ckeditor.com/ckeditor-4/demo/#article>`__.
+Article Edito mode (classic RTE)
+ Editing is done within a fixed container.
+ It is possible to customize how the editor behaves and how the content is styled.
+
+ Used in the TYPO3 Backend.
+
+Document Editor mode
+ Editing is done as in Microsoft Word or Google Docs,
+ where the document itself mimics a sheet of paper.
+ The focus is on structuring content and not mainly on the layout itself.
+
+Inline Editor mode
+ All formatting styles are reused from the surrounding HTML and CSS styles,
+ allowing for a seamless frontend editing.
+
+ Used by TYPO3’s frontend_editing,
+ which can be found on `GitHub <https://github.com/FriendsOfTYPO3/frontend_editing>`__.
+ frontend_editing is not covered in this document.
+
+For a demonstration of all three modes,
+see the `CKEditor demo <https://ckeditor.com/ckeditor-4/demo/#article>`__.
diff --git a/typo3/sysext/rte_ckeditor/Documentation/Includes.txt b/typo3/sysext/rte_ckeditor/Documentation/Includes.txt
index e5dc7ba09381..957d50c9b575 100644
--- a/typo3/sysext/rte_ckeditor/Documentation/Includes.txt
+++ b/typo3/sysext/rte_ckeditor/Documentation/Includes.txt
@@ -1,23 +1,20 @@
-.. ==================================================
-.. FOR YOUR INFORMATION
-.. --------------------------------------------------
-.. -*- coding: utf-8 -*- with BOM.
-
-.. This is 'Includes.txt'. It is included at the very top of each and
- every ReST source file in this documentation project (= manual).
-
-
-.. ==================================================
-.. DEFINE SOME TEXT ROLES
-.. --------------------------------------------------
-
-.. role:: html(code)
-
-.. role:: typoscript(code)
-
-.. role:: ts(typoscript)
- :class: typoscript
-
-.. role:: php(code)
-
-.. highlight:: php
+.. This is 'Includes.txt'. It is included at the very top of each and
+ every ReST source file in THIS documentation project (= manual).
+
+.. role:: aspect (emphasis)
+.. role:: html(code)
+.. role:: js(code)
+.. role:: php(code)
+.. role:: typoscript(code)
+.. role:: typescript(code)
+.. role:: shell(code)
+.. role:: sql(code)
+.. role:: yaml(code)
+
+.. role:: ts(typoscript)
+ :class: typoscript
+.. role:: javascript(js)
+ :class: js
+
+.. default-role:: code
+.. highlight:: yaml
diff --git a/typo3/sysext/rte_ckeditor/Documentation/Installation/Index.rst b/typo3/sysext/rte_ckeditor/Documentation/Installation/Index.rst
index f1ca55e20609..af450b826317 100644
--- a/typo3/sysext/rte_ckeditor/Documentation/Installation/Index.rst
+++ b/typo3/sysext/rte_ckeditor/Documentation/Installation/Index.rst
@@ -10,7 +10,7 @@ Installation
TYPO3 v9 and higher
===================
-For installations since TYPO3 version 9, `rte_ckeditor` is activated by
+For installations since TYPO3 version 9 LTS, `rte_ckeditor` is activated by
default and ships with a default configuration for editors.
If you installed TYPO3 via composer with "subtree split", you must install
@@ -18,7 +18,7 @@ the extension, for example:
.. code-block:: bash
- composer require typo3/cms-rte-ckeditor:~9.5
+ composer require typo3/cms-rte-ckeditor:~10.4
See :ref:`t3coreapi:extension-install` in TYPO3 Explained for more information
about installing extensions.
diff --git a/typo3/sysext/rte_ckeditor/Documentation/Introduction/Index.rst b/typo3/sysext/rte_ckeditor/Documentation/Introduction/Index.rst
index 3b46a7895e48..558fac2f06d9 100644
--- a/typo3/sysext/rte_ckeditor/Documentation/Introduction/Index.rst
+++ b/typo3/sysext/rte_ckeditor/Documentation/Introduction/Index.rst
@@ -59,7 +59,7 @@ integrated into `rte_ckeditor` and new plugins have been written for TYPO3.
Some examples of features:
-* Configurable via Yaml files
+* Configurable via YAML files
* Configuration presets (minimal, default, full) for TYPO3
* Toolbar customization
* Link functionality: integration with TYPO3 link wizard
diff --git a/typo3/sysext/rte_ckeditor/Documentation/Settings.cfg b/typo3/sysext/rte_ckeditor/Documentation/Settings.cfg
index 7269ed1c56e1..ed4605d54649 100644
--- a/typo3/sysext/rte_ckeditor/Documentation/Settings.cfg
+++ b/typo3/sysext/rte_ckeditor/Documentation/Settings.cfg
@@ -1,5 +1,3 @@
-# coding: utf-8
-
# #####
#
# Settings.cfg - A TYPO3 Documentation Project's Configuration File
@@ -14,17 +12,15 @@
# #####
[general]
-
project = Rich Text Editing in TYPO3 with CKEditor (rte_ckeditor)
-version = latest (10-dev)
-release = latest (10-dev)
+version = 10.4
+release = 10.4
t3author = Initial version by Benni Mack, updated and maintained by the TYPO3 community
copyright = 2019-2020
description = Integration of CKEditor into TYPO3 for rich text editing (RTE).
[html_theme_options]
-
# Add "Edit me on Github" button
# core contribution is possible via Github PR
github_branch = master
@@ -35,27 +31,11 @@ path_to_documentation_dir = typo3/sysext/rte_ckeditor/Documentation
project_issues = https://forge.typo3.org/projects/typo3cms-core/issues
project_repository = https://git.typo3.org/Packages/TYPO3.CMS.git
-
-
[intersphinx_mapping]
-; Comment out what you don't use.
-; Uncomment only what you actually use in crossreferencing!
-
-# t3api = https://typo3.org/api/typo3cms/
-# t3cgl = https://docs.typo3.org/typo3cms/CodingGuidelinesReference/
-t3coreapi = https://docs.typo3.org/typo3cms/CoreApiReference/
-t3editors = https://docs.typo3.org/typo3cms/EditorsTutorial/
-# t3extbasebook = https://docs.typo3.org/typo3cms/ExtbaseFluidBook/
-# t3install = https://docs.typo3.org/typo3cms/InstallationGuide/
-# t3l10n = https://docs.typo3.org/typo3cms/FrontendLocalizationGuide/
-# t3start = https://docs.typo3.org/typo3cms/GettingStartedTutorial/
-t3sitepackage = https://docs.typo3.org/typo3cms/SitePackageTutorial/
-t3tca = https://docs.typo3.org/typo3cms/TCAReference/
-# t3ts45 = https://docs.typo3.org/typo3cms/TyposcriptIn45MinutesTutorial/
-t3tsconfig = https://docs.typo3.org/typo3cms/TSconfigReference/
-t3tsref = https://docs.typo3.org/typo3cms/TyposcriptReference/
-
-[extensions]
-any_name_youtube = sphinxcontrib.youtube
-
+t3coreapi = https://docs.typo3.org/m/typo3/reference-coreapi/master/en-us/
+t3editors = https://docs.typo3.org/m/typo3/tutorial-editors/master/en-us/
+t3sitepackage = https://docs.typo3.org/m/typo3/tutorial-sitepackage/master/en-us/
+t3tca = https://docs.typo3.org/m/typo3/reference-tca/master/en-us/
+t3tsconfig = https://docs.typo3.org/m/typo3/reference-tsconfig/master/en-us/
+t3tsref = https://docs.typo3.org/m/typo3/reference-typoscript/master/en-us/
--
GitLab