Merge stable into master

ckeditor · Sep 2, 2020 · bd283ac · bd283ac
2 parents c9a384b + c5d9f21
commit bd283ac
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 1 deletion.
diff --git a/...ckeditor5-engine/docs/framework/guides/deep-dive/conversion-extending-output.md b/...ckeditor5-engine/docs/framework/guides/deep-dive/conversion-extending-output.md
@@ -355,4 +355,6 @@ Add some CSS styles for `.my-heading` to see the customization in action:
 
 ## What's next?
 
-If you would like to read more about how to make CKEditor 5 accept more content, refer to the {@link framework/guides/deep-dive/conversion-preserving-custom-content Preserving custom content} guide.
+If you would like to read more about how to make CKEditor 5 accept more content, refer to the {@link framework/guides/deep-dive/conversion-preserving-custom-content Preserving custom content} guide.
+
+If you want to learn how to create complex view structures or how to move from {@link module:engine/conversion/conversion~Conversion two-way} or {@link module:engine/conversion/conversion~Conversion#for one-way} converters to event-based ones, refer to the {@link framework/guides/deep-dive/custom-element-conversion Custom element conversion} guide.
diff --git a/...ges/ckeditor5-engine/docs/framework/guides/deep-dive/conversion-introduction.md b/...ges/ckeditor5-engine/docs/framework/guides/deep-dive/conversion-introduction.md
@@ -126,3 +126,4 @@ Once you understand more about the conversion of model attributes, you can check
 
 * {@link framework/guides/deep-dive/conversion-extending-output Extending the editor output} &mdash; How to extend the output of existing CKEditor 5 features.
 * {@link framework/guides/deep-dive/conversion-preserving-custom-content Preserving custom content} &mdash; How to make CKEditor 5 accept more content.
+* {@link framework/guides/deep-dive/custom-element-conversion Custom element conversion} &mdash; How to deal with complex view structures during the model-to-view conversion.
diff --git a/...-engine/docs/framework/guides/deep-dive/conversion-preserving-custom-content.md b/...-engine/docs/framework/guides/deep-dive/conversion-preserving-custom-content.md
@@ -487,3 +487,5 @@ ClassicEditor
 ## What's next?
 
 If you would like to read more about how to extend the output of existing CKEditor 5 features, refer to the {@link framework/guides/deep-dive/conversion-extending-output Extending the editor output} guide.
+
+If you want to learn how to create complex view structures or how to move from {@link module:engine/conversion/conversion~Conversion two-way} or {@link module:engine/conversion/conversion~Conversion#for one-way} converters to event-based ones, refer to the {@link framework/guides/deep-dive/custom-element-conversion Custom element conversion} guide.
diff --git a/packages/ckeditor5-engine/src/conversion/downcastdispatcher.js b/packages/ckeditor5-engine/src/conversion/downcastdispatcher.js
@@ -75,6 +75,12 @@ import mix from '@ckeditor/ckeditor5-utils/src/mix';
  * When providing custom listeners for downcast dispatcher, remember to use the provided
  * {@link module:engine/view/downcastwriter~DowncastWriter view downcast writer} to apply changes to the view document.
  *
+ * You can read more about conversion in the following guides:
+ *
+ * * {@glink framework/guides/deep-dive/conversion/conversion-introduction Advanced conversion concepts &mdash; attributes}
+ * * {@glink framework/guides/deep-dive/conversion/conversion-extending-output Extending the editor output }
+ * * {@glink framework/guides/deep-dive/conversion/custom-element-conversion Custom element conversion}
+ *
  * An example of a custom converter for the downcast dispatcher:
  *
  *		// You will convert inserting a "paragraph" model element into the model.

diff --git a/packages/ckeditor5-engine/src/conversion/downcasthelpers.js b/packages/ckeditor5-engine/src/conversion/downcasthelpers.js
@@ -62,6 +62,9 @@ export default class DowncastHelpers extends ConversionHelpers {
 	 * See {@link module:engine/conversion/conversion~Conversion#for `conversion.for()`} to learn how to add a converter
 	 * to the conversion process.
 	 *
+	 * You can read more about element-to-element conversion in the
+	 * {@glink framework/guides/deep-dive/conversion/custom-element-conversion Custom element conversion} guide.
+	 *
 	 * @method #elementToElement
 	 * @param {Object} config Conversion configuration.
 	 * @param {String} config.model The name of the model element to convert.
Original file line number	Diff line number	Diff line change
Expand Up		@@ -126,3 +126,4 @@ Once you understand more about the conversion of model attributes, you can check

		* {@link framework/guides/deep-dive/conversion-extending-output Extending the editor output} — How to extend the output of existing CKEditor 5 features.
		* {@link framework/guides/deep-dive/conversion-preserving-custom-content Preserving custom content} — How to make CKEditor 5 accept more content.
		* {@link framework/guides/deep-dive/custom-element-conversion Custom element conversion} — How to deal with complex view structures during the model-to-view conversion.
Original file line number	Diff line number	Diff line change
Expand Up		@@ -487,3 +487,5 @@ ClassicEditor
		## What's next?

		If you would like to read more about how to extend the output of existing CKEditor 5 features, refer to the {@link framework/guides/deep-dive/conversion-extending-output Extending the editor output} guide.

		If you want to learn how to create complex view structures or how to move from {@link module:engine/conversion/conversion~Conversion two-way} or {@link module:engine/conversion/conversion~Conversion#for one-way} converters to event-based ones, refer to the {@link framework/guides/deep-dive/custom-element-conversion Custom element conversion} guide.