Fixed merge conflicts

Author: Yulyaswan

.tool-versions

@@ -1 +1 @@
-nodejs 10.1.0
+nodejs 18.0.0

docs/_images/eeu-logo-white.svg

@@ -17,7 +17,9 @@ In most cases, the simple global variable syntax, eg. `{my_var}` will do. Global
 
     {exp:pro_variables:parse var="my_var"}
 
-Use the Parse, Single or Pair tag to parse variables during the Module & Plugin stage ([learn more about the parsing stages](https://u.expressionengine.com/course/ee-conf-spring-summit-2021/eeconf-spring-2021-but-first-parse-order-and-php-in-expressionengines-templates)). You can also use parameters, which will allow for more options than just using the variable syntax. Some variable types, like RTE and Grid, require using the tag syntax to trigger additional processing.
+Use the Parse, Single or Pair tag to parse variables during the Module & Plugin stage. You can also use parameters, which will allow for more options than just using the variable syntax. Some variable types, like RTE and Grid, require using the tag syntax to trigger additional processing.
+
+TIP: TIP: **{ee:u}** Learn more about the parsing stages at [ExpressionEngine University](https://u.expressionengine.com/course/ee-conf-spring-summit-2021/eeconf-spring-2021-but-first-parse-order-and-php-in-expressionengines-templates).
 
 NOTE: **Note:** Whenever you need parameters or additional processing, use the **tag syntax** rather than the variable syntax.
 

docs/_images/rte_js.gif

@@ -32,15 +32,15 @@ Initially RTE installs 4 tool sets:
 - 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 the toolbar buttons and plugins you wish to have in your new tool set.
+- 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.
 
 ### Editing a Tool Set
 
 - Click a tool set's name or pencil icon to open the tool set Editor.
 - Modify the tool set's name, if desired.
 - Change the tool set type, if desired.
-- Select the tools you wish to have in this tool set.
+- Select the tools you wish to have in this tool set (or use the [Advanced Configuration option](#advanced-configuration)).
 - Click **Save Tool Set** to save your changes.
 
 [TOC=3]
@@ -63,37 +63,39 @@ Choose between "Left to right" and "Right to left"
 
 The following are the buttons that can be enabled in tool set to manipulate the data within an RTE field.
 
-- HTML (Redactor only)
-- Bold
-- Italic
-- Strikethrough / Deleted
-- Underline
-- Subscript
-- Superscript
-- Block quote
-- Code
-- Heading / Format
-- Remove formatting (CKEditor only)
-- Style (Redactor only)
-- Properties (Redactor only)
-- Undo
-- Redo
-- Numbered list
-- Bulleted list
-- Decrease indent
-- Increase indent
-- Link
-- Image / File Browser
-- Table
-- Media / Video
-- Embed HTML / Widget
-- Align (left / right / center)
-- Justify
-- Horizontal line
-- Special characters
-- "Read More" separator
-- Font color / background
-- Fullscreen (Redactor only)
+<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>
 
 #### 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.
@@ -112,19 +114,24 @@ Limits the number of character that can be entered into the field (Redactor only
 
 #### Advanced configuration
 
-Toggling this button hides the visual constructor for toolbar and enables editing the configuration directly in JSON format.
+Add custom formatting styles, buttons, and interactions to your RTE toolset by using advanced configurations. Toggling this button hides the visual constructor toolbar and reveals [advanced configuration](#configuration-json) options. These advanced options allow for editing the configuration directly in JSON format.
+
+TIP: **{ee:u}** Checkout the [Advanced RTE Configurations](https://u.expressionengine.com/article/advanced-rte-configurations) article on ExpressionEngine University for examples of how to add custom CSS and JavaScript to your RTE configurations.
 
 #### Configuration JSON
 
-Allows overriding visually constructed tool set with [JSON](https://www.json.org/) object. Please be careful with using this feature and check your work. Remember that all properties need to be quoted.
+Allows overriding the visually constructed tool set with a [JSON](https://www.json.org/) object. Remember that all properties need to be quoted.
+
+WARN: **Advanced users only.** Please be careful with using this feature and check your work. Providing invalid configuration can make the RTE fields inaccessible.
 
 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 might be supported by ExpressionEngine implementation.
+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.
 
 #### 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.
 
+
 ### Cloning a Tool Set
 
 - Click a tool set's clone icon to create copy of tool set and open it for editing

docs/add-ons/pro-variables/tags.md

@@ -272,6 +272,20 @@ These are totally dynamic in that any field you create for your category will au
 
 You may use this conditional to test whether the category shown is the active category or not, based on the dynamic URI segment.
 
+### `{has_children}`
+
+    {exp:channel:categories channel="news" style="nested" show_empty="no"}
+        <a href="{path='channel/index'}">{category_name}</a>
+
+        {if has_children}
+            <button
+                type="button"
+                aria-haspopup="true"
+            >children categories</button>
+        {/if}
+    {/exp:channel:categories}
+You may use this conditional to test whether the category shown is or isn't a parent category.
+
 ## Category Dropdown Menu
 
 You can also display categories in a dropdown menu using the following code:

docs/add-ons/rte.md

@@ -249,6 +249,20 @@ There are several variables available for use inside the `{categories}{/categori
 
 You may use this conditional to test whether the category shown is the active category or not, based on the dynamic URI segment.
 
+### `{has_children}`
+
+    {categories}
+        <a href="{path='channel/index'}">{category_name}</a>
+
+        {if has_children}
+            <button
+                type="button"
+                aria-haspopup="true"
+            >children categories</button>
+        {/if}
+    {/categories}
+You may use this conditional to test whether the category shown is or isn't a parent category.
+
 ### `{category_description}`
 
     {categories}

docs/channels/categories.md

@@ -0,0 +1,17 @@
+# make:action
+
+Action Generator -- Creates a new action for an add-on 
+
+## Options list:
+
+```
+    --addon=<value>
+    -a <value>
+        Folder for third-party add-on you want to add action to
+```
+
+## Examples:
+
+### Generating an action:
+
+`php eecli.php make:action MyNewAction --addon=my_existing_addon`

docs/channels/category-archive.md

@@ -34,6 +34,10 @@ Check out our video tutorial generating an add-on!
     -e <value>
         Add-on has settings (yes/no)
 
+    --compatibility-mode
+    -p
+        Generate add-on that is compatible with ExpressionEngine versions lower than 7.2.0 and lower than 6.4.0
+
     --version=<value>
     -v <value>
         Version of the add-on
@@ -86,3 +90,7 @@ Check out our video tutorial generating an add-on!
 
 `php eecli.php make:addon my_awesome_mod --mod --description "Description of addon" --version="1.0.0" --author="Joe Shmoe" --author-url='www.example.com' --has-settings='yes'`
 
+### Generating a module in compatibility mode:
+
+`php eecli.php make:addon my_awesome_mod --mod --description "Description of addon" --version="1.0.0" --author="Joe Shmoe" --author-url='www.example.com' --has-settings='yes' --compatibility-mode`
+

docs/cli/built-in-commands/make-action.md

@@ -0,0 +1,17 @@
+# make:extension-hook
+
+Extension Hook Generator -- Implements an EE extension hook in an add-on
+
+## Options list:
+
+```
+    --addon=<value>
+    -a <value>
+        Folder for third-party add-on you want to add extension hook to
+```
+
+## Examples:
+
+### Implementing the sessions_start extension hook:
+
+`php eecli.php make:extension-hook sessions_start --addon=my_existing_addon`