Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Resolve conflict between master and stable #15929

Merged
merged 3 commits into from
Feb 26, 2024
Merged

Resolve conflict between master and stable #15929

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3e2b3b0
Fix docs.
Witoso Feb 26, 2024
22ea9ca
Merge pull request #15926 from ckeditor/docs/15922
Witoso Feb 26, 2024
53ebe66
Merge remote-tracking branch 'origin/stable' into resolve-conflict-be…
filipsobol Feb 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/tutorials/crash-course/model-and-schema.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Later you will also learn about the **editing UI**, but for now, all you need to

### Model

The first and most important part of the editing engine is the model. The model is an HTML-like structure that represents the content of the editor. When the {@link module:core/editor/editor~Editor#setData `editor.setData()`} method is called, HTML passed as the argument is converted into the model. Then, when the {@link module:core/editor/editor~Editor#getData `model.getData()`} method is called, the model is converted back to HTML.
The first and most important part of the editing engine is the model. The model is an HTML-like structure that represents the content of the editor. When the {@link module:core/editor/editor~Editor#setData `editor.setData()`} method is called, HTML passed as the argument is converted into the model. Then, when the {@link module:core/editor/editor~Editor#getData `editor.getData()`} method is called, the model is converted back to HTML.

One major difference between the model and HTML is that in the model, both text and elements can have attributes.

Expand Down