diff --git a/_includes/codepens/advcode/index.html b/_includes/codepens/advcode/index.html
new file mode 100644
index 000000000..9af34d108
--- /dev/null
+++ b/_includes/codepens/advcode/index.html
@@ -0,0 +1,41 @@
+
+
+
+
The Code Plugin
+
The Advanced Code Editor Plugin
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/_includes/codepens/advcode/index.js b/_includes/codepens/advcode/index.js
new file mode 100644
index 000000000..b4198035a
--- /dev/null
+++ b/_includes/codepens/advcode/index.js
@@ -0,0 +1,17 @@
+tinymce.init({
+ selector: 'textarea.advcodedemo',
+ plugins: 'advcode',
+ toolbar: 'code',
+
+ content_css: '//www.tiny.cloud/css/codepen.min.css',
+ height: 600
+});
+
+tinymce.init({
+ selector: 'textarea.codedemo',
+ plugins: 'code',
+ toolbar: 'code',
+
+ content_css: '//www.tiny.cloud/css/codepen.min.css',
+ height: 600
+});
\ No newline at end of file
diff --git a/_includes/misc/advcode-shortcuts.md b/_includes/misc/advcode-shortcuts.md
new file mode 100644
index 000000000..ef0387218
--- /dev/null
+++ b/_includes/misc/advcode-shortcuts.md
@@ -0,0 +1,11 @@
+## Advanced Code Editor search and replace keyboard shortcuts
+
+Advanced Code Editor provides the following shortcuts for search and replace within the code dialog.
+
+| Action | PC | Mac |
+| ---- | ----- | ----- |
+| Find | Ctrl+F | Command+F |
+| Find next instance | Ctrl+G | Command+G |
+| Find previous instance | Shift+Ctrl+G | Shift+Command+G |
+| Replace | Ctrl+H | Command+Option+F |
+| Replace All | Shift+Ctrl+R | Shift+Command+Option+F |
\ No newline at end of file
diff --git a/advanced/keyboard-shortcuts.md b/advanced/keyboard-shortcuts.md
index d8c905ef1..d281d4466 100644
--- a/advanced/keyboard-shortcuts.md
+++ b/advanced/keyboard-shortcuts.md
@@ -61,6 +61,8 @@ This is a list of available keyboard shortcuts within the editor user interface.
> Note: Browsers and Screen Readers provide additional shortcuts within the editor context.
+{% include misc/advcode-shortcuts.md %}
+
## Add custom shortcuts to TinyMCE
> **Important**: Adding a custom shortcut with a keyboard combination that conflicts with an existing {{site.productname}} or browser shortcut will override the existing shortcut.
diff --git a/enterprise/advcode.md b/enterprise/advcode.md
index b8c8d2efd..371f90412 100644
--- a/enterprise/advcode.md
+++ b/enterprise/advcode.md
@@ -13,6 +13,11 @@ The [Advanced Code Editor]({{ site.baseurl }}/plugins/advcode/) plugin (`advcode
* Bracket matching
* Code folding
* Multiple selections/carets
+* Search and Replace
+
+## The difference between the Code and Advanced Code Editor plugins
+
+{% include codepen.html id="advcode" %}
{% assign pluginname = 'Advanced Code Editor' %}
{% assign pluginminimumplan = 'tiertwo' %}
diff --git a/plugins/advcode.md b/plugins/advcode.md
index 2523a8274..19f5c5acd 100644
--- a/plugins/advcode.md
+++ b/plugins/advcode.md
@@ -11,18 +11,24 @@ controls: toolbar button, menu item
This plugin adds a toolbar button that allows a user to edit the HTML code using a more advanced [code editor]({{ site.baseurl }}/enterprise/advcode/) than the default textarea.
-If you are using Advanced Code Editor `advcode` plugin, make sure you do not use Code `code` plugin.
+If you are using Advanced Code Editor `advcode` plugin, make sure you do not use Code (`code`) plugin.
##### Example
```js
tinymce.init({
- selector: "textarea", // change this value according to your HTML
- plugins: "advcode",
- toolbar: "code"
+ selector: 'textarea', // change this value according to your HTML
+ plugins: 'advcode',
+ toolbar: 'code'
});
```
+## The difference between the Code and Advanced Code Editor plugins
+
+{% include codepen.html id="advcode" %}
+
+{% include misc/advcode-shortcuts.md %}
+
## Commands
The Advanced Code plugin provides the following JavaScript command.
diff --git a/release-notes/release-notes54.md b/release-notes/release-notes54.md
index 2694f9ab6..82a4b89b7 100644
--- a/release-notes/release-notes54.md
+++ b/release-notes/release-notes54.md
@@ -10,7 +10,6 @@ These release notes provide an overview of the changes for {{site.productname}}
- [TinyMCE 5.4 new features and enhancements](#tinymce54newfeaturesandenhancements)
- [Accompanying Premium Plugin changes](#accompanyingpremiumpluginchanges)
-- [Accompanying premium self-hosted server-side component changes](#accompanyingpremiumself-hostedserver-sidecomponentchanges)
- [Minor changes for TinyMCE 5.4](#minorchangesfortinymce54)
- [General bug fixes](#generalbugfixes)
- [Deprecated features](#deprecatedfeatures)
@@ -56,23 +55,16 @@ For information on:
The following premium plugin updates were released alongside {{site.productname}} 5.4.
-### Accessibility Checker 2.x.x
+### Advanced Code Editor 2.1.0
-The {{site.productname}} 5.4 release includes an accompanying release of the **Accessibility Checker** premium plugin.
+The {{site.productname}} 5.4 release includes an accompanying release of the **Advanced Code Editor** premium plugin.
-**Accessibility Checker** 2.x.x
+**Advanced Code Editor** 2.1.0 provides the following improvements:
-For information on the Accessibility Checker plugin, see: [Accessibility Checker plugin]({{site.baseurl}}/plugins/a11ychecker/).
-
-## Accompanying premium self-hosted server-side component changes
-
-The {{site.productname}} 5.4 release includes accompanying changes affecting the {{site.productname}} **self-hosted** services for the following plugins:
-
--
-
-
-###
+- Added search/replace support.
+- Fixed the editor `referrer_policy` option not working when loading additional resources.
+For information on the Advanced Code Editor plugin, see: [Advanced Code Editor plugin]({{site.baseurl}}/plugins/advcode/).
## Minor changes for TinyMCE 5.4