ExpressionEngine · intoeetive · Feb 14, 2024 · Feb 2, 2023 · Feb 3, 2023 · Feb 13, 2023
diff --git a/docs/_images/cp-channel-categories-tab.png b/docs/_images/cp-channel-categories-tab.png
diff --git a/docs/_images/cp-entry-categories-tab.png b/docs/_images/cp-entry-categories-tab.png
diff --git a/docs/_images/cp-members.png b/docs/_images/cp-members.png
diff --git a/docs/_images/cp_collapase_arrow.png → docs/_images/cp_collapse_arrow.png b/docs/_images/cp_collapase_arrow.png → docs/_images/cp_collapse_arrow.png
diff --git a/docs/_images/field_file.png b/docs/_images/field_file.png
diff --git a/docs/_images/field_file_file.png b/docs/_images/field_file_file.png
diff --git a/docs/_images/field_members.png b/docs/_images/field_members.png
diff --git a/docs/_images/field_short_name.png b/docs/_images/field_short_name.png
diff --git a/docs/_images/icon_edit.png b/docs/_images/icon_edit.png
diff --git a/docs/_images/icon_edit_meta.png b/docs/_images/icon_edit_meta.png
diff --git a/docs/_images/icon_remove.png b/docs/_images/icon_remove.png
diff --git a/docs/_images/rte-buttons.png b/docs/_images/rte-buttons.png
diff --git a/docs/_tips/form-attributes.md b/docs/_tips/form-attributes.md
@@ -0,0 +1 @@
+TIP: Valid HTML Form attributes (as listed in the [config file](config/config-files.md#html-form-attributes)), `data-` and `aria-` attributes passed through ExpressionEngine tag parameters in the template will be included into generated opening form tag.
diff --git a/docs/add-ons/consent.md b/docs/add-ons/consent.md
@@ -40,6 +40,8 @@ Consent Forms allow the visitor to grant or withdraw consent to one or more Cons
 
 [TOC=3]
 
+{{embed:_tips/form-attributes.md}}
+
 #### `consent=`
 
     consent='ee:cookies_functionality'
@@ -179,7 +181,7 @@ If this tag would not output any consent requests due to your filters, the conte
       No Consent Requests Available
     {/if}
 
-### Conesnt Form Examples
+### Consent Form Examples
 
 #### Simple Bulk Consent Form
 
@@ -466,7 +468,7 @@ If you need to exclude one or several types from display, use `not ` before the
 
     provider='ee'
 
-Limits display of cookies by cookie provider. 
+Limits display of cookies by cookie provider.
 If the cookie is provided by an add-on, the provider matches the add-ons short name, e.g. `comment` or `forum`
 The core ExpressionEngine cookies are identified by `ee` as provider.
 If cookie is only being used in Control Panel, the provider is set to `cp`.

diff --git a/docs/add-ons/email.md b/docs/add-ons/email.md
@@ -56,6 +56,8 @@ The contact form is created similar to a standard web form, only you **do not**
 
 [TOC=3]
 
+{{embed:_tips/form-attributes.md}}
+
 ### `charset=`
 
     charset="utf-8"

diff --git a/docs/add-ons/pro-search/filters.md b/docs/add-ons/pro-search/filters.md
@@ -168,7 +168,7 @@ You can use the native `search:field_name` parameter to target specific fields.
 ### Parameters
 
 #### `search:field_name`
-    Like the [channel search:field_name= parameter](/channel/channel_entries.html#search-field-name).
+    Like the [channel search:field_name= parameter](/channel/channel_entries.md#search-field-name).
 #### `search:field_name:column_name`
     Works just like the `search:field_name` parameter, but targets a specific column in a Grid/Matrix field.
 #### `search:title`
@@ -178,7 +178,7 @@ You can use the native `search:field_name` parameter to target specific fields.
 #### `search:status`
     Works just like the `search:field_name` parameter, but targets statuses.
 #### `contains_words`
-    Accepts parameter names. Force the given parameter values to match the full term, to ensure that the values are [not contained within other words](/channel/channel_entries.html#contains-matching). Also possible by using `search:field_name="value\W"`.
+    Accepts parameter names. Force the given parameter values to match the full term, to ensure that the values are [not contained within other words](/channel/channel_entries.md#contains-matching). Also possible by using `search:field_name="value\W"`.
 #### `ends_with`
     Accepts parameter names. Force the given parameter values to match the end of the target field. Also possible by using `search:field_name="value$"`.
 #### `exact`

diff --git a/docs/add-ons/pro-search/parameters.md b/docs/add-ons/pro-search/parameters.md
@@ -117,7 +117,7 @@ This is equal to:
 
 ### SQL parameters
 
-Pro Search supports SQL parameters. This means you can use a SQL query in any pararameter. SQL queries are limited to SELECTs only and should always end with a semi-colon (;). Pro Search will take the first item in the SELECT statement and creates a pipe-separated list from it. If the SQL query produces no results, it sets the parameter value to what comes after the semi-colon. You can optionally prefix the SQL query for better matching. Schematically, such a query looks like this:
+Pro Search supports SQL parameters. This means you can use a SQL query in any parameter. SQL queries are limited to SELECTs only and should always end with a semi-colon (;). Pro Search will take the first item in the SELECT statement and creates a pipe-separated list from it. If the SQL query produces no results, it sets the parameter value to what comes after the semi-colon. You can optionally prefix the SQL query for better matching. Schematically, such a query looks like this:
 
 `param="prefix SELECT field FROM table WHERE lorem = 'ipsum';no results"`
 

diff --git a/docs/add-ons/pro-search/settings.md b/docs/add-ons/pro-search/settings.md
@@ -40,7 +40,7 @@ The same query with GET variables would look like this:
 
 `domain.com/search/results?keywords=hello+world`
 
-Using GET variables is not possible if the `uri_protocol` config setting is set to QUERY_STRING. It can also cause unexpected behaviour if you’re using the second exception (the question mark) in your `.htaccess` file when hiding `index.php`. If you can, use the encoded query instead as this will always work.
+Using GET variables is not possible if the `uri_protocol` config setting is set to QUERY_STRING. It can also cause unexpected behavior if you’re using the second exception (the question mark) in your `.htaccess` file when hiding `index.php`. If you can, use the encoded query instead as this will always work.
 
 NOTE:**Note:** When using GET variables, make sure Dynamic Channel Query Caching is turned off.
 
@@ -54,7 +54,7 @@ Choose a tag which is used to highlight keywords in the search excerpt. Options
 
 ### Minimum word length
 
-The ft_min_word_len setting of your MySQL installation determines the minimum length of words indexed by the Full Text index. Setting that value here will trigger an alternative search algorithm when the search term is smaller than this size. Defaults to 4. Do not alter unless you have customised your MySQL installation.
+The ft_min_word_len setting of your MySQL installation determines the minimum length of words indexed by the Full Text index. Setting that value here will trigger an alternative search algorithm when the search term is smaller than this size. Defaults to 4. Do not alter unless you have customized your MySQL installation.
 
 ### Stop words
 

diff --git a/docs/add-ons/pro-variables/manage.md b/docs/add-ons/pro-variables/manage.md
@@ -51,7 +51,7 @@ When using the suffix option, you can use `{suffix}` in both the variable name a
 
 ## Variable groups
 
-You can create any number of groups to organise your variables. These groups will appear in the Group drop down for each variable, so you can assign a group to it. On the module home page, variable managers can sort the groups using drag and drop. Variable managers can also edit and delete the groups from here, by clicking on the edit or delete icon next to the group name. You can alter the variable order in a group by editing the group’s properties.
+You can create any number of groups to organize your variables. These groups will appear in the Group drop down for each variable, so you can assign a group to it. On the module home page, variable managers can sort the groups using drag and drop. Variable managers can also edit and delete the groups from here, by clicking on the edit or delete icon next to the group name. You can alter the variable order in a group by editing the group’s properties.
 
 
 ### Group label

diff --git a/docs/add-ons/pro-variables/type.md b/docs/add-ons/pro-variables/type.md
@@ -60,7 +60,7 @@ Allows applying modifiers, which, among other, are used to apply [on-the-fly ima
 
 ## Grid
 
-Uses the native [Grid field](/fieldtypes/grid.md). All native types are available, _except for Relationships_. To output the variable, use the `{exp:pro_variables:pair}` or `{exp:pro_variables:single}` tag where appropriate. You can use any of Grid’s [parameters](/fieldtypes/grid.md#parameters) and [variables](/fieldtypes/grid.ms#variables) using these tags. Additionally, one more parameter is available:
+Uses the native [Grid field](/fieldtypes/grid.md). All native types are available, _except for Relationships and Members_. To output the variable, use the `{exp:pro_variables:pair}` or `{exp:pro_variables:single}` tag where appropriate. You can use any of Grid’s [parameters](/fieldtypes/grid.md#parameters) and [variables](/fieldtypes/grid.ms#variables) using these tags. Additionally, one more parameter is available:
 
 ### Parameters
 

diff --git a/docs/add-ons/rte.md b/docs/add-ons/rte.md
@@ -11,7 +11,9 @@
 
 [TOC]
 
-ExpressionEngine's built-in Rich Text Editor (RTE) is a fieldtype that can be used for entry editing in the Control Panel as well as frontend Channel Forms. It is offering [CKEditor 5](https://ckeditor.com/ckeditor-5/) and [Redactor](https://imperavi.com/redactor/) as editing engine.
+ExpressionEngine's built-in Rich Text Editor (RTE) is a fieldtype that can be used for entry editing in the Control Panel as well as frontend Channel Forms. It is offering [CKEditor 5](https://ckeditor.com/ckeditor-5/) and [RedactorX](https://imperavi.com/redactorx/) as editing engine.
+
+Additionally, [Redactor 3](https://imperavi.com/redactor/) is available as a legacy option, but it is not recommended for new projects.
 
 NOTE: **Note:** If you're looking for how to use RTE fields in your channel entries loops, you should look at [the RTE field variable usage documentation](fieldtypes/rte.md) in the channel fields documentation.
 
@@ -24,14 +26,14 @@ Tool Sets are essentially pre-created configurations that can be used by particu
 Initially RTE installs 4 tool sets:
 - **CKEditor Basic:** is based on CKEditor and  has buttons for bold, italic, underline, link, and ordered/unordered lists
 - **CKEditor Full:** offers full set of CKEditor features
-- **Redactor Basic:** is based on Redactor and  has buttons for bold, italic, underline, link, and ordered/unordered lists
-- **Redactor Full:** offers full set of Redactor features
+- **RedactorX Basic:** is based on RedactorX and  has buttons for bold, italic, underline, link, and ordered/unordered lists
+- **RedactorX Full:** offers full set of RedactorX features
 
 ### Creating a Tool Set
 
 - Click the **Create New** button and the tool set creation form will appear.
 - Enter a tool set name.
-- Select tool set type (CKEditor or Redactor)
+- Select tool set type (CKEditor, RedactorX or Redactor)
 - Select the toolbar buttons and plugins you wish to have in your new tool set (or use the [Advanced Configuration option](#advanced-configuration)).
 - Click **Save Tool Set** to save your changes.
 
@@ -49,7 +51,7 @@ Initially RTE installs 4 tool sets:
 
 #### Editor Type
 
-Rich Text Editor comes with [CKEditor](https://ckeditor.com/) v5 and [Redactor](https://imperavi.com/redactor/) v3 support. Both are great, pick the one that fits your needs best.
+Rich Text Editor comes with [CKEditor](https://ckeditor.com/) v5 and [RedactorX](https://imperavi.com/redactorx/). Both are great, pick the one that fits your needs best. [Redactor 3](https://imperavi.com/redactor/) has been deprecated, but is also available.
 
 #### Upload Directory
 
@@ -59,43 +61,15 @@ The file management features in RTE field can be allowed to access all upload di
 
 Choose between "Left to right" and "Right to left"
 
-#### Tool Set Buttons
-
-The following are the buttons that can be enabled in tool set to manipulate the data within an RTE field.
-
-<ul style="columns: 4;">
-    <li>HTML (Redactor only)</li>
-    <li>Bold</li>
-    <li>Italic</li>
-    <li>Strikethrough / Deleted</li>
-    <li>Underline</li>
-    <li>Subscript</li>
-    <li>Superscript</li>
-    <li>Block quote</li>
-    <li>Code</li>
-    <li>Heading / Format</li>
-    <li>Remove formatting (CKEditor only)</li>
-    <li>Style (Redactor only)</li>
-    <li>Properties (Redactor only)</li>
-    <li>Undo</li>
-    <li>Redo</li>
-    <li>Numbered list</li>
-    <li>Bulleted list</li>
-    <li>Decrease indent</li>
-    <li>Increase indent</li>
-    <li>Link</li>
-    <li>Image / File Browser</li>
-    <li>Table</li>
-    <li>Media / Video</li>
-    <li>Embed HTML / Widget</li>
-    <li>Align (left / right / center)</li>
-    <li>Justify</li>
-    <li>Horizontal line</li>
-    <li>Special characters</li>
-    <li>"Read More" separator</li>
-    <li>Font color / background</li>
-    <li>Fullscreen (Redactor only)</li>
-</ul>
+#### Customize the Toolbar
+
+![RTE buttons](_images/rte-buttons.png)
+
+The exact set of buttons that are available is specific to the editor type selected. CKEditor and Redactor have a single toolbar, while RedactorX has multiple toolbars, each configured separately.
+
+The buttons / plugins that are enabled are displayed in the order they will appear in the toolbar. You can drag and drop the buttons to change their order.
+
+The disabled buttons / plugins are displayed in grey.
 
 #### Custom Stylesheet
 CSS template with styles to be applied to fields using this tool set. All styles will be automatically prefixed with toolset class, which means that the template should hold rather generic styles for the elements.
@@ -106,7 +80,7 @@ The minimal height for the field in pixels
 
 #### Maximal height
 
-The maximum height for the field in pixels (Redactor only).
+The maximum height for the field in pixels (RedactorX / Redactor only).
 
 #### Limit characters
 
@@ -126,7 +100,7 @@ WARN: **Advanced users only.** Please be careful with using this feature and che
 
 Initially the field is loaded with the saved configuration of tool set being edited.
 
-Consult [Redactor Docs](https://imperavi.com/redactor/docs/settings/) or [CKEDitor Docs](https://ckeditor.com/docs/ckeditor5/latest/installation/getting-started/configuration.html) for the list of properties. Note that not all features are supported by the ExpressionEngine implementation.
+Consult [RedactorX Docs](https://imperavi.com/redactorx/docs/settings/), [Redactor Docs](https://imperavi.com/redactor/docs/settings/) or [CKEDitor Docs](https://ckeditor.com/docs/ckeditor5/latest/installation/getting-started/configuration.html) for the list of properties. Note that not all features are supported by the ExpressionEngine implementation.
 
 #### Extra JavaScript
 JavaScript template to be included with fields using this tool set. Typically used to include extra plugins when using advanced configuration with Redactor.
@@ -148,14 +122,15 @@ To delete a tool set, check the tool set's checkbox in the tool set table listin
 
 - **Default RTE tool set** - select the tool set that will be selected by default when creating a field.
 - **File Browser** - select file browser that will be used when browsing for images and files from RTE fields. ExpressionEngine's FilePicker is used by default, third-party add-ons can provide their own filepickers
+- **Use custom CKEditor build** - Allows using custom CKEditor build with extra plugins. If enabled, RTE instances running CKEditor will be built using the script in `themes/user/rte/javascript/` folder.
 
 NOTE: **Note:** If using the [Multiple Site Manager](msm/overview.md), this preference is per-site.
 
 ## Custom plugins
 
-### Redactor
+### RedactorX
 
-When using Redactor, the javascript for the plugin can be placed in the template, which then needs to be selected in "Extra JavaScript" field for the tool set.
+When using RedactorX or Redactor, the javascript for the plugin can be placed in the template, which then needs to be selected in "Extra JavaScript" field for the tool set.
 Then enable extended configuration, add the plugin name to list of plugins and provide plugin config if necessary.
 If the plugin needs extra styling, it can be placed in CSS Templates selected in "Custom Stylesheet" field for the tool set. If the CSS is targeting buttons, the selectors need to be prefixed with `.redactor-toolbar`.
 
@@ -170,7 +145,9 @@ NOTE: **Warning** Doing this requires advanced development skills.
 In order to create custom CKEditor build:
  - Clone [GitHub repo](https://github.com/ExpressionEngine/ExpressionEngine/)
  - Install NPM packages by running `npm install`
- - Follow the installation instructions for the plugin itself
- - Make your changes to `js-src\ckeditor5-build-classic\src\ckeditor.js` and other files as necessary.
+ - Follow the installation instructions for the extra CKEditor plugins that you need
+ - Make your changes to `js-src/ckeditor5-build-classic/src/ckeditor.js` and other files as necessary.
  - Run the command `npm run build:ckeditor`
- - Copy the files from `themes/ee/asset/javascript/src/fields/rte/ckeditor` to same folder on your EE installation
+ - Copy the files from `themes/ee/asset/javascript/src/fields/rte/ckeditor` to `themes/user/rte/javascript/` folder on your EE installation
+
+TIP: Buttons provided by extra plugins might be not availble with visual toolbar builder. You will need to use Advanced Configuration JSON file to add those.
diff --git a/docs/add-ons/search/advanced.md b/docs/add-ons/search/advanced.md
@@ -143,6 +143,8 @@ The search results are displayed on the page you specify as the [result_page=](#
 
 [TOC=3]
 
+{{embed:_tips/form-attributes.md}}
+
 ### `category=`
 
     category="1"

diff --git a/docs/add-ons/search/simple.md b/docs/add-ons/search/simple.md
@@ -73,6 +73,8 @@ Besides specifying whether future entries are included in the search using the [
 
 ## Parameters
 
+{{embed:_tips/form-attributes.md}}
+
 ### `name=`
 
     name="search_form"

diff --git a/docs/add-ons/spam.md b/docs/add-ons/spam.md
@@ -25,7 +25,7 @@ The Spam Module has three important configuration settings:
 
 ### Sensitivity
 
-The Spam Module works by calculating the probability that a piece of content is spam based on all the examples it's seen before. The sensitivity is the cutoff for what we consider spam. This defaults to 70 which means there has to be at least a 70% probability something is spam for it to get flagged. If this is higher you will have fewere false positives but more spam will slip through.
+The Spam Module works by calculating the probability that a piece of content is spam based on all the examples it's seen before. The sensitivity is the cutoff for what we consider spam. This defaults to 70 which means there has to be at least a 70% probability something is spam for it to get flagged. If this is higher you will have fewer false positives but more spam will slip through.
 
 ### Word Limit
 

diff --git a/docs/advanced-usage/front-end/dock.md b/docs/advanced-usage/front-end/dock.md
@@ -12,7 +12,7 @@
 [TOC]
 
 ## Overview
-The Dock is a central component of ExpressionEngine's front-end functionality. 
+The Dock is a central component of ExpressionEngine's front-end functionality.
 
 ![dock overview](_images/ee-pro-dock.png)
 
@@ -47,7 +47,7 @@ The Control Panel button on the Dock will open the site's Control Panel in a new
 Prolets are add-on components that reveal some of add-on's functionality for the Control Panel to the front-end, making it possible to edit data directly on the page where it belongs.
 
 ### Built-in Prolets
-ExpressionEngine is shipped with the Entries and Publish prolets. 
+ExpressionEngine is shipped with the Entries and Publish prolets.
 
 Clicking on the Entries prolet opens a prolet window with all entries currently listed. Allowing you to quickly find and edit other entries in your site.
 
@@ -61,6 +61,6 @@ Developers may create third-party prolets that can be installed with add-ons. Re
 ![dock prolets](_images/ee-pro-dock-prolets.png)
 
 ## Disabling
-The Dock can be disabled by either the setting in the [Control Panel](control-panel/settings/front-end-editing.md#general-settings) or [config override](general/system-configuration-overrides.md#enable_dock).
+The Dock can be disabled by either the setting in the [Control Panel](control-panel/settings/front-end-editing.md#enable-dock) or [config override](general/system-configuration-overrides.md#enable_dock).
 
-WARN **Warning**: If the Dock is disabled, all of ExpressionEngine's [Front-End Content Management](advanced-usage/front-end/overview.md) is turned off for the front-end. 
+WARN **Warning**: If the Dock is disabled, all of ExpressionEngine's [Front-End Content Management](advanced-usage/front-end/overview.md) is turned off for the front-end.
diff --git a/docs/advanced-usage/front-end/frontend.md b/docs/advanced-usage/front-end/frontend.md
@@ -58,7 +58,7 @@ This special conditional allows you to display content if front-end editing is e
 ## Enable/Disable The Front Edit Link
 
 There are several ways to disable front-end editing links:
- - Globally with [configuration overrides](/general/system-configuration-overrides.html#enable_frontedit_links) or in [General Settings](/control-panel/settings/front-end-editing.md#enable-automatic-front-end-editing-links)
+ - Globally with [configuration overrides](/general/system-configuration-overrides.md#enable_frontedit_links) or in [General Settings](/control-panel/settings/front-end-editing.md#enable-automatic-front-end-editing-links)
  - Per field in the [field settings](control-panel/field-manager/field-manager-settings.md)
  - Via the Dock on the front-end by toggling Edit Mode on/off.
  - In the template by using [ExpressionEngine template comments](#expressionengine-comment), [HTML comments](#html-comment), or [field parameter](#field-tag-parameter)

diff --git a/docs/channels/channel-form/overview.md b/docs/channels/channel-form/overview.md
@@ -61,6 +61,8 @@ By default, validation errors will be displayed using the User Message Template.
 
 [TOC=3 hide]
 
+{{embed:_tips/form-attributes.md}}
+
 The Following parameters are available for the `{exp:channel:form}`:
 
 ### `allow_comments=`
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		TIP: Valid HTML Form attributes (as listed in the [config file](config/config-files.md#html-form-attributes)), `data-` and `aria-` attributes passed through ExpressionEngine tag parameters in the template will be included into generated opening form tag.
-Original file line number
+Diff line change
@@ Expand Up @@
     [TOC=3]
+    {{embed:_tips/form-attributes.md}}
     ### `charset=`
         charset="utf-8"
@@ Expand Down @@