Merge stable into master

ckeditor · Dec 9, 2024 · 9a0368e · 9a0368e
2 parents 1fc8f43 + 7717378
commit 9a0368e
Showing 1 changed file with 21 additions and 3 deletions.
diff --git a/packages/ckeditor5-core/src/editor/editor.ts b/packages/ckeditor5-core/src/editor/editor.ts
@@ -924,7 +924,14 @@ export default abstract class Editor extends /* #__PURE__ */ ObservableMixin() {
 
 			if ( reason == 'expired' ) {
 				/**
-				 * Your license key has expired. Please renew your license on the
+				 * Your license key has expired.
+				 *
+				 * If you used our free trial, you either need to switch to
+				 * [open-source license](https://ckeditor.com/docs/ckeditor5/latest/getting-started/licensing/license-and-legal.html), or
+				 * in case of a commercial plan, change the trial key to production key or development key.
+				 * Switching from trial, you also need to align the editor configuration to the features available in your plan.
+				 *
+				 * If you already had one of our Cloud or Custom plans, please renew your license in the
 				 * [Customer Portal](https://portal.ckeditor.com).
 				 *
 				 * @error license-key-expired
@@ -1010,13 +1017,24 @@ export default abstract class Editor extends /* #__PURE__ */ ObservableMixin() {
 				/**
 				 * Your license does not allow the current distribution channel.
 				 *
-				 * * With a 'GPL' license key, you may use the editor installed via npm or a ZIP package (self-hosted).
+				 * These are the available distribution channels:
+				 * * Self-hosted - the editor is installed via npm or from a ZIP package
+				 * * Cloud - the editor is run from CDN
+				 *
+				 * The licenses available include:
+				 * * GPL license for open-source users.
+				 * * Commercial plans (Cloud or sales-assisted).
+				 *
+				 * The relation between distribution channels and licenses works as follows:
+				 * * With the 'GPL' license key, you may use the editor installed via npm or a ZIP package (self-hosted).
 				 * * With the CKEditor Cloud plans, you may use the editor via our CDN.
 				 * * With the CKEditor Custom plans, depending on your plan details, you can use the editor via npm
-				 *   or a ZIP package (self-hosted) or Cloud (CDN)
+				 *   or a ZIP package (self-hosted) or Cloud (CDN).
 				 *
 				 * {@glink getting-started/licensing/usage-based-billing#key-terms Read more about distributions in the documentation}.
 				 * Please verify your installation or [contact support](https://ckeditor.com/contact/) for assistance.
+				 * Should you need to migrate your installation from npm to CDN, please refer to our
+				 * [dedicated migration guides](https://ckeditor.com/docs/ckeditor5/latest/updating/migrations/vanilla-js.html).
 				 *
 				 * @error license-key-invalid-distribution-channel
 				 */